X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cloudeebus%2Fcloudeebus.js;h=22aa3194993429a699bf4c94e72ed45e5569ae72;hb=f4e55de82046b82b80eb3fdff3798bc9c05ad428;hp=d4109b678b9e15f06915eb8c72644d7818f1763e;hpb=678a068e9835fae98f9f51fd3a8efb74ad990906;p=contrib%2Fcloudeebus.git diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js index d4109b6..22aa319 100644 --- a/cloudeebus/cloudeebus.js +++ b/cloudeebus/cloudeebus.js @@ -29,8 +29,8 @@ var dbus = { // hook object for dbus types not translated by python-json /*****************************************************************************/ var cloudeebus = window.cloudeebus = { - version: "0.5.99", - minVersion: "0.3.2" + version: "0.5.100", + minVersion: "0.5.100" }; cloudeebus.reset = function() { @@ -168,22 +168,12 @@ cloudeebus.BusConnection.prototype.getObject = function(busName, objectPath, int cloudeebus.BusConnection.prototype.addService = function(serviceName) { var self = this; - if (!serviceName) - serviceName = ""; - var promise = new cloudeebus.Promise(function (resolver) { 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) { @@ -207,16 +197,11 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) { /*****************************************************************************/ -//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, -//xml : the xml which describe interface/methods/signals... -cloudeebus.Agent = function(srvDbusName, objPath, jsHdl, xml) { - this.srvName = srvDbusName; + +cloudeebus.Agent = function(objectPath, handler, xml) { this.xml = xml; - this.objectPath = objPath; - this.jsHdl = jsHdl; + this.objectPath = objectPath; + this.handler = handler; return this; }; @@ -236,14 +221,7 @@ 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) { @@ -251,12 +229,6 @@ cloudeebus.Service.prototype.remove = function() { resolver.reject(errorStr, true); } - for (var idx in self.agents) { - if (self.agents[idx]) { - self.removeAgent(self.agents[idx]); - } - } - var arglist = [ self.name ]; @@ -291,19 +263,19 @@ cloudeebus.Service.prototype._addMethod = function(ifName, method, agent) { var service = this; var methodId = this.name + "#" + agent.objectPath + "#" + ifName + "#" + method; - var funcToCall = this._searchMethod(ifName, method, agent.jsHdl); + var funcToCall = this._searchMethod(ifName, method, agent.handler); if (funcToCall == null) cloudeebus.log("Method " + method + " doesn't exist in Javascript object"); else { - agent.jsHdl.wrapperFunc[method] = function() { + agent.handler.wrapperFunc[method] = function() { var result; var methodId = arguments[0]; var callDict = {}; // affectation of callDict in eval, otherwise dictionary(='{}') interpreted as block of code by eval eval("callDict = " + arguments[1]); try { - result = funcToCall.apply(agent.jsHdl, callDict.args); + result = funcToCall.apply(agent.handler, callDict.args); service._returnMethod(methodId, callDict.callIndex, true, result); } catch (e) { @@ -312,32 +284,25 @@ cloudeebus.Service.prototype._addMethod = function(ifName, method, agent) { service._returnMethod(methodId, callDict.callIndex, false, errorStr); } }; - agent.jsHdl.methodId[agent.objectPath].push(methodId); - this.wampSession.subscribe(methodId, agent.jsHdl.wrapperFunc[method]); + agent.handler.methodId[agent.objectPath].push(methodId); + this.wampSession.subscribe(methodId, agent.handler.wrapperFunc[method]); } }; cloudeebus.Service.prototype._addSignal = function(ifName, signal, agent) { var service = this; - var methodExist = false; - if (agent.jsHdl.interfaceProxies && agent.jsHdl.interfaceProxies[ifName]) - if (agent.jsHdl.interfaceProxies[ifName][signal]) { - methodExist = true; - } else { - agent.jsHdl.interfaceProxies[ifName][signal] = function() { - service._emitSignal(agent.objectPath, signal, arguments[0]); - }; - return; - } - - if ((agent.jsHdl[signal] == undefined || agent.jsHdl[signal] == null) && !methodExist) - agent.jsHdl[signal] = function() { - service._emitSignal(agent.objectPath, signal, arguments[0]); + if (agent.handler[signal]) + cloudeebus.log("Signal '" + signal + "' emitter already implemented"); + else { + agent.handler[signal] = function() { + var args = []; + for (var i=0; i < arguments.length; i++ ) + args.push(arguments[i]); + service._emitSignal(agent.objectPath, signal, args); }; - else - cloudeebus.log("Can not create new method to emit signal '" + signal + "' in object JS this method already exist!"); + } }; @@ -346,9 +311,9 @@ 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.methodId[agent.objectPath] = []; + agent.handler.wrapperFunc = {}; + agent.handler.methodId = {}; + agent.handler.methodId[agent.objectPath] = []; for (var i=0; i < ifXml.length; i++) { var ifName = ifXml[i].attributes.getNamedItem("name").value; var ifChild = ifXml[i].firstChild; @@ -372,15 +337,17 @@ 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); - resolver.fulfill(objPath, true); + self.agents.push(agent); + try { + self._createWrapper(agent); } catch (e) { var errorStr = cloudeebus.getError(e); - cloudeebus.log("Method callback exception: " + errorStr); + cloudeebus.log("Exception creating agent wrapper " + agent.objectPath + " : " + errorStr); resolver.reject(errorStr, true); + return; } + resolver.fulfill(objPath, true); } function ServiceAddAgenterrorCB(error) { @@ -389,17 +356,8 @@ cloudeebus.Service.prototype.addAgent = function(agent) { 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 = [ + self.name, agent.objectPath, agent.xml ]; @@ -413,7 +371,7 @@ cloudeebus.Service.prototype.addAgent = function(agent) { cloudeebus.Service.prototype._deleteWrapper = function(agent) { - var objJs = agent.jsHdl; + var objJs = agent.handler; if (objJs.methodId[agent.objectPath]) { while (objJs.methodId[agent.objectPath].length) { try { @@ -440,16 +398,9 @@ cloudeebus.Service.prototype.removeAgent = function(rmAgent) { break; } - try { // calling dbus hook object function for un-translated types - self.agents.splice(idx, 1); - self._deleteWrapper(agent); - resolver.fulfill(agent, true); - } - catch (e) { - var errorStr = cloudeebus.getError(e); - cloudeebus.log("Method callback exception: " + errorStr); - resolver.reject(errorStr, true); - } + self.agents.splice(idx, 1); + self._deleteWrapper(agent); + resolver.fulfill(agent, true); } function ServiceRemoveAgentErrorCB(error) { @@ -482,11 +433,11 @@ cloudeebus.Service.prototype._returnMethod = function(methodId, callIndex, succe }; -cloudeebus.Service.prototype._emitSignal = function(objectPath, signalName, result, successCB, errorCB) { +cloudeebus.Service.prototype._emitSignal = function(objectPath, signalName, args, successCB, errorCB) { var arglist = [ objectPath, signalName, - result + JSON.stringify(args) ]; this.wampSession.call("emitSignal", arglist).then(successCB, errorCB); @@ -696,7 +647,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; }; @@ -721,7 +672,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; @@ -748,7 +699,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; @@ -764,6 +715,7 @@ cloudeebus.ProxyObject = function(session, busConnection, busName, objectPath) { this.busName = busName; this.objectPath = objectPath; this.interfaceProxies = {}; + this.childNodeNames = []; return this; }; @@ -801,6 +753,10 @@ 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"); + // first node is the parent/head node + for(var i=1; i < nodes.length; i++) + self.childNodeNames.push(nodes[i].getAttribute("name")); var interfaces = xmlDoc.getElementsByTagName("interface"); self.propInterfaces = []; var supportDBusProperties = false;