X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cloudeebus%2Fcloudeebus.js;h=22aa3194993429a699bf4c94e72ed45e5569ae72;hb=f4e55de82046b82b80eb3fdff3798bc9c05ad428;hp=25a9532899e362154ed59cd09f3740230b8f2152;hpb=cc2fb13ff58f2fe855764c145a06dbfe689935d9;p=contrib%2Fcloudeebus.git diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js index 25a9532..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.1", - minVersion: "0.3.2" + version: "0.5.100", + minVersion: "0.5.100" }; cloudeebus.reset = function() { @@ -46,16 +46,18 @@ cloudeebus.log = function(msg) { cloudeebus.getError = function(error) { if (error.desc && error.uri) - return error.desc + " : " + error.uri; + 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; - return error; + if (error.name) + return error.name; + return error; // Autobahn error }; cloudeebus.versionCheck = function(version) { @@ -111,7 +113,8 @@ cloudeebus.connect = function(uri, manifest, successCB, errorCB) { if (manifest) cloudeebus.wampSession.authreq( manifest.name, - {permissions: manifest.permissions} + {permissions: manifest.permissions, + services: manifest.services} ).then(onWAMPSessionChallengedCB, onWAMPSessionAuthErrorCB); else cloudeebus.wampSession.authreq().then(function() { @@ -164,27 +167,19 @@ cloudeebus.BusConnection.prototype.getObject = function(busName, objectPath, int cloudeebus.BusConnection.prototype.addService = function(serviceName) { var self = this; - + var promise = new cloudeebus.Promise(function (resolver) { - cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName); + var cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName); 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); - } + cloudeebusService.isCreated = true; + resolver.fulfill(cloudeebusService, 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); + resolver.reject(errorStr, true); } var arglist = [ @@ -200,18 +195,13 @@ cloudeebus.BusConnection.prototype.addService = function(serviceName) { }; + /*****************************************************************************/ -//Generic definition for an agent. An agent need : -//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; - this.registered = false; + +cloudeebus.Agent = function(objectPath, handler, xml) { this.xml = xml; - this.objectPath = objPath; - this.jsHdl = jsHdl; + this.objectPath = objectPath; + this.handler = handler; return this; }; @@ -225,32 +215,18 @@ cloudeebus.Service = function(session, busConnection, name) { return this; }; + 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) { - 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.delAgent(self.agents[idx]); - } + resolver.reject(errorStr, true); } var arglist = [ @@ -264,6 +240,7 @@ cloudeebus.Service.prototype.remove = function() { return promise; }; + cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) { var funcToCall = null; @@ -281,23 +258,24 @@ cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) return funcToCall; }; + 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) { @@ -306,42 +284,36 @@ cloudeebus.Service.prototype._addMethod = function(ifName, method, agent) { service._returnMethod(methodId, callDict.callIndex, false, errorStr); } }; - agent.jsHdl.methodId[agent.objectPath].push(methodId); - cloudeebus.log("subscribe " + 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!"); + } }; + cloudeebus.Service.prototype._createWrapper = function(agent) { var self = this; 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; @@ -359,22 +331,23 @@ cloudeebus.Service.prototype._createWrapper = function(agent) { } }; + 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); + 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) { @@ -383,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 ]; @@ -405,67 +369,58 @@ cloudeebus.Service.prototype.addAgent = function(agent) { return promise; }; + cloudeebus.Service.prototype._deleteWrapper = function(agent) { - var objJs = agent.jsHdl; + var objJs = agent.handler; 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; } }; -cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) { + +cloudeebus.Service.prototype.removeAgent = function(rmAgent) { 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) { - 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 ServiceDelAgentErrorCB(error) { + 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 ]; // call dbusSend with bus type, destination, object, message and arguments - self.wampSession.call("serviceDelAgent", arglist).then(ServiceDelAgentSuccessCB, ServiceDelAgentErrorCB); + self.wampSession.call("serviceDelAgent", arglist).then(ServiceRemoveAgentSuccessCB, ServiceRemoveAgentErrorCB); }); return promise; }; + cloudeebus.Service.prototype._returnMethod = function(methodId, callIndex, success, result, successCB, errorCB) { var arglist = [ methodId, @@ -477,11 +432,12 @@ cloudeebus.Service.prototype._returnMethod = function(methodId, callIndex, succe this.wampSession.call("returnMethod", arglist).then(successCB, errorCB); }; -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); @@ -691,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; }; @@ -716,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; @@ -743,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; @@ -759,6 +715,7 @@ cloudeebus.ProxyObject = function(session, busConnection, busName, objectPath) { this.busName = busName; this.objectPath = objectPath; this.interfaceProxies = {}; + this.childNodeNames = []; return this; }; @@ -796,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; @@ -934,7 +895,7 @@ cloudeebus.ProxyObject.prototype.connectToSignal = function(ifName, signal, hand var errorStr = cloudeebus.getError(error); cloudeebus.log("Error connecting to signal: " + signal + " on object: " + self.objectPath + " : " + errorStr); if (errorCB) - errorCB(cloudeebus.getError(errorStr)); + errorCB(errorStr); } var arglist = [