@wazo/sdk 0.41.1 → 0.41.2

package/lib/web-rtc-client.js

@@ -249,8 +249,8 @@ class WebRTCClient extends Emitter_1.default {
         return this.register();
     }
     onDisconnect(error) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             logger.info('sdk webrtc disconnected', { method: 'delegate.onConnect', clientId: this.clientId, error });
             this.connectionPromise = null;
             // The UA will attempt to reconnect automatically when an error occurred
@@ -266,9 +266,9 @@ class WebRTCClient extends Emitter_1.default {
             }
         });
     }
-    register(tries = 0) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    register() {
+        return __awaiter(this, arguments, void 0, function* (tries = 0) {
+            var _a;
             const logInfo = {
                 clientId: this.clientId,
                 userAgent: !!this.userAgent,
@@ -449,14 +449,10 @@ class WebRTCClient extends Emitter_1.default {
             conference,
             options,
         });
-        const inviterOptions = {
-            sessionDescriptionHandlerOptionsReInvite: {
+        const inviterOptions = Object.assign({ sessionDescriptionHandlerOptionsReInvite: {
                 conference,
                 audioOnly,
-            },
-            earlyMedia: true,
-            options,
-        };
+            }, earlyMedia: true }, options);
         if (audioOnly) {
             inviterOptions.sessionDescriptionHandlerModifiersReInvite = [modifiers_1.stripVideo];
         }
@@ -576,8 +572,8 @@ class WebRTCClient extends Emitter_1.default {
         });
     }
     getStats(session) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const pc = (_a = session.sessionDescriptionHandler) === null || _a === void 0 ? void 0 : _a.peerConnection;
             if (!pc) {
                 return null;
@@ -628,8 +624,8 @@ class WebRTCClient extends Emitter_1.default {
             }
         });
     }
