@voicenter-team/opensips-js 1.0.14 → 1.0.16

package/build/index.d.ts

@@ -12,6 +12,9 @@ export interface InnerState {
     activeCalls: {
         [key: string]: ICall;
     };
+    extendedCalls: {
+        [key: string]: ICall;
+    };
     activeRooms: {
         [key: number]: IRoom;
     };
@@ -45,6 +48,7 @@ declare class OpenSIPSJS extends UA {
     private readonly options;
     private readonly newRTCSessionEventName;
     private readonly activeCalls;
+    private readonly extendedCalls;
     private _currentActiveRoomId;
     private _callAddingInProgress;
     private state;

package/build/index.js

@@ -26,7 +26,6 @@ const STORAGE_KEYS = {
     SELECTED_INPUT_DEVICE: 'selectedInputDevice',
     SELECTED_OUTPUT_DEVICE: 'selectedOutputDevice'
 };
-const activeCalls = {};
 class OpenSIPSJS extends UA_1.default {
     constructor(options) {
         const configuration = Object.assign(Object.assign({}, options.configuration), { sockets: options.socketInterfaces.map(sock => new jssip_1.default.WebSocketInterface(sock)) });
@@ -34,10 +33,12 @@ class OpenSIPSJS extends UA_1.default {
         this.initialized = false;
         this.newRTCSessionEventName = 'newRTCSession';
         this.activeCalls = {};
+        this.extendedCalls = {};
         this.state = {
             isMuted: false,
             isAutoAnswer: false,
             activeCalls: {},
+            extendedCalls: {},
             availableMediaDevices: [],
             selectedMediaDevices: {
                 input: 'default',
@@ -115,7 +116,7 @@ class OpenSIPSJS extends UA_1.default {
     }
     set speakerVolume(value) {
         this.state.speakerVolume = value;
-        Object.values(activeCalls).forEach((call) => {
+        Object.values(this.state.extendedCalls).forEach((call) => {
             if (call.audioTag) {
                 call.audioTag.volume = value;
             }
@@ -248,7 +249,7 @@ class OpenSIPSJS extends UA_1.default {
         if (!validation_regex.test(value)) {
             throw new Error('Not allowed character in DTMF input');
         }
-        const call = activeCalls[callId];
+        const call = this.state.extendedCalls[callId];
         call.sendDTMF(value);
     }
     doMute(value) {
@@ -260,7 +261,7 @@ class OpenSIPSJS extends UA_1.default {
         return super.sendMessage(`sip:${target}@${this.sipDomain}`, body, options);
     }
     doCallHold({ callId, toHold, automatic }) {
-        const call = activeCalls[callId];
+        const call = this.state.extendedCalls[callId];
         call._automaticHold = automatic !== null && automatic !== void 0 ? automatic : false;
         if (toHold) {
             call.hold();
@@ -276,7 +277,7 @@ class OpenSIPSJS extends UA_1.default {
         }).forEach(call => this.callTerminate(call._id));
     }
     callAnswer(callId) {
-        const call = activeCalls[callId];
+        const call = this.state.extendedCalls[callId];
         this._cancelAllOutgoingUnanswered();
         call.answer(this.sipOptions);
         this.updateCall(call);
@@ -305,7 +306,11 @@ class OpenSIPSJS extends UA_1.default {
     }
     _addCall(value, emitEvent = true) {
         this.state.activeCalls = Object.assign(Object.assign({}, this.state.activeCalls), { [value._id]: (0, audio_helper_1.simplifyCallObject)(value) });
-        activeCalls[value._id] = value;
+        /*this.state.extendedCalls = {
+            ...this.state.extendedCalls,
+            [value._id]: value
+        }*/
+        this.state.extendedCalls[value._id] = value;
         if (emitEvent) {
             this.emit('changeActiveCalls', this.state.activeCalls);
         }
@@ -316,6 +321,7 @@ class OpenSIPSJS extends UA_1.default {
                 isTransferring: false,
                 isMerging: false
             } });
+        this.emit('changeCallStatus', this.state.callStatus);
     }
     _updateCallStatus(value) {
         const prevStatus = Object.assign({}, this.state.callStatus[value.callId]);
@@ -330,11 +336,13 @@ class OpenSIPSJS extends UA_1.default {
             newStatus.isMerging = value.isMerging;
         }
         this.state.callStatus = Object.assign(Object.assign({}, this.state.callStatus), { [value.callId]: Object.assign({}, newStatus) });
+        this.emit('changeCallStatus', this.state.callStatus);
     }
     _removeCallStatus(callId) {
         const callStatusCopy = Object.assign({}, this.state.callStatus);
         delete callStatusCopy[callId];
         this.state.callStatus = Object.assign({}, callStatusCopy);
+        this.emit('changeCallStatus', this.state.callStatus);
     }
     _addRoom(value) {
         this.state.activeRooms = Object.assign(Object.assign({}, this.state.activeRooms), { [value.roomId]: value });
@@ -356,7 +364,7 @@ class OpenSIPSJS extends UA_1.default {
             if (Object.keys(this.getActiveCalls).length === 0) {
                 return;
             }
-            const callsInCurrentRoom = Object.values(activeCalls).filter(call => call.roomId === this.currentActiveRoomId);
+            const callsInCurrentRoom = Object.values(this.state.extendedCalls).filter(call => call.roomId === this.currentActiveRoomId);
             if (callsInCurrentRoom.length === 1) {
                 Object.values(callsInCurrentRoom).forEach(call => {
                     const processedStream = (0, audio_helper_1.processAudioVolume)(stream, this.microphoneInputLevel);
@@ -381,7 +389,7 @@ class OpenSIPSJS extends UA_1.default {
                 return;
             }
             this.selectedOutputDevice = dId;
-            const activeCallList = Object.values(activeCalls);
+            const activeCallList = Object.values(this.state.extendedCalls);
             if (activeCallList.length === 0) {
                 return;
             }
@@ -409,7 +417,7 @@ class OpenSIPSJS extends UA_1.default {
         if (roomId === undefined) {
             return;
         }
-        if (Object.values(activeCalls).filter(call => call.roomId === roomId).length === 0) {
+        if (Object.values(this.state.extendedCalls).filter(call => call.roomId === roomId).length === 0) {
             this.removeRoom(roomId);
             if (this.currentActiveRoomId === roomId) {
                 this.currentActiveRoomId = undefined;
@@ -434,7 +442,7 @@ class OpenSIPSJS extends UA_1.default {
             if (roomId === undefined) {
                 return;
             }
-            const callsInRoom = Object.values(activeCalls).filter(call => call.roomId === roomId);
+            const callsInRoom = Object.values(this.state.extendedCalls).filter(call => call.roomId === roomId);
             // Let`s take care on the audio output first and check if passed room is our selected room
             if (this.currentActiveRoomId === roomId) {
                 callsInRoom.forEach(call => {
@@ -547,7 +555,7 @@ class OpenSIPSJS extends UA_1.default {
         }
     }
     muteCaller(callId, value) {
-        const call = activeCalls[callId];
+        const call = this.state.extendedCalls[callId];
         if (call && call.connection.getReceivers().length) {
             call.localMuted = value;
             call.connection.getReceivers().forEach((receiver) => {
@@ -558,7 +566,7 @@ class OpenSIPSJS extends UA_1.default {
         }
     }
     callTerminate(callId) {
-        const call = activeCalls[callId];
+        const call = this.state.extendedCalls[callId];
         if (call._status !== 8) {
             call.terminate();
         }
@@ -567,10 +575,8 @@ class OpenSIPSJS extends UA_1.default {
         if (target.toString().length === 0) {
             return console.error('Target must be passed');
         }
-        const call = activeCalls[callId];
-        console.log('callTransfer', call);
+        const call = this.state.extendedCalls[callId];
         if (!call._is_confirmed && !call._is_canceled) {
-            console.log('refer', `sip:${target}@${this.sipDomain}`);
             call.refer(`sip:${target}@${this.sipDomain}`);
             return;
         }
@@ -579,7 +585,7 @@ class OpenSIPSJS extends UA_1.default {
         this.updateCall(call);
     }
     callMerge(roomId) {
-        const callsInRoom = Object.values(activeCalls).filter((call) => call.roomId === roomId);
+        const callsInRoom = Object.values(this.state.extendedCalls).filter((call) => call.roomId === roomId);
         if (callsInRoom.length !== 2)
             return;
         const firstCall = callsInRoom[0];
@@ -707,12 +713,15 @@ class OpenSIPSJS extends UA_1.default {
     _removeCall(value) {
         const stateActiveCallsCopy = Object.assign({}, this.state.activeCalls);
         delete stateActiveCallsCopy[value];
-        delete activeCalls[value];
+        // delete activeCalls[value]
         this.state.activeCalls = Object.assign({}, stateActiveCallsCopy);
+        const stateExtendedCallsCopy = Object.assign({}, this.state.extendedCalls);
+        delete stateExtendedCallsCopy[value];
+        this.state.extendedCalls = Object.assign({}, stateExtendedCallsCopy);
         this.emit('changeActiveCalls', this.state.activeCalls);
     }
     _activeCallListRemove(call) {
-        const callRoomIdToConfigure = activeCalls[call._id].roomId;
+        const callRoomIdToConfigure = this.state.extendedCalls[call._id].roomId;
         this._removeCall(call._id);
         this.roomReconfigure(callRoomIdToConfigure);
     }
@@ -732,7 +741,7 @@ class OpenSIPSJS extends UA_1.default {
             this._stopCallTimer(session.id);
             this._removeCallStatus(session.id);
             this._removeCallMetrics(session.id);
-            if (!Object.keys(activeCalls).length) {
+            if (!Object.keys(this.state.extendedCalls).length) {
                 this.isMuted = false;
             }
         });
@@ -751,7 +760,7 @@ class OpenSIPSJS extends UA_1.default {
             this._stopCallTimer(session.id);
             this._removeCallStatus(session.id);
             this._removeCallMetrics(session.id);
-            if (!Object.keys(activeCalls).length) {
+            if (!Object.keys(this.state.extendedCalls).length) {
                 this.isMuted = false;
             }
         });
@@ -768,14 +777,46 @@ class OpenSIPSJS extends UA_1.default {
             this.setCurrentActiveRoomId(roomId);
         }
     }
-    setInitialized() {
-        this.initialized = true;
-        this.emit('ready', true);
+    setInitialized(value) {
+        this.initialized = value;
+        this.emit('ready', value);
     }
     start() {
+        this.on('connecting', (res) => {
+            console.log('ON connecting', res);
+        });
+        this.on('connected', (res) => {
+            console.log('ON connected', res);
+        });
+        this.on('disconnected', (res) => {
+            console.log('ON disconnected', res);
+        });
+        this.on('registered', (res) => {
+            this.setInitialized(true);
+            console.log('ON registered', res);
+        });
+        this.on('unregistered', (res) => {
+            this.setInitialized(false);
+            console.log('ON unregistered', res);
+        });
+        this.on('registrationFailed', (res) => {
+            console.log('ON registrationFailed', res);
+        });
+        this.on('registrationExpiring', (res) => {
+            console.log('ON registrationExpiring', res);
+        });
+        this.on('newMessage', (res) => {
+            console.log('ON newMessage', res);
+        });
+        this.on('sipEvent', (res) => {
+            console.log('ON sipEvent', res);
+        });
+        this.on('newOptions', (res) => {
+            console.log('ON newOptions', res);
+        });
         this.on(this.newRTCSessionEventName, this.newRTCSessionCallback.bind(this));
         super.start();
-        this.setInitialized();
+        //this.setInitialized()
         //this.setDefaultMediaDevices()
         this.setMediaDevices(true);
         return this;
@@ -863,8 +904,8 @@ class OpenSIPSJS extends UA_1.default {
     }
     callChangeRoom({ callId, roomId }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const oldRoomId = activeCalls[callId].roomId;
-            activeCalls[callId].roomId = roomId;
+            const oldRoomId = this.state.extendedCalls[callId].roomId;
+            this.state.extendedCalls[callId].roomId = roomId;
             yield this.setCurrentActiveRoomId(roomId);
             return Promise.all([
                 this.roomReconfigure(oldRoomId),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voicenter-team/opensips-js",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "The JS package for opensips",
   "default": "src/index.ts",
   "main": "build/index.js",

package/src/types/listeners.d.ts

@@ -1,4 +1,4 @@
-import { ICall, RoomChangeEmitType } from '@/types/rtc'
+import { ICall, RoomChangeEmitType, ICallStatus } from '@/types/rtc'
 import { UAEventMap } from 'jssip/lib/UA'
 
 export type readyListener = (value: boolean) => void
@@ -17,6 +17,7 @@ export type changeOriginalStreamListener = (value: MediaStream) => void
 export type addRoomListener = (value: RoomChangeEmitType) => void
 export type updateRoomListener = (value: RoomChangeEmitType) => void
 export type removeRoomListener = (value: RoomChangeEmitType) => void
+export type changeCallStatusListener = (event: { [key: string]: ICallStatus }) => void
 
 export interface OpenSIPSEventMap extends UAEventMap {
     ready: readyListener
@@ -35,6 +36,7 @@ export interface OpenSIPSEventMap extends UAEventMap {
     addRoom: addRoomListener
     updateRoom: updateRoomListener
     removeRoom: removeRoomListener
+    changeCallStatus: changeCallStatusListener
 }
 
 export type ListenersKeyType = keyof OpenSIPSEventMap