X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cloudeebus%2Fcloudeebus.js;h=92d31081364efbf75b5c3e0eeda651b1ddcbad79;hb=de126e87fcde25b375b2efb56583712b2ca8affc;hp=cba2824a8ff4f5680499fb0cfbc3e98de05bb9d3;hpb=7b6eac7aaab64cf34f57e455bca427b06488f229;p=contrib%2Fcloudeebus.git diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js index cba2824..92d3108 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,14 +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; // error cloudeebus (from python) if (error.desc) return error.desc; if (error.uri) return error.uri; + if (error.name && error.message) + return error.name + " : " + error.message; if (error.message) return error.message; - return error; + if (error.name) + return error.name; + return error; // error from Autobahn }; cloudeebus.versionCheck = function(version) { @@ -87,9 +91,10 @@ cloudeebus.connect = function(uri, manifest, successCB, errorCB) { } function onWAMPSessionAuthErrorCB(error) { - cloudeebus.log("Authentication error: " + cloudeebus.getError(error)); + var errorStr = cloudeebus.getError(error); + cloudeebus.log("Authentication error: " + errorStr); if (errorCB) - errorCB(cloudeebus.getError(error)); + errorCB(errorStr); } function onWAMPSessionAuthenticatedCB(permissions) { @@ -105,11 +110,13 @@ 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} + {permissions: manifest.permissions, + services: manifest.services} ).then(onWAMPSessionChallengedCB, onWAMPSessionAuthErrorCB); + } else cloudeebus.wampSession.authreq().then(function() { cloudeebus.wampSession.auth().then(onWAMPSessionAuthenticatedCB, onWAMPSessionAuthErrorCB); @@ -161,55 +168,52 @@ 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) { - cloudeebus.log("Method callback exception: " + e); - resolver.reject(e, true); - } - } - - function busServiceErrorSuccessCB(error) { - resolver.reject(error, true); - } - - cloudeebusService.add(this).then(busServiceAddedSuccessCB, busServiceErrorSuccessCB); + 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); + } + } + + 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... -Agent = function(srvDbusName, objPath, jsHdl, xml) { +cloudeebus.Agent = function(srvDbusName, objPath, jsHdl, xml) { this.srvName = srvDbusName; this.registered = false; this.xml = xml; @@ -223,61 +227,51 @@ 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); - } - catch (e) { - cloudeebus.log("Method callback exception: " + e); - resolver.reject(e, true); - } - } - function ServiceAddedErrorCB(error) { - cloudeebus.log("Error adding service method: " + self.name + ", error: " + cloudeebus.getError(error)); - self.promise.resolver.reject(cloudeebus.getError(error), 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) { + var promise = new cloudeebus.Promise(function (resolver) { + function ServiceRemovedSuccessCB(serviceName) { try { - successCB(serviceName); + resolver.fulfill(serviceName, true); } catch (e) { - alert("Exception removing service " + serviceName + " : " + e); + var errorStr = cloudeebus.getError(e); + cloudeebus.log("Method callback exception: " + errorStr); + resolver.reject(errorStr, 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]); } } - } + + var arglist = [ + self.name + ]; - var arglist = [ - this.name - ]; - - // call dbusSend with bus type, destination, object, message and arguments - this.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, errorCB); + // call dbusSend with bus type, destination, object, message and arguments + self.wampSession.call("serviceRelease", arglist).then(ServiceRemovedSuccessCB, ServiceRemovedErrorCB); + }); + + return promise; }; + cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) { var funcToCall = null; @@ -295,6 +289,7 @@ cloudeebus.Service.prototype._searchMethod = function(ifName, method, objectJS) return funcToCall; }; + cloudeebus.Service.prototype._addMethod = function(ifName, method, agent) { var service = this; @@ -315,16 +310,17 @@ cloudeebus.Service.prototype._addMethod = function(ifName, method, agent) { service._returnMethod(methodId, callDict.callIndex, true, result); } catch (e) { - cloudeebus.log("Method " + ifName + "." + method + " call on " + agent.objectPath + " exception: " + e); - service._returnMethod(methodId, callDict.callIndex, false, e.message); + var errorStr = cloudeebus.getError(e); + cloudeebus.log("Method " + ifName + "." + method + " call on " + agent.objectPath + " exception: " + errorStr); + 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]); } }; + cloudeebus.Service.prototype._addSignal = function(ifName, signal, agent) { var service = this; var methodExist = false; @@ -341,12 +337,13 @@ cloudeebus.Service.prototype._addSignal = function(ifName, signal, agent) { if ((agent.jsHdl[signal] == undefined || agent.jsHdl[signal] == null) && !methodExist) agent.jsHdl[signal] = function() { - service.emitSignal(agent.objectPath, signal, arguments[0]); + service._emitSignal(agent.objectPath, signal, arguments[0]); }; 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(); @@ -365,45 +362,61 @@ cloudeebus.Service.prototype._createWrapper = function(agent) { } if (ifChild.nodeName == "signal") { var metName = ifChild.attributes.getNamedItem("name").value; - self._addSignal(objectPath, ifName, metName, objectJS); + self._addSignal(ifName, metName, agent); } ifChild = ifChild.nextSibling; } } }; -cloudeebus.Service.prototype.addAgent = function(agent, successCB, errorCB) { - function ServiceAddAgentSuccessCB(objPath) { - if (successCB) { - try { - successCB(objPath); + +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; + resolver.fulfill(objPath, true); } catch (e) { - alert("Exception adding agent " + agent.objectPath + " : " + e); - } + var errorStr = cloudeebus.getError(e); + cloudeebus.log("Method callback exception: " + errorStr); + resolver.reject(errorStr, 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) { - alert("Exception creating agent wrapper " + agent.objectPath + " : " + e); - errorCB(e); - 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 self = this; var objJs = agent.jsHdl; if (objJs.methodId[agent.objectPath]) { for (var idx in objJs.methodId[agent.objectPath]) { @@ -413,42 +426,58 @@ cloudeebus.Service.prototype._deleteWrapper = function(agent) { objJs.methodId[agent.objectPath][idx] = null; } catch (e) { - cloudeebus.log("Unsubscribe error: " + e); + cloudeebus.log("Unsubscribe error: " + cloudeebus.getError(e)); } } delete objJs.methodId[agent.objectPath]; } }; -cloudeebus.Service.prototype.delAgent = function(rmAgent, successCB, errorCB) { - function ServiceDelAgentSuccessCB(agent) { - if (successCB) { - try { - successCB(agent); + +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) { - alert("Exception deleting agent " + rmAgent.objectPath + " : " + e); - errorCB(e); - } + var errorStr = cloudeebus.getError(e); + cloudeebus.log("Method callback exception: " + errorStr); + resolver.reject(errorStr, true); + } } - } - try { - this._deleteWrapper(rmAgent); - } - catch (e) { - alert("Exception deleting agent wrapper " + rmAgent.objectPath + " : " + e); - errorCB(e); - } - - var arglist = [ - rmAgent.objectPath - ]; + function ServiceRemoveAgentErrorCB(error) { + var errorStr = cloudeebus.getError(error); + cloudeebus.log("Error removing agent : " + rmAgent.objectPath + ", error: " + errorStr); + self.promise.resolver.reject(errorStr, true); + } - // call dbusSend with bus type, destination, object, message and arguments - this.wampSession.call("serviceDelAgent", arglist).then(ServiceDelAgentSuccessCB, errorCB); + 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(ServiceRemoveAgentSuccessCB, ServiceRemoveAgentErrorCB); + }); + + return promise; }; + cloudeebus.Service.prototype._returnMethod = function(methodId, callIndex, success, result, successCB, errorCB) { var arglist = [ methodId, @@ -460,6 +489,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, @@ -517,7 +547,7 @@ cloudeebus.PromiseResolver.prototype.resolve = function(value, sync) { then.apply(value, [fulfillCallback, rejectCallback]); } catch (e) { - this.reject(e, true); + this.reject(cloudeebus.getError(e), true); } } @@ -571,7 +601,7 @@ cloudeebus.Promise = function(init) { init.apply(this, [this.resolver]); } catch (e) { - this.resolver.reject(e, true); + this.resolver.reject(cloudeebus.getError(e), true); } } return this; @@ -602,7 +632,7 @@ cloudeebus.Promise.prototype.then = function(fulfillCB, rejectCB) { resolver.resolve(value, true); } catch (e) { - resolver.reject(e, true); + resolver.reject(cloudeebus.getError(e), true); } }; else @@ -617,7 +647,7 @@ cloudeebus.Promise.prototype.then = function(fulfillCB, rejectCB) { resolver.resolve(value, true); } catch (e) { - resolver.reject(e, true); + resolver.reject(cloudeebus.getError(e), true); } }; else @@ -857,14 +887,16 @@ cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, sig resolver.fulfill(result[0], true); } catch (e) { - cloudeebus.log("Method callback exception: " + e); - resolver.reject(e, true); + var errorStr = cloudeebus.getError(e); + cloudeebus.log("Method callback exception: " + errorStr); + resolver.reject(errorStr, true); } } function callMethodErrorCB(error) { - cloudeebus.log("Error calling method: " + method + " on object: " + self.objectPath + " : " + cloudeebus.getError(error)); - resolver.reject(cloudeebus.getError(error), true); + var errorStr = cloudeebus.getError(error); + cloudeebus.log("Error calling method: " + method + " on object: " + self.objectPath + " : " + errorStr); + resolver.reject(errorStr, true); } var arglist = [ @@ -894,9 +926,10 @@ cloudeebus.ProxyObject.prototype.connectToSignal = function(ifName, signal, hand handlerCB.apply(self, eval(data)); } catch (e) { - cloudeebus.log("Signal handler exception: " + e); + var errorStr = cloudeebus.getError(e); + cloudeebus.log("Signal handler exception: " + errorStr); if (errorCB) - errorCB(e); + errorCB(errorStr); } } } @@ -906,14 +939,15 @@ cloudeebus.ProxyObject.prototype.connectToSignal = function(ifName, signal, hand self.wampSession.subscribe(str, signalHandler); } catch (e) { - cloudeebus.log("Subscribe error: " + e); + cloudeebus.log("Subscribe error: " + cloudeebus.getError(e)); } } function connectToSignalErrorCB(error) { - cloudeebus.log("Error connecting to signal: " + signal + " on object: " + self.objectPath + " : " + cloudeebus.getError(error)); + var errorStr = cloudeebus.getError(error); + cloudeebus.log("Error connecting to signal: " + signal + " on object: " + self.objectPath + " : " + errorStr); if (errorCB) - errorCB(cloudeebus.getError(error)); + errorCB(errorStr); } var arglist = [ @@ -934,6 +968,6 @@ cloudeebus.ProxyObject.prototype.disconnectSignal = function(ifName, signal) { this.wampSession.unsubscribe(this.busConnection.name + "#" + this.busName + "#" + this.objectPath + "#" + ifName + "#" + signal); } catch (e) { - cloudeebus.log("Unsubscribe error: " + e); + cloudeebus.log("Unsubscribe error: " + cloudeebus.getError(e)); } };