@webex/calling 3.0.0-next.4 → 3.0.0-next.40

package/dist/module/CallingClient/callRecordFixtures.js

@@ -1,93 +1,93 @@
-import { SessionType, Disposition, MOBIUS_EVENT_KEYS } from '../Events/types';
-const WEBEX_CALL_SESSION = {
-    id: 'd74d19cc-6aa7-f341-6012-aec433cc6f8d',
-    durationSecs: 438,
-    self: {
-        id: 'a24027e7-9b6e-4047-a950-42f4492148ec',
-        name: 'Mark',
-        phoneNumber: '123456',
-    },
-    url: 'https://janus-a.wbx2.com/janus/api/v1/history/userSessions/d74d19cc-6aa7-f341-6012-aec433cc6f8d',
-    sessionId: 'd74d19cc-6aa7-f341-6012-aec433cc6f8d',
-    sessionType: SessionType.WEBEX_CALLING,
-    startTime: '2022-08-02T10:45:21.565Z',
-    endTime: '2022-08-02T10:53:01.624Z',
-    direction: 'OUTGOING',
-    disposition: Disposition.INITIATED,
-    other: {
-        id: 'c9bde63c-e3e2-4db4-ba45-0d6c698ffd65',
-        name: 'test',
-        isPrivate: false,
-        callbackAddress: 'c9bde63c-e3e2-4db4-ba45-0d6c698ffd65',
-        phoneNumber: '123456679',
-    },
-    durationSeconds: 438,
-    joinedDurationSeconds: 457,
-    participantCount: 2,
-    links: {
-        locusUrl: 'https://locus-a.wbx2.com/locus/api/v1/loci/f5dbe4da-663b-3f73-a2fc-3a2fb0f12080',
-        conversationUrl: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/c9252ff0-9de2-11ec-a582-59d00c02cca9',
-        callbackAddress: '123-456-7890',
-    },
-    isDeleted: false,
-    isPMR: false,
-    correlationIds: ['58ea6cd9-852b-4a77-957f-e704c8b0e63e'],
-};
-const SPARK_CALL_SESSION = {
-    id: 'd74d19cc-6aa7-f341-6012-aec433cc6f8d',
-    durationSecs: 438,
-    self: {
-        id: 'a24027e7-9b6e-4047-a950-42f4492148ec',
-        name: 'Mark',
-        phoneNumber: '123456',
-    },
-    url: 'https://janus-a.wbx2.com/janus/api/v1/history/userSessions/d74d19cc-6aa7-f341-6012-aec433cc6f8d',
-    sessionId: 'd74d19cc-6aa7-f341-6012-aec433cc6f8d',
-    sessionType: SessionType.SPARK,
-    startTime: '2022-08-02T10:45:21.565Z',
-    endTime: '2022-08-02T10:53:01.624Z',
-    direction: 'OUTGOING',
-    disposition: Disposition.INITIATED,
-    other: {
-        id: 'c9bde63c-e3e2-4db4-ba45-0d6c698ffd65',
-        name: 'test',
-        isPrivate: false,
-        callbackAddress: 'c9bde63c-e3e2-4db4-ba45-0d6c698ffd65',
-        phoneNumber: '123456679',
-    },
-    durationSeconds: 438,
-    joinedDurationSeconds: 457,
-    participantCount: 2,
-    links: {
-        locusUrl: 'https://locus-a.wbx2.com/locus/api/v1/loci/f5dbe4da-663b-3f73-a2fc-3a2fb0f12080',
-        conversationUrl: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/c9252ff0-9de2-11ec-a582-59d00c02cca9',
-        callbackAddress: '123-456-7890',
-    },
-    isDeleted: false,
-    isPMR: false,
-    correlationIds: ['58ea6cd9-852b-4a77-957f-e704c8b0e63e'],
-};
-export const MOCK_SESSION_EVENT = {
-    id: 'id',
-    data: {
-        userSessions: {
-            userSessions: [WEBEX_CALL_SESSION],
-            statusCode: 0,
-        },
-        eventType: MOBIUS_EVENT_KEYS.CALL_SESSION_EVENT_INCLUSIVE,
-    },
-    timestamp: 12345,
-    trackingId: 'tracking-id',
-};
-export const MOCK_MULTIPLE_SESSIONS_EVENT = {
-    id: 'id',
-    data: {
-        userSessions: {
-            userSessions: [WEBEX_CALL_SESSION, SPARK_CALL_SESSION],
-            statusCode: 0,
-        },
-        eventType: MOBIUS_EVENT_KEYS.CALL_SESSION_EVENT_INCLUSIVE,
-    },
-    timestamp: 12345,
-    trackingId: 'tracking-id',
-};
+import { SessionType, Disposition, MOBIUS_EVENT_KEYS } from '../Events/types';
+const WEBEX_CALL_SESSION = {
+    id: 'd74d19cc-6aa7-f341-6012-aec433cc6f8d',
+    durationSecs: 438,
+    self: {
+        id: 'a24027e7-9b6e-4047-a950-42f4492148ec',
+        name: 'Mark',
+        phoneNumber: '123456',
+    },
+    url: 'https://janus-a.wbx2.com/janus/api/v1/history/userSessions/d74d19cc-6aa7-f341-6012-aec433cc6f8d',
+    sessionId: 'd74d19cc-6aa7-f341-6012-aec433cc6f8d',
+    sessionType: SessionType.WEBEX_CALLING,
+    startTime: '2022-08-02T10:45:21.565Z',
+    endTime: '2022-08-02T10:53:01.624Z',
+    direction: 'OUTGOING',
+    disposition: Disposition.INITIATED,
+    other: {
+        id: 'c9bde63c-e3e2-4db4-ba45-0d6c698ffd65',
+        name: 'test',
+        isPrivate: false,
+        callbackAddress: 'c9bde63c-e3e2-4db4-ba45-0d6c698ffd65',
+        phoneNumber: '123456679',
+    },
+    durationSeconds: 438,
+    joinedDurationSeconds: 457,
+    participantCount: 2,
+    links: {
+        locusUrl: 'https://locus-a.wbx2.com/locus/api/v1/loci/f5dbe4da-663b-3f73-a2fc-3a2fb0f12080',
+        conversationUrl: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/c9252ff0-9de2-11ec-a582-59d00c02cca9',
+        callbackAddress: '123-456-7890',
+    },
+    isDeleted: false,
+    isPMR: false,
+    correlationIds: ['58ea6cd9-852b-4a77-957f-e704c8b0e63e'],
+};
+const SPARK_CALL_SESSION = {
+    id: 'd74d19cc-6aa7-f341-6012-aec433cc6f8d',
+    durationSecs: 438,
+    self: {
+        id: 'a24027e7-9b6e-4047-a950-42f4492148ec',
+        name: 'Mark',
+        phoneNumber: '123456',
+    },
+    url: 'https://janus-a.wbx2.com/janus/api/v1/history/userSessions/d74d19cc-6aa7-f341-6012-aec433cc6f8d',
+    sessionId: 'd74d19cc-6aa7-f341-6012-aec433cc6f8d',
+    sessionType: SessionType.SPARK,
+    startTime: '2022-08-02T10:45:21.565Z',
+    endTime: '2022-08-02T10:53:01.624Z',
+    direction: 'OUTGOING',
+    disposition: Disposition.INITIATED,
+    other: {
+        id: 'c9bde63c-e3e2-4db4-ba45-0d6c698ffd65',
+        name: 'test',
+        isPrivate: false,
+        callbackAddress: 'c9bde63c-e3e2-4db4-ba45-0d6c698ffd65',
+        phoneNumber: '123456679',
+    },
+    durationSeconds: 438,
+    joinedDurationSeconds: 457,
+    participantCount: 2,
+    links: {
+        locusUrl: 'https://locus-a.wbx2.com/locus/api/v1/loci/f5dbe4da-663b-3f73-a2fc-3a2fb0f12080',
+        conversationUrl: 'https://conv-a.wbx2.com/conversation/api/v1/conversations/c9252ff0-9de2-11ec-a582-59d00c02cca9',
+        callbackAddress: '123-456-7890',
+    },
+    isDeleted: false,
+    isPMR: false,
+    correlationIds: ['58ea6cd9-852b-4a77-957f-e704c8b0e63e'],
+};
+export const MOCK_SESSION_EVENT = {
+    id: 'id',
+    data: {
+        userSessions: {
+            userSessions: [WEBEX_CALL_SESSION],
+            statusCode: 0,
+        },
+        eventType: MOBIUS_EVENT_KEYS.CALL_SESSION_EVENT_INCLUSIVE,
+    },
+    timestamp: 12345,
+    trackingId: 'tracking-id',
+};
+export const MOCK_MULTIPLE_SESSIONS_EVENT = {
+    id: 'id',
+    data: {
+        userSessions: {
+            userSessions: [WEBEX_CALL_SESSION, SPARK_CALL_SESSION],
+            statusCode: 0,
+        },
+        eventType: MOBIUS_EVENT_KEYS.CALL_SESSION_EVENT_INCLUSIVE,
+    },
+    timestamp: 12345,
+    trackingId: 'tracking-id',
+};

