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;
- return error;
+ if (error.name)
+ return error.name;
+ return error; // Autobahn error
};
cloudeebus.versionCheck = function(version) {
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.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
- 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) {
};
+
/*****************************************************************************/
-//Generic definition for an agent. An agent need :
+//Generic definition for an agent. An agent needs :
//srvDbusName : the DBus parent service
//objPath : a DBus path to access it
//jsHdl : a Javascript handler to process methods,
//xml : the xml which describe interface/methods/signals...
-cloudeebus.Agent = function(srvDbusName, objPath, jsHdl, xml) {
- this.srvName = srvDbusName;
- this.registered = false;
+cloudeebus.Agent = function(objPath, jsHdl, xml) {
+// this.srvName = srvDbusName;
this.xml = xml;
this.objectPath = objPath;
this.jsHdl = jsHdl;
return this;
};
+
cloudeebus.Service.prototype.remove = function() {
var self = this;
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) {
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]);
- }
+ resolver.reject(errorStr, true);
}
var arglist = [
return promise;
};
+
cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) {
var funcToCall = null;
return funcToCall;
};
+
cloudeebus.Service.prototype._addMethod = function(ifName, method, agent) {
var service = this;
}
};
agent.jsHdl.methodId[agent.objectPath].push(methodId);
- cloudeebus.log("subscribe " + methodId);
this.wampSession.subscribe(methodId, agent.jsHdl.wrapperFunc[method]);
}
};
+
cloudeebus.Service.prototype._addSignal = function(ifName, signal, agent) {
var service = this;
var methodExist = false;
cloudeebus.log("Can not create new method to emit signal '" + signal + "' in object JS this method already exist!");
};
+
cloudeebus.Service.prototype._createWrapper = function(agent) {
var self = this;
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;
}
};
+
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) {
- 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) {
return promise;
};
+
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);
- }
- catch (e) {
- var errorStr = cloudeebus.getError(e);
- cloudeebus.log("Method callback exception: " + errorStr);
- resolver.reject(errorStr, 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;
+ }
+
+ self.agents.splice(idx, 1);
+ self._deleteWrapper(agent);
+ resolver.fulfill(agent, true);
}
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
];
return promise;
};
+
cloudeebus.Service.prototype._returnMethod = function(methodId, callIndex, success, result, successCB, errorCB) {
var arglist = [
methodId,
this.wampSession.call("returnMethod", arglist).then(successCB, errorCB);
};
+
cloudeebus.Service.prototype._emitSignal = function(objectPath, signalName, result, successCB, errorCB) {
var arglist = [
objectPath,
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;
};
resolver.resolve(args, true);
};
index++;
- Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+ cloudeebus.Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
}
return promise;
resolver.reject(args, true);
};
index++;
- Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+ cloudeebus.Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
}
return promise;
function introspectSuccessCB(str) {
var parser = new DOMParser();
var xmlDoc = parser.parseFromString(str, "text/xml");
+ var nodes = xmlDoc.getElementsByTagName("node");
+ self.childNodeNames = [];
+ var l = nodes.length;
+ //there will always be 1 node, the parent/head node
+ if(l > 1){
+ for(var i = 1; i < l; i++){
+ self.childNodeNames.push(nodes[i].getAttribute("name"));
+ }
+ }
var interfaces = xmlDoc.getElementsByTagName("interface");
self.propInterfaces = [];
var supportDBusProperties = false;
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 = [