};
cloudeebus.getError = function(error) {
+ if (error.desc && error.uri)
+ return error.desc + " : " + error.uri; // error cloudeebus (from python)
if (error.desc)
return error.desc;
+ if (error.uri)
+ return error.uri;
+ if (error.name && error.message)
+ 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) {
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);
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);
}
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);
};
-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);