function onWAMPSessionConnectedCB(session) {
cloudeebus.wampSession = session;
- if (manifest) {
+ if (manifest)
cloudeebus.wampSession.authreq(
manifest.name,
{permissions: manifest.permissions,
services: manifest.services}
).then(onWAMPSessionChallengedCB, onWAMPSessionAuthErrorCB);
- }
else
cloudeebus.wampSession.authreq().then(function() {
cloudeebus.wampSession.auth().then(onWAMPSessionAuthenticatedCB, onWAMPSessionAuthErrorCB);
//xml : the xml which describe interface/methods/signals...
cloudeebus.Agent = function(srvDbusName, objPath, jsHdl, xml) {
this.srvName = srvDbusName;
- this.registered = false;
this.xml = xml;
this.objectPath = objPath;
this.jsHdl = jsHdl;
function ServiceRemovedErrorCB(error) {
var errorStr = cloudeebus.getError(error);
- cloudeebus.log("Error removing service : " + self.name + ", error: " + errorStr);
- self.promise.resolver.reject(errorStr, true);
+ resolver.reject(errorStr, true);
}
for (var idx in self.agents) {
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;
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) {
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;
}
};
var promise = new cloudeebus.Promise(function (resolver) {
function ServiceRemoveAgentSuccessCB(objectPath) {
// Searching agent in list
- var idx;
- for (idx in self.agents)
+ for (var idx in self.agents)
if (self.agents[idx].objectPath == objectPath) {
agent = self.agents[idx];
break;
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);
}
var arglist = [