From: Frederic PAUT <frederic.paut@linux.intel.com>
Date: Mon, 24 Jun 2013 10:18:07 +0000 (+0200)
Subject: Merge branch 'master' into agent_future
X-Git-Tag: upstream/0.6.1~42^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=236c26d85a85cccc2cc43f8678524e6de3c909b4;hp=-c;p=contrib%2Fcloudeebus.git

Merge branch 'master' into agent_future

Conflicts:
	cloudeebus/cloudeebus.js
	cloudeebus/cloudeebus.py
	setup.py
---

236c26d85a85cccc2cc43f8678524e6de3c909b4
diff --combined TODO
index a3f4fd3,14f47b1..975ac47
--- a/TODO
+++ b/TODO
@@@ -10,12 -10,7 +10,6 @@@ Proxy object properties
  - support cloning proxies so that introspection is called only once per object type.
  
  
- API style:
- ----------
- - use "Promises" pattern for asynchronous APIs 
- - force JSON description of numbers as floats when needed 
- 
- 
  DBus service support:
  ---------------------
 -- support publishing a DBus service
  - support sending signals
diff --combined cloudeebus/cloudeebus.js
index 4273179,677f002..7ddccf4
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@@ -29,7 -29,7 +29,7 @@@ var dbus = { // hook object for dbus ty
  /*****************************************************************************/
  
  var cloudeebus = window.cloudeebus = {
 -		version: "0.5.1",
 +		version: "0.5.0",
  		minVersion: "0.3.2"
  };
  
@@@ -148,474 -148,6 +148,474 @@@ cloudeebus.BusConnection.prototype.getO
  };
  
  
 +cloudeebus.BusConnection.prototype.addService = function(serviceName) {
 +	var self = this;
 +	
 +	var future = new cloudeebus.Future(function (resolver) {
 +	  cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
 +	
 +	  function busServiceAddedSuccessCB(service) {
 +		  try {
 +			  service.isCreated = true;
 +			  var result = [cloudeebusService];
 +			  resolver.accept(result[0], true);
 +		  }
 +		  catch (e) {
 +			  cloudeebus.log("Method callback exception: " + e);
 +			  resolver.reject(e, true);
 +		  }		
 +	  }
 +	
 +	  function busServiceErrorSuccessCB(error) {
 +		  resolver.reject(error, true);
 +	  }
 +	
 +	  cloudeebusService.add(this).then(busServiceAddedSuccessCB, busServiceErrorSuccessCB);
 +	});
 +	
 +	return future;
 +};
 +
 +cloudeebus.BusConnection.prototype.removeService = function(serviceName, successCB, errorCB) {
 +	var self = this;
 +	
 +	function busServiceRemovedSuccessCB(serviceName) {
 +		// Be sure we are removing the service requested...
 +		if (serviceName == self.service.name) {
 +			self.service = null;
 +			if (successCB)
 +				successCB(serviceName);
 +		}
 +	}
 +	
 +	cloudeebusService.remove(busServiceRemovedSuccessCB, errorCB);
 +};
 +
 +
 +/*****************************************************************************/
 +//Generic definition for an agent. An agent need :
 +//srvDbusName : the DBus parent service
 +//objPath : a DBus path to access it
 +//jsHdl : a Javascript handler to process methods, 
 +//xml : the xml which describe interface/methods/signals...
 +Agent = function(srvDbusName, objPath, jsHdl, xml) {
 +	this.srvName = srvDbusName;
 +	this.registered = false;
 +	this.xml = xml;
 +	this.objectPath = objPath;
 +	this.jsHdl = jsHdl;
 +	return this;
 +};
 +
 +
 +cloudeebus.Service = function(session, busConnection, name) {
 +	this.wampSession = session;
 +	this.busConnection = busConnection; 
 +	this.name = name;
 +	this.isCreated = false;
 +	return this;
 +};
 +
 +cloudeebus.Service.prototype.add = function(future) {
 +	var self = this;
 +	self.future = future;
 +	var resolver = self.future.resolver;
 +	
 +	function ServiceAddedSuccessCB(serviceName) {
 +		try { // calling dbus hook object function for un-translated types
 +			var result = [self];
 +			resolver.accept(result[0], true);
 +		}
 +		catch (e) {
 +			cloudeebus.log("Method callback exception: " + e);
 +			resolver.reject(e, true);
 +		}		
 +	}
 +	
 +	function ServiceAddedErrorCB(error) {
 +		cloudeebus.log("Error adding service method: " + self.name + ", error: " + error.desc);
 +		self.future.resolver.reject(error.desc, true);
 +	}
 +
 +	var arglist = [
 +	    this.busConnection,
 +	    this.name
 +	    ];
 +
 +	// call dbusSend with bus type, destination, object, message and arguments
 +	this.wampSession.call("serviceAdd", arglist).then(ServiceAddedSuccessCB, ServiceAddedErrorCB);
 +	return future;
 +};
 +
 +cloudeebus.Service.prototype.remove = function(successCB, errorCB) {
 +	function ServiceRemovedSuccessCB(serviceName) {
 +		if (successCB) {
 +			try {
 +				successCB(serviceName);
 +			}
 +			catch (e) {
 +				alert("Exception removing service " + serviceName + " : " + e);
 +			}
 +		}
 +	}
 +	
 +	var arglist = [
 +	    this.name
 +	    ];
 +
 +	// call dbusSend with bus type, destination, object, message and arguments
 +	this.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, errorCB);
 +};
 +
 +cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) {
 +
 +	var funcToCall = null;
 +	
 +	// Check if 'objectJS' has a member 'interfaceProxies' with an interface named 'ifName' 
 +	// and a method named 'method'
 +	if (objectJS.interfaceProxies && objectJS.interfaceProxies[ifName] &&
 +		objectJS.interfaceProxies[ifName][method]) {
 +		funcToCall = objectJS.interfaceProxies[ifName][method];
 +	} else {
 +		// retrieve the method directly from 'root' of objectJs
 +		funcToCall = objectJS[method];
 +	}
 +
 +	return funcToCall;
 +};
 +
 +cloudeebus.Service.prototype._addMethod = function(ifName, method, agent) {
 +
 +	var service = this;
 +	var methodId = this.name + "#" + agent.objectPath + "#" + ifName + "#" + method;
 +	var funcToCall = this._searchMethod(ifName, method, agent.jsHdl);
 +
 +	if (funcToCall == null)
 +		cloudeebus.log("Method " + method + " doesn't exist in Javascript object");
 +	else {
 +		agent.jsHdl.wrapperFunc[method] = function() {
 +			var result;
 +			var methodId = arguments[0];
 +			var callDict = {};
 +			// affectation of callDict in eval, otherwise dictionary(='{}') interpreted as block of code by eval
 +			eval("callDict = " + arguments[1]);
 +			try {
 +				result = funcToCall.apply(agent.jsHdl, callDict.args);
 +				service._returnMethod(methodId, callDict.callIndex, true, result);
 +			}
 +			catch (e) {
 +				cloudeebus.log("Method " + ifName + "." + method + " call on " + agent.objectPath + " exception: " + e);
 +				service._returnMethod(methodId, callDict.callIndex, false, e.message);
 +			}
 +		};
 +		agent.jsHdl.methodId[agent.objectPath].push(methodId);
 +		cloudeebus.log("subscribe " + methodId);
 +		this.wampSession.subscribe(methodId, agent.jsHdl.wrapperFunc[method]);
 +	}
 +};
 +
 +cloudeebus.Service.prototype._addSignal = function(ifName, signal, agent) {
 +	var service = this;
 +	var methodExist = false;
 +
 +	if (agent.jsHdl.interfaceProxies && agent.jsHdl.interfaceProxies[ifName])
 +		if (agent.jsHdl.interfaceProxies[ifName][signal]) {
 +			methodExist = true;
 +		} else {
 +			agent.jsHdl.interfaceProxies[ifName][signal] = function() {
 +				service._emitSignal(agent.objectPath, signal, arguments[0]);
 +			};
 +		return;
 +	}
 +		
 +	if ((agent.jsHdl[signal] == undefined || agent.jsHdl[signal] == null) && !methodExist) 
 +		agent.jsHdl[signal] = function() {
 +			service.emitSignal(agent.objectPath, signal, arguments[0]);
 +		};
 +	else
 +		cloudeebus.log("Can not create new method to emit signal '" + signal + "' in object JS this method already exist!");
 +};
 +
 +cloudeebus.Service.prototype._createWrapper = function(agent) {
 +	var self = this;
 +	var parser = new DOMParser();
 +	var xmlDoc = parser.parseFromString(agent.xml, "text/xml");
 +	var ifXml = xmlDoc.getElementsByTagName("interface");
 +	agent.jsHdl.wrapperFunc = [];
 +	agent.jsHdl.methodId = [];
 +	agent.jsHdl.methodId[agent.objectPath] = [];
 +	for (var i=0; i < ifXml.length; i++) {
 +		var ifName = ifXml[i].attributes.getNamedItem("name").value;
 +		var ifChild = ifXml[i].firstChild;
 +		while (ifChild) {
 +			if (ifChild.nodeName == "method") {
 +				var metName = ifChild.attributes.getNamedItem("name").value;
 +				self._addMethod(ifName, metName, agent);
 +			}
 +			if (ifChild.nodeName == "signal") {
 +				var metName = ifChild.attributes.getNamedItem("name").value;
 +				self._addSignal(objectPath, ifName, metName, objectJS);
 +			}
 +			ifChild = ifChild.nextSibling;
 +		}
 +	}
 +};
 +
 +cloudeebus.Service.prototype.addAgent = function(agent, successCB, errorCB) {
 +	function ServiceAddAgentSuccessCB(objPath) {
 +		if (successCB) {
 +			try {
 +				successCB(objPath);
 +			}
 +			catch (e) {
 +				alert("Exception adding agent " + agent.objectPath + " : " + e);
 +			}
 +		}
 +	}
 +	
 +	try {
 +		this._createWrapper(agent);
 +	}
 +	catch (e) {
 +		alert("Exception creating agent wrapper " + agent.objectPath + " : " + e);
 +		errorCB(e);
 +		return;
 +	}
 +	
 +	var arglist = [
 +	    agent.objectPath,
 +	    agent.xml
 +	    ];
 +
 +	// call dbusSend with bus type, destination, object, message and arguments
 +	this.wampSession.call("serviceAddAgent", arglist).then(ServiceAddAgentSuccessCB, errorCB);
 +};
 +
 +cloudeebus.Service.prototype._deleteWrapper = function(agent) {
 +	var self = this;
 +	var objJs = agent.jsHdl;
 +	if (objJs.methodId[agent.objectPath]) {
 +		for (var idx in objJs.methodId[agent.objectPath]) {
 +			try {
 +				cloudeebus.log("unsubscribe " + objJs.methodId[agent.objectPath][idx]);
 +				this.wampSession.unsubscribe(objJs.methodId[agent.objectPath][idx]);
 +				objJs.methodId[agent.objectPath][idx] = null;
 +			}
 +			catch (e) {
 +				cloudeebus.log("Unsubscribe error: " + e);
 +			}
 +		}
 +		delete objJs.methodId[agent.objectPath];
 +	}
 +};
 +
 +cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) {
 +	function ServiceDelAgentSuccessCB(agent) {
 +		if (successCB) {
 +			try {
 +				successCB(agent);
 +			}
 +			catch (e) {
 +				alert("Exception deleting agent " + rmAgent.objectPath + " : " + e);
 +				errorCB(e);
 +			}
 +		}
 +	}
 +
 +	try {
 +		this._deleteWrapper(rmAgent);
 +	}
 +	catch (e) {
 +		alert("Exception deleting agent wrapper " + rmAgent.objectPath + " : " + e);
 +		errorCB(e);
 +	}
 +	
 +	var arglist = [
 +	    rmAgent.objectPath
 +	    ];
 +
 +	// call dbusSend with bus type, destination, object, message and arguments
 +	this.wampSession.call("serviceDelAgent", arglist).then(ServiceDelAgentSuccessCB, errorCB);
 +};
 +
 +cloudeebus.Service.prototype._returnMethod = function(methodId, callIndex, success, result, successCB, errorCB) {
 +	var arglist = [
 +	    methodId,
 +	    callIndex,
 +	    success,
 +	    result
 +	    ];
 +
 +	this.wampSession.call("returnMethod", arglist).then(successCB, errorCB);
 +};
 +
 +cloudeebus.Service.prototype._emitSignal = function(objectPath, signalName, result, successCB, errorCB) {
 +	var arglist = [
 +	    objectPath,
 +	    signalName,
 +	    result
 +	    ];
 +
 +	this.wampSession.call("emitSignal", arglist).then(successCB, errorCB);
 +};
 +
 +
 +/*****************************************************************************/
 +
 +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.FutureResolver = function(future) {
 +	this.future = future;
 +	this.resolved = null;
 +    return this;
 +};
 +
 +
 +cloudeebus.FutureResolver.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) {
 +			self.resolve(arg, true);
 +		};	
 +		var rejectCallback = function(arg) {
 +			self.reject(arg, true);
 +		};
 +		try {
 +			then.apply(value, [acceptCallback, rejectCallback]);
 +		}
 +		catch (e) {
 +			this.reject(e, true);
 +		}
 +	}
 +	
 +	this.accept(value, sync);
 +};
 +
 +
 +cloudeebus.FutureResolver.prototype.accept = function(value, sync) {
 +	if (this.resolved)
 +		return;
 +	
 +	var future = this.future;
 +	future.state = "accepted";
 +	future.result = value;
 +	
 +	this.resolved = true;
 +	if (sync)
 +		_processWrappers(future._acceptWrappers, value);
 +	else
 +		_processWrappersAsync(future._acceptWrappers, value);
 +};
 +
 +
 +cloudeebus.FutureResolver.prototype.reject = function(value, sync) {
 +	if (this.resolved)
 +		return;
 +	
 +	var future = this.future;
 +	future.state = "rejected";
 +	future.result = value;
 +	
 +	this.resolved = true;
 +	if (sync)
 +		_processWrappers(future._rejectWrappers, value);
 +	else
 +		_processWrappersAsync(future._rejectWrappers, value);
 +};
 +
 +
 +
 +/*****************************************************************************/
 +
 +cloudeebus.Future = function(init) {
 +	this.state = "pending";
 +	this.result = null;
 +	this._acceptWrappers = [];
 +	this._rejectWrappers = [];
 +	this.resolver = new cloudeebus.FutureResolver(this);
 +	if (init) {
 +		try {
 +			init.apply(this, [this.resolver]);
 +		}
 +		catch (e) {
 +			this.resolver.reject(e, true);
 +		}
 +	}
 +    return this;
 +};
 +
 +
 +cloudeebus.Future.prototype.appendWrappers = function(acceptWrapper, rejectWrapper) {
 +	this._acceptWrappers.push(acceptWrapper);
 +	this._rejectWrappers.push(rejectWrapper);
 +	if (this.state == "accepted")
 +		_processWrappersAsync(this._acceptWrappers, 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;
 +	
 +	if (acceptCB)
 +		acceptWrapper = function(arg) {
 +			try {
 +				var value = acceptCB.apply(future, [arg]);
 +				resolver.resolve(value, true);
 +			}
 +			catch (e) {
 +				resolver.reject(e, true);
 +			}
 +		};
 +	else
 +		acceptWrapper = function(arg) {
 +			resolver.accept(arg, true);
 +		};
 +	
 +	if (rejectCB)
 +		rejectWrapper = function(arg) {
 +			try {
 +				var value = rejectCB.apply(future, [arg]);
 +				resolver.resolve(value, true);
 +			}
 +			catch (e) {
 +				resolver.reject(e, true);
 +			}
 +		};
 +	else
 +		rejectWrapper = function(arg) {
 +			resolver.reject(arg, true);
 +		};
 +	
 +	this.appendWrappers(acceptWrapper,rejectWrapper);
 +	return future;
 +};
 +
 +
  
  /*****************************************************************************/
  
@@@ -638,79 -170,79 +638,79 @@@ function _processWrappersAsync(wrappers
  
  /*****************************************************************************/
  
- 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]);
@@@ -723,27 -255,27 +723,27 @@@
  };
  
  
