@homebridge/dbus-native 0.4.1 → 0.4.2

package/bin/dbus2js.js

@@ -2,11 +2,16 @@
 
 const fs = require('fs');
 const xml2js = require('xml2js');
-const xml2js_opts = Object.assign({}, xml2js.defaults["0.1"], { explicitArray: true });
+const xml2js_opts = Object.assign({}, xml2js.defaults['0.1'], {
+  explicitArray: true
+});
 const dbus = require('../index');
-const optimist = require('optimist');
+const minimist = require('minimist');
 
-var argv = optimist.boolean(['server', 'dump']).argv;
+var argv = minimist(process.argv.slice(2), {
+  boolean: ['server', 'dump', 'xml'],
+  string: ['bus', 'service', 'path']
+});
 
 function die(err) {
   console.log(err);
@@ -65,9 +70,7 @@ if (!argv.server) {
         output.push('            if (err) throw new Error(err);');
         output.push('        });');
         output.push(
-          `        var signalFullName = bus.mangle('${argv.path}', '${
-            ifaceName
-          }', signame);`
+          `        var signalFullName = bus.mangle('${argv.path}', '${ifaceName}', signame);`
         );
         output.push(
           '        bus.signals.on(signalFullName, function(messageBody) {'

package/lib/address-x11.js

@@ -11,9 +11,7 @@ function getDbusAddress(callback) {
     var hostname = os.hostname().split('-')[0];
     x11.createClient(function(err, display) {
       var X = display.client;
-      var selectionName = `_DBUS_SESSION_BUS_SELECTION_${
-        hostname
-      }_${uuid.trim()}`;
+      var selectionName = `_DBUS_SESSION_BUS_SELECTION_${hostname}_${uuid.trim()}`;
       X.InternAtom(false, selectionName, function(err, id) {
         if (err) return callback(err);
         X.GetSelectionOwner(id, function(err, win) {

package/lib/align.js

@@ -1,7 +1,7 @@
 const Buffer = require('safe-buffer').Buffer;
 
 function align(ps, n) {
-  var pad = n - ps._offset % n;
+  var pad = n - (ps._offset % n);
   if (pad === 0 || pad === n) return;
   // TODO: write8(0) in a loop (3 to 7 times here) could be more efficient
   var padBuff = Buffer.alloc(pad);

package/lib/bus.js

@@ -158,9 +158,7 @@ module.exports = function bus(conn, opts) {
             self.sendError(
               msg,
               'org.freedesktop.DBus.Error.UnknownMethod',
-              `Method "${msg.member}" on interface "${
-                msg.interface
-              }" doesn't exist`
+              `Method "${msg.member}" on interface "${msg.interface}" doesn't exist`
             );
             return;
           }

package/lib/handshake.js

@@ -32,6 +32,7 @@ function getCookie(context, id, cb) {
           'User keyrings directory is writeable by other users. Aborting authentication'
         )
       );
+    // eslint-disable-next-line no-prototype-builtins
     if (process.hasOwnProperty('getuid') && stat.uid !== process.getuid())
       return cb(
         new Error(
@@ -72,6 +73,7 @@ function tryAuth(stream, methods, cb) {
   }
 
   var authMethod = methods.shift();
+  // eslint-disable-next-line no-prototype-builtins
   var uid = process.hasOwnProperty('getuid') ? process.getuid() : 0;
   var id = hexlify(uid);
 

package/lib/introspect.js

@@ -9,7 +9,9 @@ module.exports.introspectBus = function(obj, callback) {
       interface: 'org.freedesktop.DBus.Introspectable',
       member: 'Introspect'
     },
-    function(err, xml) { module.exports.processXML(err, xml, obj, callback); }
+    function(err, xml) {
+      module.exports.processXML(err, xml, obj, callback);
+    }
   );
 };
 
@@ -59,17 +61,19 @@ module.exports.processXML = function(err, xml, obj, callback) {
       }
       for (var p = 0; iface.property && p < iface.property.length; ++p) {
         property = iface.property[p];
-        currentIface.$createProp(property['$'].name, property['$'].type, property['$'].access)
+        currentIface.$createProp(
+          property['$'].name,
+          property['$'].type,
+          property['$'].access
+        );
       }
       // TODO: introspect signals
     }
     callback(null, proxy, nodes);
   });
-}
-
+};
 
-function DBusInterface(parent_obj, ifname)
-{
+function DBusInterface(parent_obj, ifname) {
   // Since methods and props presently get added directly to the object, to avoid collision with existing names we must use $ naming convention as $ is invalid for dbus member names
   // https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names
   this.$parent = parent_obj; // parent DbusObject
@@ -89,8 +93,11 @@ DBusInterface.prototype.$getSigHandler = function(callback) {
     };
   }
   return this.$sigHandlers[index];
-}
-DBusInterface.prototype.addListener = DBusInterface.prototype.on = function(signame, callback) {
+};
+DBusInterface.prototype.addListener = DBusInterface.prototype.on = function(
+  signame,
+  callback
+) {
   // http://dbus.freedesktop.org/doc/api/html/group__DBusBus.html#ga4eb6401ba014da3dbe3dc4e2a8e5b3ef
   // An example is "type='signal',sender='org.freedesktop.DBus', interface='org.freedesktop.DBus',member='Foo', path='/bar/foo',destination=':452345.34'" ...
   var bus = this.$parent.service.bus;
@@ -98,43 +105,50 @@ DBusInterface.prototype.addListener = DBusInterface.prototype.on = function(sign
   if (!bus.signals.listeners(signalFullName).length) {
     // This is the first time, so call addMatch
     var match = getMatchRule(this.$parent.name, this.$name, signame);
-    bus.addMatch(match, function(err) {
-      if (err) throw new Error(err);
-      bus.signals.on(signalFullName, this.$getSigHandler(callback));
-    }.bind(this));
+    bus.addMatch(
+      match,
+      function(err) {
+        if (err) throw new Error(err);
+        bus.signals.on(signalFullName, this.$getSigHandler(callback));
+      }.bind(this)
+    );
   } else {
     // The match is already there, just add event listener
     bus.signals.on(signalFullName, this.$getSigHandler(callback));
   }
-}
-DBusInterface.prototype.removeListener = DBusInterface.prototype.off = function(signame, callback) {
+};
+DBusInterface.prototype.removeListener = DBusInterface.prototype.off = function(
+  signame,
+  callback
+) {
   var bus = this.$parent.service.bus;
   var signalFullName = bus.mangle(this.$parent.name, this.$name, signame);
-  bus.signals.removeListener( signalFullName, this.$getSigHandler(callback) );
+  bus.signals.removeListener(signalFullName, this.$getSigHandler(callback));
   if (!bus.signals.listeners(signalFullName).length) {
     // There is no event handlers for this match
     var match = getMatchRule(this.$parent.name, this.$name, signame);
-    bus.removeMatch(match, function(err) {
-      if (err) throw new Error(err);
-      // Now it is safe to empty these arrays
-      this.$callbacks.length = 0;
-      this.$sigHandlers.length = 0;
-    }.bind(this));
+    bus.removeMatch(
+      match,
+      function(err) {
+        if (err) throw new Error(err);
+        // Now it is safe to empty these arrays
+        this.$callbacks.length = 0;
+        this.$sigHandlers.length = 0;
+      }.bind(this)
+    );
   }
-}
-DBusInterface.prototype.$createMethod = function(mName, signature)
-{
+};
+DBusInterface.prototype.$createMethod = function(mName, signature) {
   this.$methods[mName] = signature;
-  this[mName] = function() { this.$callMethod(mName, arguments); }
-}
-DBusInterface.prototype.$callMethod = function(mName, args)
-{
+  this[mName] = function() {
+    this.$callMethod(mName, arguments);
+  };
+};
+DBusInterface.prototype.$callMethod = function(mName, args) {
   var bus = this.$parent.service.bus;
   if (!Array.isArray(args)) args = Array.from(args); // Array.prototype.slice.apply(args)
   var callback =
-    typeof args[args.length - 1] === 'function'
-      ? args.pop()
-      : function() {};
+    typeof args[args.length - 1] === 'function' ? args.pop() : function() {};
   var msg = {
     destination: this.$parent.service.name,
     path: this.$parent.name,
@@ -146,18 +160,18 @@ DBusInterface.prototype.$callMethod = function(mName, args)
     msg.body = args;
   }
   bus.invoke(msg, callback);
-}
-DBusInterface.prototype.$createProp = function(propName, propType, propAccess)
-{
+};
+DBusInterface.prototype.$createProp = function(propName, propType, propAccess) {
   this.$properties[propName] = { type: propType, access: propAccess };
   Object.defineProperty(this, propName, {
     enumerable: true,
     get: () => callback => this.$readProp(propName, callback),
-    set: function(val) { this.$writeProp(propName, val) }
+    set: function(val) {
+      this.$writeProp(propName, val);
+    }
   });
-}
-DBusInterface.prototype.$readProp = function(propName, callback)
-{
+};
+DBusInterface.prototype.$readProp = function(propName, callback) {
   var bus = this.$parent.service.bus;
   bus.invoke(
     {
@@ -181,9 +195,8 @@ DBusInterface.prototype.$readProp = function(propName, callback)
       }
     }
   );
-}
-DBusInterface.prototype.$writeProp = function(propName, val)
-{
+};
+DBusInterface.prototype.$writeProp = function(propName, val) {
   var bus = this.$parent.service.bus;
   bus.invoke({
     destination: this.$parent.service.name,
@@ -193,8 +206,7 @@ DBusInterface.prototype.$writeProp = function(propName, val)
     signature: 'ssv',
     body: [this.$name, propName, [this.$properties[propName].type, val]]
   });
-}
-
+};
 
 function getMatchRule(objName, ifName, signame) {
   return `type='signal',path='${objName}',interface='${ifName}',member='${signame}'`;

package/lib/marshall.js

@@ -1,7 +1,7 @@
 const assert = require('assert');
 
 const parseSignature = require('./signature');
-const put = require('put');
+const put = require('@homebridge/put');
 const Marshallers = require('./marshallers');
 const align = require('./align').align;
 

package/lib/stdifaces.js

@@ -152,9 +152,9 @@ function interfaceToXML(iface) {
       var argName = argsNames ? argsNames[num] : direction + num;
       var dirStr = direction === 'signal' ? '' : `" direction="${direction}`;
       result.push(
-        `      <arg type="${dumpSignature([arg])}" name="${argName}${
-          dirStr
-        }" />`
+        `      <arg type="${dumpSignature([
+          arg
+        ])}" name="${argName}${dirStr}" />`
       );
     });
   };
@@ -180,9 +180,7 @@ function interfaceToXML(iface) {
     for (const propertyName in iface.properties) {
       // TODO: decide how to encode access
       result.push(
-        `    <property name="${propertyName}" type="${
-          iface.properties[propertyName]
-        }" access="readwrite"/>`
+        `    <property name="${propertyName}" type="${iface.properties[propertyName]}" access="readwrite"/>`
       );
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@homebridge/dbus-native",
   "author": "Andrey Sidorov <sidorares@yandex.com>",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "keywords": [
     "dbus",
     "dcop",
@@ -38,11 +38,11 @@
     "dbus2js": "./bin/dbus2js.js"
   },
   "dependencies": {
+    "@homebridge/long": "^5.2.1",
     "event-stream": "^4.0.0",
     "hexy": "^0.2.10",
-    "@homebridge/long": "^5.2.1",
-    "optimist": "^0.6.1",
-    "put": "0.0.6",
+    "minimist": "^1.2.6",
+    "@homebridge/put": "~0.0.8",
     "safe-buffer": "^5.1.1",
     "xml2js": "^0.4.17"
   },
@@ -52,13 +52,15 @@
     }
   },
   "devDependencies": {
-    "eslint": "^5.0.0",
+    "@types/minimist": "^1.2.2",
+    "eslint": "^6.0.0",
     "eslint-config-prettier": "^3.0.0",
-    "eslint-plugin-markdown": "^1.0.0-beta.6",
+    "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-prettier": "^3.0.0",
     "husky": "^1.0.0",
-    "lint-staged": "^8.0.0",
+    "lint-staged": "^13.0.3",
     "mocha": "*",
+    "nyc": "^15.1.0",
     "prettier": "^1.7.4"
   },
   "scripts": {