From df1eb0213907054ec42e622f9e1f3af6ee0f9993 Mon Sep 17 00:00:00 2001
From: Frederic PAUT <frederic.paut@linux.intel.com>
Date: Mon, 15 Apr 2013 16:21:15 +0200
Subject: [PATCH] Implementing request interface providing callbacks called
 when the operation completes, as well as a reference to the operation's
 result.

---
 cloudeebus/cloudeebus.js | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index 1788cae..5a81e07 100644
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -135,6 +135,25 @@ cloudeebus.BusConnection.prototype.getObject = function(busName, objectPath, int
 
 /*****************************************************************************/
 
+cloudeebus.Request = function(proxy, onsuccess, onerror) {
+	this.proxy = proxy; 
+	this.error = null;
+	this.result = null;
+	this.onsuccess = onsuccess;
+	this.onerror = onerror;
+    return this;
+};
+
+cloudeebus.Request.prototype.then = function(onsuccess, onerror) {
+	this.onsuccess = onsuccess;
+	this.onerror = onerror;
+	return this;
+};
+
+
+
+/*****************************************************************************/
+
 cloudeebus.ProxyObject = function(session, busConnection, busName, objectPath) {
 	this.wampSession = session; 
 	this.busConnection = busConnection; 
@@ -166,8 +185,7 @@ cloudeebus.ProxyObject.prototype._introspect = function(successCB, errorCB) {
 		if (self.propInterfaces.length > 0) 
 			self.callMethod("org.freedesktop.DBus.Properties", 
 				"GetAll", 
-				[self.propInterfaces[self.propInterfaces.length-1]], 
-				getAllPropertiesSuccessCB, 
+				[self.propInterfaces[self.propInterfaces.length-1]]).then(getAllPropertiesSuccessCB, 
 				errorCB ? errorCB : getAllPropertiesNextInterfaceCB);
 		else {
 			self.propInterfaces = null;
@@ -215,8 +233,7 @@ cloudeebus.ProxyObject.prototype._introspect = function(successCB, errorCB) {
 		if (supportDBusProperties && self.propInterfaces.length > 0) {
 			self.callMethod("org.freedesktop.DBus.Properties", 
 				"GetAll", 
-				[self.propInterfaces[self.propInterfaces.length-1]], 
-				getAllPropertiesSuccessCB, 
+				[self.propInterfaces[self.propInterfaces.length-1]]).then(getAllPropertiesSuccessCB, 
 				errorCB ? errorCB : getAllPropertiesNextInterfaceCB);
 		}
 		else {
@@ -227,7 +244,7 @@ cloudeebus.ProxyObject.prototype._introspect = function(successCB, errorCB) {
 	}
 
 	// call Introspect on self
-	self.callMethod("org.freedesktop.DBus.Introspectable", "Introspect", [], introspectSuccessCB, errorCB);
+	self.callMethod("org.freedesktop.DBus.Introspectable", "Introspect", []).then(introspectSuccessCB, errorCB);
 };
 
 
@@ -247,20 +264,21 @@ cloudeebus.ProxyObject.prototype._addMethod = function(ifName, method, nArgs) {
 			successCB = arguments[nArgs];
 		if (arguments.length > nArgs + 1)
 			errorCB = arguments[nArgs + 1];
-		self.callMethod(ifName, method, args, successCB, errorCB);
+		self.callMethod(ifName, method, args).then(successCB, errorCB);
 	};
 	
 };
 
-
-cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, successCB, errorCB) {
+cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, successCB = null, errorCB = null) {
 	
-	var self = this; 
+	var self = this;
+	var request = new cloudeebus.Request(this, successCB, errorCB);
 
 	function callMethodSuccessCB(str) {
-		if (successCB) {
+		request.result = eval(str);
+		if (request.onsuccess) {
 			try { // calling dbus hook object function for un-translated types
-				successCB.apply(self, eval(str));
+				request.onsuccess.apply(request.proxy, request.result);
 			}
 			catch (e) {
 				cloudeebus.log("Method callback exception: " + e);
@@ -272,8 +290,9 @@ cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, suc
 
 	function callMethodErrorCB(error) {
 		cloudeebus.log("Error calling method: " + method + " on object: " + self.objectPath + " : " + error.desc);
-		if (errorCB)
-			errorCB(error.desc);
+		request.error = error.desc
+		if (request.onerror)
+			request.onerror(request.error);
 	}
 
 	var arglist = [
@@ -287,6 +306,7 @@ cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, suc
 
 	// call dbusSend with bus type, destination, object, message and arguments
 	self.wampSession.call("dbusSend", arglist).then(callMethodSuccessCB, callMethodErrorCB);
+	return request;
 };
 
 
-- 
2.7.4