Merge pull request #25 from fpaut/agent_future

switching all methods to 'Promise' interface

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index 5f1d40b..a738641 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -168,44 +168,37 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
        var promise = new cloudeebus.Promise(function (resolver) {
          cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
        
-         function busServiceAddedSuccessCB(service) {
-                 try {
-                         service.isCreated = true;
-                         var result = [cloudeebusService];
-                         resolver.fulfill(result[0], true);
-                 }
-                 catch (e) {
-                         var errorStr = cloudeebus.getError(e);
-                         cloudeebus.log("Method callback exception: " + errorStr);
-                         resolver.reject(errorStr, true);
-                 }             
-         }
-       
-         function busServiceErrorSuccessCB(error) {
-                 resolver.reject(cloudeebus.getError(error), true);
-         }
-       
-         cloudeebusService.add(this).then(busServiceAddedSuccessCB, busServiceErrorSuccessCB);
+               function ServiceAddedSuccessCB(serviceName) {
+                       try { // calling dbus hook object function for un-translated types
+                               cloudeebusService.isCreated = true;
+                               var result = [ cloudeebusService ];
+                               resolver.fulfill(result[0], true);
+                       }
+                       catch (e) {
+                               var errorStr = cloudeebus.getError(e);
+                               cloudeebus.log("Method callback exception: " + errorStr);
+                               resolver.reject(errorStr, true);
+                       }               
+               }
+               
+               function ServiceAddedErrorCB(error) {
+                       var errorStr = cloudeebus.getError(error);
+                       cloudeebus.log("Error adding service method: " + self.name + ", error: " + errorStr);
+                       self.promise.resolver.reject(errorStr, true);
+               }
+
+               var arglist = [
+                   self.name,
+                   serviceName
+                   ];
+
+               // call dbusSend with bus type, destination, object, message and arguments
+               self.wampSession.call("serviceAdd", arglist).then(ServiceAddedSuccessCB, ServiceAddedErrorCB);
        });
        
        return promise;
 };
 
-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 :
@@ -227,61 +220,48 @@ cloudeebus.Service = function(session, busConnection, name) {
        this.wampSession = session;
        this.busConnection = busConnection; 
        this.name = name;
+       this.agents = [];
        this.isCreated = false;
        return this;
 };
 
