VIDEO-9282 - Migrate SDK from using node.js util.

.eslintrc.json

@@ -15,7 +15,8 @@
   ],
   "globals": {
     "Atomics": "readonly",
-    "SharedArrayBuffer": "readonly"
+    "SharedArrayBuffer": "readonly",
+    "globalThis": false
   },
   "parserOptions": {
     "ecmaVersion": 2018,

lib/media/track/es5/localaudiotrack.js

@@ -3,8 +3,7 @@
 // only in place so that we can support ES6 classes without requiring `new`.
 'use strict';
 
-const { inherits } = require('util');
-
+const inherits = require('../../../vendor/inherits');
 const LocalAudioTrackClass = require('../localaudiotrack');
 
 function LocalAudioTrack(mediaStreamTrack, options) {

lib/media/track/es5/localdatatrack.js

@@ -3,7 +3,7 @@
 // only in place so that we can support ES6 classes without requiring `new`.
 'use strict';
 
-const { inherits } = require('util');
+const inherits = require('../../../vendor/inherits');
 
 const LocalDataTrackClass = require('../localdatatrack');
 

lib/media/track/es5/localvideotrack.js

@@ -3,7 +3,7 @@
 // only in place so that we can support ES6 classes without requiring `new`.
 'use strict';
 
-const { inherits } = require('util');
+const inherits = require('../../../vendor/inherits');
 
 const LocalVideoTrackClass = require('../localvideotrack');
 

lib/signaling/v2/peerconnection.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const DefaultBackoff = require('backoff');
-
+const DefaultBackoff = require('../../vendor/backoff');
 const {
   RTCIceCandidate: DefaultRTCIceCandidate,
   RTCPeerConnection: DefaultRTCPeerConnection,
@@ -191,7 +190,8 @@ class PeerConnectionV2 extends StateMachine {
           false)
       },
       _iceRestartBackoff: {
-        value: options.Backoff.exponential(iceRestartBackoffConfig)
+        // eslint-disable-next-line new-cap
+        value: new options.Backoff(iceRestartBackoffConfig)
       },
       _instanceId: {
         value: ++nInstances
@@ -377,7 +377,6 @@ class PeerConnectionV2 extends StateMachine {
     peerConnection.addEventListener('icegatheringstatechange', this._handleIceGatheringStateChange.bind(this));
     peerConnection.addEventListener('signalingstatechange', this._handleSignalingStateChange.bind(this));
     peerConnection.addEventListener('track', this._handleTrackEvent.bind(this));
-    this._iceRestartBackoff.on('ready', () => this._initiateIceRestart());
 
     const self = this;
     this.on('stateChanged', function stateChanged(state) {
@@ -960,7 +959,9 @@ class PeerConnectionV2 extends StateMachine {
     }
     this._log.warn('An ICE restart has been scheduled');
     this._isIceRestartBackoffInProgress = true;
-    this._iceRestartBackoff.backoff();
+    setTimeout(() => {
+      this._initiateIceRestart();
+    }, this._iceRestartBackoff.duration());
   }
 
   /**

lib/signaling/v2/twilioconnectiontransport.js

@@ -2,7 +2,7 @@
 
 const StateMachine = require('../../statemachine');
 const TwilioConnection = require('../../twilioconnection');
-const DefaultBackoff = require('backoff');
+const DefaultBackoff = require('../../vendor/backoff');
 const { reconnectBackoffConfig } = require('../../util/constants');
 const Timeout = require('../../util/timeout');
 const { SDK_NAME, SDK_VERSION, SDP_FORMAT } = require('../../util/constants');
@@ -147,7 +147,7 @@ class TwilioConnectionTransport extends StateMachine {
         writable: true
       },
       _reconnectBackoff: {
-        value: options.Backoff.exponential(reconnectBackoffConfig)
+        value: new options.Backoff(reconnectBackoffConfig)
       },
       _session: {
         value: null,
@@ -377,8 +377,9 @@ class TwilioConnectionTransport extends StateMachine {
 
     // return promise that waits with exponential backoff.
     return new Promise(resolve => {
-      this._reconnectBackoff.once('ready', resolve);
-      this._reconnectBackoff.backoff();
+      setTimeout(() => {
+        resolve();
+      }, this._reconnectBackoff.duration());
     });
   }
 

lib/twilioconnection.js

@@ -61,7 +61,7 @@ const WS_CLOSE_BUSY_WAIT = 3005;
 const WS_CLOSE_SERVER_BUSY = 3006;
 const WS_CLOSE_OPEN_TIMEOUT = 3007;
 
-const toplevel = global.window || global;
+const toplevel = globalThis;
 const WebSocket = toplevel.WebSocket ? toplevel.WebSocket : require('ws');
 
 const CloseReason = {

lib/util/constants.js

@@ -60,16 +60,16 @@ module.exports.ICE_ACTIVITY_CHECK_PERIOD_MS = 1000;
 module.exports.ICE_INACTIVITY_THRESHOLD_MS = 3000;
 
 module.exports.iceRestartBackoffConfig = {
-  factor: 1.1,
-  initialDelay: 1,
-  maxDelay: module.exports.DEFAULT_SESSION_TIMEOUT_SEC * 1000,
-  randomisationFactor: 0.5
+  timeMultiple: 1.1,
+  min: 1,
+  max: module.exports.DEFAULT_SESSION_TIMEOUT_SEC * 1000,
+  jitter: 1
 };
 
 module.exports.reconnectBackoffConfig = {
-  factor: 1.5,
-  initialDelay: 80,
-  randomisationFactor: 0.5
+  timeMultiple: 1.5,
+  min: 80,
+  jitter: 1
 };
 
 module.exports.subscriptionMode = {

lib/util/insightspublisher/index.js

@@ -8,7 +8,7 @@ const MAX_RECONNECT_ATTEMPTS = 5;
 const RECONNECT_INTERVAL_MS = 50;
 const WS_CLOSE_NORMAL = 1000;
 
-const toplevel = global.window || global;
+const toplevel = globalThis;
 const WebSocket = toplevel.WebSocket ? toplevel.WebSocket : require('ws');
 const util = require('../../util');
 

lib/vendor/backoff.js

@@ -0,0 +1,54 @@
+
+/**
+ * Expose `Backoff`.
+ */
+
+module.exports = Backoff;
+
+/**
+  * Initialize backoff timer with `opts`.
+  *
+  * - `min` initial timeout in milliseconds [100]
+  * - `max` max timeout [10000]
+  * - `jitter` [0]
+  * - `factor` [2]
+  *
+  * @param {Object} opts
+  * @api public
+  */
+
+function Backoff(opts) {
+  opts = opts || {};
+  this.ms = opts.min || 100;
+  this.max = opts.max || 10000;
+  this.factor = opts.factor || 2;
+  this.jitter = opts.jitter > 0 && opts.jitter <= 1 ? opts.jitter : 0;
+  this.attempts = 0;
+}
+
+/**
+  * Return the backoff duration.
+  *
+  * @return {Number}
+  * @api public
+  */
+
+Backoff.prototype.duration = function() {
+  var ms = this.ms * Math.pow(this.factor, this.attempts++);
+  if (this.jitter) {
+    var rand =  Math.random();
+    var deviation = Math.floor(rand * this.jitter * ms);
+    ms = (Math.floor(rand * 10) & 1) === 0  ? ms - deviation : ms + deviation;
+  }
+  return Math.min(ms, this.max) | 0;
+};
+
+/**
+  * Reset the number of attempts.
+  *
+  * @api public
+  */
+
+Backoff.prototype.reset = function() {
+  this.attempts = 0;
+};

lib/vendor/inherits.js

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2011-2022 Isaac Z. Schlueter
+ * Licensed under the ISC License.
+ *
+ * Copied from https://github.com/isaacs/inherits (2.0.4)
+*/
+
+module.exports = function inherits(ctor, superCtor) {
+  if (ctor && superCtor) {
+    ctor.super_ = superCtor;
+    if (typeof Object.create === 'function') {
+      // implementation from standard node.js 'util' module
+      ctor.prototype = Object.create(superCtor.prototype, {
+        constructor: {
+          value: ctor,
+          enumerable: false,
+          writable: true,
+          configurable: true
+        }
+      });
+    } else {
+      // old school shim for old browsers
+      class TempCtor {
+        constructor() { }
+      }
+      TempCtor.prototype = superCtor.prototype;
+      ctor.prototype = new TempCtor();
+      ctor.prototype.constructor = ctor;
+    }
+  }
+};

lib/webrtc/rtcpeerconnection/chrome.js

@@ -3,7 +3,7 @@
 
 var ChromeRTCSessionDescription = require('../rtcsessiondescription/chrome');
 var EventTarget = require('../util/eventtarget');
-var inherits = require('util').inherits;
+var inherits = require('../../vendor/inherits');
 var Latch = require('../util/latch');
 var MediaStream = require('../mediastream');
 var RTCRtpSenderShim = require('../rtcrtpsender');

lib/webrtc/rtcpeerconnection/firefox.js

@@ -3,7 +3,7 @@
 
 var EventTarget = require('../util/eventtarget');
 var FirefoxRTCSessionDescription = require('../rtcsessiondescription/firefox');
-var inherits = require('util').inherits;
+var inherits = require('../../vendor/inherits');
 var updateTracksToSSRCs = require('../util/sdp').updateUnifiedPlanTrackIdsToSSRCs;
 var util = require('../util');
 

lib/webrtc/rtcpeerconnection/safari.js

@@ -2,7 +2,7 @@
 'use strict';
 
 var EventTarget = require('../util/eventtarget');
-var inherits = require('util').inherits;
+var inherits = require('../../vendor/inherits');
 var Latch = require('../util/latch');
 var sdpUtils = require('../util/sdp');
 var util = require('../util');

package.json

@@ -35,9 +35,9 @@
     "babel-cli": "^6.26.0",
     "babel-preset-es2015": "^6.24.1",
     "browserify": "^17.0.0",
-    "cheerio": "^0.22.0",
+    "cheerio": "^1.0.0-rc.10",
     "cors": "^2.8.5",
-    "electron": "^9.1.0",
+    "electron": "^17.2.0",
     "envify": "^4.0.0",
     "eslint": "^6.2.1",
     "eslint-config-standard": "^14.0.0",
@@ -47,21 +47,21 @@
     "eslint-plugin-standard": "^4.0.1",
     "express": "^4.16.2",
     "glob": "^7.1.7",
-    "ink-docstrap": "^1.3.2",
+    "ink-docstrap": "^0.5.4",
     "inquirer": "^7.0.0",
     "is-docker": "^2.0.0",
     "jsdoc": "^3.5.5",
     "jsdoc-babel": "^0.5.0",
     "json-loader": "^0.5.7",
-    "karma": "^5.0.2",
+    "karma": "^6.3.17",
     "karma-browserify": "^8.0.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-edgium-launcher": "^4.0.0-0",
     "karma-electron": "^6.1.0",
     "karma-firefox-launcher": "^1.3.0",
     "karma-htmlfile-reporter": "^0.3.8",
     "karma-junit-reporter": "^1.2.0",
-    "karma-mocha": "^1.3.0",
+    "karma-mocha": "^2.0.1",
     "karma-safari-launcher": "^1.0.0",
     "karma-spec-reporter": "0.0.32",
     "karma-typescript": "^5.5.1",
@@ -74,17 +74,17 @@
     "nyc": "^15.1.0",
     "requirejs": "^2.3.3",
     "rimraf": "^2.6.1",
-    "simple-git": "^1.126.0",
+    "simple-git": "^3.4.0",
     "sinon": "^4.0.1",
     "ts-node": "4.0.1",
     "tslint": "5.8.0",
     "twilio": "^3.49.0",
     "twilio-release-tool": "^1.0.2",
     "typescript": "4.2.2",
     "uglify-js": "^2.8.22",
-    "vinyl-fs": "^2.4.4",
+    "vinyl-fs": "^2.4.1",
     "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.11.1",
+    "watchify": "^4.0.0",
     "webrtc-adapter": "^7.7.1"
   },
   "engines": {
@@ -144,7 +144,6 @@
     "clean": "rimraf ./coverage ./es5 ./dist"
   },
   "dependencies": {
-    "backoff": "^2.5.0",
     "events": "^3.3.0",
     "util": "^0.12.4",
     "ws": "^7.4.6",

test/lib/webrtc/fakemediastream.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var inherits = require('util').inherits;
+var inherits = require('../../../lib/vendor/inherits');
 var randomName = require('./util').randomName;
 var EventTarget = require('../../../lib/webrtc/util/eventtarget');
 

test/unit/spec/signaling/v2/peerconnection.js

@@ -2650,14 +2650,11 @@ function makePeerConnectionV2(options) {
   const tracks = options.tracks || [{ kind: 'audio' }, { kind: 'video', getSettings }];
   tracks.forEach(track => pc.addTrack(track));
 
-  const Backoff = {
-    exponential() {
-      const backoff = new EventEmitter();
-      backoff.backoff = sinon.spy(() => backoff.emit('ready'));
-      backoff.reset = sinon.spy(() => {});
-      return backoff;
-    }
-  };
+  function Backoff(opts) {
+    opts = opts || {};
+    this.duration = function() { sinon.spy(() => {}); };
+    this.reset = function() { sinon.spy(() => {}); };
+  }
 
   function RTCPeerConnection() {
     return pc;

test/unit/spec/signaling/v2/twilioconnectiontransport.js

@@ -1700,6 +1700,12 @@ function createTwilioConnection(options) {
   return FakeTwilioConnection;
 }
 
+function Backoff(opts) {
+  opts = opts || {};
+  this.duration = function() { sinon.spy(() => {}); };
+  this.reset = function() { sinon.spy(() => {}); };
+}
+
 function makeTest(options) {
   options = options || {};
   options.eventObserver = options.eventObserver || new EventObserver(makeInsightsPublisher(), 0, log);
@@ -1719,14 +1725,14 @@ function makeTest(options) {
   options.onIced = options.onIced || sinon.spy(() => Promise.resolve());
   options.peerConnectionManager = options.peerConnectionManager || makePeerConnectionManager(options);
   options.TwilioConnection = options.TwilioConnection || createTwilioConnection(options);
+  options.Backoff = options.Backoff || Backoff;
   options.transport = options.transport || new TwilioConnectionTransport(
     options.name,
     options.accessToken,
     options.localParticipant,
     options.peerConnectionManager,
     options.wsServer,
     options);
-  options.twilioConnection = options.transport._twilioConnection;
   options.transitions = [];
   options.transport.on('stateChanged', state => {
     options.transitions.push(state);