X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cloudeebus%2Fcloudeebus.js;h=04faaa44a98699337d704bf5dcd65281254e19f0;hb=3ba62abcc4144f5179f80ac6994adf735e6607f9;hp=f147ac438e4946c2d8af99523e37b18193c41100;hpb=ddaf9ff6821f2d36e3a3d26eb56884466addbd1e;p=contrib%2Fcloudeebus.git diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js index f147ac4..04faaa4 100644 --- a/cloudeebus/cloudeebus.js +++ b/cloudeebus/cloudeebus.js @@ -29,7 +29,7 @@ var dbus = { // hook object for dbus types not translated by python-json /*****************************************************************************/ var cloudeebus = window.cloudeebus = { - version: "0.5.1", + version: "0.5.99", minVersion: "0.3.2" }; @@ -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,58 +167,46 @@ 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) { - cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName); - - function busServiceAddedSuccessCB(service) { - try { - service.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); - } - } - - function busServiceErrorSuccessCB(error) { - resolver.reject(cloudeebus.getError(error), true); - } - - cloudeebusService.add(this).then(busServiceAddedSuccessCB, busServiceErrorSuccessCB); + var cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName); + + function ServiceAddedSuccessCB(serviceName) { + 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); + resolver.reject(errorStr, true); + } + + var arglist = [ + self.name, + serviceName + ]; + + // call dbusSend with bus type, destination, object, message and arguments + self.wampSession.call("serviceAdd", arglist).then(ServiceAddedSuccessCB, ServiceAddedErrorCB); }); 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 : +//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; - this.registered = false; +cloudeebus.Agent = function(objPath, jsHdl, xml) { +// this.srvName = srvDbusName; this.xml = xml; this.objectPath = objPath; this.jsHdl = jsHdl; @@ -227,62 +218,36 @@ cloudeebus.Service = function(session, busConnection, name) { this.wampSession = session; this.busConnection = busConnection; this.name = name; + this.agents = []; this.isCreated = false; return this; }; -cloudeebus.Service.prototype.add = function(promise) { + +cloudeebus.Service.prototype.remove = function() { var self = this; - self.promise = promise; - var resolver = self.promise.resolver; - function ServiceAddedSuccessCB(serviceName) { - try { // calling dbus hook object function for un-translated types - var result = [self]; - resolver.fulfill(result[0], true); + var promise = new cloudeebus.Promise(function (resolver) { + function ServiceRemovedSuccessCB(serviceName) { + resolver.fulfill(serviceName, true); } - catch (e) { - var errorStr = cloudeebus.getError(e); - cloudeebus.log("Method callback exception: " + errorStr); + + function ServiceRemovedErrorCB(error) { + var errorStr = cloudeebus.getError(error); resolver.reject(errorStr, true); - } - } + } + + var arglist = [ + self.name + ]; + + // call dbusSend with bus type, destination, object, message and arguments + self.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, ServiceRemovedErrorCB); + }); - function ServiceAddedErrorCB(error) { - var errorStr = cloudeebus.getError(error); - cloudeebus.log("Error adding service method: " + self.name + ", error: " + errorStr); - self.promise.resolver.reject(errorStr, true); - } - - var arglist = [ - this.busConnection, - this.name - ]; - - // call dbusSend with bus type, destination, object, message and arguments - this.wampSession.call("serviceAdd", arglist).then(ServiceAddedSuccessCB, ServiceAddedErrorCB); return promise; }; -cloudeebus.Service.prototype.remove = function(successCB, errorCB) { - function ServiceRemovedSuccessCB(serviceName) { - if (successCB) { - try { - successCB(serviceName); - } - catch (e) { - alert("Exception removing service " + serviceName + " : " + cloudeebus.getError(e)); - } - } - } - - var arglist = [ - this.name - ]; - - // call dbusSend with bus type, destination, object, message and arguments - this.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, errorCB); -}; cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) { @@ -301,6 +266,7 @@ cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) return funcToCall; }; + cloudeebus.Service.prototype._addMethod = function(ifName, method, agent) { var service = this; @@ -327,11 +293,11 @@ cloudeebus.Service.prototype._addMethod = function(ifName, method, agent) { } }; agent.jsHdl.methodId[agent.objectPath].push(methodId); - cloudeebus.log("subscribe " + methodId); this.wampSession.subscribe(methodId, agent.jsHdl.wrapperFunc[method]); } }; + cloudeebus.Service.prototype._addSignal = function(ifName, signal, agent) { var service = this; var methodExist = false; @@ -354,13 +320,14 @@ cloudeebus.Service.prototype._addSignal = function(ifName, signal, agent) { 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.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; @@ -379,85 +346,96 @@ cloudeebus.Service.prototype._createWrapper = function(agent) { } }; -cloudeebus.Service.prototype.addAgent = function(agent, successCB, errorCB) { - function ServiceAddAgentSuccessCB(objPath) { - if (successCB) { - try { - successCB(objPath); - } - catch (e) { - alert("Exception adding agent " + agent.objectPath + " : " + cloudeebus.getError(e)); - } + +cloudeebus.Service.prototype.addAgent = function(agent) { + var self = this; + + var promise = new cloudeebus.Promise(function (resolver) { + function ServiceAddAgentSuccessCB(objPath) { + self.agents.push(agent); + resolver.fulfill(objPath, true); } - } + + function ServiceAddAgenterrorCB(error) { + var errorStr = cloudeebus.getError(error); + cloudeebus.log("Error adding agent : " + agent.objectPath + ", error: " + errorStr); + 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 = [ + agent.objectPath, + agent.xml + ]; - try { - this._createWrapper(agent); - } - catch (e) { - var errorStr = cloudeebus.getError(e); - alert("Exception creating agent wrapper " + agent.objectPath + " : " + errorStr); - errorCB(errorStr); - return; - } + // call dbusSend with bus type, destination, object, message and arguments + self.wampSession.call("serviceAddAgent", arglist).then(ServiceAddAgentSuccessCB, ServiceAddAgenterrorCB); + }); - var arglist = [ - agent.objectPath, - agent.xml - ]; - - // call dbusSend with bus type, destination, object, message and arguments - this.wampSession.call("serviceAddAgent", arglist).then(ServiceAddAgentSuccessCB, errorCB); + return promise; }; + 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; } }; -cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) { - function ServiceDelAgentSuccessCB(agent) { - if (successCB) { - try { - successCB(agent); - } - catch (e) { - var errorStr = cloudeebus.getError(e); - alert("Exception deleting agent " + rmAgent.objectPath + " : " + errorStr); - errorCB(errorStr); - } - } - } - try { - this._deleteWrapper(rmAgent); - } - catch (e) { - var errorStr = cloudeebus.getError(e); - alert("Exception deleting agent wrapper " + rmAgent.objectPath + " : " + errorStr); - errorCB(errorStr); - } +cloudeebus.Service.prototype.removeAgent = function(rmAgent) { + var self = this; - var arglist = [ - rmAgent.objectPath - ]; + var promise = new cloudeebus.Promise(function (resolver) { + 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); + } - // call dbusSend with bus type, destination, object, message and arguments - this.wampSession.call("serviceDelAgent", arglist).then(ServiceDelAgentSuccessCB, errorCB); + function ServiceRemoveAgentErrorCB(error) { + var errorStr = cloudeebus.getError(error); + cloudeebus.log("Error removing agent : " + rmAgent.objectPath + ", error: " + errorStr); + resolver.reject(errorStr, true); + } + + var arglist = [ + rmAgent.objectPath + ]; + + // call dbusSend with bus type, destination, object, message and arguments + self.wampSession.call("serviceDelAgent", arglist).then(ServiceRemoveAgentSuccessCB, ServiceRemoveAgentErrorCB); + }); + + return promise; }; + cloudeebus.Service.prototype._returnMethod = function(methodId, callIndex, success, result, successCB, errorCB) { var arglist = [ methodId, @@ -469,6 +447,7 @@ 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) { var arglist = [ objectPath, @@ -683,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; }; @@ -708,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; @@ -735,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; @@ -788,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; @@ -926,7 +914,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 = [