/*****************************************************************************/
var cloudeebus = window.cloudeebus = {
- version: "0.4.0",
+ version: "0.5.1",
minVersion: "0.3.2"
};
/*****************************************************************************/
-cloudeebus.FutureResolver = function(future) {
- this.future = future;
+cloudeebus.PromiseResolver = function(promise) {
+ this.promise = promise;
this.resolved = null;
return this;
};
-cloudeebus.FutureResolver.prototype.resolve = function(value, sync) {
+cloudeebus.PromiseResolver.prototype.resolve = function(value, sync) {
if (this.resolved)
return;
var then = (value && value.then && value.then.apply) ? value.then : null;
if (then) {
var self = this;
- var acceptCallback = function(arg) {
+ var fulfillCallback = function(arg) {
self.resolve(arg, true);
};
var rejectCallback = function(arg) {
self.reject(arg, true);
};
try {
- then.apply(value, [acceptCallback, rejectCallback]);
+ then.apply(value, [fulfillCallback, rejectCallback]);
}
catch (e) {
this.reject(e, true);
}
}
- this.accept(value, sync);
+ this.fulfill(value, sync);
};
-cloudeebus.FutureResolver.prototype.accept = function(value, sync) {
+cloudeebus.PromiseResolver.prototype.fulfill = function(value, sync) {
if (this.resolved)
return;
- var future = this.future;
- future.state = "accepted";
- future.result = value;
+ var promise = this.promise;
+ promise.state = "fulfilled";
+ promise.result = value;
this.resolved = true;
if (sync)
- _processWrappers(future._acceptWrappers, value);
+ _processWrappers(promise._fulfillWrappers, value);
else
- _processWrappersAsync(future._acceptWrappers, value);
+ _processWrappersAsync(promise._fulfillWrappers, value);
};
-cloudeebus.FutureResolver.prototype.reject = function(value, sync) {
+cloudeebus.PromiseResolver.prototype.reject = function(value, sync) {
if (this.resolved)
return;
- var future = this.future;
- future.state = "rejected";
- future.result = value;
+ var promise = this.promise;
+ promise.state = "rejected";
+ promise.result = value;
this.resolved = true;
if (sync)
- _processWrappers(future._rejectWrappers, value);
+ _processWrappers(promise._rejectWrappers, value);
else
- _processWrappersAsync(future._rejectWrappers, value);
+ _processWrappersAsync(promise._rejectWrappers, value);
};
/*****************************************************************************/
-cloudeebus.Future = function(init) {
+cloudeebus.Promise = function(init) {
this.state = "pending";
this.result = null;
- this._acceptWrappers = [];
+ this._fulfillWrappers = [];
this._rejectWrappers = [];
- this.resolver = new cloudeebus.FutureResolver(this);
+ this.resolver = new cloudeebus.PromiseResolver(this);
if (init) {
try {
init.apply(this, [this.resolver]);
};
-cloudeebus.Future.prototype.appendWrappers = function(acceptWrapper, rejectWrapper) {
- this._acceptWrappers.push(acceptWrapper);
- this._rejectWrappers.push(rejectWrapper);
- if (this.state == "accepted")
- _processWrappersAsync(this._acceptWrappers, this.result);
+cloudeebus.Promise.prototype.appendWrappers = function(fulfillWrapper, rejectWrapper) {
+ if (fulfillWrapper)
+ this._fulfillWrappers.push(fulfillWrapper);
+ if (rejectWrapper)
+ this._rejectWrappers.push(rejectWrapper);
+ if (this.state == "fulfilled")
+ _processWrappersAsync(this._fulfillWrappers, this.result);
if (this.state == "rejected")
_processWrappersAsync(this._rejectWrappers, this.result);
};
-cloudeebus.Future.prototype.then = function(acceptCB, rejectCB) {
- var future = new cloudeebus.Future();
- var resolver = future.resolver;
- var acceptWrapper, rejectWrapper;
+cloudeebus.Promise.prototype.then = function(fulfillCB, rejectCB) {
+ var promise = new cloudeebus.Promise();
+ var resolver = promise.resolver;
+ var fulfillWrapper, rejectWrapper;
- if (acceptCB)
- acceptWrapper = function(arg) {
+ if (fulfillCB)
+ fulfillWrapper = function(arg) {
try {
- var value = acceptCB.apply(future, [arg]);
+ var value = fulfillCB.apply(promise, [arg]);
resolver.resolve(value, true);
}
catch (e) {
}
};
else
- acceptWrapper = function(arg) {
- resolver.accept(arg, true);
+ fulfillWrapper = function(arg) {
+ resolver.fulfill(arg, true);
};
if (rejectCB)
rejectWrapper = function(arg) {
try {
- var value = rejectCB.apply(future, [arg]);
+ var value = rejectCB.apply(promise, [arg]);
resolver.resolve(value, true);
}
catch (e) {
resolver.reject(arg, true);
};
- this.appendWrappers(acceptWrapper,rejectWrapper);
- return future;
+ this.appendWrappers(fulfillWrapper,rejectWrapper);
+ return promise;
};
-cloudeebus.Future.resolve = function(value) {
- var future = new cloudeebus.Future();
- future.resolver.resolve(value, true);
- return future;
+cloudeebus.Promise.prototype["catch"] = function(rejectCB) {
+ return this.then(undefined,rejectCB);
};
-cloudeebus.Future.accept = function(value) {
- var future = new cloudeebus.Future();
- future.resolver.accept(value, true);
- return future;
+cloudeebus.Promise.prototype.done = function(fulfillCB, rejectCB) {
+ this.appendWrappers(fulfillCB,rejectCB);
};
-cloudeebus.Future.reject = function(value) {
- var future = new cloudeebus.Future();
- future.resolver.reject(value, true);
- return future;
+cloudeebus.Promise.resolve = function(value) {
+ var promise = new cloudeebus.Promise();
+ promise.resolver.resolve(value);
+ return promise;
};
+cloudeebus.Promise.fulfill = function(value) {
+ var promise = new cloudeebus.Promise();
+ promise.resolver.fulfill(value);
+ return promise;
+};
+
+
+cloudeebus.Promise.reject = function(value) {
+ var promise = new cloudeebus.Promise();
+ promise.resolver.reject(value);
+ return promise;
+};
+
+
+cloudeebus.Promise.any = function() {
+ var promise = new cloudeebus.Promise();
+ var resolver = promise.resolver;
+ var fulfillCallback = function(arg) {
+ resolver.resolve(arg, true);
+ };
+ var rejectCallback = function(arg) {
+ resolver.reject(arg, true);
+ };
+ if (arguments.length == 0)
+ resolver.resolve(undefined, true);
+ else
+ for (i in arguments)
+ Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+ return promise;
+};
+
+
+cloudeebus.Promise.every = function() {
+ var promise = new cloudeebus.Promise();
+ var resolver = promise.resolver;
+ var index = 0;
+ var countdown = arguments.length;
+ var args = new Array(countdown);
+ var rejectCallback = function(arg) {
+ resolver.reject(arg, true);
+ };
+ if (arguments.length == 0)
+ resolver.resolve(undefined, true);
+ else
+ for (i in arguments) {
+ var fulfillCallback = function(arg) {
+ args[index] = arg;
+ countdown--;
+ if (countdown == 0)
+ resolver.resolve(args, true);
+ };
+ index++;
+ Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+ }
+
+ return promise;
+};
+
+
+cloudeebus.Promise.some = function() {
+ var promise = new cloudeebus.Promise();
+ var resolver = promise.resolver;
+ var index = 0;
+ var countdown = arguments.length;
+ var args = new Array(countdown);
+ var fulfillCallback = function(arg) {
+ resolver.resolve(arg, true);
+ };
+ if (arguments.length == 0)
+ resolver.resolve(undefined, true);
+ else
+ for (i in arguments) {
+ var rejectCallback = function(arg) {
+ args[index] = arg;
+ countdown--;
+ if (countdown == 0)
+ resolver.reject(args, true);
+ };
+ index++;
+ Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+ }
+
+ return promise;
+};
+
+
+
/*****************************************************************************/
cloudeebus.ProxyObject = function(session, busConnection, busName, objectPath) {
var self = this;
- var future = new cloudeebus.Future(function (resolver) {
+ var promise = new cloudeebus.Promise(function (resolver) {
function callMethodSuccessCB(str) {
try { // calling dbus hook object function for un-translated types
var result = eval(str);
- resolver.accept(result[0], true);
+ resolver.fulfill(result[0], true);
}
catch (e) {
cloudeebus.log("Method callback exception: " + e);
self.wampSession.call("dbusSend", arglist).then(callMethodSuccessCB, callMethodErrorCB);
});
- return future;
+ return promise;
};
-cloudeebus.ProxyObject.prototype.connectToSignal = function(ifName, signal, successCB, errorCB) {
+cloudeebus.ProxyObject.prototype.connectToSignal = function(ifName, signal, handlerCB, errorCB) {
var self = this;
function signalHandler(id, data) {
- if (successCB) {
+ if (handlerCB) {
try { // calling dbus hook object function for un-translated types
- successCB.apply(self, eval(data));
+ handlerCB.apply(self, eval(data));
}
catch (e) {
cloudeebus.log("Signal handler exception: " + e);