@homebridge/dbus-native 0.5.0 → 0.6.0

package/README.md

@@ -1,17 +1,25 @@
-node-dbus
-===========
+<p align="center">
+  <a href="https://homebridge.io"><img src="https://raw.githubusercontent.com/homebridge/branding/latest/logos/homebridge-color-round-stylized.png" height="140"></a>
+</p>
+
+<span align="center">
+
+# D-Bus Native
 
 [![Greenkeeper badge](https://badges.greenkeeper.io/sidorares/dbus-native.svg)](https://greenkeeper.io/)
-D-bus protocol client and server for node.js
+[![Node Test](https://github.com/homebridge/dbus-native/actions/workflows/run-test.yml/badge.svg)](https://github.com/homebridge/dbus-native/actions/workflows/run-test.yml)
 
-[![Build Status](https://secure.travis-ci.org/sidorares/dbus-native.png)](http://travis-ci.org/sidorares/dbus-native)
+</span>
+
+D-bus protocol client and server for node.js
 
 Fork Status
 ------------
 
-This fork is maintained with the following two changes:
+This fork is maintained with the following changes:
 * Removed the optional `abstract-socket` dependency for faster installs
 * Moved to our `long.js` fork to work around a crash on `ARMv6` platforms running node 16.1+
+* Updated dependencies (including `prettier`, which has made style changes to a lot of files)
 
 Installation
 ------------

package/bin/dbus2js.js

@@ -37,20 +37,20 @@ function getXML(callback) {
 }
 
 if (argv.dump) {
-  getXML(function(err, xml) {
+  getXML(function (err, xml) {
     console.log(xml);
     bus.connection.end();
   });
 }
 
 if (!argv.server) {
-  getXML(function(err, xml) {
+  getXML(function (err, xml) {
     if (err) die(err);
 
     var output = [];
 
     var parser = new xml2js.Parser(xml2js_opts);
-    parser.parseString(xml, function(err, result) {
+    parser.parseString(xml, function (err, result) {
       if (err) die(err);
 
       var ifaceName, method, property, iface, arg, signature;

package/index.js

@@ -27,7 +27,7 @@ function createStream(opts) {
     var familyParams = address.split(':');
     var family = familyParams[0];
     var params = {};
-    familyParams[1].split(',').map(function(p) {
+    familyParams[1].split(',').map(function (p) {
       var keyVal = p.split('=');
       params[keyVal[0]] = keyVal[1];
     });
@@ -76,25 +76,25 @@ function createConnection(opts) {
   var stream = (self.stream = createStream(opts));
   stream.setNoDelay();
 
-  stream.on('error', function(err) {
+  stream.on('error', function (err) {
     // forward network and stream errors
     self.emit('error', err);
   });
 
-  stream.on('end', function() {
+  stream.on('end', function () {
     self.emit('end');
-    self.message = function() {
+    self.message = function () {
       console.warn("Didn't write bytes to closed stream");
     };
   });
 
-  self.end = function() {
+  self.end = function () {
     stream.end();
     return self;
   };
 
   var handshake = opts.server ? serverHandshake : clientHandshake;
-  handshake(stream, opts, function(error, guid) {
+  handshake(stream, opts, function (error, guid) {
     if (error) {
       return self.emit('error', error);
     }
@@ -102,7 +102,7 @@ function createConnection(opts) {
     self.emit('connect');
     message.unmarshalMessages(
       stream,
-      function(message) {
+      function (message) {
         self.emit('message', message);
       },
       opts
@@ -112,11 +112,11 @@ function createConnection(opts) {
   self._messages = [];
 
   // pre-connect version, buffers all messages. replaced after connect
-  self.message = function(msg) {
+  self.message = function (msg) {
     self._messages.push(msg);
   };
 
-  self.once('connect', function() {
+  self.once('connect', function () {
     self.state = 'connected';
     for (var i = 0; i < self._messages.length; ++i) {
       stream.write(message.marshall(self._messages[i]));
@@ -124,7 +124,7 @@ function createConnection(opts) {
     self._messages.length = 0;
 
     // no need to buffer once connected
-    self.message = function(msg) {
+    self.message = function (msg) {
       stream.write(message.marshall(msg));
     };
   });
@@ -132,12 +132,12 @@ function createConnection(opts) {
   return self;
 }
 
-module.exports.createClient = function(params) {
+module.exports.createClient = function (params) {
   var connection = createConnection(params || {});
   return new MessageBus(connection, params || {});
 };
 
-module.exports.systemBus = function() {
+module.exports.systemBus = function () {
   return module.exports.createClient({
     busAddress:
       process.env.DBUS_SYSTEM_BUS_ADDRESS ||
@@ -145,7 +145,7 @@ module.exports.systemBus = function() {
   });
 };
 
-module.exports.sessionBus = function(opts) {
+module.exports.sessionBus = function (opts) {
   return module.exports.createClient(opts);
 };
 

package/lib/address-x11.js

@@ -6,27 +6,36 @@ const os = require('os');
 
 function getDbusAddress(callback) {
   // read machine uuid
-  fs.readFile('/var/lib/dbus/machine-id', 'ascii', function(err, uuid) {
+  fs.readFile('/var/lib/dbus/machine-id', 'ascii', function (err, uuid) {
     if (err) return callback(err);
     var hostname = os.hostname().split('-')[0];
-    x11.createClient(function(err, display) {
+    x11.createClient(function (err, display) {
       var X = display.client;
       var selectionName = `_DBUS_SESSION_BUS_SELECTION_${hostname}_${uuid.trim()}`;
-      X.InternAtom(false, selectionName, function(err, id) {
+      X.InternAtom(false, selectionName, function (err, id) {
         if (err) return callback(err);
-        X.GetSelectionOwner(id, function(err, win) {
+        X.GetSelectionOwner(id, function (err, win) {
           if (err) return callback(err);
-          X.InternAtom(false, '_DBUS_SESSION_BUS_ADDRESS', function(
-            err,
-            propId
-          ) {
-            if (err) return callback(err);
-            win = display.screen[0].root;
-            X.GetProperty(0, win, propId, 0, 0, 10000000, function(err, val) {
+          X.InternAtom(
+            false,
+            '_DBUS_SESSION_BUS_ADDRESS',
+            function (err, propId) {
               if (err) return callback(err);
-              callback(null, val.data.toString());
-            });
-          });
+              win = display.screen[0].root;
+              X.GetProperty(
+                0,
+                win,
+                propId,
+                0,
+                0,
+                10000000,
+                function (err, val) {
+                  if (err) return callback(err);
+                  callback(null, val.data.toString());
+                }
+              );
+            }
+          );
         });
       });
     });

package/lib/bus.js

@@ -17,21 +17,21 @@ module.exports = function bus(conn, opts) {
   this.signals = new EventEmitter();
   this.exportedObjects = {};
 
-  this.invoke = function(msg, callback) {
+  this.invoke = function (msg, callback) {
     if (!msg.type) msg.type = constants.messageType.methodCall;
     msg.serial = self.serial++;
     this.cookies[msg.serial] = callback;
     self.connection.message(msg);
   };
 
-  this.invokeDbus = function(msg, callback) {
+  this.invokeDbus = function (msg, callback) {
     if (!msg.path) msg.path = '/org/freedesktop/DBus';
     if (!msg.destination) msg.destination = 'org.freedesktop.DBus';
     if (!msg['interface']) msg['interface'] = 'org.freedesktop.DBus';
     self.invoke(msg, callback);
   };
 
-  this.mangle = function(path, iface, member) {
+  this.mangle = function (path, iface, member) {
     var obj = {};
     if (typeof path === 'object') {
       // handle one argumant case mangle(msg)
@@ -46,7 +46,7 @@ module.exports = function bus(conn, opts) {
     return JSON.stringify(obj);
   };
 
-  this.sendSignal = function(path, iface, name, signature, args) {
+  this.sendSignal = function (path, iface, name, signature, args) {
     var signalMsg = {
       type: constants.messageType.signal,
       serial: self.serial++,
@@ -62,7 +62,7 @@ module.exports = function bus(conn, opts) {
   };
 
   // Warning: errorName must respect the same rules as interface names (must contain a dot)
-  this.sendError = function(msg, errorName, errorText) {
+  this.sendError = function (msg, errorName, errorText) {
     var reply = {
       type: constants.messageType.error,
       serial: self.serial++,
@@ -75,7 +75,7 @@ module.exports = function bus(conn, opts) {
     this.connection.message(reply);
   };
 
-  this.sendReply = function(msg, signature, body) {
+  this.sendReply = function (msg, signature, body) {
     var reply = {
       type: constants.messageType.methodReturn,
       serial: self.serial++,
@@ -88,14 +88,14 @@ module.exports = function bus(conn, opts) {
   };
 
   // route reply/error
-  this.connection.on('message', function(msg) {
+  this.connection.on('message', function (msg) {
     function invoke(impl, func, resultSignature) {
       Promise.resolve()
-        .then(function() {
+        .then(function () {
           return func.apply(impl, (msg.body || []).concat(msg));
         })
         .then(
-          function(methodReturnResult) {
+          function (methodReturnResult) {
             var methodReturnReply = {
               type: constants.messageType.methodReturn,
               serial: self.serial++,
@@ -108,7 +108,7 @@ module.exports = function bus(conn, opts) {
             }
             self.connection.message(methodReturnReply);
           },
-          function(e) {
+          function (e) {
             self.sendError(
               msg,
               e.dbusName || 'org.freedesktop.DBus.Error.Failed',
@@ -137,7 +137,7 @@ module.exports = function bus(conn, opts) {
           args = [null].concat(args); // first argument - no errors, null
           handler.apply(props, args); // body as array of arguments
         } else {
-          handler.call(props, {name: msg.errorName, message: args}); // body as first argument
+          handler.call(props, { name: msg.errorName, message: args }); // body as first argument
         }
       }
     } else if (msg.type === constants.messageType.signal) {
@@ -185,12 +185,12 @@ module.exports = function bus(conn, opts) {
     }
   });
 
-  this.setMethodCallHandler = function(objectPath, iface, member, handler) {
+  this.setMethodCallHandler = function (objectPath, iface, member, handler) {
     var key = self.mangle(objectPath, iface, member);
     self.methodCallHandlers[key] = handler;
   };
 
-  this.exportInterface = function(obj, path, iface) {
+  this.exportInterface = function (obj, path, iface) {
     var entry;
     if (!self.exportedObjects[path]) {
       entry = self.exportedObjects[path] = {};
@@ -201,7 +201,7 @@ module.exports = function bus(conn, opts) {
     // monkey-patch obj.emit()
     if (typeof obj.emit === 'function') {
       var oldEmit = obj.emit;
-      obj.emit = function() {
+      obj.emit = function () {
         var args = Array.prototype.slice.apply(arguments);
         var signalName = args[0];
         if (!signalName) throw new Error('Trying to emit undefined signa');
@@ -234,7 +234,7 @@ module.exports = function bus(conn, opts) {
 
   // register name
   if (opts.direct !== true) {
-    this.invokeDbus({ member: 'Hello' }, function(err, name) {
+    this.invokeDbus({ member: 'Hello' }, function (err, name) {
       if (err) throw new Error(err);
       self.name = name;
     });
@@ -245,7 +245,7 @@ module.exports = function bus(conn, opts) {
   function DBusObject(name, service) {
     this.name = name;
     this.service = service;
-    this.as = function(name) {
+    this.as = function (name) {
       return this.proxy[name];
     };
   }
@@ -253,11 +253,11 @@ module.exports = function bus(conn, opts) {
   function DBusService(name, bus) {
     this.name = name;
     this.bus = bus;
-    this.getObject = function(name, callback) {
+    this.getObject = function (name, callback) {
       if (name === undefined)
         return callback(new Error('Object name is null or undefined'));
       var obj = new DBusObject(name, this);
-      introspect(obj, function(err, ifaces, nodes) {
+      introspect(obj, function (err, ifaces, nodes) {
         if (err) return callback(err);
         obj.proxy = ifaces;
         obj.nodes = nodes;
@@ -265,25 +265,25 @@ module.exports = function bus(conn, opts) {
       });
     };
 
-    this.getInterface = function(objName, ifaceName, callback) {
-      this.getObject(objName, function(err, obj) {
+    this.getInterface = function (objName, ifaceName, callback) {
+      this.getObject(objName, function (err, obj) {
         if (err) return callback(err);
         callback(null, obj.as(ifaceName));
       });
     };
   }
 
-  this.getService = function(name) {
+  this.getService = function (name) {
     return new DBusService(name, this);
   };
 
-  this.getObject = function(path, name, callback) {
+  this.getObject = function (path, name, callback) {
     var service = this.getService(path);
     return service.getObject(name, callback);
   };
 
-  this.getInterface = function(path, objname, name, callback) {
-    return this.getObject(path, objname, function(err, obj) {
+  this.getInterface = function (path, objname, name, callback) {
+    return this.getObject(path, objname, function (err, obj) {
       if (err) return callback(err);
       callback(null, obj.as(name));
     });
@@ -292,49 +292,49 @@ module.exports = function bus(conn, opts) {
   // TODO: refactor
 
   // bus meta functions
-  this.addMatch = function(match, callback) {
+  this.addMatch = function (match, callback) {
     this.invokeDbus(
       { member: 'AddMatch', signature: 's', body: [match] },
       callback
     );
   };
 
-  this.removeMatch = function(match, callback) {
+  this.removeMatch = function (match, callback) {
     this.invokeDbus(
       { member: 'RemoveMatch', signature: 's', body: [match] },
       callback
     );
   };
 
-  this.getId = function(callback) {
+  this.getId = function (callback) {
     this.invokeDbus({ member: 'GetId' }, callback);
   };
 
-  this.requestName = function(name, flags, callback) {
+  this.requestName = function (name, flags, callback) {
     this.invokeDbus(
       { member: 'RequestName', signature: 'su', body: [name, flags] },
-      function(err, name) {
+      function (err, name) {
         if (callback) callback(err, name);
       }
     );
   };
 
-  this.releaseName = function(name, callback) {
+  this.releaseName = function (name, callback) {
     this.invokeDbus(
       { member: 'ReleaseName', signature: 's', body: [name] },
       callback
     );
   };
 
-  this.listNames = function(callback) {
+  this.listNames = function (callback) {
     this.invokeDbus({ member: 'ListNames' }, callback);
   };
 
-  this.listActivatableNames = function(callback) {
+  this.listActivatableNames = function (callback) {
     this.invokeDbus({ member: 'ListActivatableNames' }, callback);
   };
 
-  this.updateActivationEnvironment = function(env, callback) {
+  this.updateActivationEnvironment = function (env, callback) {
     this.invokeDbus(
       {
         member: 'UpdateActivationEnvironment',
@@ -345,35 +345,35 @@ module.exports = function bus(conn, opts) {
     );
   };
 
-  this.startServiceByName = function(name, flags, callback) {
+  this.startServiceByName = function (name, flags, callback) {
     this.invokeDbus(
       { member: 'StartServiceByName', signature: 'su', body: [name, flags] },
       callback
     );
   };
 
-  this.getConnectionUnixUser = function(name, callback) {
+  this.getConnectionUnixUser = function (name, callback) {
     this.invokeDbus(
       { member: 'GetConnectionUnixUser', signature: 's', body: [name] },
       callback
     );
   };
 
-  this.getConnectionUnixProcessId = function(name, callback) {
+  this.getConnectionUnixProcessId = function (name, callback) {
     this.invokeDbus(
       { member: 'GetConnectionUnixProcessID', signature: 's', body: [name] },
       callback
     );
   };
 
-  this.getNameOwner = function(name, callback) {
+  this.getNameOwner = function (name, callback) {
     this.invokeDbus(
       { member: 'GetNameOwner', signature: 's', body: [name] },
       callback
     );
   };
 
-  this.nameHasOwner = function(name, callback) {
+  this.nameHasOwner = function (name, callback) {
     this.invokeDbus(
       { member: 'NameHasOwner', signature: 's', body: [name] },
       callback

package/lib/dbus-buffer.js

@@ -14,53 +14,53 @@ function DBusBuffer(buffer, startPos, options) {
   (this.startPos = startPos ? startPos : 0), (this.pos = 0);
 }
 
-DBusBuffer.prototype.align = function(power) {
+DBusBuffer.prototype.align = function (power) {
   var allbits = (1 << power) - 1;
   var paddedOffset = ((this.pos + this.startPos + allbits) >> power) << power;
   this.pos = paddedOffset - this.startPos;
 };
 
-DBusBuffer.prototype.readInt8 = function() {
+DBusBuffer.prototype.readInt8 = function () {
   this.pos++;
   return this.buffer[this.pos - 1];
 };
 
-DBusBuffer.prototype.readSInt16 = function() {
+DBusBuffer.prototype.readSInt16 = function () {
   this.align(1);
   var res = this.buffer.readInt16LE(this.pos);
   this.pos += 2;
   return res;
 };
 
-DBusBuffer.prototype.readInt16 = function() {
+DBusBuffer.prototype.readInt16 = function () {
   this.align(1);
   var res = this.buffer.readUInt16LE(this.pos);
   this.pos += 2;
   return res;
 };
 
-DBusBuffer.prototype.readSInt32 = function() {
+DBusBuffer.prototype.readSInt32 = function () {
   this.align(2);
   var res = this.buffer.readInt32LE(this.pos);
   this.pos += 4;
   return res;
 };
 
-DBusBuffer.prototype.readInt32 = function() {
+DBusBuffer.prototype.readInt32 = function () {
   this.align(2);
   var res = this.buffer.readUInt32LE(this.pos);
   this.pos += 4;
   return res;
 };
 
-DBusBuffer.prototype.readDouble = function() {
+DBusBuffer.prototype.readDouble = function () {
   this.align(3);
   var res = this.buffer.readDoubleLE(this.pos);
   this.pos += 8;
   return res;
 };
 
-DBusBuffer.prototype.readString = function(len) {
+DBusBuffer.prototype.readString = function (len) {
   if (len === 0) {
     this.pos++;
     return '';

package/lib/handshake.js

@@ -24,7 +24,7 @@ function getCookie(context, id, cb) {
 
   var filename = path.join(dirname, context);
   // check it's not writable by others and readable by user
-  fs.stat(dirname, function(err, stat) {
+  fs.stat(dirname, function (err, stat) {
     if (err) return cb(err);
     if (stat.mode & 0o22)
       return cb(
@@ -39,7 +39,7 @@ function getCookie(context, id, cb) {
           'Keyrings directory is not owned by the current user. Aborting authentication!'
         )
       );
-    fs.readFile(filename, 'ascii', function(err, keyrings) {
+    fs.readFile(filename, 'ascii', function (err, keyrings) {
       if (err) return cb(err);
       var lines = keyrings.split('\n');
       for (var l = 0; l < lines.length; ++l) {
@@ -78,7 +78,7 @@ function tryAuth(stream, methods, cb) {
   var id = hexlify(uid);
 
   function beginOrNextAuth() {
-    readLine(stream, function(line) {
+    readLine(stream, function (line) {
       var ok = line.toString('ascii').match(/^([A-Za-z]+) (.*)/);
       if (ok && ok[1] === 'OK') {
         stream.write('BEGIN\r\n');
@@ -101,14 +101,8 @@ function tryAuth(stream, methods, cb) {
       break;
     case 'DBUS_COOKIE_SHA1':
       stream.write(`AUTH ${authMethod} ${id}\r\n`);
-      readLine(stream, function(line) {
-        var data = Buffer.from(
-          line
-            .toString()
-            .split(' ')[1]
-            .trim(),
-          'hex'
-        )
+      readLine(stream, function (line) {
+        var data = Buffer.from(line.toString().split(' ')[1].trim(), 'hex')
           .toString()
           .split(' ');
         var cookieContext = data[0];
@@ -116,7 +110,7 @@ function tryAuth(stream, methods, cb) {
         var serverChallenge = data[2];
         // any random 16 bytes should work, sha1(rnd) to make it simplier
         var clientChallenge = crypto.randomBytes(16).toString('hex');
-        getCookie(cookieContext, cookieId, function(err, cookie) {
+        getCookie(cookieContext, cookieId, function (err, cookie) {
           if (err) return cb(err);
           var response = sha1(
             [serverChallenge, clientChallenge, cookie].join(':')

package/lib/hello-message.js

@@ -1,7 +1,7 @@
 const Buffer = require('safe-buffer').Buffer;
 
 // Pre-serialised hello message. serial = 1
-module.exports = function() {
+module.exports = function () {
   return Buffer.from(
     `6c01 0001 0000 0000 0100 0000 6d00 0000
      0101 6f00 1500 0000 2f6f 7267 2f66 7265

package/lib/introspect.js

@@ -1,6 +1,6 @@
 const xml2js = require('xml2js');
 
-module.exports.introspectBus = function(obj, callback) {
+module.exports.introspectBus = function (obj, callback) {
   var bus = obj.service.bus;
   bus.invoke(
     {
@@ -9,16 +9,16 @@ module.exports.introspectBus = function(obj, callback) {
       interface: 'org.freedesktop.DBus.Introspectable',
       member: 'Introspect'
     },
-    function(err, xml) {
+    function (err, xml) {
       module.exports.processXML(err, xml, obj, callback);
     }
   );
 };
 
-module.exports.processXML = function(err, xml, obj, callback) {
+module.exports.processXML = function (err, xml, obj, callback) {
   if (err) return callback(err);
   var parser = new xml2js.Parser();
-  parser.parseString(xml, function(err, result) {
+  parser.parseString(xml, function (err, result) {
     if (err) return callback(err);
     if (!result.node) throw new Error('No root XML node');
     result = result.node; // unwrap the root node
@@ -84,17 +84,17 @@ function DBusInterface(parent_obj, ifname) {
   this.$callbacks = [];
   this.$sigHandlers = [];
 }
-DBusInterface.prototype.$getSigHandler = function(callback) {
+DBusInterface.prototype.$getSigHandler = function (callback) {
   var index;
   if ((index = this.$callbacks.indexOf(callback)) === -1) {
     index = this.$callbacks.push(callback) - 1;
-    this.$sigHandlers[index] = function(messageBody) {
+    this.$sigHandlers[index] = function (messageBody) {
       callback.apply(null, messageBody);
     };
   }
   return this.$sigHandlers[index];
 };
-DBusInterface.prototype.addListener = DBusInterface.prototype.on = function(
+DBusInterface.prototype.addListener = DBusInterface.prototype.on = function (
   signame,
   callback
 ) {
@@ -107,7 +107,7 @@ DBusInterface.prototype.addListener = DBusInterface.prototype.on = function(
     var match = getMatchRule(this.$parent.name, this.$name, signame);
     bus.addMatch(
       match,
-      function(err) {
+      function (err) {
         if (err) throw new Error(err);
         bus.signals.on(signalFullName, this.$getSigHandler(callback));
       }.bind(this)
@@ -117,38 +117,36 @@ DBusInterface.prototype.addListener = DBusInterface.prototype.on = function(
     bus.signals.on(signalFullName, this.$getSigHandler(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));
-  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)
-    );
-  }
-};
-DBusInterface.prototype.$createMethod = function(mName, signature) {
+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));
+    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)
+      );
+    }
+  };
+DBusInterface.prototype.$createMethod = function (mName, signature) {
   this.$methods[mName] = signature;
-  this[mName] = function() {
+  this[mName] = function () {
     this.$callMethod(mName, arguments);
   };
 };
-DBusInterface.prototype.$callMethod = function(mName, args) {
+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,
@@ -161,17 +159,21 @@ DBusInterface.prototype.$callMethod = function(mName, 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) {
+    get: () => (callback) => this.$readProp(propName, callback),
+    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(
     {
@@ -182,7 +184,7 @@ DBusInterface.prototype.$readProp = function(propName, callback) {
       signature: 'ss',
       body: [this.$name, propName]
     },
-    function(err, val) {
+    function (err, val) {
       if (err) {
         callback(err);
       } else {
@@ -196,7 +198,7 @@ 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,

package/lib/marshallers.js

@@ -10,7 +10,7 @@ const Long = require('@homebridge/long');
  * check returns nothing - it only raises errors if the data is
  * invalid for the signature
  */
-var MakeSimpleMarshaller = function(signature) {
+var MakeSimpleMarshaller = function (signature) {
   var marshaller = {};
   function checkValidString(data) {
     if (typeof data !== 'string') {
@@ -55,43 +55,39 @@ var MakeSimpleMarshaller = function(signature) {
     // TODO: verify object path here?
     case 's': // eslint-disable-line no-fallthrough
       //STRING
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         checkValidString(data);
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         this.check(data);
         // utf8 string
         align(ps, 4);
         const buff = Buffer.from(data, 'utf8');
-        ps.word32le(buff.length)
-          .put(buff)
-          .word8(0);
+        ps.word32le(buff.length).put(buff).word8(0);
         ps._offset += 5 + buff.length;
       };
       break;
     case 'g':
       //SIGNATURE
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         checkValidString(data);
         checkValidSignature(data);
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         this.check(data);
         // signature
         const buff = Buffer.from(data, 'ascii');
-        ps.word8(data.length)
-          .put(buff)
-          .word8(0);
+        ps.word8(data.length).put(buff).word8(0);
         ps._offset += 2 + buff.length;
       };
       break;
     case 'y':
       //BYTE
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         checkInteger(data);
         checkRange(0x00, 0xff, data);
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         this.check(data);
         ps.word8(data);
         ps._offset++;
@@ -99,10 +95,10 @@ var MakeSimpleMarshaller = function(signature) {
       break;
     case 'b':
       //BOOLEAN
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         checkBoolean(data);
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         this.check(data);
         // booleans serialised as 0/1 unsigned 32 bit int
         data = data ? 1 : 0;
@@ -113,11 +109,11 @@ var MakeSimpleMarshaller = function(signature) {
       break;
     case 'n':
       //INT16
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         checkInteger(data);
         checkRange(-0x7fff - 1, 0x7fff, data);
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         this.check(data);
         align(ps, 2);
         const buff = Buffer.alloc(2);
@@ -128,11 +124,11 @@ var MakeSimpleMarshaller = function(signature) {
       break;
     case 'q':
       //UINT16
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         checkInteger(data);
         checkRange(0, 0xffff, data);
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         this.check(data);
         align(ps, 2);
         ps.word16le(data);
@@ -141,11 +137,11 @@ var MakeSimpleMarshaller = function(signature) {
       break;
     case 'i':
       //INT32
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         checkInteger(data);
         checkRange(-0x7fffffff - 1, 0x7fffffff, data);
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         this.check(data);
         align(ps, 4);
         const buff = Buffer.alloc(4);
@@ -156,11 +152,11 @@ var MakeSimpleMarshaller = function(signature) {
       break;
     case 'u':
       //UINT32
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         checkInteger(data);
         checkRange(0, 0xffffffff, data);
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         this.check(data);
         // 32 t unsigned int
         align(ps, 4);
@@ -170,10 +166,10 @@ var MakeSimpleMarshaller = function(signature) {
       break;
     case 't':
       //UINT64
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         return checkLong(data, false);
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         data = this.check(data);
         align(ps, 8);
         ps.word32le(data.low);
@@ -183,10 +179,10 @@ var MakeSimpleMarshaller = function(signature) {
       break;
     case 'x':
       //INT64
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         return checkLong(data, true);
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         data = this.check(data);
         align(ps, 8);
         ps.word32le(data.low);
@@ -196,7 +192,7 @@ var MakeSimpleMarshaller = function(signature) {
       break;
     case 'd':
       //DOUBLE
-      marshaller.check = function(data) {
+      marshaller.check = function (data) {
         if (typeof data !== 'number') {
           throw new Error(`Data: ${data} was not of type number`);
         } else if (Number.isNaN(data)) {
@@ -205,7 +201,7 @@ var MakeSimpleMarshaller = function(signature) {
           throw new Error('Number outside range');
         }
       };
-      marshaller.marshall = function(ps, data) {
+      marshaller.marshall = function (ps, data) {
         this.check(data);
         align(ps, 8);
         const buff = Buffer.alloc(8);
@@ -221,13 +217,13 @@ var MakeSimpleMarshaller = function(signature) {
 };
 exports.MakeSimpleMarshaller = MakeSimpleMarshaller;
 
-var checkRange = function(minValue, maxValue, data) {
+var checkRange = function (minValue, maxValue, data) {
   if (data > maxValue || data < minValue) {
     throw new Error('Number outside range');
   }
 };
 
-var checkInteger = function(data) {
+var checkInteger = function (data) {
   if (typeof data !== 'number') {
     throw new Error(`Data: ${data} was not of type number`);
   }
@@ -236,14 +232,14 @@ var checkInteger = function(data) {
   }
 };
 
-var checkBoolean = function(data) {
+var checkBoolean = function (data) {
   if (!(typeof data === 'boolean' || data === 0 || data === 1))
     throw new Error(`Data: ${data} was not of type boolean`);
 };
 
 // This is essentially a tweaked version of 'fromValue' from Long.js with error checking.
 // This can take number or string of decimal characters or 'Long' instance (or Long-style object with props low,high,unsigned).
-var makeLong = function(val, signed) {
+var makeLong = function (val, signed) {
   if (val instanceof Long) return val;
   if (val instanceof Number) val = val.valueOf();
   if (typeof val === 'number') {
@@ -304,7 +300,7 @@ var makeLong = function(val, signed) {
   }
 };
 
-var checkLong = function(data, signed) {
+var checkLong = function (data, signed) {
   if (!Long.isLong(data)) {
     data = makeLong(data, signed);
   }

package/lib/message.js

@@ -15,7 +15,7 @@ module.exports.unmarshalMessages = function messageParser(
   var fieldsLength, fieldsLengthPadded;
   var fieldsAndBodyLength = 0;
   var bodyLength = 0;
-  stream.on('readable', function() {
+  stream.on('readable', function () {
     while (1) {
       if (state === 0) {
         header = stream.read(16);
@@ -96,7 +96,7 @@ module.exports.marshall = function marshallMessage(message) {
   ];
   var headerBuff = marshall('yyyyuu', header);
   var fields = [];
-  constants.headerTypeName.forEach(function(fieldName) {
+  constants.headerTypeName.forEach(function (fieldName) {
     var fieldVal = message[fieldName];
     if (fieldVal) {
       fields.push([

package/lib/portforward.js

@@ -6,32 +6,32 @@ var address = process.env.DBUS_SESSION_BUS_ADDRESS;
 var m = address.match(/abstract=([^,]+)/);
 
 net
-  .createServer(function(s) {
+  .createServer(function (s) {
     var buff = '';
     var connected = false;
     var cli = abs.createConnection(`\0${m[1]}`);
-    s.on('data', function(d) {
+    s.on('data', function (d) {
       if (connected) {
         cli.write(d);
       } else {
         buff += d.toString();
       }
     });
-    setTimeout(function() {
+    setTimeout(function () {
       console.log('CONNECTED!');
       connected = true;
       cli.write(buff);
     }, 100);
     cli.pipe(s);
 
-    cli.on('data', function(b) {
+    cli.on('data', function (b) {
       console.log(hexy(b, { prefix: 'from client ' }));
     });
-    s.on('data', function(b) {
+    s.on('data', function (b) {
       console.log(hexy(b, { prefix: 'from server ' }));
     });
   })
-  .listen(3334, function() {
+  .listen(3334, function () {
     console.log(
       'Server started. connect with DBUS_SESSION_BUS_ADDRESS=tcp:host=127.0.0.1,port=3334'
     );

package/lib/server-handshake.js

@@ -3,20 +3,20 @@ const readLine = require('./readline');
 
 module.exports = function serverHandshake(stream, opts, cb) {
   stream.name = 'SERVER SERVER';
-  readLine(stream, function(hello) {
+  readLine(stream, function (hello) {
     console.log(['hello string: ', hello.toString(), hello]);
     stream.write('REJECTED EXTERNAL DBUS_COOKIE_SHA1 ANONYMOUS\r\n');
-    readLine(stream, function() {
+    readLine(stream, function () {
       stream.write(
         `DATA ${Buffer.from(
           'org_freedesktop_general 642038150 b9ce247a275f427c8586e4c9de9bb951'
         ).toString('hex')}\r\n`
       );
-      readLine(stream, function() {
+      readLine(stream, function () {
         stream.write(
           'OK 6f72675f667265656465736b746f705f67656e6572616c20353631303331333937206239636532343761323735663432376338353836653463396465396262393531\r\n'
         );
-        readLine(stream, function(begin) {
+        readLine(stream, function (begin) {
           console.log(['AFTER begin: ', begin.toString()]);
           cb(null);
         });

package/lib/server.js

@@ -1,10 +1,10 @@
 const dbus = require('../index');
 const net = require('net');
 
-module.exports.createServer = function(handler) {
+module.exports.createServer = function (handler) {
   function Server() {
     var id = 123;
-    this.server = net.createServer(function(socket) {
+    this.server = net.createServer(function (socket) {
       socket.idd = id;
       id++;
 

package/lib/signature.js

@@ -6,7 +6,7 @@ var match = {
 };
 
 var knownTypes = {};
-'(){}ybnqiuxtdsogarvehm*?@&^'.split('').forEach(function(c) {
+'(){}ybnqiuxtdsogarvehm*?@&^'.split('').forEach(function (c) {
   knownTypes[c] = true;
 });
 

package/lib/stdifaces.js

@@ -8,7 +8,7 @@ var xmlHeader =
   '    "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">';
 var stdIfaces;
 
-module.exports = function(msg, bus) {
+module.exports = function (msg, bus) {
   if (
     msg['interface'] === 'org.freedesktop.DBus.Introspectable' &&
     msg.member === 'Introspect'
@@ -145,10 +145,10 @@ module.exports = function(msg, bus) {
 // TODO: move to introspect.js
 function interfaceToXML(iface) {
   var result = [];
-  var dumpArgs = function(argsSignature, argsNames, direction) {
+  var dumpArgs = function (argsSignature, argsNames, direction) {
     if (!argsSignature) return;
     var args = parseSignature(argsSignature);
-    args.forEach(function(arg, num) {
+    args.forEach(function (arg, num) {
       var argName = argsNames ? argsNames[num] : direction + num;
       var dirStr = direction === 'signal' ? '' : `" direction="${direction}`;
       result.push(
@@ -190,7 +190,7 @@ function interfaceToXML(iface) {
 
 function dumpSignature(s) {
   var result = [];
-  s.forEach(function(sig) {
+  s.forEach(function (sig) {
     result.push(sig.type + dumpSignature(sig.child));
     if (sig.type === '{') result.push('}');
     if (sig.type === '(') result.push(')');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@homebridge/dbus-native",
   "author": "Andrey Sidorov <sidorares@yandex.com>",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "keywords": [
     "dbus",
     "dcop",
@@ -32,19 +32,19 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/homebridge/dbus-native.git"
+    "url": "git+https://github.com/homebridge/dbus-native.git"
   },
   "bin": {
-    "dbus2js": "./bin/dbus2js.js"
+    "dbus2js": "bin/dbus2js.js"
   },
   "dependencies": {
     "@homebridge/long": "^5.2.1",
-    "event-stream": "^4.0.0",
-    "hexy": "^0.2.10",
+    "@homebridge/put": "^0.0.8",
+    "event-stream": "^4.0.1",
+    "hexy": "^0.3.5",
     "minimist": "^1.2.6",
-    "@homebridge/put": "~0.0.8",
-    "safe-buffer": "^5.1.1",
-    "xml2js": "^0.4.17"
+    "safe-buffer": "^5.1.2",
+    "xml2js": "^0.6.2"
   },
   "comment": {
     "optionalDependencies": {
@@ -53,15 +53,15 @@
   },
   "devDependencies": {
     "@types/minimist": "^1.2.2",
-    "eslint": "^6.0.0",
-    "eslint-config-prettier": "^3.0.0",
-    "eslint-plugin-markdown": "^3.0.0",
-    "eslint-plugin-prettier": "^3.0.0",
-    "husky": "^1.0.0",
-    "lint-staged": "^13.0.3",
-    "mocha": "*",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-markdown": "^4.0.1",
+    "eslint-plugin-prettier": "^5.1.3",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.2",
+    "mocha": "^10.0.0",
     "nyc": "^15.1.0",
-    "prettier": "^1.7.4"
+    "prettier": "^3.2.5"
   },
   "scripts": {
     "lint": "npm run lint:docs && npm run lint:code",