fix: removed dependency for node-requests (#311)

opentok · Oct 23, 2023 · 2e3c476 · 2e3c476
1 parent baa3f38
commit 2e3c476
Show file tree

Hide file tree

Showing 16 changed files with 2,088 additions and 4,756 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -5,6 +5,6 @@
     "brace-style": ["error", "stroustrup", { "allowSingleLine": true }],
     "no-param-reassign": ["off"],
     "func-names": ["off"],
-    no-plusplus: ["error", { "allowForLoopAfterthoughts": true }],
+    "no-plusplus": ["error", { "allowForLoopAfterthoughts": true }]
   }
-}
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node: [12.x, 14.x, 16.x, 18.x]
+        node: [16.x, 18.x, 20.x]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [12.x]
+        node: [18.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node }}
@@ -23,3 +23,5 @@ jobs:
       run: npm run report-coverage
     - name: Run codecov
       uses: codecov/codecov-action@v1
+      with:
+        files: ./mocha.lcov,./jasmine.lcov
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ sample/*/package-lock.json
 out/
 .nyc_output
 coverage.lcov
+mocha.lcov
+jasmine.lcov
diff --git a/lib/archiving.js b/lib/archiving.js
@@ -1,8 +1,8 @@
-var request = require('request');
 var errors = require('./errors');
 var pkg = require('../package.json');
 var _ = require('lodash');
 var generateJwt = require('./generateJwt');
+var fetch = require('node-fetch');
 
 // functions
 var api;
@@ -11,7 +11,7 @@ var generateHeaders = function generateHeaders(config) {
   return {
     'User-Agent': 'OpenTok-Node-SDK/' + pkg.version,
     'X-OPENTOK-AUTH': generateJwt(config),
-    Accept: 'application/json'
+    Accept: 'application/json',
   };
 };
 
@@ -191,17 +191,35 @@ function Archive(config, properties) {
 
 api = function (config, method, path, body, callback) {
   var rurl = config.apiEndpoint + '/v2/project/' + config.apiKey + path;
-  request.defaults(_.pick(config, 'proxy', 'timeout'))(
+
+  const headers = generateHeaders(config);
+
+  if (body && ['POST', 'PATCH', 'PUT'].includes(method)) {
+   headers['Content-Type'] = 'application/json';
+  }
+
+  Promise.resolve(fetch(
+    rurl,
     {
-      url: rurl,
       method: method,
-      headers: generateHeaders(config),
-      json: body
-    },
-    callback
-  );
+      body: body ? JSON.stringify(body) : null,
+      headers: headers,
+    }
+  ))
+    .then(async (response) => {
+      const otResponse = {
+        statusCode: response.status,
+      }
+      let body = await response.text();
+
+      callback(null, otResponse, body)
+    })
+    .catch(async (error) => {
+    callback(error);
+  });
 };
 
+
 exports.listArchives = function (config, options, callback) {
   var qs = [];
 
@@ -287,26 +305,32 @@ exports.startArchive = function (ot, config, sessionId, options, callback) {
     function startArchiveCallback(err, response, body) {
       if (err) {
         callback(err);
+        return;
       }
-      else if (response.statusCode !== 200) {
-        if (response && response.statusCode === 404) {
+      try {
+        body = JSON.parse(body);
+      } catch {}
+
+      switch (response.statusCode) {
+        case 404:
           callback(new errors.ArchiveError('Session not found'));
-        }
-        else if (response && response.statusCode === 403) {
+          return;
+        case 403:
           callback(new errors.AuthError('Invalid API key or secret'));
-        }
-        else if (response && response.statusCode === 409) {
+          return;
+        case 409:
           callback(new errors.ArchiveError('Recording already in progress or session not using OpenTok Media Router'));
-        }
-        else {
+          return;
+        case 200:
+          if (body.status !== 'started') {
+            callback(new errors.RequestError('Unexpected response from OpenTok: ' + JSON.stringify(body || { statusCode: response.statusCode, statusMessage: response.statusMessage })));
+            return;
+          }
+
+          callback(null, new Archive(config, body));
+          return;
+        default:
           callback(new errors.RequestError('Unexpected response from OpenTok: ' + JSON.stringify(body || { statusCode: response.statusCode, statusMessage: response.statusMessage })));
-        }
-      }
-      else if (body.status !== 'started') {
-        callback(new errors.RequestError('Unexpected response from OpenTok: ' + JSON.stringify(body || { statusCode: response.statusCode, statusMessage: response.statusMessage })));
-      }
-      else {
-        callback(null, new Archive(config, body));
       }
     }
   );
@@ -328,23 +352,30 @@ exports.stopArchive = function (config, archiveId, callback) {
     function stopArchiveCallback(err, response, body) {
       if (err) {
         callback(err);
+        return;
+      }
+
+      let responseJson = {};
+      try {
+        responseJson = JSON.parse(body);
+      } catch {
+
       }
-      else if (response.statusCode !== 200) {
-        if (response && response.statusCode === 404) {
+      switch (response?.statusCode) {
+        case 200:
+          callback(null, new Archive(config, responseJson));
+          break;
+        case 404:
           callback(new errors.ArchiveError('Archive not found'));
-        }
-        else if (response && response.statusCode === 409) {
-          callback(new errors.ArchiveError(body.message));
-        }
-        else if (response && response.statusCode === 403) {
+          break;
+        case 409:
+          callback(new errors.ArchiveError(responseJson.message));
+          break;
+        case 403:
           callback(new errors.AuthError('Invalid API key or secret'));
-        }
-        else {
-          callback(new errors.RequestError('Unexpected response from OpenTok: ' + JSON.stringify(body || { statusCode: response.statusCode, statusMessage: response.statusMessage })));
-        }
-      }
-      else {
-        callback(null, new Archive(config, body));
+          break;
+        default:
+          callback(new errors.RequestError('Unexpected response from OpenTok: ' + JSON.stringify({ statusCode: response.statusCode, statusMessage: response.statusMessage })));
       }
     }
   );
@@ -372,20 +403,21 @@ exports.getArchive = function (config, archiveId, callback) {
           err = _err;
         }
       }
-      if (err || response.statusCode !== 200) {
-        if (response && response.statusCode === 404) {
+
+      switch(response.statusCode) {
+        case 200:
+          callback(null, new Archive(config, body));
+          return;
+        case 404:
           callback(new errors.ArchiveError('Archive not found'));
-        }
-        else if (response && response.statusCode === 403) {
+          return;
+        case 403:
           callback(new errors.AuthError('Invalid API key or secret'));
-        }
-        else {
+          return;
+        default:
           callback(new errors.RequestError('Unexpected response from OpenTok: ' + JSON.stringify(body || { statusCode: response.statusCode, statusMessage: response.statusMessage })));
-        }
-      }
-      else {
-        callback(null, new Archive(config, body));
       }
+
     }
   );
 };
@@ -501,19 +533,19 @@ exports.deleteArchive = function (config, archiveId, callback) {
     '/archive/' + encodeURIComponent(archiveId),
     null,
     function deleteArchiveCallback(err, response, body) {
-      if (err || response.statusCode !== 204) {
-        if (response && response.statusCode === 404) {
+      switch (response.statusCode) {
+        case 204:
+          callback(null);
+          return;
+        case 404:
           callback(new errors.ArchiveError('Archive not found'));
-        }
-        else if (response && response.statusCode === 403) {
+          return
+        case 403:
           callback(new errors.AuthError('Invalid API key or secret'));
-        }
-        else {
+          return;
+        default:
           callback(new errors.RequestError('Unexpected response from OpenTok: ' + JSON.stringify(body || { statusCode: response.statusCode, statusMessage: response.statusMessage })));
-        }
-      }
-      else {
-        callback(null);
+          return;
       }
     }
   );