X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cloudeebus%2Fcloudeebus.js;h=04faaa44a98699337d704bf5dcd65281254e19f0;hb=3ba62abcc4144f5179f80ac6994adf735e6607f9;hp=92d31081364efbf75b5c3e0eeda651b1ddcbad79;hpb=de126e87fcde25b375b2efb56583712b2ca8affc;p=contrib%2Fcloudeebus.git diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js index 92d3108..04faaa4 100644 --- a/cloudeebus/cloudeebus.js +++ b/cloudeebus/cloudeebus.js @@ -46,18 +46,18 @@ cloudeebus.log = function(msg) { cloudeebus.getError = function(error) { if (error.desc && error.uri) - return error.desc + " : " + error.uri; // error cloudeebus (from python) + 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; if (error.name) return error.name; - return error; // error from Autobahn + return error; // Autobahn error }; cloudeebus.versionCheck = function(version) { @@ -110,13 +110,12 @@ cloudeebus.connect = function(uri, manifest, successCB, errorCB) { 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); @@ -176,15 +175,8 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) { var cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName); function ServiceAddedSuccessCB(serviceName) { - try { - 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) { @@ -213,9 +205,8 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) { //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; @@ -238,26 +229,12 @@ cloudeebus.Service.prototype.remove = function() { 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 = [ @@ -349,8 +326,8 @@ cloudeebus.Service.prototype._createWrapper = function(agent) { 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; @@ -375,16 +352,8 @@ cloudeebus.Service.prototype.addAgent = function(agent) { 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) { - 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) { @@ -419,17 +388,15 @@ cloudeebus.Service.prototype.addAgent = function(agent) { 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; } }; @@ -438,34 +405,25 @@ 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); - 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 ]; @@ -704,7 +662,7 @@ cloudeebus.Promise.any = function() { 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; }; @@ -729,7 +687,7 @@ cloudeebus.Promise.every = function() { resolver.resolve(args, true); }; index++; - Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback); + cloudeebus.Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback); } return promise; @@ -756,7 +714,7 @@ cloudeebus.Promise.some = function() { resolver.reject(args, true); }; index++; - Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback); + cloudeebus.Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback); } return promise; @@ -809,6 +767,15 @@ cloudeebus.ProxyObject.prototype._introspect = function(successCB, errorCB) { 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;