Merge pull request #31 from fpaut/master

dbus service : removing service do not remove agent(s)

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index c0e38c0..2684da8 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -175,15 +175,8 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
                var cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
        
                function ServiceAddedSuccessCB(serviceName) {
-                       try {
-                               cloudeebusService.isCreated = true;
-                               resolver.fulfill(cloudeebusService, true);
-                       }
-                       catch (e) {
-                               var errorStr = cloudeebus.getError(e);
-                               cloudeebus.log("Method callback exception: " + errorStr);
-                               resolver.reject(errorStr, true);
-                       }               
+                       cloudeebusService.isCreated = true;
+                       resolver.fulfill(cloudeebusService, true);
                }
                
                function ServiceAddedErrorCB(error) {
@@ -236,14 +229,7 @@ cloudeebus.Service.prototype.remove = function() {
        
        var promise = new cloudeebus.Promise(function (resolver) {
                function ServiceRemovedSuccessCB(serviceName) {
-                       try {
-                               resolver.fulfill(serviceName, true);
-                       }
-                       catch (e) {
-                               var errorStr = cloudeebus.getError(e);
-                               cloudeebus.log("Method callback exception: " + errorStr);
-                               resolver.reject(errorStr, true);
-                       }               
+                       resolver.fulfill(serviceName, true);
                }
                
                function ServiceRemovedErrorCB(error) {
@@ -251,12 +237,6 @@ cloudeebus.Service.prototype.remove = function() {
                        resolver.reject(errorStr, true);
                }
                
-               for (var idx in self.agents) {
-                       if (self.agents[idx]) {
-                               self.removeAgent(self.agents[idx]);
-                       }
-               }
-               
                var arglist = [
                    self.name
                    ];
@@ -372,15 +352,8 @@ cloudeebus.Service.prototype.addAgent = function(agent) {
        
        var promise = new cloudeebus.Promise(function (resolver) {
                function ServiceAddAgentSuccessCB(objPath) {
-                       try {
-                               self.agents.push(agent);
-                               resolver.fulfill(objPath, true);
-                       }
-                       catch (e) {
-                               var errorStr = cloudeebus.getError(e);
-                               cloudeebus.log("Method callback exception: " + errorStr);
-                               resolver.reject(errorStr, true);
-                       }               
+                       self.agents.push(agent);
+                       resolver.fulfill(objPath, true);
                }
                
                function ServiceAddAgenterrorCB(error) {
@@ -440,16 +413,9 @@ cloudeebus.Service.prototype.removeAgent = function(rmAgent) {
                                        break;
                                }
                                        
-                       try {
-                               self.agents.splice(idx, 1);
-                               self._deleteWrapper(agent);
-                               resolver.fulfill(agent, true);
-                       }
-                       catch (e) {
-                               var errorStr = cloudeebus.getError(e);
-                               cloudeebus.log("Method callback exception: " + errorStr);
-                               resolver.reject(errorStr, true);
-                       }               
+                       self.agents.splice(idx, 1);
+                       self._deleteWrapper(agent);
+                       resolver.fulfill(agent, true);
                }
 
                function ServiceRemoveAgentErrorCB(error) {

diff --git a/doc/agent/client.html b/doc/agent/client.html
index ac09ebf..625d3a1 100644 (file)
--- a/doc/agent/client.html
+++ b/doc/agent/client.html
@@ -27,8 +27,6 @@ var manifest = {
 };
 
 
-var sampleProxy = null;
-
 cloudeebus.log = function(msg) {
   document.getElementById("log").innerHTML += msg + "\n";
 }
@@ -41,29 +39,13 @@ function errorCB(error) {
   cloudeebus.log(error.desc ? error.desc : error);
 }
 
-function gotDictResult(result) {
-  cloudeebus.log("gotDictResult: " + JSON.stringify(result));
-  cloudeebus.log("Name: " + result.Name);
-}
-
 function gotDivResult(result) {
   cloudeebus.log("gotDivResult: " + result);
-  if (result % 1 == 0) {
-         var dictionary = {Name: "Mickey",
-                                        Sisters: [""], 
-                                        Married: true,
-                                        Divorced: 0,
-                                        Friends: ["Donald", "Dingo"],
-                                        Others: [""]};
-         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).then(gotDivResult,errorCB);
+  window.sampleProxy.Div(result,3.33).then(gotDivResult,errorCB);
 }
 
 function signalHandler(result) {
@@ -71,26 +53,35 @@ function signalHandler(result) {
 }
 
 function gotProxy(proxy) {
-       sampleProxy = proxy;
-   logCB(sampleProxy);
-  if (0) {
-    proxy.Release();
-    return;
-   } else {
-         proxy.connectToSignal("org.cloudeebus.Sample1", "ResultChanged", signalHandler);
-         logCB('Addition');
+       proxy.connectToSignal("org.cloudeebus.Sample", "ResultChanged", signalHandler);
+       logCB(proxy);
+       window.sampleProxy = proxy;
+       testProxy();
+}
+
+function testProxy() {
+       var dictionary = {Name: "Mickey",
+                                        Sisters: [""], 
+                                        Married: true,
+                                        Divorced: 0,
+                                        Friends: ["Donald", "Dingo"],
+                                        Others: [""]};
+       window.sampleProxy.Variant(dictionary).then(logCB,errorCB);
          
-         for (var i=-10; i<10; i++)
-           proxy.Add(i,i*2).then(gotAddResult,errorCB);
-  }
-  
+       logCB('Addition');
+       for (var i=-2; i<2; i++)
+         window.sampleProxy.Add(i,i*2).then(gotAddResult,errorCB);
 }
 
 function connectSuccess() {
-  cloudeebus.SessionBus().getObject("org.cloudeebus.Sample", "/org/cloudeebus/Sample", gotProxy, errorCB);
+       cloudeebus.SessionBus().getObject("org.cloudeebus.Sample", "/org/cloudeebus/Sample", gotProxy, errorCB);
 }
 
-cloudeebus.connect("ws://localhost:9002", manifest, connectSuccess, errorCB);
+if (!window.sampleProxy)
+       cloudeebus.connect("ws://localhost:9002", manifest, connectSuccess, errorCB);
+else
+       testProxy();
+
 </textarea>
                <br>
                <input type="button" value="run script" onclick="evalScript()"/>

diff --git a/doc/agent/server.html b/doc/agent/server.html
index 4baded4..b975b8e 100644 (file)
--- a/doc/agent/server.html
+++ b/doc/agent/server.html
@@ -27,7 +27,7 @@ var manifest = {
 };
 
 
-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.Sample"><method name="Add"><arg type="i" name="arg1"/><arg type="i" name="arg2"/><arg type="i" name="result" direction="out"/></method><method name="Div"><arg type="d" name="arg1"/><arg type="d" name="arg2"/><arg type="d" 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></node>';
 
 cloudeebus.log = function(msg) {
   document.getElementById("log").innerHTML += msg + "\n";
@@ -51,9 +51,6 @@ sampleObjectHandler = {
     cloudeebus.log("Get and return :" + JSON.stringify(a));
     return a;
   }, 
-  Release: function() {
-    gService.remove().then(logCB, errorCB);
-  },
   Div: function(a,b) {
     cloudeebus.log("Div " + a + " / " + b);
        this.ResultChanged(a/b);
@@ -66,21 +63,33 @@ function addAgent(service) {
   var agent = new cloudeebus.Agent(service.name, "/org/cloudeebus/Sample", sampleObjectHandler, sampleXml);
   cloudeebus.log("Adding agent " + agent.objectPath + " on " + service.name + ", mapped on Javascript object: 'sampleObjectHandler");
   service.addAgent(agent).then(logCB, errorCB);
- 
+  window.gAgent = agent;
 }
 
 function connectSuccess() {
   cloudeebus.SessionBus().addService("org.cloudeebus.Sample").then(addAgent, errorCB);
 }
 
-cloudeebus.connect("ws://localhost:9003", manifest, connectSuccess, errorCB);
+if (!window.sampleProxy)
+  cloudeebus.connect("ws://localhost:9003", manifest, connectSuccess, errorCB);
 </textarea>
                <br>
 -              <input type="button" value="run script" onclick="evalScript('script')"/>
                <input type="button" value="clear log" onclick="document.getElementById('log').innerHTML='';"/>
                <br>
+<textarea style="width:80%" rows="7" id="removeCmd">
+function removeService() {
+cloudeebus.log("Agent " + JSON.stringify(window.gAgent));
+       cloudeebus.log("Removing service");
+       window.gService.remove()
+}
+
+cloudeebus.log("Service = " + JSON.stringify(window.gService));
+cloudeebus.log("Removing agent " + JSON.stringify(window.gAgent));
+window.gService.removeAgent(window.gAgent).then(removeService, null);
+</textarea>
+               <br>
                <input type="button" value="Unregister service" onclick="evalScript('removeCmd')"/>
--              <input id="removeCmd" type="text" value="window.gService.remove()"/>
                <br>
                <pre id="log" style="height: 20em; overflow-x: auto; overflow-y: auto; background-color: #faa;"></pre>
    </body>