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 :
this.wampSession = session;
this.busConnection = busConnection;
this.name = name;
+ this.agents = [];
this.isCreated = false;
return this;
};
-cloudeebus.Service.prototype.remove = function(successCB, errorCB) {
- function ServiceRemovedSuccessCB(serviceName) {
- if (successCB) {
- try {
- successCB(serviceName);
+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);
}
catch (e) {
- alert("Exception removing service " + serviceName + " : " + cloudeebus.getError(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]) {
+ cloudeebus.log("Removing agent : " + JSON.stringify(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) {
};
cloudeebus.Service.prototype.addAgent = function(agent, successCB, errorCB) {
+ 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);
<center><h1>cloudeebus</h1></center>
<br>
<textarea style="width:80%" rows="32" id="script">var sampleXml= '<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"\n"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">\n<node><interface name="org.cloudeebus.Sample1"><method name="Release"></method><method name="Add"><arg type="i" name="arg1"/><arg type="i" name="arg2"/><arg type="i" name="result" direction="out"/></method><method name="Variant"><arg type="a{sv}" name="arg1"/><arg type="a{sv}" name="result" direction="out"/></method><signal name="ResultChanged"><arg type="v" name="result"/></signal></interface><interface name="org.cloudeebus.Sample2"><method name="Div"><arg type="d" name="arg1"/><arg type="d" name="arg2"/><arg type="d" name="result" direction="out"/></method></interface></node>';
+
cloudeebus.log = function(msg) {
document.getElementById("log").innerHTML += msg + "\n";
}
};
function addAgents(service) {
+ gService = service;
var agent1 = new cloudeebus.Agent(service.name, "/org/cloudeebus/Sample", sampleObjectHandler, sampleXml);
cloudeebus.log("Adding agent " + agent1.objectPath + " on " + service.name + ", mapped on Javascript object: 'sampleObjectHandler");
service.addAgent(agent1, logCB, errorCB);
}
function connectSuccess() {
- cloudeebus.SessionBus().addService("org.cloudeebus.Sample").then(addAgents, errorCB);
+ if (1)
+ cloudeebus.SessionBus().addService("org.cloudeebus.Sample").then(addAgents, errorCB);
+ else {
+ gService.remove().then(logCB, errorCB);
+ }
}
cloudeebus.connect("ws://localhost:9003", null, connectSuccess, errorCB);