X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cloudeebus%2Fcloudeebus.js;h=677f0029b8e3f7a30a5ccd56dcc41fa83ede2424;hb=c2e2edfe53a07103b72208b4702b627d2aec00a1;hp=bc34d4f39a29da596fd7ef8a782953fdea7c1dd8;hpb=6a667321616c8307957cb01ad11776076212e56e;p=contrib%2Fcloudeebus.git

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index bc34d4f..677f002 100644
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -28,7 +28,10 @@ var dbus = { // hook object for dbus types not translated by python-json
 
 /*****************************************************************************/
 
-var cloudeebus = window.cloudeebus = {version: "0.3.1"};
+var cloudeebus = window.cloudeebus = {
+		version: "0.5.1",
+		minVersion: "0.3.2"
+};
 
 cloudeebus.reset = function() {
 	cloudeebus.sessionBus = null;
@@ -42,17 +45,30 @@ cloudeebus.log = function(msg) {
 };
 
 
+cloudeebus.versionCheck = function(version) {
+	var ver = version.split(".");
+	var min = cloudeebus.minVersion.split(".");
+	for (var i=0; i<ver.length; i++) {
+		if (Number(ver[i]) > Number(min[i]))
+			return true;
+		if (Number(ver[i]) < Number(min[i]))
+			return false;
+	}
+	return true;
+};
+
+
 cloudeebus.connect = function(uri, manifest, successCB, errorCB) {
 	cloudeebus.reset();
 	cloudeebus.uri = uri;
 	
 	function onCloudeebusVersionCheckCB(version) {
-		if (cloudeebus.version == version) {
+		if (cloudeebus.versionCheck(version)) {
 			cloudeebus.log("Connected to " + cloudeebus.uri);
 			if (successCB)
 				successCB();
 		} else {
-			var errorMsg = "Cloudeebus server version " + version + " and client version " + cloudeebus.version + " mismatch";
+			var errorMsg = "Cloudeebus server version " + version + " unsupported, need version " + cloudeebus.minVersion + " or superior";
 			cloudeebus.log(errorMsg);
 			if (errorCB)
 				errorCB(errorMsg);
@@ -81,7 +97,7 @@ cloudeebus.connect = function(uri, manifest, successCB, errorCB) {
 		if (manifest)
 			cloudeebus.wampSession.authreq(
 					manifest.name, 
-					{permissions: JSON.stringify(manifest.permissions)}
+					{permissions: manifest.permissions}
 				).then(onWAMPSessionChallengedCB, onWAMPSessionAuthErrorCB);
 		else
 			cloudeebus.wampSession.authreq().then(function() {
@@ -135,19 +151,262 @@ cloudeebus.BusConnection.prototype.getObject = function(busName, objectPath, int
 
 /*****************************************************************************/
 
-cloudeebus.Request = function(proxy, onsuccess, onerror) {
-	this.proxy = proxy; 
-	this.error = null;
+function _processWrappers(wrappers, value) {
+	for (var i=0; i<wrappers.length; i++)
+		wrappers[i](value);
+}
+
+
+function _processWrappersAsync(wrappers, value) {
+	var taskid = -1;
+	function processAsyncOnce() {
+		_processWrappers(wrappers, value);
+		clearInterval(taskid);
+	}
+	taskid = setInterval(processAsyncOnce, 200);
+}
+
+
+
+/*****************************************************************************/
+
+cloudeebus.PromiseResolver = function(promise) {
+	this.promise = promise;
+	this.resolved = null;
+    return this;
+};
+
+
+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 fulfillCallback = function(arg) {
+			self.resolve(arg, true);
+		};	
+		var rejectCallback = function(arg) {
+			self.reject(arg, true);
+		};
+		try {
+			then.apply(value, [fulfillCallback, rejectCallback]);
+		}
+		catch (e) {
+			this.reject(e, true);
+		}
+	}
+	
+	this.fulfill(value, sync);
+};
+
+
+cloudeebus.PromiseResolver.prototype.fulfill = function(value, sync) {
+	if (this.resolved)
+		return;
+	
+	var promise = this.promise;
+	promise.state = "fulfilled";
+	promise.result = value;
+	
+	this.resolved = true;
+	if (sync)
+		_processWrappers(promise._fulfillWrappers, value);
+	else
+		_processWrappersAsync(promise._fulfillWrappers, value);
+};
+
+
+cloudeebus.PromiseResolver.prototype.reject = function(value, sync) {
+	if (this.resolved)
+		return;
+	
+	var promise = this.promise;
+	promise.state = "rejected";
+	promise.result = value;
+	
+	this.resolved = true;
+	if (sync)
+		_processWrappers(promise._rejectWrappers, value);
+	else
+		_processWrappersAsync(promise._rejectWrappers, value);
+};
+
+
+
+/*****************************************************************************/
+
+cloudeebus.Promise = function(init) {
+	this.state = "pending";
 	this.result = null;
-	this.onsuccess = onsuccess;
-	this.onerror = onerror;
+	this._fulfillWrappers = [];
+	this._rejectWrappers = [];
+	this.resolver = new cloudeebus.PromiseResolver(this);
+	if (init) {
+		try {
+			init.apply(this, [this.resolver]);
+		}
+		catch (e) {
+			this.resolver.reject(e, true);
+		}
+	}
     return this;
 };
 
-cloudeebus.Request.prototype.then = function(onsuccess, onerror) {
-	this.onsuccess = onsuccess;
-	this.onerror = onerror;
-	return this;
+
+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.Promise.prototype.then = function(fulfillCB, rejectCB) {
+	var promise = new cloudeebus.Promise();
+	var resolver = promise.resolver;
+	var fulfillWrapper, rejectWrapper;
+	
+	if (fulfillCB)
+		fulfillWrapper = function(arg) {
+			try {
+				var value = fulfillCB.apply(promise, [arg]);
+				resolver.resolve(value, true);
+			}
+			catch (e) {
+				resolver.reject(e, true);
+			}
+		};
+	else
+		fulfillWrapper = function(arg) {
+			resolver.fulfill(arg, true);
+		};
+	
+	if (rejectCB)
+		rejectWrapper = function(arg) {
+			try {
+				var value = rejectCB.apply(promise, [arg]);
+				resolver.resolve(value, true);
+			}
+			catch (e) {
+				resolver.reject(e, true);
+			}
+		};
+	else
+		rejectWrapper = function(arg) {
+			resolver.reject(arg, true);
+		};
+	
+	this.appendWrappers(fulfillWrapper,rejectWrapper);
+	return promise;
+};
+
+
+cloudeebus.Promise.prototype["catch"] = function(rejectCB) {
+	return this.then(undefined,rejectCB);
+};
+
+
+cloudeebus.Promise.prototype.done = function(fulfillCB, rejectCB) {
+	this.appendWrappers(fulfillCB,rejectCB);
+};
+
+
+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;
 };
 
 
@@ -210,17 +469,20 @@ cloudeebus.ProxyObject.prototype._introspect = function(successCB, errorCB) {
 			while (ifChild) {
 				if (ifChild.nodeName == "method") {
 					var nArgs = 0;
+					var signature = "";
 					var metChild = ifChild.firstChild;
 					while (metChild) {
 						if (metChild.nodeName == "arg" &&
-							metChild.attributes.getNamedItem("direction").value == "in")
+							metChild.attributes.getNamedItem("direction").value == "in") {
+								signature += metChild.attributes.getNamedItem("type").value;
 								nArgs++;
+						}
 						metChild = metChild.nextSibling;
 					}
 					var metName = ifChild.attributes.getNamedItem("name").value;
 					if (!self[metName])
-						self._addMethod(ifName, metName, nArgs);
-					self.interfaceProxies[ifName]._addMethod(ifName, metName, nArgs);
+						self._addMethod(ifName, metName, nArgs, signature);
+					self.interfaceProxies[ifName]._addMethod(ifName, metName, nArgs, signature);
 				}
 				else if (ifChild.nodeName == "property") {
 					if (!hasProperties)
@@ -248,76 +510,65 @@ cloudeebus.ProxyObject.prototype._introspect = function(successCB, errorCB) {
 };
 
 
-cloudeebus.ProxyObject.prototype._addMethod = function(ifName, method, nArgs) {
+cloudeebus.ProxyObject.prototype._addMethod = function(ifName, method, nArgs, signature) {
 
 	var self = this;
 	
 	self[method] = function() {
-		if (arguments.length < nArgs || arguments.length > nArgs + 2)
-			throw "Error: method " + method + " takes " + nArgs + " parameters, got " + arguments.length + ".";
 		var args = [];
-		var successCB = null;
-		var errorCB = null;
 		for (var i=0; i < nArgs; i++ )
 			args.push(arguments[i]);
-		if (arguments.length > nArgs)
-			successCB = arguments[nArgs];
-		if (arguments.length > nArgs + 1)
-			errorCB = arguments[nArgs + 1];
-		self.callMethod(ifName, method, args).then(successCB, errorCB);
-	};
-	
+		return self.callMethod(ifName, method, args, signature);
+	};	
 };
 
-cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, successCB, errorCB) {
+
+cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, signature) {
 	
 	var self = this;
-	var request = new cloudeebus.Request(this, successCB, errorCB);
-
-	function callMethodSuccessCB(str) {
-		request.result = eval(str);
-		if (request.onsuccess) {
+	
+	var promise = new cloudeebus.Promise(function (resolver) {
+		function callMethodSuccessCB(str) {
 			try { // calling dbus hook object function for un-translated types
-				request.onsuccess.apply(request.proxy, request.result);
+				var result = eval(str);
+				resolver.fulfill(result[0], true);
 			}
 			catch (e) {
 				cloudeebus.log("Method callback exception: " + e);
-				if (request.onerror)
-					request.onerror(e);
+				resolver.reject(e, true);
 			}
 		}
-	}
-
-	function callMethodErrorCB(error) {
-		cloudeebus.log("Error calling method: " + method + " on object: " + self.objectPath + " : " + error.desc);
-		request.error = error.desc;
-		if (request.onerror)
-			request.onerror(request.error);
-	}
 
-	var arglist = [
-		self.busConnection.name,
-		self.busName,
-		self.objectPath,
-		ifName,
-		method,
-		JSON.stringify(args)
-	];
+		function callMethodErrorCB(error) {
+			cloudeebus.log("Error calling method: " + method + " on object: " + self.objectPath + " : " + error.desc);
+			resolver.reject(error.desc, true);
+		}
 
-	// call dbusSend with bus type, destination, object, message and arguments
-	self.wampSession.call("dbusSend", arglist).then(callMethodSuccessCB, callMethodErrorCB);
-	return request;
+		var arglist = [
+			self.busConnection.name,
+			self.busName,
+			self.objectPath,
+			ifName,
+			method,
+			JSON.stringify(args)
+		];
+
+		// call dbusSend with bus type, destination, object, message and arguments
+		self.wampSession.call("dbusSend", arglist).then(callMethodSuccessCB, callMethodErrorCB);
+	});
+	
+	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);