Merge pull request #27 from fpaut/master

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

diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js
index dd7a525..92d3108 100644 (file)
--- a/cloudeebus/cloudeebus.js
+++ b/cloudeebus/cloudeebus.js
@@ -46,7 +46,7 @@ cloudeebus.log = function(msg) {
 
 cloudeebus.getError = function(error) {
        if (error.desc && error.uri)
-               return error.desc + " : " + error.uri;
+               return error.desc + " : " + error.uri; // error cloudeebus (from python)
        if (error.desc)
                return error.desc;
        if (error.uri)
@@ -55,7 +55,9 @@ cloudeebus.getError = function(error) {
                return error.name + " : " + error.message;
        if (error.message)
                return error.message;
-       return error;
+       if (error.name)
+               return error.name;
+       return error; // error from Autobahn
 };
 
 cloudeebus.versionCheck = function(version) {
@@ -108,11 +110,13 @@ 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}
+                                       {permissions: manifest.permissions, 
+                                                services: manifest.services}
                                ).then(onWAMPSessionChallengedCB, onWAMPSessionAuthErrorCB);
+               }
                else
                        cloudeebus.wampSession.authreq().then(function() {
                                cloudeebus.wampSession.auth().then(onWAMPSessionAuthenticatedCB, onWAMPSessionAuthErrorCB);
@@ -164,12 +168,15 @@ cloudeebus.BusConnection.prototype.getObject = function(busName, objectPath, int
 
 cloudeebus.BusConnection.prototype.addService = function(serviceName) {
        var self = this;
+
+       if (!serviceName)
+               serviceName = "";
        
        var promise = new cloudeebus.Promise(function (resolver) {
                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);
                        }
@@ -309,7 +316,6 @@ cloudeebus.Service.prototype._addMethod = function(ifName, method, agent) {
                        }
                };
                agent.jsHdl.methodId[agent.objectPath].push(methodId);
-               cloudeebus.log("subscribe " + methodId);
                this.wampSession.subscribe(methodId, agent.jsHdl.wrapperFunc[method]);
        }
 };
@@ -372,8 +378,7 @@ cloudeebus.Service.prototype.addAgent = function(agent) {
                        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);
+                               resolver.fulfill(objPath, true);
                        }
                        catch (e) {
                                var errorStr = cloudeebus.getError(e);
@@ -429,16 +434,15 @@ cloudeebus.Service.prototype._deleteWrapper = function(agent) {
 };
 
 
-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);
+                               self.agents.pop(agent);
+                               agent.registered = false;
+                               resolver.fulfill(agent, true);
                        }
                        catch (e) {
                                var errorStr = cloudeebus.getError(e);
@@ -943,7 +947,7 @@ cloudeebus.ProxyObject.prototype.connectToSignal = function(ifName, signal, hand
                var errorStr = cloudeebus.getError(error);
                cloudeebus.log("Error connecting to signal: " + signal + " on object: " + self.objectPath + " : " + errorStr);
                if (errorCB)
-                       errorCB(cloudeebus.getError(errorStr));
+                       errorCB(errorStr);
        }
 
        var arglist = [