lint and format

Author: Tony Crisci

lib/address-x11.js

@@ -1,26 +1,22 @@
-// read dbus adress from window selection
-try {
-  var x11 = require('x11');
-} catch (err) {
-  x11 = null;
-}
-
 const fs = require('fs');
 const os = require('os');
 
 function getDbusAddressFromWindowSelection (callback) {
+  // read dbus adress from window selection
+  // TODO: implement this somewhere
+  const x11 = require('x11');
   if (x11 === null) {
     throw new Error('cannot get session bus address from window selection: dbus-next was installed without x11 support');
   }
 
   // read machine uuid
   fs.readFile('/var/lib/dbus/machine-id', 'ascii', function (err, uuid) {
     if (err) return callback(err);
-    var hostname = os.hostname().split('-')[0];
+    const hostname = os.hostname().split('-')[0];
     x11.createClient(function (err, display) {
       if (err) return callback(err);
-      var X = display.client;
-      var selectionName = `_DBUS_SESSION_BUS_SELECTION_${
+      const X = display.client;
+      const selectionName = `_DBUS_SESSION_BUS_SELECTION_${
         hostname
       }_${uuid.trim()}`;
       X.InternAtom(false, selectionName, function (err, id) {

lib/align.js

@@ -1,10 +1,10 @@
 const Buffer = require('safe-buffer').Buffer;
 
 function align (ps, n) {
-  var pad = n - ps._offset % n;
+  const 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);
+  const padBuff = Buffer.alloc(pad);
   ps.put(Buffer.from(padBuff));
   ps._offset += pad;
 }

lib/bus.js

@@ -418,7 +418,7 @@ class MessageBus extends EventEmitter {
 
     const pathSplit = path.split('/').filter(n => n);
 
-    let children = new Set();
+    const children = new Set();
 
     for (const key of Object.keys(this._serviceObjects)) {
       const keySplit = key.split('/').filter(n => n);
@@ -430,12 +430,12 @@ class MessageBus extends EventEmitter {
       }
     }
 
-    for (let child of children) {
-        xml.node.node.push({
-          $: {
-            name: child
-          }
-        });
+    for (const child of children) {
+      xml.node.node.push({
+        $: {
+          name: child
+        }
+      });
     }
 
     return xmlHeader + this._builder.buildObject(xml);
@@ -461,7 +461,7 @@ class MessageBus extends EventEmitter {
   }
 
   _addMatch (match) {
-    if (this._matchRules.hasOwnProperty(match)) {
+    if (Object.prototype.hasOwnProperty.call(match, this._matchRules)) {
       this._matchRules[match] += 1;
       return Promise.resolve();
     }
@@ -485,7 +485,7 @@ class MessageBus extends EventEmitter {
       return Promise.resolve();
     }
 
-    if (this._matchRules.hasOwnProperty(match)) {
+    if (Object.prototype.hasOwnProperty.call(match, this._matchRules)) {
       this._matchRules[match] -= 1;
       if (this._matchRules[match] > 0) {
         return Promise.resolve();

lib/connection.js

@@ -24,7 +24,7 @@ function createStream (opts) {
     const familyParams = address.split(':');
     const family = familyParams[0];
     const params = {};
-    familyParams[1].split(',').map(function (p) {
+    familyParams[1].split(',').forEach(function (p) {
       const keyVal = p.split('=');
       params[keyVal[0]] = keyVal[1];
     });

lib/dbus-buffer.js

@@ -22,8 +22,8 @@ function DBusBuffer (buffer, startPos, endian, options) {
 }
 
 DBusBuffer.prototype.align = function (power) {
-  var allbits = (1 << power) - 1;
-  var paddedOffset = ((this.pos + this.startPos + allbits) >> power) << power;
+  const allbits = (1 << power) - 1;
+  const paddedOffset = ((this.pos + this.startPos + allbits) >> power) << power;
   this.pos = paddedOffset - this.startPos;
 };
 
@@ -35,7 +35,7 @@ DBusBuffer.prototype.readInt8 = function () {
 DBusBuffer.prototype.readSInt16 = function () {
   this.align(1);
 
-  var res = (this.endian === LE
+  const res = (this.endian === LE
     ? this.buffer.readInt16LE(this.pos)
     : this.buffer.readInt16BE(this.pos));
 
@@ -46,7 +46,7 @@ DBusBuffer.prototype.readSInt16 = function () {
 DBusBuffer.prototype.readInt16 = function () {
   this.align(1);
 
-  var res = (this.endian === LE
+  const res = (this.endian === LE
     ? this.buffer.readUInt16LE(this.pos)
     : this.buffer.readUInt16BE(this.pos));
 
@@ -57,7 +57,7 @@ DBusBuffer.prototype.readInt16 = function () {
 DBusBuffer.prototype.readSInt32 = function () {
   this.align(2);
 
-  var res = (this.endian === LE
+  const res = (this.endian === LE
     ? this.buffer.readInt32LE(this.pos)
     : this.buffer.readInt32BE(this.pos));
 
@@ -68,7 +68,7 @@ DBusBuffer.prototype.readSInt32 = function () {
 DBusBuffer.prototype.readInt32 = function () {
   this.align(2);
 
-  var res = (this.endian === LE
+  const res = (this.endian === LE
     ? this.buffer.readUInt32LE(this.pos)
     : this.buffer.readUInt32BE(this.pos));
 
@@ -79,7 +79,7 @@ DBusBuffer.prototype.readInt32 = function () {
 DBusBuffer.prototype.readDouble = function () {
   this.align(3);
 
-  var res = (this.endian === LE
+  const res = (this.endian === LE
     ? this.buffer.readDoubleLE(this.pos)
     : this.buffer.readDoubleBE(this.pos));
 
@@ -92,7 +92,7 @@ DBusBuffer.prototype.readString = function (len) {
     this.pos++;
     return '';
   }
-  var res = this.buffer.toString('utf8', this.pos, this.pos + len);
+  const res = this.buffer.toString('utf8', this.pos, this.pos + len);
   this.pos += len + 1; // dbus strings are always zero-terminated ('s' and 'g' types)
   return res;
 };
@@ -105,9 +105,10 @@ DBusBuffer.prototype.readTree = function readTree (tree) {
       this.align(3);
       return this.readStruct(tree.child);
     case 'a':
-      if (!tree.child || tree.child.length !== 1) { throw new Error('Incorrect array element signature'); }
-      var arrayBlobLength = this.readInt32();
-      return this.readArray(tree.child[0], arrayBlobLength);
+      if (!tree.child || tree.child.length !== 1) {
+        throw new Error('Incorrect array element signature');
+      }
+      return this.readArray(tree.child[0], this.readInt32());
     case 'v':
       return this.readVariant();
     default:
@@ -116,27 +117,27 @@ DBusBuffer.prototype.readTree = function readTree (tree) {
 };
 
 DBusBuffer.prototype.read = function read (signature) {
-  var tree = parseSignature(signature);
+  const tree = parseSignature(signature);
   return this.readStruct(tree);
 };
 
 DBusBuffer.prototype.readVariant = function readVariant () {
-  var signature = this.readSimpleType('g');
-  var tree = parseSignature(signature);
+  const signature = this.readSimpleType('g');
+  const tree = parseSignature(signature);
   return [tree, this.readStruct(tree)];
 };
 
 DBusBuffer.prototype.readStruct = function readStruct (struct) {
-  var result = [];
-  for (var i = 0; i < struct.length; ++i) {
+  const result = [];
+  for (let i = 0; i < struct.length; ++i) {
     result.push(this.readTree(struct[i]));
   }
   return result;
 };
 
 DBusBuffer.prototype.readArray = function readArray (eleType, arrayBlobSize) {
-  var result;
-  var start = this.pos;
+  const result = [];
+  const start = this.pos;
 
   // special case: treat ay as Buffer
   if (eleType.type === 'y' && this.options.ayBuffer) {
@@ -147,15 +148,18 @@ DBusBuffer.prototype.readArray = function readArray (eleType, arrayBlobSize) {
   // end of array is start of first element + array size
   // we need to add 4 bytes if not on 8-byte boundary
   // and array element needs 8 byte alignment
-  if (['x', 't', 'd', '{', '(', 'r'].indexOf(eleType.type) !== -1) { this.align(3); }
-  var end = this.pos + arrayBlobSize;
-  result = [];
-  while (this.pos < end) result.push(this.readTree(eleType));
+  if (['x', 't', 'd', '{', '(', 'r'].indexOf(eleType.type) !== -1) {
+    this.align(3);
+  }
+  const end = this.pos + arrayBlobSize;
+  while (this.pos < end) {
+    result.push(this.readTree(eleType));
+  }
   return result;
 };
 
 DBusBuffer.prototype.readSimpleType = function readSimpleType (t) {
-  var len, word0, word1;
+  let len, word0, word1;
   switch (t) {
     case 'y':
       return this.readInt8();

lib/handshake.js

@@ -7,7 +7,7 @@ const constants = require('./constants');
 const readLine = require('./readline');
 
 function sha1 (input) {
-  var shasum = crypto.createHash('sha1');
+  const shasum = crypto.createHash('sha1');
   shasum.update(input);
   return shasum.digest('hex');
 }
@@ -18,11 +18,11 @@ function getUserHome () {
 
 function getCookie (context, id, cb) {
   // http://dbus.freedesktop.org/doc/dbus-specification.html#auth-mechanisms-sha
-  var dirname = path.join(getUserHome(), '.dbus-keyrings');
+  const dirname = path.join(getUserHome(), '.dbus-keyrings');
   // > There is a default context, "org_freedesktop_general" that's used by servers that do not specify otherwise.
   if (context.length === 0) context = 'org_freedesktop_general';
 
-  var filename = path.join(dirname, context);
+  const filename = path.join(dirname, context);
   // check it's not writable by others and readable by user
   fs.stat(dirname, function (err, stat) {
     if (err) return cb(err);
@@ -42,9 +42,9 @@ function getCookie (context, id, cb) {
     }
     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) {
-        var data = lines[l].split(' ');
+      const lines = keyrings.split('\n');
+      for (let l = 0; l < lines.length; ++l) {
+        const data = lines[l].split(' ');
         if (id === data[0]) return cb(null, data[2]);
       }
       return cb(new Error('cookie not found'));
@@ -58,7 +58,7 @@ function hexlify (input) {
 
 module.exports = function auth (stream, opts, cb) {
   // filter used to make a copy so we don't accidently change opts data
-  var authMethods;
+  let authMethods;
   if (opts.authMethods) {
     authMethods = opts.authMethods;
   } else {
@@ -73,13 +73,13 @@ function tryAuth (stream, methods, cb) {
     return cb(new Error('No authentication methods left to try'));
   }
 
-  var authMethod = methods.shift();
-  var uid = 'getuid' in process ? process.getuid() : 0;
-  var id = hexlify(uid);
+  const authMethod = methods.shift();
+  const uid = 'getuid' in process ? process.getuid() : 0;
+  const id = hexlify(uid);
 
   function beginOrNextAuth () {
     readLine(stream, function (line) {
-      var ok = line.toString('ascii').match(/^([A-Za-z]+) (.*)/);
+      const ok = line.toString('ascii').match(/^([A-Za-z]+) (.*)/);
       if (ok && ok[1] === 'OK') {
         stream.write('BEGIN\r\n');
         return cb(null, ok[2]); // ok[2] = guid. Do we need it?
@@ -102,7 +102,7 @@ function tryAuth (stream, methods, cb) {
     case 'DBUS_COOKIE_SHA1':
       stream.write(`AUTH ${authMethod} ${id}\r\n`);
       readLine(stream, function (line) {
-        var data = Buffer.from(
+        const data = Buffer.from(
           line
             .toString()
             .split(' ')[1]
@@ -111,17 +111,17 @@ function tryAuth (stream, methods, cb) {
         )
           .toString()
           .split(' ');
-        var cookieContext = data[0];
-        var cookieId = data[1];
-        var serverChallenge = data[2];
+        const cookieContext = data[0];
+        const cookieId = data[1];
+        const serverChallenge = data[2];
         // any random 16 bytes should work, sha1(rnd) to make it simplier
-        var clientChallenge = crypto.randomBytes(16).toString('hex');
+        const clientChallenge = crypto.randomBytes(16).toString('hex');
         getCookie(cookieContext, cookieId, function (err, cookie) {
           if (err) return cb(err);
-          var response = sha1(
+          const response = sha1(
             [serverChallenge, clientChallenge, cookie].join(':')
           );
-          var reply = hexlify(clientChallenge + response);
+          const reply = hexlify(clientChallenge + response);
           stream.write(`DATA ${reply}\r\n`);
           beginOrNextAuth();
         });