@exotel-npm-dev/webrtc-client-sdk 2.0.5 → 3.0.2

package/src/listeners/ExotelVoiceClientListener.js

@@ -1,16 +1,21 @@
-import { registerCallback } from "./Callback";
 import { diagnosticsCallback } from "./Callback";
 
 export class ExotelVoiceClientListener {
+
+    registerCallback  = null;
+    constructor(registerCallback) {
+        this.registerCallback = registerCallback;
+
+    }
     onInitializationSuccess(phone) {
         /**
          * Abstract class for Initialization Success
          */
-        registerCallback.initializeRegister("registered", phone);
+        this.registerCallback.initializeRegister("registered", phone);
         /**
          * Triggers UI callback to indicate the status of the registered phone
          */
-        registerCallback.triggerRegisterCallback();
+        this.registerCallback.triggerRegisterCallback();
         diagnosticsCallback.triggerKeyValueSetCallback("userReg", "registered", phone);
     }
 
@@ -18,8 +23,8 @@ export class ExotelVoiceClientListener {
         /**
          * If register fails send error message to Callback function 
          */
-        registerCallback.initializeRegister("unregistered", phone);
-        registerCallback.triggerRegisterCallback();
+        this.registerCallback.initializeRegister("unregistered", phone);
+        this.registerCallback.triggerRegisterCallback();
         diagnosticsCallback.triggerKeyValueSetCallback("userReg", "unregistered", phone);
     }
 
@@ -27,11 +32,17 @@ export class ExotelVoiceClientListener {
         /**
          * If register fails send error message to Callback function 
          */
-        registerCallback.initializeRegister("sent_request", phone);
-        registerCallback.triggerRegisterCallback();
+        this.registerCallback.initializeRegister("sent_request", phone);
+        this.registerCallback.triggerRegisterCallback();
         diagnosticsCallback.triggerKeyValueSetCallback("userReg", "sent_request", phone);
     }
 
+    onRegistrationStateChanged(state, phone) {
+        this.registerCallback.initializeRegister(state, phone);
+        this.registerCallback.triggerRegisterCallback();
+        diagnosticsCallback.triggerKeyValueSetCallback("userReg", state, phone);
+    }
+
     onLog(LogLevel, tag, message) {
         /**
          * To get SDK logs

package/src/listeners/SessionListeners.js

@@ -1,123 +1,141 @@
-import { sessionCallback } from './Callback';
 import { v4 as uuidv4 } from 'uuid';
-import { FetchTabInfo } from '../constants/common';
-import { webrtcSIPPhone } from '@exotel-npm-dev/webrtc-core-sdk';
+import { getLogger } from "@exotel-npm-dev/webrtc-core-sdk";
 
-var logger = webrtcSIPPhone.getLogger();
+const logger = getLogger();
 /**
  * Session listeners is invoked when user opens two tabs, the data in tab 1 is
  * copied into tab 2
  */
-export function SessionListener() {
+export class SessionListener {
+  sessionCallback = null;
+  constructor(sessionCallback) {
+    this.sessionCallback = sessionCallback;
+  }
 
-  const channel = new BroadcastChannel('app-data');
-  channel.addEventListener('message', (event) => {
-    if (event.data.message == "re-register-needed") {
-      /** Send the hash to app seeking for reregistration */
-      sessionCallback.initializeSession('re-register', event.data.hashMsg);
-      sessionCallback.triggerSessionCallback();
-    } else if (event.data.message == 'logout') {
-      sessionCallback.initializeSession('logout', '');
-      sessionCallback.triggerSessionCallback();
-    } else if (event.data.message == 'login-successful') {
-      const loginObj = {
-        phone: window.localStorage.getItem('currentUser'),
-        tabHash: event.data.tabHash
-      }
-      sessionCallback.initializeSession('login-successful', JSON.stringify(loginObj));
-      sessionCallback.triggerSessionCallback();
-    } else if (window.sessionStorage.getItem("activeSessionTab") !== null) {
-      if (event.data.callState !== null && event.data.callState !== undefined) {
-        sessionCallback.initializeSession(event.data.callState, event.data.callNumber);
-      }
-      sessionCallback.triggerSessionCallback();
-    }
-  });
-  /**
-   * Add listeners for all storage events
-   */
-  window.localStorage.setItem('REQUESTING_SHARED_CREDENTIALS', Date.now().toString())
-  window.localStorage.removeItem('REQUESTING_SHARED_CREDENTIALS')
+  onSessionEstablished = function (session) {
+    logger.log("SessionListener: onSessionEstablished");
+    this.sessionCallback.triggerCallback("established", session);
+  }
 
-  const credentials = {
-    user: window.sessionStorage.getItem('user'),
-    selectedPhone: window.localStorage.getItem('selectedPhone'),
+  onSessionTerminated = function (session) {
+    logger.log("SessionListener: onSessionTerminated");
+    this.sessionCallback.triggerCallback("terminated", session);
   }
 
-  window.addEventListener('storage', (event) => {
+  onSessionEvent(event) {
+    this.sessionCallback.triggerSessionCallback(event);
+  }
+
+  onTBD() {
+    const channel = new BroadcastChannel('app-data');
+    channel.addEventListener('message', (event) => {
+      if (event.data.message == "re-register-needed") {
+        /** Send the hash to app seeking for reregistration */
+        this.sessionCallback.initializeSession('re-register', event.data.hashMsg);
+        this.sessionCallback.triggerSessionCallback();
+      } else if (event.data.message == 'logout') {
+        this.sessionCallback.initializeSession('logout', '');
+        this.sessionCallback.triggerSessionCallback();
+      } else if (event.data.message == 'login-successful') {
+        const loginObj = {
+          phone: window.localStorage.getItem('currentUser'),
+          tabHash: event.data.tabHash
+        }
+        this.sessionCallback.initializeSession('login-successful', JSON.stringify(loginObj));
+        this.sessionCallback.triggerSessionCallback();
+      } else if (window.sessionStorage.getItem("activeSessionTab") !== null) {
+        if (event.data.callState !== null && event.data.callState !== undefined) {
+          this.sessionCallback.initializeSession(event.data.callState, event.data.callNumber);
+        }
+        this.sessionCallback.triggerSessionCallback();
+      }
+    });
     /**
-    * When user tries to duplicate tab, this gets called in Tab1
-    */
-    if (event.key === 'REQUESTING_SHARED_CREDENTIALS' && credentials) {
-      window.localStorage.setItem('CREDENTIALS_SHARING', JSON.stringify(credentials))
-      window.localStorage.removeItem('CREDENTIALS_SHARING')
-      /**
-       * When the data is to be shared between two tabs then add the current state onto that session storage
-       */
-      //sessionCallback.triggerSessionCallback();
+     * Add listeners for all storage events
+     */
+    window.localStorage.setItem('REQUESTING_SHARED_CREDENTIALS', Date.now().toString())
+    window.localStorage.removeItem('REQUESTING_SHARED_CREDENTIALS')
+
+    const credentials = {
+      user: window.sessionStorage.getItem('user'),
+      selectedPhone: window.localStorage.getItem('selectedPhone'),
     }
-    if (event.key === 'CREDENTIALS_SHARING' && credentials !== null) {
 
-      const newData = JSON.parse(event.newValue);
-      if (event.newValue !== null) {
-        window.sessionStorage.setItem('user', newData.user);
-        window.sessionStorage.setItem('isAuthenticated', true);
-      }
+    window.addEventListener('storage', (event) => {
       /**
-       * Fetch the array of tabs and add the tab, put it on session also
-       */
-      const currentTab = {
-        tabID: uuidv4(),
-        tabType: 'child',
-        tabStatus: 'active'
+      * When user tries to duplicate tab, this gets called in Tab1
+      */
+      if (event.key === 'REQUESTING_SHARED_CREDENTIALS' && credentials) {
+        window.localStorage.setItem('CREDENTIALS_SHARING', JSON.stringify(credentials))
+        window.localStorage.removeItem('CREDENTIALS_SHARING')
+        /**
+         * When the data is to be shared between two tabs then add the current state onto that session storage
+         */
+        //sessionCallback.triggerSessionCallback();
       }
-      const tabArr = JSON.parse(window.localStorage.getItem('tabs'));
-      /** Based on activeSessionTab id fetch the type */
+      if (event.key === 'CREDENTIALS_SHARING' && credentials !== null) {
+
+        const newData = JSON.parse(event.newValue);
+        if (event.newValue !== null) {
+          window.sessionStorage.setItem('user', newData.user);
+          window.sessionStorage.setItem('isAuthenticated', true);
+        }
+        /**
+         * Fetch the array of tabs and add the tab, put it on session also
+         */
+        const currentTab = {
+          tabID: uuidv4(),
+          tabType: 'child',
+          tabStatus: 'active'
+        }
+        const tabArr = JSON.parse(window.localStorage.getItem('tabs'));
+        /** Based on activeSessionTab id fetch the type */
+
+        if (window.sessionStorage.getItem('activeSessionTab') !== null && window.sessionStorage.getItem('activeSessionTab') == "parent0") {
+          logger.log('Adding a child tab spawned from parent....');
+          /** In order to keep tabID same for all the child ones, we are using below IF to distinguish */
 
-      if (window.sessionStorage.getItem('activeSessionTab') !== null && window.sessionStorage.getItem('activeSessionTab') == "parent0") {
-        logger.log('Adding a child tab spawned from parent....');
-        /** In order to keep tabID same for all the child ones, we are using below IF to distinguish */
+          if (tabArr.length > 1 && window.sessionStorage.getItem('activeSessionTab') == "parent0") {
+            if (!document.hidden) {
+              const lastIndex = (tabArr.length) - 1;
+              window.sessionStorage.setItem('activeSessionTab', tabArr[lastIndex].tabID);
+            }
 
-        if (tabArr.length > 1 && window.sessionStorage.getItem('activeSessionTab') == "parent0") {
-          if (!document.hidden) {
+          } else {
+            tabArr.push(currentTab);
+            window.localStorage.removeItem('tabs');
+            window.localStorage.setItem('tabs', JSON.stringify(tabArr));
             const lastIndex = (tabArr.length) - 1;
             window.sessionStorage.setItem('activeSessionTab', tabArr[lastIndex].tabID);
           }
 
+
         } else {
-          tabArr.push(currentTab);
-          window.localStorage.removeItem('tabs');
-          window.localStorage.setItem('tabs', JSON.stringify(tabArr));
+          /** pull from the tabarray and then add it to the session storage */
+
           const lastIndex = (tabArr.length) - 1;
           window.sessionStorage.setItem('activeSessionTab', tabArr[lastIndex].tabID);
         }
+        //window.localStorage.setItem('selectedPhone', newData.selectedPhone);
+        return;
+        //}
 
-
-      } else {
-        /** pull from the tabarray and then add it to the session storage */
-
-        const lastIndex = (tabArr.length) - 1;
-        window.sessionStorage.setItem('activeSessionTab', tabArr[lastIndex].tabID);
       }
-      //window.localStorage.setItem('selectedPhone', newData.selectedPhone);
-      return;
-      //}
-
-    }
-    /**
-     * When a tab is closed
-     */
-    if (event.key === 'CREDENTIALS_FLUSH' && credentials) {
-      window.sessionStorage.removeItem('user');
-      window.sessionStorage.removeItem('selectedPhone');
-      window.sessionStorage.removeItem('isAuthenticated')
-      window.sessionStorage.removeItem('activeSession');
-    }
-    /**
-     * When any tab is closed, active call gets terminated
-     */
-    if (event.key === 'CALL_FLUSH') {
-      window.sessionStorage.removeItem('activeSession');
-    }
-  });
-};
+      /**
+       * When a tab is closed
+       */
+      if (event.key === 'CREDENTIALS_FLUSH' && credentials) {
+        window.sessionStorage.removeItem('user');
+        window.sessionStorage.removeItem('selectedPhone');
+        window.sessionStorage.removeItem('isAuthenticated')
+        window.sessionStorage.removeItem('activeSession');
+      }
+      /**
+       * When any tab is closed, active call gets terminated
+       */
+      if (event.key === 'CALL_FLUSH') {
+        window.sessionStorage.removeItem('activeSession');
+      }
+    });
+  }
+}