Update code to match scality guidelines

Author: benzekrimaha

index.js

@@ -1,4 +1,5 @@
-module.exports = {
-    hdcontroller: require('./lib/hdcontroller'),
-    shuffle: require('./lib/shuffle'),
-};
+import hdcontroller from './lib/hdcontroller';
+import shuffle from './lib/shuffle';
+
+export { hdcontroller, shuffle };
+

lib/RequestLogger.js

@@ -1,12 +1,12 @@
-'use strict'; // eslint-disable-line strict
-Object.defineProperty(exports, "__esModule", { value: true });
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
 exports.HDProxydClient = exports.HDProxydError = void 0;
-const assert = require("assert");
-const async = require("async");
-const http = require("http");
-const werelogs = require("werelogs");
-const httpagent_1 = require("httpagent");
-const shuffle_1 = require("./shuffle");
+const assert = require('assert');
+const async = require('async');
+const http = require('http');
+const werelogs = require('werelogs');
+const httpagent_1 = require('httpagent');
+const shuffle_1 = require('./shuffle');
 class HDProxydError extends Error {
     constructor() {
         super(...arguments);
@@ -19,7 +19,7 @@ exports.HDProxydError = HDProxydError;
  */
 function _createRequest(req, log, callback) {
     let callbackCalled = false;
-    const request = http.request(req, (response) => {
+    const request = http.request(req, response => {
         callbackCalled = true;
         // Get range returns a 206
         // Concurrent deletes on hdproxyd/immutable keys returns 423
@@ -33,14 +33,15 @@ function _createRequest(req, log, callback) {
             return callback(error);
         }
         return callback(undefined, response);
-    }).on('error', (err) => {
+    }).on('error', err => {
         if (!callbackCalled) {
             callbackCalled = true;
             return callback(err);
         }
         if (err.code !== 'ERR_SOCKET_TIMEOUT') {
             log.error('got socket error after response', { err });
         }
+        return null;
     });
     // disable nagle algorithm
     request.setNoDelay(true);
@@ -55,7 +56,7 @@ function _createRequest(req, log, callback) {
  * maintain.
  */
 function _parseBootstrapList(list) {
-    return list.map((value) => value.split(':'));
+    return list.map(value => value.split(':'));
 }
 class HDProxydClient {
     /**
@@ -144,9 +145,7 @@ class HDProxydClient {
         reqHeaders['X-Scal-Request-Uids'] = reqUids;
         reqHeaders['X-Scal-Trace-Ids'] = reqUids;
         if (params && params.range) {
-            /* eslint-disable dot-notation */
             reqHeaders.Range = `bytes=${params.range[0]}-${params.range[1]}`;
-            /* eslint-enable dot-notation */
         }
         let realPath;
         if (key === '/job/delete') {
@@ -199,7 +198,8 @@ class HDProxydClient {
      * creation and its sending.
      */
     _handleRequest(method, stream, size, key, log, callback, params, payload) {
-        const headers = params.headers ? params.headers : {};
+         
+        const headers = (params.headers ? params.headers : {});
         const req = this._createRequestHeader(method, headers, key, params, log);
         const host = this.getCurrentBootstrap();
         const isBatchDelete = key === '/job/delete';
@@ -227,7 +227,7 @@ class HDProxydClient {
                 contentLength: size,
             }));
             stream.pipe(request);
-            stream.on('error', (err) => {
+            stream.on('error', err => {
                 log.error('error from readable stream', {
                     error: err,
                     method: '_handleRequest',
@@ -278,9 +278,8 @@ class HDProxydClient {
                 return callback(new HDProxydError('no key returned'));
             }
             const key = response.headers['scal-key'];
-            response.on('end', () => {
-                return callback(undefined, key);
-            });
+            response.on('end', () => callback(undefined, key));
+            return null;
         }, params);
     }
     /**
@@ -332,7 +331,7 @@ class HDProxydClient {
      */
     batchDelete(list, reqUids, callback) {
         assert.strictEqual(typeof list, 'object');
-        assert(list.keys.every((k) => typeof k === 'string'));
+        assert(list.keys.every(k => typeof k === 'string'));
         // split the list into batches of 1000 each
         const batches = [];
         while (list.keys.length > 0) {
@@ -353,7 +352,7 @@ class HDProxydClient {
                     done(err);
                 }
             }, {}, payload);
-        }, (err) => {
+        }, err => {
             if (err) {
                 callback(err);
             }

lib/hdcontroller.js

@@ -1,8 +1,8 @@
-'use strict'; // eslint-disable-line strict
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.shuffle = void 0;
-const crypto = require("crypto");
-const randomBytes = crypto.randomBytes;
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.shuffle = shuffle;
+const cryptoLib = require('crypto');
+const randomBytes = cryptoLib.randomBytes;
 /*
  * This set of function allows us to create an efficient shuffle
  * of our array, since Math.random() will not be enough (32 bits of
@@ -23,7 +23,7 @@ function nextBytes(numBytes) {
         return randomBytes(numBytes);
     }
     catch (ex) {
-        throw new Error('Insufficient entropy');
+        throw new Error(`Insufficient entropy: ${ex instanceof Error ? ex.message : 'Unknown error'}`);
     }
 }
 /*
@@ -68,4 +68,3 @@ function shuffle(array) {
     }
     return array;
 }
-exports.shuffle = shuffle;

lib/shuffle.js

@@ -1,8 +1,3 @@
-/* eslint-disable strict */
-/* eslint-disable prefer-destructuring */
-/* eslint-disable no-bitwise */
-/* eslint-disable no-console */
-
 'use strict';
 
 /**
@@ -18,6 +13,7 @@
 
 import { createServer } from 'http';
 import { readFileSync } from 'fs';
+import * as werelogs from 'werelogs';
 
 import { hdcontroller } from '../index';
 
@@ -29,6 +25,8 @@ import { hdcontroller } from '../index';
 */
 let removeMemIndexOnDelete = true;
 
+const log = new werelogs.Logger('HDClient:Server');
+
 function getHyperdriveClient(config) {
     return new hdcontroller.HDProxydClient(config);
 }
@@ -162,7 +160,7 @@ function loadConfig(file) {
 function main() {
     const args = process.argv;
     if (args.length < 4) {
-        console.error(`Usage: <port> <conf path> <memindexnodel>
+        log.error(`Usage: <port> <conf path> <memindexnodel>
 {Number} port to listen on
 {String} path to HyperdriveClient json config
 {*}      don't remove in-memory keys on DELETE (used to check
@@ -183,7 +181,7 @@ function main() {
     const server = createServer(
         (req, res) => serverCallback(client, object2rawkey, req, res),
     );
-    server.listen(port, () => console.log('Listening on %d',
+    server.listen(port, () => log.info('Listening on %d',
         server.address().port));
     server.on('connection', socket => socket.setNoDelay(true));
 }