Upgrade codebase with safe es6 features

Author: btd

.eslintrc.yml

@@ -0,0 +1,29 @@
+env:
+  node: true
+
+parserOptions:
+  ecmaVersion: 6
+
+extends:
+  - eslint:recommended
+  - plugin:node/recommended
+
+rules:
+  valid-jsdoc: 0
+  func-style: 0
+  no-use-before-define: 0
+  camelcase: 1
+  no-unused-vars: 2
+  no-alert: 2
+  no-console: [2, { allow: ['warn', 'error'] }]
+  no-underscore-dangle: 0
+
+  strict: [2, 'global']
+  no-var: 2
+  prefer-arrow-callback: 2
+  prefer-const: 2
+  no-inner-declarations: 0
+  object-shorthand: [2, 'consistent-as-needed']
+  newline-per-chained-call: 2
+
+  node/no-deprecated-api: 0

.npmignore

@@ -1,2 +1,3 @@
 node_modules
 tmp
+test

lib/backoffs.js

@@ -1,13 +1,15 @@
-var _ = require('lodash');
+'use strict';
 
-var builtinStrategies = {
-  fixed: function(delay) {
+const _ = require('lodash');
+
+const builtinStrategies = {
+  fixed(delay) {
     return function() {
       return delay;
     };
   },
 
-  exponential: function(delay) {
+  exponential(delay) {
     return function(attemptsMade) {
       return Math.round((Math.pow(2, attemptsMade) - 1) * delay);
     };
@@ -29,7 +31,7 @@ function lookupStrategy(backoff, customStrategies) {
 }
 
 module.exports = {
-  normalize: function(backoff) {
+  normalize(backoff) {
     if (_.isFinite(backoff)) {
       return {
         type: 'fixed',
@@ -40,9 +42,9 @@ module.exports = {
     }
   },
 
-  calculate: function(backoff, attemptsMade, customStrategies, err) {
+  calculate(backoff, attemptsMade, customStrategies, err) {
     if (backoff) {
-      var strategy = lookupStrategy(backoff, customStrategies);
+      const strategy = lookupStrategy(backoff, customStrategies);
 
       return strategy(attemptsMade, err);
     }

lib/commands/index.js

@@ -12,27 +12,27 @@
  */
 'use strict';
 
-var fs = require('fs');
-var path = require('path');
-var promisify = require('util.promisify'); //TODO in node >= 8 could be removed
+const fs = require('fs');
+const path = require('path');
+const promisify = require('util.promisify'); //TODO in node >= 8 could be removed
 
-var utils = require('../utils');
+const utils = require('../utils');
 
 //TODO node >= 10 could be used require('fs').promises()
-var _fs = {
+const _fs = {
   readdirAsync: promisify(fs.readdir),
   readFileAsync: promisify(fs.readFile)
 };
 
 module.exports = (function() {
-  var scripts;
+  let scripts;
 
   return function(client) {
-    return utils.isRedisReady(client).then(function() {
+    return utils.isRedisReady(client).then(() => {
       scripts = scripts || loadScripts(__dirname);
 
-      return scripts.then(function(_scripts) {
-        return _scripts.forEach(function(command) {
+      return scripts.then(_scripts => {
+        return _scripts.forEach(command => {
           return client.defineCommand(command.name, command.options);
         });
       });
@@ -43,19 +43,19 @@ module.exports = (function() {
 function loadScripts(dir) {
   return _fs
     .readdirAsync(dir)
-    .then(function(files) {
-      return files.filter(function(file) {
+    .then(files => {
+      return files.filter(file => {
         return path.extname(file) === '.lua';
       });
     })
-    .then(function(files) {
+    .then(files => {
       return Promise.all(
-        files.map(function(file) {
-          var longName = path.basename(file, '.lua');
-          var name = longName.split('-')[0];
-          var numberOfKeys = parseInt(longName.split('-')[1]);
+        files.map(file => {
+          const longName = path.basename(file, '.lua');
+          const name = longName.split('-')[0];
+          const numberOfKeys = parseInt(longName.split('-')[1]);
 
-          return _fs.readFileAsync(path.join(dir, file)).then(function(lua) {
+          return _fs.readFileAsync(path.join(dir, file)).then(lua => {
             return {
               name: name,
               options: { numberOfKeys: numberOfKeys, lua: lua.toString() }

lib/getters.js

@@ -1,21 +1,18 @@
-/*eslint-env node */
 'use strict';
 
-var _ = require('lodash');
-var Job = require('./job');
+const _ = require('lodash');
+const Job = require('./job');
 
 module.exports = function(Queue) {
   Queue.prototype.getJob = function(jobId) {
     return Job.fromId(this, jobId);
   };
 
   Queue.prototype._commandByType = function(types, count, callback) {
-    var _this = this;
-
-    return _.map(types, function(type) {
+    return _.map(types, type => {
       type = type === 'waiting' ? 'wait' : type; // alias
 
-      var key = _this.toKey(type);
+      const key = this.toKey(type);
 
       switch (type) {
         case 'completed':
@@ -44,7 +41,7 @@ module.exports = function(Queue) {
   // Queue#getJobCountByTypes('completed', 'failed') => completed + failed count
   // Queue#getJobCountByTypes('completed,waiting', 'failed') => completed + waiting + failed count
   Queue.prototype.getJobCountByTypes = function() {
-    return this.getJobCounts.apply(this, arguments).then(function(result) {
+    return this.getJobCounts.apply(this, arguments).then(result => {
       return _.chain(result)
         .values()
         .sum()
@@ -57,16 +54,16 @@ module.exports = function(Queue) {
    *
    */
   Queue.prototype.getJobCounts = function() {
-    var types = parseTypeArg(arguments);
-    var multi = this.multi();
+    const types = parseTypeArg(arguments);
+    const multi = this.multi();
 
-    this._commandByType(types, true, function(key, command) {
+    this._commandByType(types, true, (key, command) => {
       multi[command](key);
     });
 
-    return multi.exec().then(function(res) {
-      var counts = {};
-      res.forEach(function(res, index) {
+    return multi.exec().then(res => {
+      const counts = {};
+      res.forEach((res, index) => {
         counts[types[index]] = res[1] || 0;
       });
       return counts;
@@ -119,15 +116,13 @@ module.exports = function(Queue) {
   };
 
   Queue.prototype.getRanges = function(types, start, end, asc) {
-    var _this = this;
-
     start = _.isUndefined(start) ? 0 : start;
     end = _.isUndefined(end) ? -1 : end;
 
-    var multi = this.multi();
-    var multiCommands = [];
+    const multi = this.multi();
+    const multiCommands = [];
 
-    _this._commandByType(parseTypeArg(types), false, function(key, command) {
+    this._commandByType(parseTypeArg(types), false, (key, command) => {
       switch (command) {
         case 'lrange':
           if (asc) {
@@ -148,11 +143,11 @@ module.exports = function(Queue) {
       }
     });
 
-    return multi.exec().then(function(responses) {
-      var results = [];
+    return multi.exec().then(responses => {
+      let results = [];
 
-      responses.forEach(function(response, index) {
-        var result = response[1] || [];
+      responses.forEach((response, index) => {
+        const result = response[1] || [];
 
         if (asc && multiCommands[index] === 'lrange') {
           results = results.concat(result.reverse());
@@ -165,15 +160,14 @@ module.exports = function(Queue) {
   };
 
   Queue.prototype.getJobs = function(types, start, end, asc) {
-    var _this = this;
-    return this.getRanges(types, start, end, asc).then(function(jobIds) {
-      return Promise.all(jobIds.map(_this.getJobFromId));
+    return this.getRanges(types, start, end, asc).then(jobIds => {
+      return Promise.all(jobIds.map(this.getJobFromId));
     });
   };
 };
 
 function parseTypeArg(args) {
-  var types = _.chain([])
+  const types = _.chain([])
     .concat(args)
     .join(',')
     .split(/\s*,\s*/g)