/*****************************************************************************/
var cloudeebus = window.cloudeebus = {
- version: "0.5.1",
+ version: "0.5.99",
minVersion: "0.3.2"
};
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)
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) {
- cloudeebusService = new cloudeebus.Service(self.wampSession, self, 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;
- var result = [ cloudeebusService ];
- resolver.fulfill(result[0], true);
+ resolver.fulfill(cloudeebusService, true);
}
catch (e) {
var errorStr = cloudeebus.getError(e);
function ServiceAddedErrorCB(error) {
var errorStr = cloudeebus.getError(error);
cloudeebus.log("Error adding service method: " + self.name + ", error: " + errorStr);
- self.promise.resolver.reject(errorStr, true);
+ resolver.reject(errorStr, true);
}
var arglist = [
};
+
/*****************************************************************************/
-//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,
return this;
};
+
cloudeebus.Service.prototype.remove = function() {
var self = this;
var promise = new cloudeebus.Promise(function (resolver) {
function ServiceRemovedSuccessCB(serviceName) {
- try { // calling dbus hook object function for un-translated types
- var result = [ serviceName ];
- resolver.fulfill(result[0], true);
+ try {
+ resolver.fulfill(serviceName, true);
}
catch (e) {
var errorStr = cloudeebus.getError(e);
for (var idx in self.agents) {
if (self.agents[idx]) {
- cloudeebus.log("Removing agent : " + JSON.stringify(self.agents[idx]));
- self.delAgent(self.agents[idx]);
+ self.removeAgent(self.agents[idx]);
}
}
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();
}
};
-cloudeebus.Service.prototype.addAgent = function(agent, successCB, errorCB) {
+
+cloudeebus.Service.prototype.addAgent = function(agent) {
var self = this;
- function ServiceAddAgentSuccessCB(objPath) {
- self.agents.push(agent);
- agent.registered = true;
- cloudeebus.log("Agent pushed : " + JSON.stringify(agent))
- if (successCB) {
- try {
- successCB(objPath);
+ 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;
+ resolver.fulfill(objPath, true);
}
catch (e) {
- alert("Exception adding agent " + agent.objectPath + " : " + cloudeebus.getError(e));
- }
+ var errorStr = cloudeebus.getError(e);
+ cloudeebus.log("Method callback exception: " + errorStr);
+ resolver.reject(errorStr, true);
+ }
}
- }
+
+ function ServiceAddAgenterrorCB(error) {
+ var errorStr = cloudeebus.getError(error);
+ cloudeebus.log("Error adding agent : " + agent.objectPath + ", error: " + errorStr);
+ self.promise.resolver.reject(errorStr, true);
+ }
+
+ try {
+ self._createWrapper(agent);
+ }
+ catch (e) {
+ var errorStr = cloudeebus.getError(e);
+ cloudeebus.log("Exception creating agent wrapper " + agent.objectPath + " : " + errorStr);
+ resolver.reject(errorStr, true);
+ return;
+ }
+
+ var arglist = [
+ agent.objectPath,
+ agent.xml
+ ];
- try {
- this._createWrapper(agent);
- }
- catch (e) {
- var errorStr = cloudeebus.getError(e);
- alert("Exception creating agent wrapper " + agent.objectPath + " : " + errorStr);
- errorCB(errorStr);
- return;
- }
+ // call dbusSend with bus type, destination, object, message and arguments
+ self.wampSession.call("serviceAddAgent", arglist).then(ServiceAddAgentSuccessCB, ServiceAddAgenterrorCB);
+ });
- var arglist = [
- agent.objectPath,
- agent.xml
- ];
-
- // call dbusSend with bus type, destination, object, message and arguments
- this.wampSession.call("serviceAddAgent", arglist).then(ServiceAddAgentSuccessCB, errorCB);
+ return promise;
};
+
cloudeebus.Service.prototype._deleteWrapper = function(agent) {
var objJs = agent.jsHdl;
if (objJs.methodId[agent.objectPath]) {
}
};
-cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) {
- function ServiceDelAgentSuccessCB(agent) {
- if (successCB) {
- try {
- successCB(agent);
+
+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.pop(agent);
+ agent.registered = false;
+ resolver.fulfill(agent, true);
}
catch (e) {
var errorStr = cloudeebus.getError(e);
- alert("Exception deleting agent " + rmAgent.objectPath + " : " + errorStr);
- errorCB(errorStr);
- }
+ cloudeebus.log("Method callback exception: " + errorStr);
+ resolver.reject(errorStr, true);
+ }
}
- }
- try {
- this._deleteWrapper(rmAgent);
- }
- catch (e) {
- var errorStr = cloudeebus.getError(e);
- alert("Exception deleting agent wrapper " + rmAgent.objectPath + " : " + errorStr);
- errorCB(errorStr);
- }
-
- var arglist = [
- rmAgent.objectPath
- ];
+ function ServiceRemoveAgentErrorCB(error) {
+ var errorStr = cloudeebus.getError(error);
+ cloudeebus.log("Error removing agent : " + rmAgent.objectPath + ", error: " + errorStr);
+ self.promise.resolver.reject(errorStr, true);
+ }
- // call dbusSend with bus type, destination, object, message and arguments
- this.wampSession.call("serviceDelAgent", arglist).then(ServiceDelAgentSuccessCB, errorCB);
+ 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
+ ];
+
+ // call dbusSend with bus type, destination, object, message and arguments
+ self.wampSession.call("serviceDelAgent", arglist).then(ServiceRemoveAgentSuccessCB, ServiceRemoveAgentErrorCB);
+ });
+
+ 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,
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 = [
projects / contrib / cloudeebus.git / blobdiff