comment cleanup

[contrib/cloudeebus.git] / cloudeebus / cloudeebus.js

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index 08528eb..c0e38c0 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -46,18 +46,18 @@ cloudeebus.log = function(msg) {
 
 cloudeebus.getError = function(error) {
        if (error.desc && error.uri)
-               return error.desc + " : " + error.uri;
+               return error.desc + " : " + error.uri; // Python exception (cloudeebus.py)
        if (error.desc)
                return error.desc;
        if (error.uri)
                return error.uri;
        if (error.name && error.message)
-               return error.name + " : " + error.message;
+               return error.name + " : " + error.message; // Javascript exception
        if (error.message)
                return error.message;
        if (error.name)
                return error.name;
-       return error;
+       return error; // Autobahn error
 };
 
 cloudeebus.versionCheck = function(version) {
@@ -110,13 +110,12 @@ cloudeebus.connect = function(uri, manifest, successCB, errorCB) {
        
        function onWAMPSessionConnectedCB(session) {
                cloudeebus.wampSession = session;
-               if (manifest) {
+               if (manifest)
                        cloudeebus.wampSession.authreq(
                                        manifest.name, 
                                        {permissions: manifest.permissions, 
                                                 services: manifest.services}
                                ).then(onWAMPSessionChallengedCB, onWAMPSessionAuthErrorCB);
-               }
                else
                        cloudeebus.wampSession.authreq().then(function() {
                                cloudeebus.wampSession.auth().then(onWAMPSessionAuthenticatedCB, onWAMPSessionAuthErrorCB);
@@ -176,7 +175,7 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
                var cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
        
                function ServiceAddedSuccessCB(serviceName) {
-                       try { // calling dbus hook object function for un-translated types
+                       try {
                                cloudeebusService.isCreated = true;
                                resolver.fulfill(cloudeebusService, true);
                        }
@@ -215,7 +214,6 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) {
 //xml : the xml which describe interface/methods/signals...
 cloudeebus.Agent = function(srvDbusName, objPath, jsHdl, xml) {
        this.srvName = srvDbusName;
-       this.registered = false;
        this.xml = xml;
        this.objectPath = objPath;
        this.jsHdl = jsHdl;
@@ -250,8 +248,7 @@ cloudeebus.Service.prototype.remove = function() {
                
                function ServiceRemovedErrorCB(error) {
                        var errorStr = cloudeebus.getError(error);
-                       cloudeebus.log("Error removing service : " + self.name + ", error: " + errorStr);
-                       self.promise.resolver.reject(errorStr, true);
+                       resolver.reject(errorStr, true);
                }
                
                for (var idx in self.agents) {
@@ -349,8 +346,8 @@ cloudeebus.Service.prototype._createWrapper = function(agent) {
        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.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;
@@ -375,11 +372,9 @@ cloudeebus.Service.prototype.addAgent = function(agent) {
        
        var promise = new cloudeebus.Promise(function (resolver) {
                function ServiceAddAgentSuccessCB(objPath) {
-                       try { // calling dbus hook object function for un-translated types
+                       try {
                                self.agents.push(agent);
-                               agent.registered = true;
-                               var result = [ objPath ];
-                               resolver.fulfill(result[0], true);
+                               resolver.fulfill(objPath, true);
                        }
                        catch (e) {
                                var errorStr = cloudeebus.getError(e);
@@ -420,31 +415,35 @@ cloudeebus.Service.prototype.addAgent = function(agent) {
 cloudeebus.Service.prototype._deleteWrapper = function(agent) {
        var objJs = agent.jsHdl;
        if (objJs.methodId[agent.objectPath]) {
-               for (var idx in objJs.methodId[agent.objectPath]) {
+               while (objJs.methodId[agent.objectPath].length) {
                        try {
-                               cloudeebus.log("unsubscribe " + objJs.methodId[agent.objectPath][idx]);
-                               this.wampSession.unsubscribe(objJs.methodId[agent.objectPath][idx]);
-                               objJs.methodId[agent.objectPath][idx] = null;
+                               this.wampSession.unsubscribe( objJs.methodId[agent.objectPath].pop() );
                        }
                        catch (e) {
                                cloudeebus.log("Unsubscribe error: " + cloudeebus.getError(e));
                        }
                }
-               delete objJs.methodId[agent.objectPath];
+               objJs.methodId[agent.objectPath] = null;
        }
 };
 
 
-cloudeebus.Service.prototype.removeAgent = function(rmAgent, successCB, errorCB) {
+cloudeebus.Service.prototype.removeAgent = function(rmAgent) {
        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);
+               function ServiceRemoveAgentSuccessCB(objectPath) {
+                       // Searching agent in list
+                       for (var idx in self.agents)
+                               if (self.agents[idx].objectPath == objectPath) {
+                                       agent = self.agents[idx];
+                                       break;
+                               }
+                                       
+                       try {
+                               self.agents.splice(idx, 1);
+                               self._deleteWrapper(agent);
+                               resolver.fulfill(agent, true);
                        }
                        catch (e) {
                                var errorStr = cloudeebus.getError(e);
@@ -456,18 +455,9 @@ cloudeebus.Service.prototype.removeAgent = function(rmAgent, successCB, errorCB)
                function ServiceRemoveAgentErrorCB(error) {
                        var errorStr = cloudeebus.getError(error);
                        cloudeebus.log("Error removing agent : " + rmAgent.objectPath + ", error: " + errorStr);
-                       self.promise.resolver.reject(errorStr, true);
+                       resolver.reject(errorStr, true);
                }
 
-               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
                    ];
@@ -706,7 +696,7 @@ cloudeebus.Promise.any = function() {
                resolver.resolve(undefined, true);
        else
                for (i in arguments) 
-                       Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+                       cloudeebus.Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
        return promise;
 };
 
@@ -731,7 +721,7 @@ cloudeebus.Promise.every = function() {
                                        resolver.resolve(args, true);
                        };
                        index++;
-                       Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+                       cloudeebus.Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
                }
        
        return promise;
@@ -758,7 +748,7 @@ cloudeebus.Promise.some = function() {
                                        resolver.reject(args, true);
                        };
                        index++;
-                       Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+                       cloudeebus.Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
                }
        
        return promise;