/******************************************************************************
- * Copyright 2012 Intel Corporation.
+ * Copyright 2012 - 2013 Intel Corporation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/*****************************************************************************/
var cloudeebus = window.cloudeebus = {
- version: "0.5.99",
- minVersion: "0.3.2"
+ version: "0.6.1",
+ minVersion: "0.6.0"
};
cloudeebus.reset = function() {
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);
+/******************************************************************************
+ * Copyright 2012 - 2013 Intel Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *****************************************************************************/
+
+
+
/*****************************************************************************/
-//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(srvName, objPath, jsHdl, xml) {
- this.srvName = srvName;
+
+cloudeebus.Agent = function(objectPath, handler, xml) {
this.xml = xml;
- this.objectPath = objPath;
- this.jsHdl = jsHdl;
+ this.objectPath = objectPath;
+ this.handler = handler;
return this;
};
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) {
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!");
+ }
};
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;
function ServiceAddAgenterrorCB(error) {
var errorStr = cloudeebus.getError(error);
cloudeebus.log("Error adding agent : " + agent.objectPath + ", error: " + errorStr);
- self.promise.resolver.reject(errorStr, true);
+ resolver.reject(errorStr, true);
}
var arglist = [
- agent.srvName,
+ self.name,
agent.objectPath,
agent.xml
];
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 {
};
-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);
+/******************************************************************************
+ * Copyright 2012 - 2013 Intel Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *****************************************************************************/
+
+
+
/*****************************************************************************/
function _processWrappers(wrappers, value) {
function _processWrappersAsync(wrappers, value) {
var taskid = -1;
function processAsyncOnce() {
- _processWrappers(wrappers, value);
+ if (!wrappers.processed)
+ _processWrappers(wrappers, value);
clearInterval(taskid);
+ wrappers.processed = true;
}
taskid = setInterval(processAsyncOnce, 200);
}
+/******************************************************************************
+ * Copyright 2012 - 2013 Intel Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *****************************************************************************/
+
+
+
/*****************************************************************************/
cloudeebus.ProxyObject = function(session, busConnection, busName, objectPath) {
this.busName = busName;
this.objectPath = objectPath;
this.interfaceProxies = {};
+ this.childNodeNames = [];
return this;
};
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"));
- }
- }
+ // 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;
projects / contrib / cloudeebus.git / blobdiff