@autofleet/node-common 1.7.3-beta-1 → 2.0.0

package/index.js

@@ -1,17 +1,7 @@
-const Network = require('./network');
-const Logger = require('./logger');
 const Settings = require('./settings');
-const client = require('./delorean-client');
 const Router = require('./router');
-const Queue = require('./queue');
 
 module.exports = {
-  Network,
-  Logger,
   Settings,
-  Delorean: {
-    client,
-  },
   Router,
-  Queue,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.7.3-beta-1",
+  "version": "2.0.0",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",
@@ -23,12 +23,9 @@
   },
   "homepage": "https://github.com/Autofleet/node-common",
   "dependencies": {
-    "@google-cloud/logging-winston": "^0.10.2",
-    "@google-cloud/pubsub": "^0.20.1",
-    "axios": "^0.21.1",
+    "axios": "^0.18.0",
     "axios-retry": "^3.1.0",
     "dotenv": "^5.0.1",
-    "event-pubsub": "^4.3.0",
     "express": "^4.16.2",
     "jest": "^22.4.4",
     "mock-socket": "^7.1.0",

package/delorean-client/index.js

@@ -1,52 +0,0 @@
-const tk = require('timekeeper');
-const WebSocket = require('ws');
-const Logger = require('../logger');
-
-const logger = Logger();
-
-const createWs = (host, resolve) => {
-  const ws = new WebSocket(`ws://${host}`);
-
-  ws.on('open', () => {
-    ws.send(JSON.stringify({ type: 'ping' }));
-    if (resolve) {
-      resolve(true);
-    }
-  });
-
-  ws.on('error', (error) => {
-    logger.error('ERROR', error);
-  });
-
-  ws.on('message', (data) => {
-    const jsonMsg = JSON.parse(data);
-
-    if (jsonMsg.type === 'freeze') {
-      logger.info('I know you just sent me back to the future, but I\'m back.I\'m back from the future.', { goingBackTo: jsonMsg.time });
-      tk.freeze(new Date(jsonMsg.time));
-    } else if (jsonMsg.type === 'travel') {
-      tk.travel(jsonMsg.time);
-    }
-  });
-
-  ws.on('close', () => {
-    setTimeout(() => {
-      if (process.env.TIME_TRAVEL_MS_SERVICE_HOST === host) {
-        createWs(host, null);
-      }
-    }, 500);
-  });
-};
-
-module.exports = () => new Promise((resolve) => {
-  const { TIME_TRAVEL_MS_SERVICE_HOST, SHOULD_TIME_TRAVEL } = process.env;
-  if (TIME_TRAVEL_MS_SERVICE_HOST && SHOULD_TIME_TRAVEL) {
-    logger.info('If my calculations are correct, when this baby hits 88 miles per hour... you\'re gonna see some serious shit.', {
-      TIME_TRAVEL_MS_SERVICE_HOST,
-    });
-
-    createWs(TIME_TRAVEL_MS_SERVICE_HOST, resolve);
-  } else {
-    resolve(false);
-  }
-});

package/delorean-client/index.test.js

@@ -1,105 +0,0 @@
-const tk = require('timekeeper');
-const deloreanClient = require('./index');
-const portfinder = require('portfinder');
-const WebSocket = require('ws');
-
-const { env } = process;
-
-const createUrl = async () => {
-  const port = await portfinder.getPortPromise();
-  return {
-    url: `127.0.0.1:${port}`,
-    port,
-  };
-};
-
-const mockServer = (port, time, type) => {
-  const wss = new WebSocket.Server({ port });
-  let gotPing = false;
-
-  wss.on('connection', (ws) => {
-    ws.on('message', (message) => {
-      const json = JSON.parse(message);
-      if (json.type === 'ping') {
-        gotPing = true;
-      }
-    });
-
-    ws.send(JSON.stringify({
-      type,
-      time,
-    }));
-  });
-
-  return {
-    close: () => wss.close(),
-    gotPing: () => gotPing,
-  };
-};
-
-describe('Logger', () => {
-  beforeEach(() => {
-    tk.reset();
-    env.SHOULD_TIME_TRAVEL = true;
-    env.TIME_TRAVEL_MS_SERVICE_HOST = '';
-  });
-
-  afterAll(() => {
-    env.SHOULD_TIME_TRAVEL = false;
-    env.TIME_TRAVEL_MS_SERVICE_HOST = '0';
-  });
-
-  test('Conects to server, sends ping an freeze time', async (done) => {
-    const { url, port } = await createUrl();
-    env.TIME_TRAVEL_MS_SERVICE_HOST = url;
-    const mockedDate = new Date('2013-10-08 12:32:50 +0530').getTime();
-    const { close, gotPing } = mockServer(port, mockedDate, 'freeze');
-    await deloreanClient();
-
-    setTimeout(() => {
-      expect(Date.now()).toEqual(mockedDate);
-      expect(gotPing()).toBeTruthy();
-      close();
-      done();
-    }, 100);
-  });
-
-  it('Conects to server, sends ping an freeze time', async (done) => {
-    const { url, port } = await createUrl();
-    env.TIME_TRAVEL_MS_SERVICE_HOST = url;
-    const mockedDate = new Date('2013-10-08 12:32:50 +0530').getTime();
-    const { close, gotPing } = mockServer(port, mockedDate, 'travel');
-    await deloreanClient();
-
-    setTimeout(() => {
-      expect(Date.now()).toBeGreaterThan(mockedDate);
-      expect(Date.now()).toBeLessThan(new Date('2013-10-08 13:32:50 +0530').getTime());
-      expect(gotPing()).toBeTruthy();
-      close();
-      done();
-    }, 100);
-  });
-
-  it('Wont start without TIME_TRAVEL_MS_SERVICE_HOST', async () => {
-    const { port } = await createUrl();
-    delete env.TIME_TRAVEL_MS_SERVICE_HOST;
-    const mockedDate = new Date('2013-10-08 12:32:50 +0530').getTime();
-    const { close } = mockServer(port, mockedDate, 'travel');
-    const result = await deloreanClient();
-
-    expect(result).toBeFalsy();
-    close();
-  });
-
-  it('Wont start without SHOULD_TIME_TRAVEL', async () => {
-    const { url, port } = await createUrl();
-    env.TIME_TRAVEL_MS_SERVICE_HOST = url;
-    delete env.SHOULD_TIME_TRAVEL;
-    const mockedDate = new Date('2013-10-08 12:32:50 +0530').getTime();
-    const { close } = mockServer(port, mockedDate, 'travel');
-    const result = await deloreanClient();
-
-    expect(result).toBeFalsy();
-    close();
-  });
-});

package/logger/example.js

@@ -1,5 +0,0 @@
-const logger = require('./index')();
-
-logger.info('it is working');
-logger.error('errors displayed in logs/error.log', { e: new Error('test error') });
-logger.debug('debug with object', { a: 5 });

package/logger/index.js

@@ -1,114 +0,0 @@
-const winston = require('winston');
-
-const { createLogger } = winston;
-require('dotenv').config();
-
-const { env } = process;
-
-const infoEnvNmaes = [
-  'production',
-  'staging',
-  'test',
-];
-
-const serializeError = (error) => {
-  const fields = ['code', 'status', 'statusCode', 'message', 'messageData', 'name', 'stack', 'stackTrace'];
-  return fields.reduce((v, field) => ({ ...v, [field]: error[field] }), {});
-};
-
-const getLevel = (logLevel) => {
-  if (logLevel) return logLevel;
-  if (env.LOG_LEVEL) return env.LOG_LEVEL;
-  if (infoEnvNmaes.includes(env.NODE_ENV)) return 'info';
-  if (env.NODE_ENV === 'development') return 'debug';
-  return 'debug';
-};
-
-const enumerateErrorFormat = winston.format((info) => {
-  if (info.message instanceof Error) {
-    info.message = Object.assign({ // eslint-disable-line
-      message: info.message.message,
-      stack: info.message.stack,
-    }, info.message);
-  }
-  if (info instanceof Error) {
-    return Object.assign({
-      message: info.message,
-      stack: info.stack,
-    }, info);
-  }
-
-  // eslint-disable-next-line array-callback-return
-  Object.keys(info).map((k) => {
-    if (info[k] instanceof Error) {
-      // eslint-disable-next-line no-param-reassign
-      info[k] = serializeError(info[k]);
-    }
-  });
-
-  return info;
-});
-
-const getFormat = () => {
-  if (env.NODE_ENV === 'production') {
-    return winston.format.combine(
-      enumerateErrorFormat(),
-      winston.format.json(),
-    );
-  }
-
-  return winston.format.combine(
-    enumerateErrorFormat(),
-    winston.format.splat(),
-    winston.format.colorize(),
-    winston.format.simple(),
-  );
-};
-
-const createLoggerInstance = (level, exceptionHandlers) => {
-  const transports = [new winston.transports.Console()];
-
-  const logger = createLogger({
-    level,
-    format: getFormat(),
-    transports,
-    exceptionHandlers,
-    exitOnError: false,
-  });
-
-  logger.httpMorganInfo = (options) => {
-    logger.info(options.url, {
-      httpRequest: {
-        status: options.status,
-        requestUrl: options.url,
-        requestMethod: options.method,
-        responseSize: options['content-length'],
-        latency: {
-          seconds: parseInt(options['response-time'], 10) / 1000,
-          nanos: parseInt(options['response-time'], 10) * 1000000,
-        },
-        userAgent: options['user-agent'],
-      },
-    });
-  };
-  if (env.NODE_ENV !== 'production') {
-    logger.httpMorganInfo = undefined;
-  }
-  return logger;
-};
-
-class LoggerInstanceManager {
-  static getLoggerInstance(logLevel) {
-    if (!LoggerInstanceManager.instances) {
-      LoggerInstanceManager.instances = {};
-    }
-    const level = getLevel(logLevel);
-    if (!LoggerInstanceManager.instances[level]) {
-      LoggerInstanceManager.instances[level] = createLoggerInstance(level);
-    }
-    return LoggerInstanceManager.instances[level];
-  }
-}
-
-
-module.exports = LoggerInstanceManager.getLoggerInstance;

package/logger/index.test.js

@@ -1,54 +0,0 @@
-const Logger = require('./index');
-
-const { env } = process;
-
-describe('Logger', () => {
-  it('it`s default level is info', () => {
-    env.NODE_ENV = '';
-    const logger = Logger();
-    expect(logger).toBeDefined();
-    expect(logger.level).toBe('debug');
-  });
-
-  it('its default develpment level is debug', () => {
-    env.NODE_ENV = 'development';
-    const logger = Logger();
-    expect(logger.level).toBe('debug');
-  });
-
-  it('its default test level is info', () => {
-    env.NODE_ENV = 'test';
-    const logger = Logger();
-    expect(logger.level).toBe('info');
-  });
-
-  it('its default production level is info', () => {
-    env.NODE_ENV = 'production';
-    const logger = Logger();
-    expect(logger.level).toBe('info');
-  });
-
-  it('its level can be override by LOG_LEVEL env variable', () => {
-    env.NODE_ENV = 'development';
-    env.LOG_LEVEL = 'warn';
-    const logger = Logger();
-    expect(logger.level).toBe('warn');
-  });
-
-  it('its level can be override by function variable', () => {
-    env.NODE_ENV = 'production';
-    env.LOG_LEVEL = 'warn';
-    const logger = Logger('silly');
-    expect(logger.level).toBe('silly');
-  });
-
-  it('its has functions for each level', () => {
-    const logger = Logger();
-    expect(logger.error).toBeFunction();
-    expect(logger.warn).toBeFunction();
-    expect(logger.info).toBeFunction();
-    expect(logger.verbose).toBeFunction();
-    expect(logger.debug).toBeFunction();
-    expect(logger.silly).toBeFunction();
-  });
-});

package/network/index.js

@@ -1,105 +0,0 @@
-const axios = require('axios');
-const axiosRetry = require('axios-retry');
-const Logger = require('../logger');
-const qs = require('qs');
-const httpAdapter = require('axios/lib/adapters/http');
-require('dotenv').config();
-/**
- * Add support for nock testing
- * see s://github.com/axios/axios/issues/305
- */
-if (process.env.NODE_ENV === 'test') {
-  axios.defaults.adapter = httpAdapter;
-}
-
-const HTTPMethods = [
-  'get',
-  'post',
-  'delete',
-  'head',
-  'put',
-  'patch',
-  'options',
-];
-
-const defaultSettings = {
-  timeout: 10000,
-  headers: { 'X-AF-AUTH': 'ANYONE' },
-  paramsSerializer: params => qs.stringify(params, { arrayFormat: 'brackets' }),
-};
-
-const getHttpRequestObject = response => ({
-  status: response.status ? response.status : undefined,
-  requestUrl: response.config ? response.config.url : undefined,
-  query: response.config ? response.config.params : undefined,
-  body: response.config ? response.config.data : undefined,
-  requestMethod: response.config ? response.config.method.toUpperCase() : undefined,
-  message: response.message ? response.message.toString() : undefined,
-  stack: response.stack ? response.stack.toString() : undefined,
-});
-
-module.exports = class Network {
-  constructor(settings = {}) {
-    this.settings = Object.assign({}, defaultSettings, settings);
-    this.createBaseUrl();
-
-    this.axios = axios.create(this.settings);
-    this.addRetry(settings);
-    this.buildClassHttpMethods();
-    this.addLogs();
-  }
-
-  addRetry(settings) {
-    axiosRetry(this.axios, {
-      retries: 0,
-      retryDelay: axiosRetry.exponentialDelay,
-      ...settings,
-    });
-  }
-
-  addLogs() {
-    const logger = Logger();
-    this.axios.interceptors.request.use((request) => {
-      logger.info(`Start Request: [${request.method.toUpperCase()}] ${request.baseURL} ${request.url}`, {
-        headers: request.headers,
-        query: request.params,
-        body: request.data,
-      });
-      return request;
-    });
-
-    this.axios.interceptors.response.use((response) => {
-      logger.info(`Finish Request: ${response.config.method.toUpperCase()} ${response.config.url}`, getHttpRequestObject(response));
-      return response;
-    }, (error) => {
-      logger.error('Finish Request with error', { data: error.response ? error.response.data : undefined, ...getHttpRequestObject(error.response || error) });
-      return error;
-    });
-  }
-
-  createBaseUrl() {
-    if (!this.settings.serviceUrl && !this.settings.serviceName) {
-      throw new Error('At least one of the settings Missing serviceUrl or serviceName');
-    }
-
-    const { settings } = this;
-    if (settings.serviceUrl) {
-      settings.baseURL = settings.serviceUrl;
-    } else if (settings.serviceName) {
-      const envServiceHostName = `${settings.serviceName}_SERVICE_HOST`;
-      settings.baseURL = `http://${process.env[envServiceHostName]}`;
-      if (!settings.baseURL) {
-        throw new Error(`Missing environment variable: ${envServiceHostName}`);
-      }
-    }
-  }
-
-  /**
-   * Build class methods that wrap axios methods
-   */
-  buildClassHttpMethods() {
-    HTTPMethods.forEach((method) => {
-      this[method] = (...args) => this.axios[method](...args);
-    });
-  }
-};

package/network/index.test.js

@@ -1,69 +0,0 @@
-const nock = require('nock');
-const Network = require('./index');
-
-nock('http://www.google.com')
-  .get('/resource')
-  .reply(200, { one: 1 });
-
-
-nock('https://www.apple.com')
-  .get('/resource')
-  .reply(200, { two: 2 });
-
-describe('Network', () => {
-  it('Making requests by service name from ENV', async () => {
-    process.env.TEST_SERVICE_HOST = 'www.google.com';
-    const n = new Network({ serviceName: 'TEST' });
-    const response = await n.get('/resource');
-    expect(response).toBeDefined();
-    expect(response.data).toBeDefined();
-    expect(response.data.one).toBe(1);
-  });
-
-  it('Making requests by service name from url', async () => {
-    const n = new Network({ serviceUrl: 'https://www.apple.com' });
-    const response = await n.get('/resource');
-    expect(response).toBeDefined();
-    expect(response.data).toBeDefined();
-    expect(response.data.two).toBe(2);
-  });
-
-  // it('Getting 404', async () => {
-  //   const n = new Network({ serviceUrl: 'https://github.com/' });
-
-  //   const action = async () => n.get('/404', {
-  //     query: {
-  //       a: 'b',
-  //     },
-  //   });
-
-  //   expect(action()).rejects.toThrow(Error);
-  // });
-
-  test('Retry 1 time', async () => {
-    nock('https://www.apple2.com')
-      .get('/resource')
-      .once()
-      .reply(500);
-
-
-    nock('https://www.apple2.com')
-      .get('/resource')
-      .once()
-      .reply(200, { two: 2 });
-
-    const n = new Network({ serviceUrl: 'https://www.apple2.com' });
-    const response = await n.get('/resource', {
-      query: {
-        a: 'b',
-      },
-      'axios-retry': {
-        retries: 1,
-      },
-    });
-
-    expect(response).toBeDefined();
-    expect(response.data).toBeDefined();
-    expect(response.data.two).toBe(2);
-  });
-});

package/queue/index.js

@@ -1,107 +0,0 @@
-const NodeResque = require('node-resque');
-const logger = require('../logger')();
-
-const redisBaseSettings = {
-  pkg: 'ioredis',
-  host: '127.0.0.1',
-  password: '',
-  port: 6379,
-  database: 0,
-  namespace: 'resque',
-};
-
-class AfQueue {
-  static redisParams(params) {
-    return Object.assign({}, redisBaseSettings, params);
-  }
-
-  constructor() {
-    this.inited = false;
-  }
-
-  async exitHandler() {
-    process.stdin.resume();
-
-    if (this.existing) {
-      return;
-    }
-
-    this.existing = true;
-    logger.info('Will remove AfQueue');
-
-    if (this.worker) {
-      await this.worker.end();
-    }
-
-    if (this.queue) {
-      await this.queue.end();
-    }
-
-    if (this.scheduler) {
-      await this.scheduler.end();
-    }
-
-    process.exit();
-  }
-
-  async init(connectionDetails, workerSettings, shouldCreateQueue = true) {
-    if (this.inited) {
-      throw new Error('AfQueue: Already inited');
-    }
-
-    const redisConf = Object.assign({}, redisBaseSettings, connectionDetails);
-    this.inited = true;
-    const promiseArr = [];
-    if (shouldCreateQueue) {
-      await this.startQueue(redisConf);
-      promiseArr.push(this.startScheduler(redisConf));
-    }
-
-    if (workerSettings) {
-      promiseArr.push(this.startWorker(redisConf, workerSettings));
-    }
-
-    process.on('SIGINT', this.exitHandler.bind(this));
-    process.on('SIGTERM', this.exitHandler.bind(this));
-
-    return Promise.all(promiseArr);
-  }
-
-  async getQueue() {
-    if (!this.queue) {
-      await this.startQueue();
-    }
-    return this.queue;
-  }
-
-  async startScheduler(connectionDetails) {
-    this.scheduler = new NodeResque.Scheduler({
-      connection: AfQueue.redisParams(connectionDetails),
-    });
-    await this.scheduler.connect();
-    this.scheduler.start();
-  }
-
-  async startQueue(connectionDetails) {
-    this.queue = new NodeResque.Queue({
-      connection: AfQueue.redisParams(connectionDetails),
-    });
-    await this.queue.connect();
-  }
-
-  async startWorker(connectionDetails, { queues, jobs }) {
-    this.worker = new NodeResque.MultiWorker({
-      connection: AfQueue.redisParams(connectionDetails),
-      queues,
-      minTaskProcessors: 1,
-      maxTaskProcessors: 10,
-      checkTimeout: 5000,
-      maxEventLoopDelay: 10,
-    }, jobs);
-
-    await this.worker.start();
-  }
-}
-
-
-module.exports = new AfQueue();