package/dist/module/CallingClient/calling/CallerId/index.js

@@ -1,169 +1,149 @@
-import log from '../../../Logger/index';
-import { CALLER_ID_FILE, FETCH_NAME, VALID_PHONE } from '../../constants';
-import SDKConnector from '../../../SDKConnector';
-import { resolveCallerIdDisplay } from '../../../common';
-export class CallerId {
-    webex;
-    callerInfo;
-    sdkConnector;
-    emitter;
-    constructor(webex, emitter) {
-        this.sdkConnector = SDKConnector;
-        this.callerInfo = {};
-        if (!this.sdkConnector.getWebex()) {
-            SDKConnector.setWebex(webex);
-        }
-        this.webex = this.sdkConnector.getWebex();
-        this.emitter = emitter;
-    }
-    async resolveCallerId(filter) {
-        const displayResult = (await resolveCallerIdDisplay(filter));
-        let isChanged = false;
-        if (displayResult.name && this.callerInfo.name !== displayResult.name) {
-            log.info('Updating Name after resolution', {
-                file: CALLER_ID_FILE,
-                method: 'resolveCallerId',
-            });
-            this.callerInfo.name = displayResult.name;
-            isChanged = true;
-        }
-        if (displayResult.num && this.callerInfo.num !== displayResult.num) {
-            log.info('Updating Number after resolution', {
-                file: CALLER_ID_FILE,
-                method: 'resolveCallerId',
-            });
-            this.callerInfo.num = displayResult.num;
-            isChanged = true;
-        }
-        if (!this.callerInfo.avatarSrc || this.callerInfo.avatarSrc !== displayResult.avatarSrc) {
-            log.info('Updating Avatar Id after resolution', {
-                file: CALLER_ID_FILE,
-                method: 'resolveCallerId',
-            });
-            this.callerInfo.avatarSrc = displayResult.avatarSrc;
-            isChanged = true;
-        }
-        if (!this.callerInfo.id || this.callerInfo.id !== displayResult.id) {
-            log.info('Updating User Id after resolution', {
-                file: CALLER_ID_FILE,
-                method: 'resolveCallerId',
-            });
-            this.callerInfo.id = displayResult.id;
-            isChanged = true;
-        }
-        if (isChanged) {
-            this.emitter(this.callerInfo);
-        }
-    }
-    async parseRemotePartyInfo(data) {
-        const lastToken = data.split(';').slice(-1)[0];
-        if (lastToken.includes('externalId')) {
-            const externalId = lastToken.split('=')[1];
-            log.info(`externalId retrieved: ${externalId}`, {
-                file: CALLER_ID_FILE,
-                method: 'parseRemotePartyInfo',
-            });
-            this.resolveCallerId(`id eq "${externalId}"`);
-        }
-        else {
-            log.warn(`externalId not found!`, {
-                file: CALLER_ID_FILE,
-                method: 'parseRemotePartyInfo',
-            });
-        }
-    }
-    parseSipUri(paid) {
-        const result = {};
-        const data = paid.split('@')[0].replace(/"/g, '');
-        const nameMatch = FETCH_NAME.exec(data);
-        const num = data.substring(data.indexOf(':') + 1, data.length);
-        if (nameMatch) {
-            result.name = nameMatch[0].trimEnd();
-            log.info(`Parsed Name: ${result.name}`, {
-                file: CALLER_ID_FILE,
-                method: 'parseSipUri',
-            });
-        }
-        else {
-            log.warn(`Name field not found!`, {
-                file: CALLER_ID_FILE,
-                method: 'parseSipUri',
-            });
-        }
-        const phoneMatch = num.match(VALID_PHONE);
-        if (phoneMatch && phoneMatch[0].length === num.length) {
-            result.num = num;
-            log.info(`Parsed Number: ${result.num}`, {
-                file: CALLER_ID_FILE,
-                method: 'parseSipUri',
-            });
-        }
-        else {
-            log.warn(`Number field not found!`, {
-                file: CALLER_ID_FILE,
-                method: 'parseSipUri',
-            });
-        }
-        return result;
-    }
-    fetchCallerDetails(callerId) {
-        this.callerInfo.id = undefined;
-        this.callerInfo.avatarSrc = undefined;
-        this.callerInfo.name = undefined;
-        this.callerInfo.num = undefined;
-        if ('p-asserted-identity' in callerId) {
-            log.info(`Parsing p-asserted-identity:- ${callerId['p-asserted-identity']}`, {
-                file: CALLER_ID_FILE,
-                method: 'fetchCallerDetails',
-            });
-            const result = this.parseSipUri(callerId['p-asserted-identity']);
-            this.callerInfo.name = result.name;
-            this.callerInfo.num = result.num;
-            log.info(`CallerId retrieved from p-asserted-identity: name: ${this.callerInfo.name} , num: ${this.callerInfo.num}`, {
-                file: CALLER_ID_FILE,
-                method: 'fetchCallerDetails',
-            });
-        }
-        if (callerId.from) {
-            log.info(`Parsing from header:- ${callerId.from}`, {
-                file: CALLER_ID_FILE,
-                method: 'fetchCallerDetails',
-            });
-            const result = this.parseSipUri(callerId.from);
-            log.info(`CallerId retrieved from FROM: name: ${result.name} , num: ${result.num}`, {
-                file: CALLER_ID_FILE,
-                method: 'fetchCallerDetails',
-            });
-            if (!this.callerInfo.name && result.name) {
-                log.info('Updating name field from From header', {
-                    file: CALLER_ID_FILE,
-                    method: 'fetchCallerDetails',
-                });
-                this.callerInfo.name = result.name;
-            }
-            if (!this.callerInfo.num && result.num) {
-                log.info('Updating number field from From header', {
-                    file: CALLER_ID_FILE,
-                    method: 'fetchCallerDetails',
-                });
-                this.callerInfo.num = result.num;
-            }
-        }
-        if (this.callerInfo.name || this.callerInfo.num) {
-            this.emitter(this.callerInfo);
-        }
-        if ('x-broadworks-remote-party-info' in callerId) {
-            log.info(`Parsing x-broadworks-remote-party-info:- ${callerId['x-broadworks-remote-party-info']}`, {
-                file: CALLER_ID_FILE,
-                method: 'fetchCallerDetails',
-            });
-            this.parseRemotePartyInfo(callerId['x-broadworks-remote-party-info']);
-        }
-        log.log(`Intermediate callerId :- name: ${this.callerInfo.name} , num: ${this.callerInfo.num}`, {
-            file: CALLER_ID_FILE,
-            method: 'fetchCallerDetails',
-        });
-        return this.callerInfo;
-    }
-}
-export const createCallerId = (webex, emitterCb) => new CallerId(webex, emitterCb);
+import log from '../../../Logger/index';
+import { CALLER_ID_FILE, FETCH_NAME, VALID_PHONE } from '../../constants';
+import SDKConnector from '../../../SDKConnector';
+import { resolveCallerIdDisplay } from '../../../common';
+export class CallerId {
+    webex;
+    callerInfo;
+    sdkConnector;
+    emitter;
+    constructor(webex, emitter) {
+        this.sdkConnector = SDKConnector;
+        this.callerInfo = {};
+        if (!this.sdkConnector.getWebex()) {
+            SDKConnector.setWebex(webex);
+        }
+        this.webex = this.sdkConnector.getWebex();
+        this.emitter = emitter;
+    }
+    async resolveCallerId(filter) {
+        const displayResult = (await resolveCallerIdDisplay(filter));
+        let isChanged = false;
+        if (displayResult.name && this.callerInfo.name !== displayResult.name) {
+            log.info('Updating Name after resolution', {
+                file: CALLER_ID_FILE,
+                method: 'resolveCallerId',
+            });
+            this.callerInfo.name = displayResult.name;
+            isChanged = true;
+        }
+        if (displayResult.num && this.callerInfo.num !== displayResult.num) {
+            log.info('Updating Number after resolution', {
+                file: CALLER_ID_FILE,
+                method: 'resolveCallerId',
+            });
+            this.callerInfo.num = displayResult.num;
+            isChanged = true;
+        }
+        if (!this.callerInfo.avatarSrc || this.callerInfo.avatarSrc !== displayResult.avatarSrc) {
+            log.info('Updating Avatar Id after resolution', {
+                file: CALLER_ID_FILE,
+                method: 'resolveCallerId',
+            });
+            this.callerInfo.avatarSrc = displayResult.avatarSrc;
+            isChanged = true;
+        }
+        if (!this.callerInfo.id || this.callerInfo.id !== displayResult.id) {
+            log.info('Updating User Id after resolution', {
+                file: CALLER_ID_FILE,
+                method: 'resolveCallerId',
+            });
+            this.callerInfo.id = displayResult.id;
+            isChanged = true;
+        }
+        if (isChanged) {
+            this.emitter(this.callerInfo);
+        }
+    }
+    async parseRemotePartyInfo(data) {
+        const lastToken = data.split(';').slice(-1)[0];
+        if (lastToken.includes('externalId')) {
+            const externalId = lastToken.split('=')[1];
+            log.info(`externalId retrieved: ${externalId}`, {
+                file: CALLER_ID_FILE,
+                method: 'parseRemotePartyInfo',
+            });
+            this.resolveCallerId(`id eq "${externalId}"`);
+        }
+        else {
+            log.warn(`externalId not found!`, {
+                file: CALLER_ID_FILE,
+                method: 'parseRemotePartyInfo',
+            });
+        }
+    }
+    parseSipUri(paid) {
+        const result = {};
+        const data = paid.split('@')[0].replace(/"/g, '');
+        const nameMatch = FETCH_NAME.exec(data);
+        const num = data.substring(data.indexOf(':') + 1, data.length);
+        if (nameMatch) {
+            result.name = nameMatch[0].trimEnd();
+        }
+        else {
+            log.warn(`Name field not found!`, {
+                file: CALLER_ID_FILE,
+                method: 'parseSipUri',
+            });
+        }
+        const phoneMatch = num.match(VALID_PHONE);
+        if (phoneMatch && phoneMatch[0].length === num.length) {
+            result.num = num;
+        }
+        else {
+            log.warn(`Number field not found!`, {
+                file: CALLER_ID_FILE,
+                method: 'parseSipUri',
+            });
+        }
+        return result;
+    }
+    fetchCallerDetails(callerId) {
+        this.callerInfo.id = undefined;
+        this.callerInfo.avatarSrc = undefined;
+        this.callerInfo.name = undefined;
+        this.callerInfo.num = undefined;
+        if ('p-asserted-identity' in callerId) {
+            log.info('Parsing p-asserted-identity within remote party information', {
+                file: CALLER_ID_FILE,
+                method: 'fetchCallerDetails',
+            });
+            const result = this.parseSipUri(callerId['p-asserted-identity']);
+            this.callerInfo.name = result.name;
+            this.callerInfo.num = result.num;
+        }
+        if (callerId.from) {
+            log.info('Parsing from header within the remote party information', {
+                file: CALLER_ID_FILE,
+                method: 'fetchCallerDetails',
+            });
+            const result = this.parseSipUri(callerId.from);
+            if (!this.callerInfo.name && result.name) {
+                log.info('Updating name field from From header', {
+                    file: CALLER_ID_FILE,
+                    method: 'fetchCallerDetails',
+                });
+                this.callerInfo.name = result.name;
+            }
+            if (!this.callerInfo.num && result.num) {
+                log.info('Updating number field from From header', {
+                    file: CALLER_ID_FILE,
+                    method: 'fetchCallerDetails',
+                });
+                this.callerInfo.num = result.num;
+            }
+        }
+        if (this.callerInfo.name || this.callerInfo.num) {
+            this.emitter(this.callerInfo);
+        }
+        if ('x-broadworks-remote-party-info' in callerId) {
+            log.info('Parsing x-broadworks-remote-party-info within remote party information', {
+                file: CALLER_ID_FILE,
+                method: 'fetchCallerDetails',
+            });
+            this.parseRemotePartyInfo(callerId['x-broadworks-remote-party-info']);
+        }
+        return this.callerInfo;
+    }
+}
+export const createCallerId = (webex, emitterCb) => new CallerId(webex, emitterCb);

package/dist/module/CallingClient/calling/CallerId/types.js

@@ -1 +1 @@
-export {};
+export {};