Refactor/req to fetch (#49)

* refactor(request): refactor to fetch

* refactor(request): remove request dep

* refactor(request): fix yarn lock

* refactor(request): run yarn audit fix

Author: dogpatch626

__mocks__/request.js __mocks__/node-fetch.js__mocks__/request.js renamed to __mocks__/node-fetch.js

@@ -14,28 +14,29 @@
 
 const instances = [];
 
-const request = jest.fn((config) => {
+const fetch = jest.fn((url, config) => {
   const reqInstance = {
     mockRequest: true,
     config,
     events: {},
   };
-  reqInstance.on = jest.fn((event, cb) => {
+  reqInstance.catch = jest.fn((cb) => {
+    const event = 'error';
     reqInstance.events[event] = reqInstance.events[event] || [];
     reqInstance.events[event].push(cb);
     return reqInstance;
   });
   reqInstance.emit = jest.fn((event, data) => {
     (reqInstance.events[event] || []).forEach((cb) => cb(data));
   });
-  reqInstance.pipe = jest.fn((s) => s);
+  reqInstance.pipe = jest.fn((s) => Promise.resolve(s));
   instances.push(reqInstance);
   return reqInstance;
 });
 
-request.__resetRequests = () => { // eslint-disable-line no-underscore-dangle
+fetch.__resetRequests = () => { // eslint-disable-line no-underscore-dangle
   instances.splice(0, Infinity);
 };
-request.__getRequest = (n) => instances[n]; // eslint-disable-line no-underscore-dangle
+fetch.__getRequest = (n) => Promise.resolve(instances[n]); // eslint-disable-line no-underscore-dangle, max-len
 
-module.exports = request;
+module.exports = fetch;

__tests__/src/middleware.spec.js

@@ -12,15 +12,15 @@
  * under the License.
  */
 
-import request from 'request';
+import fetch from 'node-fetch';
 import chalk from 'chalk';
 import {
   setRemoteUrl,
   pipe,
 } from '../../src/middleware';
 
-jest.mock('request');
 jest.mock('chalk', () => ({ red: jest.fn((s) => `<red>${s}</red>`) }));
+jest.mock('node-fetch');
 
 describe('setRemoteUrl', () => {
   it('should build the remote URL for the request and attach it to the request', () => new Promise((done) => {
@@ -47,8 +47,8 @@ describe('pipe', () => {
   const res = { data: 'data' };
 
   beforeEach(() => {
-    request.__resetRequests(); // eslint-disable-line no-underscore-dangle
-    request.mockClear();
+    fetch.__resetRequests(); // eslint-disable-line no-underscore-dangle
+    fetch.mockClear();
     req.pipe.mockClear();
   });
 
@@ -58,22 +58,22 @@ describe('pipe', () => {
     expect(req.headers.referer).toBe(undefined);
   });
 
-  it('should pipe request', () => {
+  it('should pipe request', async () => {
     pipe(false)(req, res);
-    const reqInstance = request.__getRequest(0); // eslint-disable-line no-underscore-dangle
-    expect(req.pipe).toBeCalledWith(reqInstance);
+    const reqInstance = await fetch.__getRequest(0); // eslint-disable-line no-underscore-dangle
+    expect(req.pipe).toHaveBeenCalledWith(reqInstance);
   });
 
-  it('should pipe response', () => {
+  it('should pipe response', async () => {
     pipe(false)(req, res);
-    const reqInstance = request.__getRequest(0); // eslint-disable-line no-underscore-dangle
+    const reqInstance = await fetch.__getRequest(0); // eslint-disable-line no-underscore-dangle
     expect(reqInstance.pipe).toBeCalledWith(res);
   });
 
-  it('should show a message when there is a socket error', () => {
+  it('should show a message when there is a socket error', async () => {
     jest.spyOn(console, 'error').mockImplementation(() => 0);
     pipe(false)(req, res);
-    const reqInstance = request.__getRequest(0); // eslint-disable-line no-underscore-dangle
+    const reqInstance = await fetch.__getRequest(0); // eslint-disable-line no-underscore-dangle
     reqInstance.emit('error', new Error('test error like socket timeout'));
     expect(chalk.red).toHaveBeenCalled();
     expect(console.error).toHaveBeenCalled();

package.json

@@ -58,7 +58,7 @@
     "chalk": "^3.0.0",
     "cors": "^2.8.3",
     "express": "^4.15.2",
-    "request": "^2.88.2",
+    "node-fetch": "2.6.7",
     "rimraf": "^2.6.1",
     "yargs": "^15.4.1"
   },

src/middleware.js

@@ -13,29 +13,28 @@
  */
 
 /* eslint-disable no-param-reassign */
-import request from 'request';
+import fetch from 'node-fetch';
 import chalk from 'chalk';
 
 export const setRemoteUrl = (remoteBaseUrl) => (req, res, next) => {
   req.remoteUrl = `${remoteBaseUrl}${req.originalUrl.slice(req.baseUrl.length)}`;
   next();
 };
 
-export const pipe = () => (req, res) => {
+export const pipe = () => async (req, res) => {
   // avoid copying the request
   delete req.headers.origin;
   delete req.headers.referer;
 
   const config = {
     method: req.method,
-    url: req.remoteUrl,
     rejectUnauthorized: false,
   };
 
   return req
     .pipe(
-      request(config)
-        .on('error', (err) => {
+      await fetch(req.remoteUrl, config)
+        .catch((err) => {
           console.error(`${chalk.red(`request to ${req.remoteUrl} failed:`)} ${err.message}`);
         })
     )