-cloudeebus.Service.prototype.add = function(promise) {
+cloudeebus.Service.prototype.remove = function() {
        var self = this;
-       self.promise = promise;
-       var resolver = self.promise.resolver;
-       
-       function ServiceAddedSuccessCB(serviceName) {
-               try { // calling dbus hook object function for un-translated types
-                       var result = [self];
-                       resolver.fulfill(result[0], true);
-               }
-               catch (e) {
-                       var errorStr = cloudeebus.getError(e);
-                       cloudeebus.log("Method callback exception: " + errorStr);
-                       resolver.reject(errorStr, true);
-               }               
-       }
        
-       function ServiceAddedErrorCB(error) {
-               var errorStr = cloudeebus.getError(error);
-               cloudeebus.log("Error adding service method: " + self.name + ", error: " + errorStr);
-               self.promise.resolver.reject(errorStr, 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 promise;
-};
-
-cloudeebus.Service.prototype.remove = function(successCB, errorCB) {
-       function ServiceRemovedSuccessCB(serviceName) {
-               if (successCB) {
-                       try {
-                               successCB(serviceName);
+       var promise = new cloudeebus.Promise(function (resolver) {
+               function ServiceRemovedSuccessCB(serviceName) {
+                       try { // calling dbus hook object function for un-translated types
+                               var result = [ serviceName ];
+                               resolver.fulfill(result[0], true);
                        }
                        catch (e) {
-                               alert("Exception removing service " + serviceName + " : " + cloudeebus.getError(e));
+                               var errorStr = cloudeebus.getError(e);
+                               cloudeebus.log("Method callback exception: " + errorStr);
+                               resolver.reject(errorStr, true);
+                       }               
+               }
+               
+               function ServiceRemovedErrorCB(error) {
+                       var errorStr = cloudeebus.getError(error);
+                       cloudeebus.log("Error removing service : " + self.name + ", error: " + errorStr);
+                       self.promise.resolver.reject(errorStr, true);
+               }
+               
+               for (var idx in self.agents) {
+                       if (self.agents[idx]) {
+                               self.removeAgent(self.agents[idx]);
                        }
                }
-       }
+               
+               var arglist = [
+                   self.name
+                   ];
        
-       var arglist = [
-           this.name
-           ];
-
-       // call dbusSend with bus type, destination, object, message and arguments
-       this.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, errorCB);
+               // call dbusSend with bus type, destination, object, message and arguments
+               self.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, ServiceRemovedErrorCB);
+       });
+       
+       return promise;
 };
 
 cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) {
@@ -379,35 +359,50 @@ cloudeebus.Service.prototype._createWrapper = function(agent) {
        }
 };
 
-cloudeebus.Service.prototype.addAgent = function(agent, successCB, errorCB) {
-       function ServiceAddAgentSuccessCB(objPath) {
-               if (successCB) {
-                       try {
-                               successCB(objPath);
+cloudeebus.Service.prototype.addAgent = function(agent) {
+       var self = this;
+       
+       var promise = new cloudeebus.Promise(function (resolver) {
+               function ServiceAddAgentSuccessCB(objPath) {
+                       try { // calling dbus hook object function for un-translated types
+                               self.agents.push(agent);
+                               agent.registered = true;
+                               var result = [ objPath ];
+                               resolver.fulfill(result[0], true);
                        }
                        catch (e) {
-                               alert("Exception adding agent " + agent.objectPath + " : " + cloudeebus.getError(e));
-                       }
+                               var errorStr = cloudeebus.getError(e);
+                               cloudeebus.log("Method callback exception: " + errorStr);
+                               resolver.reject(errorStr, true);
+                       }               
                }
-       }
+               
+               function ServiceAddAgenterrorCB(error) {
+                       var errorStr = cloudeebus.getError(error);
+                       cloudeebus.log("Error adding agent : " + agent.objectPath + ", error: " + errorStr);
+                       self.promise.resolver.reject(errorStr, true);
+               }
+               
+               try {
+                       self._createWrapper(agent);
+               }
+               catch (e) {
+                       var errorStr = cloudeebus.getError(e);
+                       cloudeebus.log("Exception creating agent wrapper " + agent.objectPath + " : " + errorStr);
+                       resolver.reject(errorStr, true);
+                       return;
+               }
+               
+               var arglist = [
+                   agent.objectPath,
+                   agent.xml
+                   ];
        
-       try {
-               this._createWrapper(agent);
-       }
-       catch (e) {
-               var errorStr = cloudeebus.getError(e);
-               alert("Exception creating agent wrapper " + agent.objectPath + " : " + errorStr);
-               errorCB(errorStr);
-               return;
-       }
+               // call dbusSend with bus type, destination, object, message and arguments
+               self.wampSession.call("serviceAddAgent", arglist).then(ServiceAddAgentSuccessCB, ServiceAddAgenterrorCB);
+       });
        
-       var arglist = [
-           agent.objectPath,
-           agent.xml
-           ];
-
-       // call dbusSend with bus type, destination, object, message and arguments
-       this.wampSession.call("serviceAddAgent", arglist).then(ServiceAddAgentSuccessCB, errorCB);
+       return promise;
 };
 
 cloudeebus.Service.prototype._deleteWrapper = function(agent) {
@@ -427,35 +422,48 @@ cloudeebus.Service.prototype._deleteWrapper = function(agent) {
        }
 };
 
-cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) {
-       function ServiceDelAgentSuccessCB(agent) {
-               if (successCB) {
-                       try {
-                               successCB(agent);
+cloudeebus.Service.prototype.removeAgent = function(rmAgent, successCB, errorCB) {
+       var self = this;
+       
+       var promise = new cloudeebus.Promise(function (resolver) {
+               function ServiceRemoveAgentSuccessCB(agent) {
+                       try { // calling dbus hook object function for un-translated types
+                               self.agents.push(agent);
+                               agent.registered = true;
+                               var result = [ agent ];
+                               resolver.fulfill(result[0], true);
                        }
                        catch (e) {
                                var errorStr = cloudeebus.getError(e);
-                               alert("Exception deleting agent " + rmAgent.objectPath + " : " + errorStr);
-                               errorCB(errorStr);
-                       }
+                               cloudeebus.log("Method callback exception: " + errorStr);
+                               resolver.reject(errorStr, true);
+                       }               
                }
-       }
 
-       try {
-               this._deleteWrapper(rmAgent);
-       }
-       catch (e) {
-               var errorStr = cloudeebus.getError(e);
-               alert("Exception deleting agent wrapper " + rmAgent.objectPath + " : " + errorStr);
-               errorCB(errorStr);
-       }
-       
-       var arglist = [
-           rmAgent.objectPath
-           ];
+               function ServiceRemoveAgentErrorCB(error) {
+                       var errorStr = cloudeebus.getError(error);
+                       cloudeebus.log("Error removing agent : " + rmAgent.objectPath + ", error: " + errorStr);
+                       self.promise.resolver.reject(errorStr, true);
+               }
 
-       // call dbusSend with bus type, destination, object, message and arguments
-       this.wampSession.call("serviceDelAgent", arglist).then(ServiceDelAgentSuccessCB, errorCB);
+               try {
+                       self._deleteWrapper(rmAgent);
+               }
+               catch (e) {
+                       var errorStr = cloudeebus.getError(e);
+                       cloudeebus.log("Exception removing wrapper of agent " + rmAgent.objectPath + " : " + errorStr);
+                       errorCB(errorStr);
+               }
+               
+               var arglist = [
+                   rmAgent.objectPath
+                   ];
+       
+               // call dbusSend with bus type, destination, object, message and arguments
+               self.wampSession.call("serviceDelAgent", arglist).then(ServiceRemoveAgentSuccessCB, ServiceRemoveAgentErrorCB);
+       });
+       
+       return promise;
 };
 
 cloudeebus.Service.prototype._returnMethod = function(methodId, callIndex, success, result, successCB, errorCB) {

diff --git a/cloudeebus/cloudeebus.py b/cloudeebus/cloudeebus.py
index ae79f18..903ece1 100755 (executable)
--- a/cloudeebus/cloudeebus.py
+++ b/cloudeebus/cloudeebus.py
@@ -592,7 +592,7 @@ class CloudeebusService:
         arguments: busName, srvName
         '''
         busName = list[0]
-        self.bus =  cache.dbusConnexion( busName['name'] )
+        self.bus =  cache.dbusConnexion( busName )
         self.srvName = list[1]
         if (self.services.has_key(self.srvName) == False):            
             self.services[self.srvName] = dbus.service.BusName(name = self.srvName, bus = self.bus)
@@ -608,7 +608,7 @@ class CloudeebusService:
             self.services.pop(self.srvName)
             return self.srvName
         else:
-            raise Exception(self.srvName + " do not exist")
+            raise Exception(self.srvName + " does not exist")
                    
     @exportRpc
     def serviceAddAgent(self, list):

diff --git a/doc/agent/server.html b/doc/agent/server.html
index df81774..f54698d 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>';
+
 cloudeebus.log = function(msg) {
   document.getElementById("log").innerHTML += msg + "\n";
 }
@@ -41,8 +42,7 @@ sampleObjectHandler = {
     return a;
   }, 
   Release: function() {
-    cloudeebus.SessionBus().service.delAgent("/org/cloudeebus/Sample", logCB, errorCB);
-    cloudeebus.SessionBus().service.remove(logCB, errorCB);
+    gService.remove().then(logCB, errorCB);
   },
   interfaceProxies : {
     "org.cloudeebus.Sample2" : {
@@ -67,8 +67,7 @@ sampleObjectHandler2 = {
     return a;
   }, 
       Release: function() {
-        cloudeebus.SessionBus().service.delAgent("/org/cloudeebus/Sample", logCB, errorCB);
-        cloudeebus.SessionBus().service.remove(logCB, errorCB);
+        gService.remove().then(logCB, errorCB);
       },
     },
     "org.cloudeebus.Sample2" : {
@@ -80,17 +79,22 @@ sampleObjectHandler2 = {
 };
 
 function addAgents(service) {
+  gService = service;
   var agent1 = new cloudeebus.Agent(service.name, "/org/cloudeebus/Sample", sampleObjectHandler, sampleXml);
-  cloudeebus.log("Adding agent " + agent1.name + " on " + service.name + "and mapped on Javascript object: 'sampleObjectHandler");
-  service.addAgent(agent1, logCB, errorCB);
+  cloudeebus.log("Adding agent " + agent1.objectPath + " on " + service.name + ", mapped on Javascript object: 'sampleObjectHandler");
+  service.addAgent(agent1).then(logCB, errorCB);
   
   var agent2 = new cloudeebus.Agent(service.name, "/org/cloudeebus/Sample2", sampleObjectHandler2, sampleXml);
-  cloudeebus.log("Adding agent " + agent2.name + " on " + service.name + "and mapped on Javascript object: 'sampleObjectHandler2");
-  service.addAgent(agent2, logCB, errorCB);
+  cloudeebus.log("Adding agent " + agent2.objectPath + " on " + service.name + ", mapped on Javascript object: 'sampleObjectHandler2");
+  service.addAgent(agent2).then(logCB, errorCB);
 }
 
 function connectSuccess() {
-  cloudeebus.SessionBus().addService("org.cloudeebus.Sample").then(addAgents, errorCB);
+  if (1)
+       cloudeebus.SessionBus().addService("org.cloudeebus.Sample").then(addAgents, errorCB);
+  else {
+    gService.remove().then(logCB, errorCB);
+  }
 }
 
 cloudeebus.connect("ws://localhost:9003", null, connectSuccess, errorCB);