Future : Server side, using 'Future' to create service and adding agents

In client side, using 'Future' to set callbacks

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index 30e3286..12cdaac 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -149,19 +149,34 @@ cloudeebus.BusConnection.prototype.getObject = function(busName, objectPath, int
 };
 
 
-cloudeebus.BusConnection.prototype.addService = function(serviceName, successCB, errorCB) {
+cloudeebus.BusConnection.prototype.addService = function(serviceName) {
        var self = this;
        
-       cloudeebusService = new cloudeebus.Service(this.wampSession, this, serviceName);
        
-       function busServiceAddedSuccessCB(service) {
-               self.service = cloudeebusService;
-               if (successCB)
-                       successCB(cloudeebusService);
-       }
+       var future = new cloudeebus.Future(function (resolver) {
+         cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
+       
+         function busServiceAddedSuccessCB(service) {
+                 self.service = cloudeebusService;
+                 try {
+                         var result = [cloudeebusService];
+                         resolver.accept(result[0], true);
+                 }
+                 catch (e) {
+                         cloudeebus.log("Method callback exception: " + e);
+                         resolver.reject(e, true);
+                 }             
+         }
+       
+         function busServiceErrorSuccessCB(error) {
+                 self.service = null;
+                 resolver.reject(error, true);
+         }
+       
+         cloudeebusService.add(this).then(busServiceAddedSuccessCB, busServiceErrorSuccessCB);
+       });
        
-       cloudeebusService.add(busServiceAddedSuccessCB, errorCB);
-       return cloudeebusService;
+       return future;
 };
 
 cloudeebus.BusConnection.prototype.removeService = function(serviceName, successCB, errorCB) {
@@ -190,27 +205,35 @@ cloudeebus.Service = function(session, busConnection, name) {
        return this;
 };
 
-cloudeebus.Service.prototype.add = function(successCB, errorCB) {
+cloudeebus.Service.prototype.add = function(future) {
        var self = this;
+       self.future = future;
        
        function ServiceAddedSuccessCB(serviceName) {
-               if (successCB) {
-                       try {
-                               successCB(self);
-                       }
-                       catch (e) {
-                               alert("Exception adding service " + serviceName + " : " + e);
-                       }
+               try { // calling dbus hook object function for un-translated types
+                       var resolver = self.future.resolver;
+                       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, errorCB);
+       this.wampSession.call("serviceAdd", arglist).then(ServiceAddedSuccessCB, ServiceAddedErrorCB);
+       return future;
 };
 
 cloudeebus.Service.prototype.remove = function(successCB, errorCB) {

diff --git a/doc/agent/client.html b/doc/agent/client.html
index f87c484..27ddc6e 100644 (file)
--- a/doc/agent/client.html
+++ b/doc/agent/client.html
@@ -26,6 +26,7 @@ var manifest = {
        ]
 };
 
+
 var sampleProxy = null;
 
 cloudeebus.log = function(msg) {
@@ -53,14 +54,14 @@ function gotDivResult(result) {
                                 Divorced: 0,
                                 Friends: ["Donald", "Dingo"],
                                 Others: [""]};
-  sampleProxy.Variant(dictionary,gotDictResult,errorCB);  
+  sampleProxy.Variant(dictionary).then(gotDictResult,errorCB);  
 //  sampleProxy.Release();
 }
 
 function gotAddResult(result) {
   cloudeebus.log("gotAddResult: " + result);
   logCB('Divide by 3.33');
-  sampleProxy.Div(result,3.33,gotDivResult,errorCB);
+  sampleProxy.Div(result,3.33).then(gotDivResult,errorCB);
 }
 
 function signalHandler(result) {
@@ -76,11 +77,9 @@ function gotProxy(proxy) {
    } else {
          proxy.connectToSignal("org.cloudeebus.Sample1", "ResultChanged", signalHandler);
          logCB('Addition');
-           proxy.Add(4,5,gotAddResult,errorCB);
-           return;
          
          for (var i=-10; i<10; i++)
-           proxy.Add(i,i*2,gotAddResult,errorCB);
+           proxy.Add(i,i*2).then(gotAddResult,errorCB);
   }
   
 }

diff --git a/doc/agent/server.html b/doc/agent/server.html
index 849d1d2..8ce51dd 100644 (file)
--- a/doc/agent/server.html
+++ b/doc/agent/server.html
@@ -18,6 +18,7 @@
         <center><h1>cloudeebus</h1></center>
         <br>
                <textarea style="width:80%" rows="32" id="script">var sampleXml= '<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"\n"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">\n<node><interface name="org.cloudeebus.Sample1"><method name="Release"></method><method name="Add"><arg type="i" name="arg1"/><arg type="i" name="arg2"/><arg type="i" name="result" direction="out"/></method><method name="Variant"><arg type="a{sv}" name="arg1"/><arg type="a{sv}" name="result" direction="out"/></method><signal name="ResultChanged"><arg type="v" name="result"/></signal></interface><interface name="org.cloudeebus.Sample2"><method name="Div"><arg type="d" name="arg1"/><arg type="d" name="arg2"/><arg type="d" name="result" direction="out"/></method></interface></node>';
+var sampleXml= '<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"\n"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">\n<node><interface name="org.cloudeebus.Sample1"><method name="Release"></method><method name="Add"><arg type="i" name="arg1"/><arg type="i" name="arg2"/><arg type="i" name="result" direction="out"/></method><method name="Variant"><arg type="a{sv}" name="arg1"/><arg type="a{sv}" name="result" direction="out"/></method><signal name="ResultChanged"><arg type="v" name="result"/></signal></interface><interface name="org.cloudeebus.Sample2"><method name="Div"><arg type="d" name="arg1"/><arg type="d" name="arg2"/><arg type="d" name="result" direction="out"/></method></interface></node>';
 cloudeebus.log = function(msg) {
   document.getElementById("log").innerHTML += msg + "\n";
 }
@@ -62,6 +63,10 @@ sampleObjectHandler2 = {
        this.interfaceProxies["org.cloudeebus.Sample1"].ResultChanged(a+b);
        return a+b;
       }, 
+  Variant: function(a) {
+    cloudeebus.log("Get and return :" + JSON.stringify(a));
+    return a;
+  }, 
       Release: function() {
         cloudeebus.SessionBus().service.delAgent("/org/cloudeebus/Sample", logCB, errorCB);
         cloudeebus.SessionBus().service.remove(logCB, errorCB);
@@ -75,19 +80,25 @@ sampleObjectHandler2 = {
   }
 };
 
-function serviceAdded(service) {
+function addAgents(service) {
   var agentName = "/org/cloudeebus/Sample"; // = DBUS object name
+  cloudeebus.log("Adding agent " + agentName + " on " + service.name + "and mapped on Javascript object: 'sampleObjectHandler");
   cloudeebus.SessionBus().service.addAgent(agentName, sampleXml, sampleObjectHandler, logCB, errorCB);
+  
+  // adding another agent using parameter 'service'
+  agentName = agentName +"2";
+  cloudeebus.log("Adding agent " + agentName + " on " + service.name + "and mapped on Javascript object: 'sampleObjectHandler2'");
+  service.addAgent(agentName, sampleXml, sampleObjectHandler2, logCB, errorCB);
 }
 
 function connectSuccess() {
-  cloudeebus.SessionBus().addService("org.cloudeebus.Sample", serviceAdded, errorCB);
+  cloudeebus.SessionBus().addService("org.cloudeebus.Sample").then(addAgents, errorCB);
 }
 
 cloudeebus.connect("ws://localhost:9003", null, connectSuccess, errorCB);
 </textarea>
                <br>
-               <input type="button" value="run script" onclick="evalScript()"/>
+-              <input type="button" value="run script" onclick="evalScript()"/>
                <input type="button" value="clear log" onclick="document.getElementById('log').innerHTML='';"/>
                <br>
                <pre id="log" style="height: 20em; overflow-x: auto; overflow-y: auto; background-color: #faa;"></pre>