/*****************************************************************************/
-var cloudeebus = window.cloudeebus = {};
+var dbus = { // hook object for dbus types not translated by python-json
+ Double: function(value, level) {
+ return value;
+ }
+};
+
+
+
+/*****************************************************************************/
+
+var cloudeebus = window.cloudeebus = {
+ version: "0.5.1",
+ minVersion: "0.3.2"
+};
cloudeebus.reset = function() {
cloudeebus.sessionBus = null;
};
-cloudeebus.log = function(msg) {
+cloudeebus.log = function(msg) {
};
-cloudeebus.connect = function(uri, successCB, errorCB) {
+cloudeebus.versionCheck = function(version) {
+ var ver = version.split(".");
+ var min = cloudeebus.minVersion.split(".");
+ for (var i=0; i<ver.length; i++) {
+ if (Number(ver[i]) > Number(min[i]))
+ return true;
+ if (Number(ver[i]) < Number(min[i]))
+ return false;
+ }
+ return true;
+};
+
+
+cloudeebus.connect = function(uri, manifest, successCB, errorCB) {
cloudeebus.reset();
cloudeebus.uri = uri;
- function onWAMPSessionConnectedCB(session) {
- cloudeebus.wampSession = session;
+ function onCloudeebusVersionCheckCB(version) {
+ if (cloudeebus.versionCheck(version)) {
+ cloudeebus.log("Connected to " + cloudeebus.uri);
+ if (successCB)
+ successCB();
+ } else {
+ var errorMsg = "Cloudeebus server version " + version + " unsupported, need version " + cloudeebus.minVersion + " or superior";
+ cloudeebus.log(errorMsg);
+ if (errorCB)
+ errorCB(errorMsg);
+ }
+ }
+
+ function onWAMPSessionAuthErrorCB(error) {
+ cloudeebus.log("Authentication error: " + error.desc);
+ if (errorCB)
+ errorCB(error.desc);
+ }
+
+ function onWAMPSessionAuthenticatedCB(permissions) {
cloudeebus.sessionBus = new cloudeebus.BusConnection("session", cloudeebus.wampSession);
cloudeebus.systemBus = new cloudeebus.BusConnection("system", cloudeebus.wampSession);
- cloudeebus.log("Connected to " + cloudeebus.uri);
- if (successCB)
- successCB();
+ cloudeebus.wampSession.call("getVersion").then(onCloudeebusVersionCheckCB, errorCB);
+ }
+
+ function onWAMPSessionChallengedCB(challenge) {
+ var signature = cloudeebus.wampSession.authsign(challenge, manifest.key);
+ cloudeebus.wampSession.auth(signature).then(onWAMPSessionAuthenticatedCB, onWAMPSessionAuthErrorCB);
+ }
+
+ function onWAMPSessionConnectedCB(session) {
+ cloudeebus.wampSession = session;
+ if (manifest)
+ cloudeebus.wampSession.authreq(
+ manifest.name,
+ {permissions: manifest.permissions}
+ ).then(onWAMPSessionChallengedCB, onWAMPSessionAuthErrorCB);
+ else
+ cloudeebus.wampSession.authreq().then(function() {
+ cloudeebus.wampSession.auth().then(onWAMPSessionAuthenticatedCB, onWAMPSessionAuthErrorCB);
+ }, onWAMPSessionAuthErrorCB);
}
function onWAMPSessionErrorCB(code, reason) {
/*****************************************************************************/
+function _processWrappers(wrappers, value) {
+ for (var i=0; i<wrappers.length; i++)
+ wrappers[i](value);
+}
+
+
+function _processWrappersAsync(wrappers, value) {
+ var taskid = -1;
+ function processAsyncOnce() {
+ _processWrappers(wrappers, value);
+ clearInterval(taskid);
+ }
+ taskid = setInterval(processAsyncOnce, 200);
+}
+
+
+
+/*****************************************************************************/
+
+cloudeebus.PromiseResolver = function(promise) {
+ this.promise = promise;
+ this.resolved = null;
+ return this;
+};
+
+
+cloudeebus.PromiseResolver.prototype.resolve = function(value, sync) {
+ if (this.resolved)
+ return;
+
+ var then = (value && value.then && value.then.apply) ? value.then : null;
+ if (then) {
+ var self = this;
+ var fulfillCallback = function(arg) {
+ self.resolve(arg, true);
+ };
+ var rejectCallback = function(arg) {
+ self.reject(arg, true);
+ };
+ try {
+ then.apply(value, [fulfillCallback, rejectCallback]);
+ }
+ catch (e) {
+ this.reject(e, true);
+ }
+ }
+
+ this.fulfill(value, sync);
+};
+
+
+cloudeebus.PromiseResolver.prototype.fulfill = function(value, sync) {
+ if (this.resolved)
+ return;
+
+ var promise = this.promise;
+ promise.state = "fulfilled";
+ promise.result = value;
+
+ this.resolved = true;
+ if (sync)
+ _processWrappers(promise._fulfillWrappers, value);
+ else
+ _processWrappersAsync(promise._fulfillWrappers, value);
+};
+
+
+cloudeebus.PromiseResolver.prototype.reject = function(value, sync) {
+ if (this.resolved)
+ return;
+
+ var promise = this.promise;
+ promise.state = "rejected";
+ promise.result = value;
+
+ this.resolved = true;
+ if (sync)
+ _processWrappers(promise._rejectWrappers, value);
+ else
+ _processWrappersAsync(promise._rejectWrappers, value);
+};
+
+
+
+/*****************************************************************************/
+
+cloudeebus.Promise = function(init) {
+ this.state = "pending";
+ this.result = null;
+ this._fulfillWrappers = [];
+ this._rejectWrappers = [];
+ this.resolver = new cloudeebus.PromiseResolver(this);
+ if (init) {
+ try {
+ init.apply(this, [this.resolver]);
+ }
+ catch (e) {
+ this.resolver.reject(e, true);
+ }
+ }
+ return this;
+};
+
+
+cloudeebus.Promise.prototype.appendWrappers = function(fulfillWrapper, rejectWrapper) {
+ if (fulfillWrapper)
+ this._fulfillWrappers.push(fulfillWrapper);
+ if (rejectWrapper)
+ this._rejectWrappers.push(rejectWrapper);
+ if (this.state == "fulfilled")
+ _processWrappersAsync(this._fulfillWrappers, this.result);
+ if (this.state == "rejected")
+ _processWrappersAsync(this._rejectWrappers, this.result);
+};
+
+
+cloudeebus.Promise.prototype.then = function(fulfillCB, rejectCB) {
+ var promise = new cloudeebus.Promise();
+ var resolver = promise.resolver;
+ var fulfillWrapper, rejectWrapper;
+
+ if (fulfillCB)
+ fulfillWrapper = function(arg) {
+ try {
+ var value = fulfillCB.apply(promise, [arg]);
+ resolver.resolve(value, true);
+ }
+ catch (e) {
+ resolver.reject(e, true);
+ }
+ };
+ else
+ fulfillWrapper = function(arg) {
+ resolver.fulfill(arg, true);
+ };
+
+ if (rejectCB)
+ rejectWrapper = function(arg) {
+ try {
+ var value = rejectCB.apply(promise, [arg]);
+ resolver.resolve(value, true);
+ }
+ catch (e) {
+ resolver.reject(e, true);
+ }
+ };
+ else
+ rejectWrapper = function(arg) {
+ resolver.reject(arg, true);
+ };
+
+ this.appendWrappers(fulfillWrapper,rejectWrapper);
+ return promise;
+};
+
+
+cloudeebus.Promise.prototype["catch"] = function(rejectCB) {
+ return this.then(undefined,rejectCB);
+};
+
+
+cloudeebus.Promise.prototype.done = function(fulfillCB, rejectCB) {
+ this.appendWrappers(fulfillCB,rejectCB);
+};
+
+
+cloudeebus.Promise.resolve = function(value) {
+ var promise = new cloudeebus.Promise();
+ promise.resolver.resolve(value);
+ return promise;
+};
+
+
+cloudeebus.Promise.fulfill = function(value) {
+ var promise = new cloudeebus.Promise();
+ promise.resolver.fulfill(value);
+ return promise;
+};
+
+
+cloudeebus.Promise.reject = function(value) {
+ var promise = new cloudeebus.Promise();
+ promise.resolver.reject(value);
+ return promise;
+};
+
+
+cloudeebus.Promise.any = function() {
+ var promise = new cloudeebus.Promise();
+ var resolver = promise.resolver;
+ var fulfillCallback = function(arg) {
+ resolver.resolve(arg, true);
+ };
+ var rejectCallback = function(arg) {
+ resolver.reject(arg, true);
+ };
+ if (arguments.length == 0)
+ resolver.resolve(undefined, true);
+ else
+ for (i in arguments)
+ Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+ return promise;
+};
+
+
+cloudeebus.Promise.every = function() {
+ var promise = new cloudeebus.Promise();
+ var resolver = promise.resolver;
+ var index = 0;
+ var countdown = arguments.length;
+ var args = new Array(countdown);
+ var rejectCallback = function(arg) {
+ resolver.reject(arg, true);
+ };
+ if (arguments.length == 0)
+ resolver.resolve(undefined, true);
+ else
+ for (i in arguments) {
+ var fulfillCallback = function(arg) {
+ args[index] = arg;
+ countdown--;
+ if (countdown == 0)
+ resolver.resolve(args, true);
+ };
+ index++;
+ Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+ }
+
+ return promise;
+};
+
+
+cloudeebus.Promise.some = function() {
+ var promise = new cloudeebus.Promise();
+ var resolver = promise.resolver;
+ var index = 0;
+ var countdown = arguments.length;
+ var args = new Array(countdown);
+ var fulfillCallback = function(arg) {
+ resolver.resolve(arg, true);
+ };
+ if (arguments.length == 0)
+ resolver.resolve(undefined, true);
+ else
+ for (i in arguments) {
+ var rejectCallback = function(arg) {
+ args[index] = arg;
+ countdown--;
+ if (countdown == 0)
+ resolver.reject(args, true);
+ };
+ index++;
+ Promise.resolve(arguments[i]).appendWrappers(fulfillCallback,rejectCallback);
+ }
+
+ return promise;
+};
+
+
+
+/*****************************************************************************/
+
cloudeebus.ProxyObject = function(session, busConnection, busName, objectPath) {
this.wampSession = session;
this.busConnection = busConnection;
this.busName = busName;
this.objectPath = objectPath;
+ this.interfaceProxies = {};
return this;
};
+cloudeebus.ProxyObject.prototype.getInterface = function(ifName) {
+ return this.interfaceProxies[ifName];
+};
+
+
cloudeebus.ProxyObject.prototype._introspect = function(successCB, errorCB) {
var self = this;
function getAllPropertiesSuccessCB(props) {
+ var ifProxy = self.interfaceProxies[self.propInterfaces[self.propInterfaces.length-1]];
for (var prop in props)
- self[prop] = props[prop];
+ ifProxy[prop] = self[prop] = props[prop];
+ getAllPropertiesNextInterfaceCB();
+ }
+
+ function getAllPropertiesNextInterfaceCB() {
+ self.propInterfaces.pop();
if (self.propInterfaces.length > 0)
- self.callMethod("org.freedesktop.DBus.Properties",
+ self.callMethod("org.freedesktop.DBus.Properties",
"GetAll",
- [self.propInterfaces.pop()],
- getAllPropertiesSuccessCB,
- errorCB);
+ [self.propInterfaces[self.propInterfaces.length-1]]).then(getAllPropertiesSuccessCB,
+ errorCB ? errorCB : getAllPropertiesNextInterfaceCB);
else {
self.propInterfaces = null;
if (successCB)
var supportDBusProperties = false;
for (var i=0; i < interfaces.length; i++) {
var ifName = interfaces[i].attributes.getNamedItem("name").value;
+ self.interfaceProxies[ifName] = new cloudeebus.ProxyObject(self.wampSession, self.busConnection, self.busName, self.objectPath);
if (ifName == "org.freedesktop.DBus.Properties")
supportDBusProperties = true;
var hasProperties = false;
while (ifChild) {
if (ifChild.nodeName == "method") {
var nArgs = 0;
+ var signature = "";
var metChild = ifChild.firstChild;
while (metChild) {
if (metChild.nodeName == "arg" &&
- metChild.attributes.getNamedItem("direction").value == "in")
+ metChild.attributes.getNamedItem("direction").value == "in") {
+ signature += metChild.attributes.getNamedItem("type").value;
nArgs++;
+ }
metChild = metChild.nextSibling;
}
- self._addMethod(ifName,
- ifChild.attributes.getNamedItem("name").value,
- nArgs);
+ var metName = ifChild.attributes.getNamedItem("name").value;
+ if (!self[metName])
+ self._addMethod(ifName, metName, nArgs, signature);
+ self.interfaceProxies[ifName]._addMethod(ifName, metName, nArgs, signature);
}
else if (ifChild.nodeName == "property") {
if (!hasProperties)
}
}
if (supportDBusProperties && self.propInterfaces.length > 0) {
- self.callMethod("org.freedesktop.DBus.Properties",
+ self.callMethod("org.freedesktop.DBus.Properties",
"GetAll",
- [self.propInterfaces.pop()],
- getAllPropertiesSuccessCB,
- errorCB);
+ [self.propInterfaces[self.propInterfaces.length-1]]).then(getAllPropertiesSuccessCB,
+ errorCB ? errorCB : getAllPropertiesNextInterfaceCB);
}
else {
self.propInterfaces = null;
}
}
- // call Introspect on self
- self.callMethod("org.freedesktop.DBus.Introspectable", "Introspect", [], introspectSuccessCB, errorCB);
+ // call Introspect on self
+ self.callMethod("org.freedesktop.DBus.Introspectable", "Introspect", []).then(introspectSuccessCB, errorCB);
};
-cloudeebus.ProxyObject.prototype._addMethod = function(ifName, method, nArgs) {
+cloudeebus.ProxyObject.prototype._addMethod = function(ifName, method, nArgs, signature) {
var self = this;
self[method] = function() {
- if (arguments.length < nArgs || arguments.length > nArgs + 2)
- throw "Error: method " + method + " takes " + nArgs + " parameters, got " + arguments.length + ".";
var args = [];
- var successCB = null;
- var errorCB = null;
for (var i=0; i < nArgs; i++ )
args.push(arguments[i]);
- if (arguments.length > nArgs)
- successCB = arguments[nArgs];
- if (arguments.length > nArgs + 1)
- errorCB = arguments[nArgs + 1];
- self.callMethod(ifName, method, args, successCB, errorCB);
- };
-
+ return self.callMethod(ifName, method, args, signature);
+ };
};
-cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, successCB, errorCB) {
+cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, signature) {
- var self = this;
-
- function callMethodSuccessCB(str) {
- if (successCB)
- successCB.apply(self, JSON.parse(str));
- }
-
- function callMethodErrorCB(error) {
- cloudeebus.log("Error calling method: " + method + " on object: " + self.objectPath + " : " + error.desc);
- if (errorCB)
- errorCB(error.desc);
- }
+ var self = this;
+
+ var promise = new cloudeebus.Promise(function (resolver) {
+ function callMethodSuccessCB(str) {
+ try { // calling dbus hook object function for un-translated types
+ var result = eval(str);
+ resolver.fulfill(result[0], true);
+ }
+ catch (e) {
+ cloudeebus.log("Method callback exception: " + e);
+ resolver.reject(e, true);
+ }
+ }
- var arglist = [
- self.busConnection.name,
- self.busName,
- self.objectPath,
- ifName,
- method,
- JSON.stringify(args)
- ];
+ function callMethodErrorCB(error) {
+ cloudeebus.log("Error calling method: " + method + " on object: " + self.objectPath + " : " + error.desc);
+ resolver.reject(error.desc, true);
+ }
- // call dbusSend with bus type, destination, object, message and arguments
- self.wampSession.call("dbusSend", arglist).then(callMethodSuccessCB, callMethodErrorCB);
+ var arglist = [
+ self.busConnection.name,
+ self.busName,
+ self.objectPath,
+ ifName,
+ method,
+ JSON.stringify(args)
+ ];
+
+ // call dbusSend with bus type, destination, object, message and arguments
+ self.wampSession.call("dbusSend", arglist).then(callMethodSuccessCB, callMethodErrorCB);
+ });
+
+ return promise;
};
-cloudeebus.ProxyObject.prototype.connectToSignal = function(ifName, signal, successCB, errorCB) {
+cloudeebus.ProxyObject.prototype.connectToSignal = function(ifName, signal, handlerCB, errorCB) {
var self = this;
function signalHandler(id, data) {
- if (successCB)
- successCB.apply(self, JSON.parse(data));
+ if (handlerCB) {
+ try { // calling dbus hook object function for un-translated types
+ handlerCB.apply(self, eval(data));
+ }
+ catch (e) {
+ cloudeebus.log("Signal handler exception: " + e);
+ if (errorCB)
+ errorCB(e);
+ }
+ }
}
function connectToSignalSuccessCB(str) {
errorCB(error.desc);
}
- var arglist = [
+ var arglist = [
self.busConnection.name,
self.busName,
self.objectPath,
signal
];
- // call dbusSend with bus type, destination, object, message and arguments
- self.wampSession.call("dbusRegister", arglist).then(connectToSignalSuccessCB, connectToSignalErrorCB);
+ // call dbusSend with bus type, destination, object, message and arguments
+ self.wampSession.call("dbusRegister", arglist).then(connectToSignalSuccessCB, connectToSignalErrorCB);
};
cloudeebus.ProxyObject.prototype.disconnectSignal = function(ifName, signal) {
try {
- this.wampSession.unsubscribe(this.busName + "#" + this.objectPath + "#" + ifName + "#" + signal);
+ this.wampSession.unsubscribe(this.busConnection.name + "#" + this.busName + "#" + this.objectPath + "#" + ifName + "#" + signal);
}
catch (e) {
cloudeebus.log("Unsubscribe error: " + e);
projects / contrib / cloudeebus.git / blobdiff