-    close(force = false) {
-        return __awaiter(this, void 0, void 0, function* () {
+    close() {
+        return __awaiter(this, arguments, void 0, function* (force = false) {
             logger.info('sdk webrtc closing client', {
                 clientId: this.clientId,
                 userAgent: !!this.userAgent,
@@ -817,8 +813,8 @@ class WebRTCClient extends Emitter_1.default {
     }
     // Returns true if a re-INVITE is required
     upgradeToVideo(session, constraints, isConference) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const pc = (_a = session.sessionDescriptionHandler) === null || _a === void 0 ? void 0 : _a.peerConnection;
             // Check if a video sender already exists
             let videoSender;
@@ -875,8 +871,8 @@ class WebRTCClient extends Emitter_1.default {
             localStream.removeTrack(videoTrack);
         });
     }
-    getStreamFromConstraints(constraints, conference = false) {
-        return __awaiter(this, void 0, void 0, function* () {
+    getStreamFromConstraints(constraints_1) {
+        return __awaiter(this, arguments, void 0, function* (constraints, conference = false) {
             const video = constraints && constraints.video;
             const { constraints: newConstraints, } = this.getMediaConfiguration(video, conference, constraints);
             let newStream = null;
@@ -2032,9 +2028,9 @@ class WebRTCClient extends Emitter_1.default {
     _makeURI(target) {
         return user_agent_1.UserAgent.makeURI(`sip:${target}@${this.config.host}`);
     }
-    _disconnectTransport(force = false) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    _disconnectTransport() {
+        return __awaiter(this, arguments, void 0, function* (force = false) {
+            var _a;
             const transport = (_a = this.userAgent) === null || _a === void 0 ? void 0 : _a.transport;
             if (force && transport) {
                 // Bypass sip.js state machine that prevent to close WS with the state `Connecting`
@@ -2155,8 +2151,8 @@ class WebRTCClient extends Emitter_1.default {
             }
         });
     }
-    _accept(session, options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _accept(session_1) {
+        return __awaiter(this, arguments, void 0, function* (session, options = {}) {
             if (session.state === session_state_1.SessionState.Terminated || session.state === session_state_1.SessionState.Terminating) {
                 const error = 'Trying to accept a terminated sipSession.';
                 logger.warn(error, { state: session.state, sessionId: session.id });
@@ -2181,8 +2177,8 @@ class WebRTCClient extends Emitter_1.default {
             }
         });
     }
-    _reject(session, options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _reject(session_1) {
+        return __awaiter(this, arguments, void 0, function* (session, options = {}) {
             if (session.state !== session_state_1.SessionState.Initial && session.state !== session_state_1.SessionState.Establishing) {
                 logger.warn('Trying to reject a session in a wrong state', { state: session.state, sessionId: session.id });
                 return;
@@ -2200,8 +2196,8 @@ class WebRTCClient extends Emitter_1.default {
             }
         });
     }
-    _cancel(session, options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _cancel(session_1) {
+        return __awaiter(this, arguments, void 0, function* (session, options = {}) {
             if (session.state !== session_state_1.SessionState.Initial && session.state !== session_state_1.SessionState.Establishing) {
                 logger.warn('Trying to cancel a session in a wrong state', { state: session.state, sessionId: session.id });
                 return;
@@ -2214,8 +2210,8 @@ class WebRTCClient extends Emitter_1.default {
             }
         });
     }
-    _bye(session, options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _bye(session_1) {
+        return __awaiter(this, arguments, void 0, function* (session, options = {}) {
             if (session.state !== session_state_1.SessionState.Established) {
                 logger.warn('Trying to end a session in a wrong state', { state: session.state, sessionId: session.id });
                 return null;

package/lib/websocket-client.js

@@ -220,7 +220,7 @@ class WebSocketClient extends Emitter_1.default {
             logger.warn('Trying to close an already closed websocket, bailing.', { url: this._getUrl() });
             return;
         }
-        this.socket.close();
+        this.socket.close(1000);
         this.initialized = false;
         if (force) {
             this.host = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.41.1",
+  "version": "0.41.2",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "index.js",
   "types": "lib/types/index.d.ts",
@@ -51,26 +51,26 @@
     "fstream": "^1.0.12",
     "getstats": "wazo-platform/getStats#fix_stats_mobile",
     "google-libphonenumber": "^3.2.32",
-    "js-base64": "^3.7.5",
+    "js-base64": "^3.7.7",
     "json-to-graphql-query": "^2.2.5",
-    "jsrsasign": "^11.0.0",
-    "moment": "^2.29.1",
+    "jsrsasign": "^11.1.0",
+    "moment": "^2.30.1",
     "reconnecting-websocket": "^4.4.0",
-    "sdp-transform": "^2.14.1",
+    "sdp-transform": "^2.14.2",
     "sip.js": "^0.21.2",
     "webrtc-adapter": "^8.2.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.8",
-    "@babel/preset-env": "^7.22.7",
-    "@babel/preset-typescript": "^7.22.5",
-    "@rollup/plugin-commonjs": "^25.0.2",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.1.0",
-    "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.1.2",
-    "@types/events": "^3.0.0",
-    "@types/google-libphonenumber": "^7.4.23",
+    "@babel/core": "^7.24.4",
+    "@babel/preset-env": "^7.24.4",
+    "@babel/preset-typescript": "^7.24.1",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/events": "^3.0.3",
+    "@types/google-libphonenumber": "^7.4.30",
     "@types/jest": "^29.5.2",
     "@types/jsrsasign": "^10.5.8",
     "@types/node": "^20.4.0",
@@ -79,20 +79,23 @@
     "@typescript-eslint/parser": "^5.61.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "10.1.0",
-    "babel-loader": "^9.1.2",
+    "babel-loader": "^9.1.3",
     "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.6.1",
     "jsonlint": "^1.6.3",
     "prettier-eslint-cli": "^7.1.0",
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.5",
     "rollup": "^3.26.2",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.1.6"
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.4.5"
+  },
+  "resolutions": {
+    "underscore": "1.12.1"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/__tests__/api-client.test.ts

@@ -87,7 +87,9 @@ client.setToken(token);
 describe('With correct API results', () => {
   beforeEach(() => {
     jest.resetModules();
-    global.fetch = jest.fn(() => Promise.resolve(mockedJson)) as any;
+    Object.defineProperty(global, 'fetch', {
+      value: jest.fn(() => Promise.resolve(mockedJson) as any),
+    });
   });
 
   describe('logIn test', () => {
@@ -135,7 +137,9 @@ describe('With correct API results', () => {
 describe('With unAuthorized API results', () => {
   beforeEach(() => {
     jest.resetModules();
-    global.fetch = jest.fn(() => Promise.resolve(mockedUnAuthorized)) as any;
+    Object.defineProperty(global, 'fetch', {
+      value: jest.fn(() => Promise.resolve(mockedUnAuthorized) as any),
+    });
   });
 
   describe('checkLogin test', () => {
@@ -157,7 +161,9 @@ describe('With unAuthorized API results', () => {
 describe('With not found API results', () => {
   beforeEach(() => {
     jest.resetModules();
-    global.fetch = jest.fn(() => Promise.resolve(mockedNotFound)) as any;
+    Object.defineProperty(global, 'fetch', {
+      value: jest.fn(() => Promise.resolve(mockedNotFound) as any),
+    });
   });
 
   describe('fetchVoicemail test', () => {
@@ -192,7 +198,9 @@ describe('With not found API results', () => {
 describe('With erroneous text API results', () => {
   beforeEach(() => {
     jest.resetModules();
-    global.fetch = jest.fn(() => Promise.resolve(mockedTextError)) as any;
+    Object.defineProperty(global, 'fetch', {
+      value: jest.fn(() => Promise.resolve(mockedTextError) as any),
+    });
   });
 
   it('throw an exception when the response is >= 500', async () => {
@@ -217,7 +225,9 @@ describe('With erroneous text API results', () => {
 describe('With erroneous json API results', () => {
   beforeEach(() => {
     jest.resetModules();
-    global.fetch = jest.fn(() => Promise.resolve(mockedJsonError)) as any;
+    Object.defineProperty(global, 'fetch', {
+      value: jest.fn(() => Promise.resolve(mockedJsonError) as any),
+    });
   });
 
   it('throw an exception when the response is >= 500', async () => {

package/src/service/__tests__/IssueReporter.test.ts

@@ -24,7 +24,11 @@ describe('IssueReporter', () => {
   });
   beforeEach(() => {
     jest.resetAllMocks();
-    jest.spyOn(global, 'fetch');
+    Object.defineProperty(global, 'fetch', {
+      value: jest.fn(() => ({
+        catch: () => {},
+      })),
+    });
   });
   afterAll(() => {
     console.log = oldLog;

package/src/utils/__tests__/api-requester.test.ts

@@ -79,12 +79,14 @@ describe('Retrieving headers', () => {
 });
 describe('Calling fetch', () => {
   it('should call fetch without body but query string in get method', async () => {
-    global.fetch = jest.fn(() => Promise.resolve({
-      json: () => Promise.resolve({}),
-      headers: {
-        get: () => '',
-      },
-    })) as any;
+    Object.defineProperty(global, 'fetch', {
+      value: jest.fn(() => Promise.resolve({
+        json: () => Promise.resolve({}),
+        headers: {
+          get: () => '',
+        },
+      }) as any),
+    });
 
     await new ApiRequester({
       server,
@@ -107,17 +109,19 @@ describe('Calling fetch', () => {
 describe('With a refresh token', () => {
   it('should retry the call with a new token', async () => {
     let calls = 0;
+    Object.defineProperty(global, 'fetch', {
+      value: jest.fn(() => {
+        calls++;
+        return Promise.resolve({
+          headers: {
+            get: () => 'application/json',
+          },
+          status: calls === 1 ? 401 : 200,
+          json: () => Promise.resolve({}),
+        } as any);
+      }),
+    });
 
-    global.fetch = jest.fn(() => {
-      calls++;
-      return Promise.resolve({
-        headers: {
-          get: () => 'application/json',
-        },
-        status: calls === 1 ? 401 : 200,
-        json: () => Promise.resolve({}),
-      });
-    }) as any;
     const requester = new ApiRequester({
       server,
       agent: null,

package/src/web-rtc-client.ts

@@ -565,7 +565,7 @@ export default class WebRTCClient extends Emitter {
         audioOnly,
       },
       earlyMedia: true,
-      options,
+      ...options,
     };
 
     if (audioOnly) {

package/src/websocket-client.ts

@@ -277,7 +277,7 @@ class WebSocketClient extends Emitter {
       return;
     }
 
-    this.socket.close();
+    this.socket.close(1000);
     this.initialized = false;
 
     if (force) {