feat: improve active-calls callerId parser

src/func/active-calls.test.ts

@@ -1,4 +1,4 @@
-import { checkActiveCalls, offActiveCallsChange, onActiveCallsChange } from './active-calls';
+import { checkActiveCalls, createCallerInfoFromCallerId, offActiveCallsChange, onActiveCallsChange } from './active-calls';
 import { closeDb, initDb } from '../database';
 
 import { connectTo3cxApi } from '../api/connection';
@@ -25,6 +25,44 @@ describe('active-calls', () => {
   });
 });
 
+describe('active-calls callerId parsing', () => {
+  it('should parse format: +4912341234', () => {
+    const info = createCallerInfoFromCallerId('+4912341234');
+    expect(info.phoneNumber).toBe('+4912341234');
+    expect(info.displayName).toBeUndefined();
+  });
+
+  it('should parse format: Nick Sample (001231234)', () => {
+    const info = createCallerInfoFromCallerId('Nick Sample (001231234)');
+    expect(info.phoneNumber).toBe('001231234');
+    expect(info.displayName).toBe('Nick Sample');
+  });
+
+  it('should parse format: (100)', () => {
+    const info = createCallerInfoFromCallerId('(100)');
+    expect(info.phoneNumber).toBe('100');
+    expect(info.displayName).toBeUndefined();
+  });
+
+  it('should prefer number in parenthesis and parse format: 112 113 (100)', () => {
+    const info = createCallerInfoFromCallerId('112 113 (100)');
+    expect(info.phoneNumber).toBe('100');
+    expect(info.displayName).toBe('112 113');
+  });
+
+  it('should parse format: 10 My Extension', () => {
+    const info = createCallerInfoFromCallerId('10 My Extension');
+    expect(info.phoneNumber).toBe('10');
+    expect(info.displayName).toBe('My Extension');
+  });
+
+  it('should parse format: 10 My Fav Nr Is 55', () => {
+    const info = createCallerInfoFromCallerId('10 My Fav Nr Is 55');
+    expect(info.phoneNumber).toBe('10');
+    expect(info.displayName).toBe('My Fav Nr Is 55');
+  });
+});
+
 afterAll(async () => {
   await closeDb();
 });

src/func/active-calls.ts

@@ -21,29 +21,32 @@ export interface ActiveCall {
 }
 
 function getPhoneNumberFromCallerId(callerId: string) {
-  // format can be for instance: "Name name (+123456789)", "(123495)", "+4359090132"
-  const test = /(^|\()([+]?\d{2,})($|\)$)/;
-  const match = test.exec(callerId);
-  if (match)
-    return match[2];
-  return undefined;
+  // format can be for instance: "Name name (+123456789)", "(123495)", "+4359090132", "1234 Name name"
+  // minimum 2 digits as 3CX extensions/dns can have 2,3 or 4 numbers
+  const test1 = /\(([+]?\d{2,})\)$/; // check for number in parenthesis
+  const test2 = /^([+]?\d{2,})/; // check for number at the beginning
+  const match1 = test1.exec(callerId);
+  const match2 = test2.exec(callerId);
+  // match in parenthesis has priority
+  return match1?.[1] || match2?.[1] || undefined;
 }
 
 function stripPhoneNumberFromCallerId(callerId: string, phoneNumber: string) {
   return callerId
     .replace(phoneNumber, '')
-    .replace(' ()', '');
+    .replace('()', '')
+    .trim();
 }
 
-function createCallerInfoFromCallerId(callerId: string): CallerInfo {
+export function createCallerInfoFromCallerId(callerId: string): CallerInfo {
   const phoneNumber = getPhoneNumberFromCallerId(callerId);
   if (!phoneNumber)
     return { displayName: callerId };
 
   const entry = resolveCaller(phoneNumber);
   const callerIdWithoutNr = stripPhoneNumberFromCallerId(callerId, phoneNumber);
   return {
-    displayName: entry?.displayName || callerIdWithoutNr,
+    displayName: entry?.displayName || callerIdWithoutNr || undefined,
     phoneNumber,
     phoneBookId: entry?.id || undefined,
   };