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;
}
function onWAMPSessionAuthErrorCB(error) {
- cloudeebus.log("Authentication error: " + cloudeebus.getError(error));
+ var errorStr = cloudeebus.getError(error);
+ cloudeebus.log("Authentication error: " + errorStr);
if (errorCB)
- errorCB(cloudeebus.getError(error));
+ errorCB(errorStr);
}
function onWAMPSessionAuthenticatedCB(permissions) {
var promise = new cloudeebus.Promise(function (resolver) {
cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
- function busServiceAddedSuccessCB(service) {
- try {
- service.isCreated = true;
- var result = [cloudeebusService];
- resolver.accept(result[0], true);
- }
- catch (e) {
- cloudeebus.log("Method callback exception: " + e);
- resolver.reject(e, true);
- }
- }
-
- function busServiceErrorSuccessCB(error) {
- resolver.reject(error, true);
- }
-
- cloudeebusService.add(this).then(busServiceAddedSuccessCB, busServiceErrorSuccessCB);
+ function ServiceAddedSuccessCB(serviceName) {
+ try { // calling dbus hook object function for un-translated types
+ cloudeebusService.isCreated = true;
+ var result = [ cloudeebusService ];
+ resolver.fulfill(result[0], true);
+ }
+ catch (e) {
+ var errorStr = cloudeebus.getError(e);
+ cloudeebus.log("Method callback exception: " + errorStr);
+ resolver.reject(errorStr, true);
+ }
+ }
+
+ function ServiceAddedErrorCB(error) {
+ var errorStr = cloudeebus.getError(error);
+ cloudeebus.log("Error adding service method: " + self.name + ", error: " + errorStr);
+ self.promise.resolver.reject(errorStr, true);
+ }
+
+ var arglist = [
+ self.name,
+ serviceName
+ ];
+
+ // call dbusSend with bus type, destination, object, message and arguments
+ self.wampSession.call("serviceAdd", arglist).then(ServiceAddedSuccessCB, ServiceAddedErrorCB);
});
return promise;
};
-cloudeebus.BusConnection.prototype.removeService = function(serviceName, successCB, errorCB) {
- var self = this;
-
- function busServiceRemovedSuccessCB(serviceName) {
- // Be sure we are removing the service requested...
- if (serviceName == self.service.name) {
- self.service = null;
- if (successCB)
- successCB(serviceName);
- }
- }
-
- cloudeebusService.remove(busServiceRemovedSuccessCB, errorCB);
-};
-
/*****************************************************************************/
//Generic definition for an agent. An agent need :
//objPath : a DBus path to access it
//jsHdl : a Javascript handler to process methods,
//xml : the xml which describe interface/methods/signals...
-Agent = function(srvDbusName, objPath, jsHdl, xml) {
+cloudeebus.Agent = function(srvDbusName, objPath, jsHdl, xml) {
this.srvName = srvDbusName;
this.registered = false;
this.xml = xml;
this.wampSession = session;
this.busConnection = busConnection;
this.name = name;
+ this.agents = [];
this.isCreated = false;
return this;
};
-cloudeebus.Service.prototype.add = function(promise) {
+cloudeebus.Service.prototype.remove = function() {
var self = this;
- self.promise = promise;
- var resolver = self.promise.resolver;
-
- function ServiceAddedSuccessCB(serviceName) {
- try { // calling dbus hook object function for un-translated types
- var result = [self];
- resolver.accept(result[0], true);
- }
- catch (e) {
- cloudeebus.log("Method callback exception: " + e);
- resolver.reject(e, true);
- }
- }
- function ServiceAddedErrorCB(error) {
- cloudeebus.log("Error adding service method: " + self.name + ", error: " + cloudeebus.getError(error));
- self.promise.resolver.reject(cloudeebus.getError(error), true);
- }
-
- var arglist = [
- this.busConnection,
- this.name
- ];
-
- // call dbusSend with bus type, destination, object, message and arguments
- this.wampSession.call("serviceAdd", arglist).then(ServiceAddedSuccessCB, ServiceAddedErrorCB);
- return promise;
-};
-
-cloudeebus.Service.prototype.remove = function(successCB, errorCB) {
- function ServiceRemovedSuccessCB(serviceName) {
- if (successCB) {
- try {
- successCB(serviceName);
+ 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);
}
catch (e) {
- alert("Exception removing service " + serviceName + " : " + e);
+ var errorStr = cloudeebus.getError(e);
+ cloudeebus.log("Method callback exception: " + errorStr);
+ resolver.reject(errorStr, 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.delAgent(self.agents[idx]);
}
}
- }
+
+ var arglist = [
+ self.name
+ ];
- var arglist = [
- this.name
- ];
-
- // call dbusSend with bus type, destination, object, message and arguments
- this.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, errorCB);
+ // call dbusSend with bus type, destination, object, message and arguments
+ self.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, ServiceRemovedErrorCB);
+ });
+
+ return promise;
};
cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) {
service._returnMethod(methodId, callDict.callIndex, true, result);
}
catch (e) {
- cloudeebus.log("Method " + ifName + "." + method + " call on " + agent.objectPath + " exception: " + e);
- service._returnMethod(methodId, callDict.callIndex, false, e.message);
+ var errorStr = cloudeebus.getError(e);
+ cloudeebus.log("Method " + ifName + "." + method + " call on " + agent.objectPath + " exception: " + errorStr);
+ service._returnMethod(methodId, callDict.callIndex, false, errorStr);
}
};
agent.jsHdl.methodId[agent.objectPath].push(methodId);
if ((agent.jsHdl[signal] == undefined || agent.jsHdl[signal] == null) && !methodExist)
agent.jsHdl[signal] = function() {
- service.emitSignal(agent.objectPath, signal, arguments[0]);
+ service._emitSignal(agent.objectPath, signal, arguments[0]);
};
else
cloudeebus.log("Can not create new method to emit signal '" + signal + "' in object JS this method already exist!");
}
if (ifChild.nodeName == "signal") {
var metName = ifChild.attributes.getNamedItem("name").value;
- self._addSignal(objectPath, ifName, metName, objectJS);
+ self._addSignal(ifName, metName, agent);
}
ifChild = ifChild.nextSibling;
}
}
};
-cloudeebus.Service.prototype.addAgent = function(agent, successCB, errorCB) {
- function ServiceAddAgentSuccessCB(objPath) {
- if (successCB) {
- try {
- successCB(objPath);
+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) {
- alert("Exception adding agent " + agent.objectPath + " : " + 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) {
- alert("Exception creating agent wrapper " + agent.objectPath + " : " + e);
- errorCB(e);
- 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 self = this;
var objJs = agent.jsHdl;
if (objJs.methodId[agent.objectPath]) {
for (var idx in objJs.methodId[agent.objectPath]) {
objJs.methodId[agent.objectPath][idx] = null;
}
catch (e) {
- cloudeebus.log("Unsubscribe error: " + e);
+ cloudeebus.log("Unsubscribe error: " + cloudeebus.getError(e));
}
}
delete objJs.methodId[agent.objectPath];
};
cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) {
- function ServiceDelAgentSuccessCB(agent) {
- if (successCB) {
- try {
- successCB(agent);
+ var self = this;
+
+ var promise = new cloudeebus.Promise(function (resolver) {
+ function ServiceDelAgentSuccessCB(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) {
- alert("Exception deleting agent " + rmAgent.objectPath + " : " + e);
- errorCB(e);
- }
+ var errorStr = cloudeebus.getError(e);
+ cloudeebus.log("Method callback exception: " + errorStr);
+ resolver.reject(errorStr, true);
+ }
}
- }
- try {
- this._deleteWrapper(rmAgent);
- }
- catch (e) {
- alert("Exception deleting agent wrapper " + rmAgent.objectPath + " : " + e);
- errorCB(e);
- }
-
- var arglist = [
- rmAgent.objectPath
- ];
+ function ServiceDelAgentErrorCB(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(ServiceDelAgentSuccessCB, ServiceDelAgentErrorCB);
+ });
+
+ return promise;
};
cloudeebus.Service.prototype._returnMethod = function(methodId, callIndex, success, result, successCB, errorCB) {
then.apply(value, [fulfillCallback, rejectCallback]);
}
catch (e) {
- this.reject(e, true);
+ this.reject(cloudeebus.getError(e), true);
}
}
init.apply(this, [this.resolver]);
}
catch (e) {
- this.resolver.reject(e, true);
+ this.resolver.reject(cloudeebus.getError(e), true);
}
}
return this;
resolver.resolve(value, true);
}
catch (e) {
- resolver.reject(e, true);
+ resolver.reject(cloudeebus.getError(e), true);
}
};
else
resolver.resolve(value, true);
}
catch (e) {
- resolver.reject(e, true);
+ resolver.reject(cloudeebus.getError(e), true);
}
};
else
resolver.fulfill(result[0], true);
}
catch (e) {
- cloudeebus.log("Method callback exception: " + e);
- resolver.reject(e, true);
+ var errorStr = cloudeebus.getError(e);
+ cloudeebus.log("Method callback exception: " + errorStr);
+ resolver.reject(errorStr, true);
}
}
function callMethodErrorCB(error) {
- cloudeebus.log("Error calling method: " + method + " on object: " + self.objectPath + " : " + cloudeebus.getError(error));
- resolver.reject(cloudeebus.getError(error), true);
+ var errorStr = cloudeebus.getError(error);
+ cloudeebus.log("Error calling method: " + method + " on object: " + self.objectPath + " : " + errorStr);
+ resolver.reject(errorStr, true);
}
var arglist = [
handlerCB.apply(self, eval(data));
}
catch (e) {
- cloudeebus.log("Signal handler exception: " + e);
+ var errorStr = cloudeebus.getError(e);
+ cloudeebus.log("Signal handler exception: " + errorStr);
if (errorCB)
- errorCB(e);
+ errorCB(errorStr);
}
}
}
self.wampSession.subscribe(str, signalHandler);
}
catch (e) {
- cloudeebus.log("Subscribe error: " + e);
+ cloudeebus.log("Subscribe error: " + cloudeebus.getError(e));
}
}
function connectToSignalErrorCB(error) {
- cloudeebus.log("Error connecting to signal: " + signal + " on object: " + self.objectPath + " : " + cloudeebus.getError(error));
+ var errorStr = cloudeebus.getError(error);
+ cloudeebus.log("Error connecting to signal: " + signal + " on object: " + self.objectPath + " : " + errorStr);
if (errorCB)
- errorCB(cloudeebus.getError(error));
+ errorCB(cloudeebus.getError(errorStr));
}
var arglist = [
this.wampSession.unsubscribe(this.busConnection.name + "#" + this.busName + "#" + this.objectPath + "#" + ifName + "#" + signal);
}
catch (e) {
- cloudeebus.log("Unsubscribe error: " + e);
+ cloudeebus.log("Unsubscribe error: " + cloudeebus.getError(e));
}
};
projects / contrib / cloudeebus.git / blobdiff