sendSignal helper

lib/bus.js

@@ -53,6 +53,21 @@ module.exports = function bus(conn) {
         return JSON.stringify(obj);
     };
 
+    this.sendSignal = function(path, iface, name, signature, args) {
+        var signalMsg = {
+            type: constants.messageType.signal,
+            serial: self.serial,
+            'interface': iface,
+            path: path,
+            member: name
+        };
+        if (signature) {
+            signalMsg.signature = signature;
+            signalMsg.body = args;
+        }
+        self.connection.message(signalMsg);
+    }
+
     this.sendError = function(msg, errorName, errorText) {
         var reply = {
             type: constants.messageType.error,
@@ -102,15 +117,13 @@ module.exports = function bus(conn) {
            self.signals.emit(self.mangle(msg), msg.body, msg.signature);
        } else { // methodCall
 
-           //console.log(msg);
-           //console.log(JSON.stringify(self.exportedObjects, null, 4));
            // exported interfaces handlers
-
-           if (stdDbusIfaces(msg, self))
-               return;
-
            var obj, iface, impl;
            if (obj = self.exportedObjects[msg.path]) {
+
+               if (stdDbusIfaces(msg, self))
+                   return;
+
                if (iface = obj[msg['interface']]) {
                    // now we are ready to serve msg.member
                    impl = iface[1];
@@ -143,8 +156,7 @@ module.exports = function bus(conn) {
                    console.error('Interface ' + msg['interface'] + ' is not supported');
                    // TODO: respond with standard dbus error
                }
-           } 
-
+           }
            // setMethodCall handlers 
            handler = self.methodCallHandlers[self.mangle(msg)];
            if (handler) {
@@ -153,8 +165,8 @@ module.exports = function bus(conn) {
                result = handler[0].apply(null, msg.body);
            } catch (e) {
                console.error("Caught exception while trying to execute handler: ", e);
-               throw e;
-               // TODO: send error reply to bus
+               self.sendError(e.message, e.description);
+               return;
            }           
            var reply = {
                type: constants.messageType.methodReturn,
@@ -164,10 +176,13 @@ module.exports = function bus(conn) {
            };
            if (result) {
                reply.signature = handler[1];
-               reply.body = [result];
+               reply.body = result;
            }
            self.connection.message(reply);
+           } else {
+               self.sendError(msg, 'org.freedesktop.DBus.Error.UnknownService', 'Uh oh oh');
            }
+
        }
     });
 

lib/unmarshall.js

@@ -169,8 +169,6 @@ function readSimpleType(bs, t, callback)
             });
         */
         return bs.buffer('buff', 4).tap(function(vars) {
-            console.log(vars);
-            console.log(vars.buff.length);
             var param = vars.buff.readInt32LE(0);            
             callback(null, param);
         });