- cloudeebus.Future.prototype.appendWrappers = function(acceptWrapper, rejectWrapper) {
- 	if (acceptWrapper)
- 		this._acceptWrappers.push(acceptWrapper);
+ cloudeebus.Promise.prototype.appendWrappers = function(fulfillWrapper, rejectWrapper) {
+ 	if (fulfillWrapper)
+ 		this._fulfillWrappers.push(fulfillWrapper);
  	if (rejectWrapper)
  		this._rejectWrappers.push(rejectWrapper);
- 	if (this.state == "accepted")
- 		_processWrappersAsync(this._acceptWrappers, this.result);
+ 	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) {
@@@ -751,14 -283,14 +751,14 @@@
  			}
  		};
  	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) {
@@@ -770,46 -302,46 +770,46 @@@
  			resolver.reject(arg, true);
  		};
  	
- 	this.appendWrappers(acceptWrapper,rejectWrapper);
- 	return future;
+ 	this.appendWrappers(fulfillWrapper,rejectWrapper);
+ 	return promise;
  };
  
  
- cloudeebus.Future.prototype["catch"] = function(rejectCB) {
+ cloudeebus.Promise.prototype["catch"] = function(rejectCB) {
  	return this.then(undefined,rejectCB);
  };
  
  
- cloudeebus.Future.prototype.done = function(acceptCB, rejectCB) {
- 	this.appendWrappers(acceptCB,rejectCB);
+ cloudeebus.Promise.prototype.done = function(fulfillCB, rejectCB) {
+ 	this.appendWrappers(fulfillCB,rejectCB);
  };
  
  
- cloudeebus.Future.resolve = function(value) {
- 	var future = new cloudeebus.Future();
- 	future.resolver.resolve(value);
- 	return future;
+ cloudeebus.Promise.resolve = function(value) {
+ 	var promise = new cloudeebus.Promise();
+ 	promise.resolver.resolve(value);
+ 	return promise;
  };
  
  
- cloudeebus.Future.accept = function(value) {
- 	var future = new cloudeebus.Future();
- 	future.resolver.accept(value);
- 	return future;
+ cloudeebus.Promise.fulfill = function(value) {
+ 	var promise = new cloudeebus.Promise();
+ 	promise.resolver.fulfill(value);
+ 	return promise;
  };
  
  
- cloudeebus.Future.reject = function(value) {
- 	var future = new cloudeebus.Future();
- 	future.resolver.reject(value);
- 	return future;
+ cloudeebus.Promise.reject = function(value) {
+ 	var promise = new cloudeebus.Promise();
+ 	promise.resolver.reject(value);
+ 	return promise;
  };
  
  
- cloudeebus.Future.any = function() {
- 	var future = new cloudeebus.Future();
- 	var resolver = future.resolver;
- 	var acceptCallback = function(arg) {
+ 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) {
@@@ -819,14 -351,14 +819,14 @@@
  		resolver.resolve(undefined, true);
  	else
  		for (i in arguments) 
- 			Future.resolve(arguments[i]).appendWrappers(acceptCallback,rejectCallback);
- 	return future;
+ 			Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+ 	return promise;
  };
  
  
- cloudeebus.Future.every = function() {
- 	var future = new cloudeebus.Future();
- 	var resolver = future.resolver;
+ 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);
@@@ -837,27 -369,27 +837,27 @@@
  		resolver.resolve(undefined, true);
  	else
  		for (i in arguments) {
- 			var acceptCallback = function(arg) {
+ 			var fulfillCallback = function(arg) {
  				args[index] = arg;
  				countdown--;
  				if (countdown == 0)
  					resolver.resolve(args, true);
  			};
  			index++;
- 			Future.resolve(arguments[i]).appendWrappers(acceptCallback,rejectCallback);
+ 			Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
  		}
  	
- 	return future;
+ 	return promise;
  };
  
  
- cloudeebus.Future.some = function() {
- 	var future = new cloudeebus.Future();
- 	var resolver = future.resolver;
+ 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 acceptCallback = function(arg) {
+ 	var fulfillCallback = function(arg) {
  		resolver.resolve(arg, true);
  	};
  	if (arguments.length == 0)
@@@ -871,10 -403,10 +871,10 @@@
  					resolver.reject(args, true);
  			};
  			index++;
- 			Future.resolve(arguments[i]).appendWrappers(acceptCallback,rejectCallback);
+ 			Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
  		}
  	
- 	return future;
+ 	return promise;
  };
  
  
@@@ -995,11 -527,11 +995,11 @@@ cloudeebus.ProxyObject.prototype.callMe
  	
  	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);
@@@ -1025,18 -557,18 +1025,18 @@@
  		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);