@wazo/sdk 0.41.1 → 0.42.0-rc.0

package/lib/utils/__tests__/PhoneNumberUtil.test.js

@@ -13,7 +13,7 @@ describe('Formatting phone numbers', () => {
         expect((0, PhoneNumberUtil_1.getDisplayableNumber)('+33675456545', 'FR')).toBe('06 75 45 65 45');
         expect((0, PhoneNumberUtil_1.getDisplayableNumber)('0675456545', 'FR')).toBe('06 75 45 65 45');
         expect((0, PhoneNumberUtil_1.getDisplayableNumber)('+33675456545', 'US')).toBe('+33 6 75 45 65 45');
-        expect((0, PhoneNumberUtil_1.getDisplayableNumber)('0675456545', 'US')).toBe('+1 0675456545');
+        expect((0, PhoneNumberUtil_1.getDisplayableNumber)('0675456545', 'US')).toBe('+33 6 75 45 65 45');
         expect((0, PhoneNumberUtil_1.getDisplayableNumber)('4188884356', 'US')).toBe('(418) 888-4356');
     });
     it('should format real phone numbers when typing', () => {
@@ -21,12 +21,12 @@ describe('Formatting phone numbers', () => {
         expect((0, PhoneNumberUtil_1.getDisplayableNumber)('067545', 'FR', true)).toBe('06 75 45');
         expect((0, PhoneNumberUtil_1.getDisplayableNumber)('+3367545', 'US', true)).toBe('+33 6 75 45');
         expect((0, PhoneNumberUtil_1.getDisplayableNumber)('067545', 'US', true)).toBe('067545');
-        expect((0, PhoneNumberUtil_1.getDisplayableNumber)('418808', 'US', true)).toBe('418-808');
+        expect((0, PhoneNumberUtil_1.getDisplayableNumber)('418808', 'US', true)).toBe('(418) 808');
     });
     it('should use the international number if the country number is different from the given country', () => {
-        expect((0, PhoneNumberUtil_1.getDisplayableNumber)('00201005803648', 'FR')).toBe('+20 100 580 3648');
-        expect((0, PhoneNumberUtil_1.getDisplayableNumber)('+14188004554', 'FR')).toBe('+1 418-800-4554');
-        expect((0, PhoneNumberUtil_1.getDisplayableNumber)('00201005803648', 'EG')).toBe('0100 580 3648');
+        expect((0, PhoneNumberUtil_1.getDisplayableNumber)('00201005803648', 'FR')).toBe('+20 10 05803648');
+        expect((0, PhoneNumberUtil_1.getDisplayableNumber)('+14188004554', 'FR')).toBe('+1 418 800 4554');
+        expect((0, PhoneNumberUtil_1.getDisplayableNumber)('00201005803648', 'EG')).toBe('010 05803648');
         expect((0, PhoneNumberUtil_1.getDisplayableNumber)('0634543450', 'FR')).toBe('06 34 54 34 50');
         expect((0, PhoneNumberUtil_1.getDisplayableNumber)('4188034302', 'US')).toBe('(418) 803-4302');
         expect((0, PhoneNumberUtil_1.getDisplayableNumber)('8775863230', 'CA')).toBe('(877) 586-3230');
@@ -53,3 +53,20 @@ describe('getCallableNumber', () => {
         expect((0, PhoneNumberUtil_1.getCallableNumber)('9000')).toBe('9000');
     });
 });
+describe('guessParsePhoneNumber', () => {
+    it('should guess with default countries', () => {
+        const parsedNumber = (0, PhoneNumberUtil_1.guessParsePhoneNumber)('0675456545');
+        expect(parsedNumber === null || parsedNumber === void 0 ? void 0 : parsedNumber.country).toBe('FR');
+        expect(parsedNumber === null || parsedNumber === void 0 ? void 0 : parsedNumber.isValid()).toBe(true);
+    });
+    it('should guess with specified countries', () => {
+        const parsedNumber = (0, PhoneNumberUtil_1.guessParsePhoneNumber)('752097514', undefined, ['JP']);
+        expect(parsedNumber === null || parsedNumber === void 0 ? void 0 : parsedNumber.country).toBe('JP');
+        expect(parsedNumber === null || parsedNumber === void 0 ? void 0 : parsedNumber.isValid()).toBe(true);
+    });
+    it('should used use defaultCountry has guesser', () => {
+        const parsedNumber = (0, PhoneNumberUtil_1.guessParsePhoneNumber)('752097514', 'JP', []);
+        expect(parsedNumber === null || parsedNumber === void 0 ? void 0 : parsedNumber.country).toBe('JP');
+        expect(parsedNumber === null || parsedNumber === void 0 ? void 0 : parsedNumber.isValid()).toBe(true);
+    });
+});

package/lib/utils/__tests__/api-requester.test.js

@@ -88,12 +88,14 @@ describe('Retrieving headers', () => {
 });
 describe('Calling fetch', () => {
     it('should call fetch without body but query string in get method', () => __awaiter(void 0, void 0, void 0, function* () {
-        global.fetch = jest.fn(() => Promise.resolve({
-            json: () => Promise.resolve({}),
-            headers: {
-                get: () => '',
-            },
-        }));
+        Object.defineProperty(global, 'fetch', {
+            value: jest.fn(() => Promise.resolve({
+                json: () => Promise.resolve({}),
+                headers: {
+                    get: () => '',
+                },
+            })),
+        });
         yield new api_requester_1.default({
             server,
             agent: null,
@@ -113,15 +115,17 @@ describe('Calling fetch', () => {
 describe('With a refresh token', () => {
     it('should retry the call with a new token', () => __awaiter(void 0, void 0, void 0, function* () {
         let calls = 0;
-        global.fetch = jest.fn(() => {
-            calls++;
-            return Promise.resolve({
-                headers: {
-                    get: () => 'application/json',
-                },
-                status: calls === 1 ? 401 : 200,
-                json: () => Promise.resolve({}),
-            });
+        Object.defineProperty(global, 'fetch', {
+            value: jest.fn(() => {
+                calls++;
+                return Promise.resolve({
+                    headers: {
+                        get: () => 'application/json',
+                    },
+                    status: calls === 1 ? 401 : 200,
+                    json: () => Promise.resolve({}),
+                });
+            }),
         });
         const requester = new api_requester_1.default({
             server,

package/lib/utils/api-requester.js

@@ -73,8 +73,8 @@ class ApiRequester {
     enableErrorLogging() {
         this.shouldLogErrors = true;
     }
-    call(path, method = 'get', body = null, headers = null, parse = ApiRequester.defaultParser, firstCall = true) {
-        return __awaiter(this, void 0, void 0, function* () {
+    call(path_1) {
+        return __awaiter(this, arguments, void 0, function* (path, method = 'get', body = null, headers = null, parse = ApiRequester.defaultParser, firstCall = true) {
             const url = this.computeUrl(method, path, body);
             const newHeaders = this.getHeaders(headers);
             let newBody = method === 'get' ? null : body;

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.42.0-rc.0",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "index.js",
   "types": "lib/types/index.d.ts",
@@ -50,27 +50,26 @@
     "events": "^3.3.0",
     "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",
+    "libphonenumber-js": "^1.10.60",
+    "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/jest": "^29.5.2",
     "@types/jsrsasign": "^10.5.8",
     "@types/node": "^20.4.0",
@@ -79,20 +78,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/api/confd.ts

@@ -1,6 +1,7 @@
 import ApiRequester from '../utils/api-requester';
 import type { UUID, ListConfdUsersResponse, ListApplicationsResponse } from '../domain/types';
 import type { MeetingCreateArguments, MeetingUpdateArguments } from '../domain/Meeting';
+import CallerID from '../domain/CallerID';
 import Profile from '../domain/Profile';
 import SipLine from '../domain/SipLine';
 import ExternalApp from '../domain/ExternalApp';
@@ -35,6 +36,7 @@ export interface ConfD {
   guestGetMeeting: (meetingUuid: string) => Promise<Meeting>;
   guestAuthorizationRequest: (userUuid: string, meetingUuid: string, username: string) => Promise<any>;
   guestAuthorizationCheck: (userUuid: string, meetingUuid: string, authorizationUuid: string) => Promise<any>;
+  getOutgoingCallerIDs: (userUuid: string) => Promise<CallerID[]>;
 }
 
 export default ((client: ApiRequester, baseUrl: string): ConfD => ({
@@ -107,4 +109,5 @@ export default ((client: ApiRequester, baseUrl: string): ConfD => ({
     guest_name: username,
   }).then(MeetingAuthorization.parse),
   guestAuthorizationCheck: (userUuid: string, meetingUuid: string, authorizationUuid: string): Promise<any> => client.get(`${baseUrl}/guests/${userUuid}/meetings/${meetingUuid}/authorizations/${authorizationUuid}`, null),
+  getOutgoingCallerIDs: (userUuid: string): Promise<CallerID[]> => client.get(`${baseUrl}/users/${userUuid}/callerids/outgoing`, null).then(CallerID.parseMany),
 }));

package/src/domain/CallerID.ts

@@ -0,0 +1,49 @@
+import newFrom from '../utils/new-from';
+
+type Response = {
+  number?: string;
+  type: 'main' | 'associated' | 'anonymous';
+};
+
+type ListResponse = {
+  items: Response[];
+};
+
+type Arguments = {
+  number?: string;
+  type: 'main' | 'associated' | 'anonymous';
+};
+
+export default class CallerID {
+  number?: string;
+
+  idType: 'main' | 'associated' | 'anonymous';
+
+  type: string;
+
+  static parse(plain: Response): CallerID {
+    return new CallerID({
+      number: plain.number,
+      type: plain.type,
+    });
+  }
+
+  static parseMany(plain: ListResponse): CallerID[] {
+    return plain.items.map(item => CallerID.parse(item));
+  }
+
+  static newFrom(profile: CallerID) {
+    return newFrom(profile, CallerID);
+  }
+
+  constructor({
+    type,
+    number,
+  }: Arguments) {
+    this.idType = type;
+    this.number = number;
+    // Useful to compare instead of instanceof with minified code
+    this.type = 'CallerID';
+  }
+
+}

package/src/domain/Features.ts

@@ -1,6 +1,6 @@
 import getApiClient from '../service/getApiClient';
 
-export const FEATURES = ['chat', 'video', 'call_recording', 'fax', 'mobile_double_call', 'mobile_gsm', 'meeting'];
+export const FEATURES = ['chat', 'video', 'call_recording', 'fax', 'mobile_double_call', 'mobile_gsm', 'meeting', 'caller_id'];
 export const getScopeName = (featureName: string) => `enterprise.app.${featureName}`;
 const scopesToCheck = FEATURES.map(getScopeName); // Handle available features on the engine.
 
@@ -19,6 +19,8 @@ class Features {
 
   _hasMeeting: boolean;
 
+  _hasCallerID: boolean;
+
   constructor() {
     this._hasChat = true;
     this._hasVideo = true;
@@ -27,6 +29,7 @@ class Features {
     this._hasMobileDoubleCall = true;
     this._hasMobileGsm = true;
     this._hasMeeting = true;
+    this._hasCallerID = false;
   }
 
   async fetchAccess() {
@@ -51,6 +54,7 @@ class Features {
     this._hasMobileDoubleCall = this._hasFeatures(scopes, 'mobile_double_call');
     this._hasMobileGsm = this._hasFeatures(scopes, 'mobile_gsm');
     this._hasMeeting = this._hasFeatures(scopes, 'meeting');
+    this._hasCallerID = this._hasFeatures(scopes, 'caller_id');
   }
 
   hasChat() {
@@ -81,6 +85,10 @@ class Features {
     return this._hasMeeting;
   }
 
+  hasCallerID() {
+    return this._hasCallerID;
+  }
+
   _hasFeatures(scopes: Record<string, any>, featureName: string) {
     const scopeName = getScopeName(featureName);
 

package/src/index.ts

@@ -24,6 +24,7 @@ export { default as Room } from './domain/Room';
 export { default as CallSession } from './domain/CallSession';
 export { default as IndirectTransfer } from './domain/IndirectTransfer';
 export { default as SwitchboardCall } from './domain/SwitchboardCall';
+export { default as CallerID } from './domain/CallerID';
 export { default as WebRTCPhone } from './domain/Phone/WebRTCPhone';
 export { default as CTIPhone } from './domain/Phone/CTIPhone';
 export { default as Meeting, MeetingCreateArguments, MeetingUpdateArguments } from './domain/Meeting';

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/PhoneNumberUtil.ts

@@ -1,12 +1,8 @@
-import LibPhoneNumber from 'google-libphonenumber';
+import { AsYouType, parsePhoneNumber as libParsePhoneNumber, CountryCode } from 'libphonenumber-js';
 
-const PhoneNumberUtil = LibPhoneNumber.PhoneNumberUtil.getInstance();
-const {
-  PhoneNumberFormat,
-  AsYouTypeFormatter,
-} = LibPhoneNumber;
 // eslint-disable-next-line
 const EXTRA_CHAR_REGEXP = /[^+*\d]/g;
+const DEFAULT_GUESSING_COUNTRIES: CountryCode[] = ['US', 'FR', 'GB', 'AU'];
 
 const shouldBeFormatted = (number: string | null | undefined) => {
   if (!number || number.length <= 5) {
@@ -24,7 +20,23 @@ const isSameCountry = (country1: string, country2: string) => {
   return country1 === country2;
 };
 
-const getDisplayableNumber = (rawNumber: string, country: string, asYouType = false): string => {
+const guessParsePhoneNumber = (number: string, defaultCountry?: CountryCode, guessingCountries: CountryCode[] = DEFAULT_GUESSING_COUNTRIES) => {
+  const mergedCountries = [...new Set([defaultCountry, ...guessingCountries])].filter(Boolean) as CountryCode[];
+
+  let parsedNumber;
+  for (let i = 0; i < mergedCountries.length; i++) {
+    const country = mergedCountries[i];
+
+    parsedNumber = libParsePhoneNumber(number, country);
+    if (parsedNumber.isValid()) {
+      break;
+    }
+  }
+
+  return parsedNumber;
+};
+
+const getDisplayableNumber = (rawNumber: string, country: CountryCode, asYouType = false, guessingCountries: CountryCode[] | undefined = DEFAULT_GUESSING_COUNTRIES): string => {
   if (!rawNumber) {
     return rawNumber;
   }
@@ -38,18 +50,16 @@ const getDisplayableNumber = (rawNumber: string, country: string, asYouType = fa
   let displayValue = '';
 
   if (asYouType) {
-    const formatter = new AsYouTypeFormatter(country);
-    number.split('').forEach(char => {
-      displayValue = formatter.inputDigit(char);
-    });
+    displayValue = new AsYouType(country).input(number);
   } else {
     try {
-      const parsedNumber = PhoneNumberUtil.parseAndKeepRawInput(number, country);
-      const numberCountry = PhoneNumberUtil.getRegionCodeForNumber(parsedNumber);
-      const format = isSameCountry(String(numberCountry), country) ? PhoneNumberFormat.NATIONAL : PhoneNumberFormat.INTERNATIONAL;
-      displayValue = PhoneNumberUtil.format(parsedNumber, format);
-    } catch (_) {
-      // Avoid to crash when phone number like `0080510` can't be parsed
+      const parsedNumber = guessParsePhoneNumber(number, country, guessingCountries);
+      if (parsedNumber?.isValid()) {
+        displayValue = isSameCountry(String(parsedNumber.country), country) ? parsedNumber.formatNational() : parsedNumber.formatInternational();
+      } else {
+        displayValue = rawNumber;
+      }
+    } catch (error) {
       displayValue = rawNumber;
     }
   }
@@ -59,16 +69,13 @@ const getDisplayableNumber = (rawNumber: string, country: string, asYouType = fa
 
 const parsePhoneNumber = (phoneNumber: string): string => phoneNumber.replace(EXTRA_CHAR_REGEXP, '');
 
-const getCallableNumber = (number: string, country?: string | null): string | null | undefined => {
+const getCallableNumber = (number: string, country?: CountryCode): string => {
   try {
-    if (country) {
-      return getDisplayableNumber(number, country).replace(EXTRA_CHAR_REGEXP, '');
-    }
-
-    return parsePhoneNumber(number);
+    const callableNumber = country ? getDisplayableNumber(number, country) : number;
+    return parsePhoneNumber(callableNumber);
   } catch (_) {
     return number;
   }
 };
 
-export { PhoneNumberUtil, PhoneNumberFormat, parsePhoneNumber, AsYouTypeFormatter, getDisplayableNumber, getCallableNumber };
+export { parsePhoneNumber, getDisplayableNumber, guessParsePhoneNumber, getCallableNumber, type CountryCode };