@wazo/sdk 0.38.22 → 0.39.0-beta.10

package/esm/utils/PhoneNumberUtil.js

@@ -1,74 +1,59 @@
 import LibPhoneNumber from 'google-libphonenumber';
-
-//      
-
 const PhoneNumberUtil = LibPhoneNumber.PhoneNumberUtil.getInstance();
-const { PhoneNumberFormat, AsYouTypeFormatter } = LibPhoneNumber;
-
+const { PhoneNumberFormat, AsYouTypeFormatter, } = LibPhoneNumber;
 // eslint-disable-next-line
 const EXTRA_CHAR_REGEXP = /[^+*\d]/g;
-
-const shouldBeFormatted = (number         ) => {
-  if (!number || number.length <= 5) {
-    return false;
-  }
-
-  return !number.includes('#') && !number.includes('*') && !number.match(/[aA-zZ]/);
+const shouldBeFormatted = (number) => {
+    if (!number || number.length <= 5) {
+        return false;
+    }
+    return !number.includes('#') && !number.includes('*') && !number.match(/[aA-zZ]/);
 };
-
 const isSameCountry = (country1, country2) => {
-  if ((country1 === 'US' && country2 === 'CA') || (country2 === 'US' && country1 === 'CA')) {
-    return true;
-  }
-
-  return country1 === country2;
+    if ((country1 === 'US' && country2 === 'CA') || (country2 === 'US' && country1 === 'CA')) {
+        return true;
+    }
+    return country1 === country2;
 };
-
-const getDisplayableNumber = (rawNumber        , country        , asYouType          = false)         => {
-  if (!rawNumber) {
-    return rawNumber;
-  }
-
-  const number = String(rawNumber);
-  if (!shouldBeFormatted(number)) {
-    return number;
-  }
-
-  let displayValue = '';
-
-  if (asYouType) {
-    const formatter = new AsYouTypeFormatter(country);
-    number.split('').forEach(char => {
-      displayValue = formatter.inputDigit(char);
-    });
-  } else {
-    try {
-      const parsedNumber = PhoneNumberUtil.parseAndKeepRawInput(number, country);
-      const numberCountry = PhoneNumberUtil.getRegionCodeForNumber(parsedNumber);
-      const format = isSameCountry(numberCountry, country) ? PhoneNumberFormat.NATIONAL
-        : PhoneNumberFormat.INTERNATIONAL;
-
-      displayValue = PhoneNumberUtil.format(parsedNumber, format);
-    } catch (_) {
-      // Avoid to crash when phone number like `0080510` can't be parsed
-      displayValue = rawNumber;
+const getDisplayableNumber = (rawNumber, country, asYouType = false) => {
+    if (!rawNumber) {
+        return rawNumber;
+    }
+    const number = String(rawNumber);
+    if (!shouldBeFormatted(number)) {
+        return number;
     }
-  }
-
-  return displayValue;
+    let displayValue = '';
+    if (asYouType) {
+        const formatter = new AsYouTypeFormatter(country);
+        number.split('').forEach(char => {
+            displayValue = formatter.inputDigit(char);
+        });
+    }
+    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
+            displayValue = rawNumber;
+        }
+    }
+    return displayValue;
 };
-
-const parsePhoneNumber = (phoneNumber        )         => phoneNumber.replace(EXTRA_CHAR_REGEXP, '');
-
-const getCallableNumber = (number        , country         )          => {
-  try {
-    if (country) {
-      return getDisplayableNumber(number, country).replace(EXTRA_CHAR_REGEXP, '');
+const parsePhoneNumber = (phoneNumber) => phoneNumber.replace(EXTRA_CHAR_REGEXP, '');
+const getCallableNumber = (number, country) => {
+    try {
+        if (country) {
+            return getDisplayableNumber(number, country).replace(EXTRA_CHAR_REGEXP, '');
+        }
+        return parsePhoneNumber(number);
+    }
+    catch (_) {
+        return number;
     }
-    return parsePhoneNumber(number);
-  } catch (_) {
-    return number;
-  }
 };
-
-export { AsYouTypeFormatter, PhoneNumberFormat, PhoneNumberUtil, getCallableNumber, getDisplayableNumber, parsePhoneNumber };
+export { PhoneNumberUtil, PhoneNumberFormat, parsePhoneNumber, AsYouTypeFormatter, getDisplayableNumber, getCallableNumber };

package/esm/utils/__tests__/Heartbeat.test.js

@@ -1,174 +1,65 @@
-//      
-
-const DEFAULT_HEARTBEAT_DELAY = 2000;
-const DEFAULT_HEARTBEAT_TIMEOUT = 5000;
-const DEFAULT_MAX_HEARTBEATS = 3;
-
-class Heartbeat {
-                         
-                           
-                        
-
-                        
-                                     
-                                           
-                          
-                                    
-                                
-
-  constructor(heartbeatDelay         = DEFAULT_HEARTBEAT_DELAY, heartbeatTimeout         = DEFAULT_HEARTBEAT_TIMEOUT,
-    maxHeartbeats         = DEFAULT_MAX_HEARTBEATS) {
-    this.heartbeatDelay = heartbeatDelay;
-    this.heartbeatTimeout = heartbeatTimeout;
-    this.maxHeartbeats = maxHeartbeats;
-
-    this.hasHeartbeat = false;
-    this._heartbeatTries = 0;
-  }
-
-  setSendHeartbeat(cb          ) {
-    this._sendHeartbeatCallback = cb;
-  }
-
-  setOnHeartbeatTimeout(cb          ) {
-    this._onTimeoutCallback = cb;
-  }
-
-  stop() {
-    this.hasHeartbeat = false;
-
-    if (this._heartbeatNotReceivedTimeout) {
-      clearTimeout(this._heartbeatNotReceivedTimeout);
-    }
-    if (this._heartbeatDelayTimeout) {
-      clearTimeout(this._heartbeatDelayTimeout);
-    }
-  }
-
-  start() {
-    this.stop();
-    this.hasHeartbeat = true;
-    this._heartbeatTries = 0;
-    this._sendHeartbeat();
-  }
-
-  onHeartbeat() {
-    this._clearTimeouts();
-
-    if (!this.hasHeartbeat) {
-      return;
-    }
-
-    this._sendHeartbeat();
-  }
-
-  _sendHeartbeat() {
-    if (this._heartbeatTries >= this.maxHeartbeats) {
-      return;
-    }
-
-    this._clearTimeouts();
-
-    this._heartbeatDelayTimeout = setTimeout(() => {
-      this._heartbeatTries++;
-
-      if (this._sendHeartbeatCallback) {
-        this._sendHeartbeatCallback();
-      }
-    }, this.heartbeatDelay);
-
-    if (this._onTimeoutCallback) {
-      this._heartbeatNotReceivedTimeout = setTimeout(this._onTimeoutCallback, this.heartbeatTimeout);
-    }
-  }
-
-  _clearTimeouts() {
-    if (this._heartbeatNotReceivedTimeout) {
-      clearTimeout(this._heartbeatNotReceivedTimeout);
-    }
-
-    if (this._heartbeatDelayTimeout) {
-      clearTimeout(this._heartbeatDelayTimeout);
-    }
-  }
-}
-
+import Heartbeat from '../Heartbeat';
 describe('Heartbeat', () => {
-  describe('When onHearbeat is not called', () => {
-    it('should retry the call with a new token', async () => {
-      const spy = jest.fn();
-      const heartbeat = new Heartbeat(10, 50, 2);
-      heartbeat.setOnHeartbeatTimeout(spy);
-      heartbeat.start();
-
-      await new Promise(resolve => setTimeout(resolve, 70));
-
-      expect(spy).toHaveBeenCalled();
+    describe('When onHearbeat is not called', () => {
+        it('should retry the call with a new token', async () => {
+            const spy = jest.fn();
+            const heartbeat = new Heartbeat(10, 50, 2);
+            heartbeat.setOnHeartbeatTimeout(spy);
+            heartbeat.start();
+            await new Promise(resolve => setTimeout(resolve, 70));
+            expect(spy).toHaveBeenCalled();
+        });
     });
-  });
-
-  describe('When onHearbeat is called', () => {
-    it('should not call onTimeout', async () => {
-      const timeout = jest.fn();
-      const sendHeartbeat = jest.fn();
-      const heartbeat = new Heartbeat(10, 50, 2);
-      heartbeat.setSendHeartbeat(sendHeartbeat);
-      heartbeat.setOnHeartbeatTimeout(timeout);
-      heartbeat.start();
-
-      setTimeout(() => {
-        heartbeat.onHeartbeat();
-      }, 30);
-
-      await new Promise(resolve => setTimeout(resolve, 70));
-
-      expect(sendHeartbeat).toHaveBeenCalled();
-      expect(timeout).not.toHaveBeenCalled();
+    describe('When onHearbeat is called', () => {
+        it('should not call onTimeout', async () => {
+            const timeout = jest.fn();
+            const sendHeartbeat = jest.fn();
+            const heartbeat = new Heartbeat(10, 50, 2);
+            heartbeat.setSendHeartbeat(sendHeartbeat);
+            heartbeat.setOnHeartbeatTimeout(timeout);
+            heartbeat.start();
+            setTimeout(() => {
+                heartbeat.onHeartbeat();
+            }, 30);
+            await new Promise(resolve => setTimeout(resolve, 70));
+            expect(sendHeartbeat).toHaveBeenCalled();
+            expect(timeout).not.toHaveBeenCalled();
+        });
     });
-  });
-
-  describe('When onHearbeat is called every times', () => {
-    it('should not timeout', async () => {
-      const timeout = jest.fn();
-      const heartbeat = new Heartbeat(5, 50, 8);
-      const sendHeartbeat = jest.fn(() => {
-        heartbeat.onHeartbeat();
-      });
-      heartbeat.setSendHeartbeat(sendHeartbeat);
-      heartbeat.setOnHeartbeatTimeout(timeout);
-      heartbeat.start();
-
-      await new Promise(resolve => setTimeout(resolve, 100));
-
-      expect(sendHeartbeat).toHaveBeenNthCalledWith(8);
-      expect(timeout).not.toHaveBeenCalled();
+    describe('When onHearbeat is called every times', () => {
+        it('should not timeout', async () => {
+            const timeout = jest.fn();
+            const heartbeat = new Heartbeat(5, 50, 8);
+            const sendHeartbeat = jest.fn(() => {
+                heartbeat.onHeartbeat();
+            });
+            heartbeat.setSendHeartbeat(sendHeartbeat);
+            heartbeat.setOnHeartbeatTimeout(timeout);
+            heartbeat.start();
+            await new Promise(resolve => setTimeout(resolve, 100));
+            expect(sendHeartbeat).toHaveBeenNthCalledWith(8);
+            expect(timeout).not.toHaveBeenCalled();
+        });
     });
-  });
-
-  describe('When calling it twice', () => {
-    it('should work like the first time', async () => {
-      const timeout = jest.fn();
-      const heartbeat = new Heartbeat(5, 50, 8);
-      const sendHeartbeat = jest.fn(() => {
-        heartbeat.onHeartbeat();
-      });
-      heartbeat.setSendHeartbeat(sendHeartbeat);
-      heartbeat.setOnHeartbeatTimeout(timeout);
-
-      // First call
-      heartbeat.start();
-
-      await new Promise(resolve => setTimeout(resolve, 100));
-
-      expect(sendHeartbeat).toHaveBeenNthCalledWith(8);
-      expect(timeout).not.toHaveBeenCalled();
-
-      // Second call
-      heartbeat.setSendHeartbeat(() => {});
-      heartbeat.start();
-      await new Promise(resolve => setTimeout(resolve, 100));
-
-      expect(timeout).toHaveBeenCalled();
+    describe('When calling it twice', () => {
+        it('should work like the first time', async () => {
+            const timeout = jest.fn();
+            const heartbeat = new Heartbeat(5, 50, 8);
+            const sendHeartbeat = jest.fn(() => {
+                heartbeat.onHeartbeat();
+            });
+            heartbeat.setSendHeartbeat(sendHeartbeat);
+            heartbeat.setOnHeartbeatTimeout(timeout);
+            // First call
+            heartbeat.start();
+            await new Promise(resolve => setTimeout(resolve, 100));
+            expect(sendHeartbeat).toHaveBeenNthCalledWith(8);
+            expect(timeout).not.toHaveBeenCalled();
+            // Second call
+            heartbeat.setSendHeartbeat(() => { });
+            heartbeat.start();
+            await new Promise(resolve => setTimeout(resolve, 100));
+            expect(timeout).toHaveBeenCalled();
+        });
     });
-  });
 });

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

@@ -1,129 +1,59 @@
-import LibPhoneNumber from 'google-libphonenumber';
-
-//      
-
-const PhoneNumberUtil = LibPhoneNumber.PhoneNumberUtil.getInstance();
-const { PhoneNumberFormat, AsYouTypeFormatter } = LibPhoneNumber;
-
-// eslint-disable-next-line
-const EXTRA_CHAR_REGEXP = /[^+*\d]/g;
-
-const shouldBeFormatted = (number         ) => {
-  if (!number || number.length <= 5) {
-    return false;
-  }
-
-  return !number.includes('#') && !number.includes('*') && !number.match(/[aA-zZ]/);
-};
-
-const isSameCountry = (country1, country2) => {
-  if ((country1 === 'US' && country2 === 'CA') || (country2 === 'US' && country1 === 'CA')) {
-    return true;
-  }
-
-  return country1 === country2;
-};
-
-const getDisplayableNumber = (rawNumber        , country        , asYouType          = false)         => {
-  if (!rawNumber) {
-    return rawNumber;
-  }
-
-  const number = String(rawNumber);
-  if (!shouldBeFormatted(number)) {
-    return number;
-  }
-
-  let displayValue = '';
-
-  if (asYouType) {
-    const formatter = new AsYouTypeFormatter(country);
-    number.split('').forEach(char => {
-      displayValue = formatter.inputDigit(char);
-    });
-  } else {
-    try {
-      const parsedNumber = PhoneNumberUtil.parseAndKeepRawInput(number, country);
-      const numberCountry = PhoneNumberUtil.getRegionCodeForNumber(parsedNumber);
-      const format = isSameCountry(numberCountry, country) ? PhoneNumberFormat.NATIONAL
-        : PhoneNumberFormat.INTERNATIONAL;
-
-      displayValue = PhoneNumberUtil.format(parsedNumber, format);
-    } catch (_) {
-      // Avoid to crash when phone number like `0080510` can't be parsed
-      displayValue = rawNumber;
-    }
-  }
-
-  return displayValue;
-};
-
-const parsePhoneNumber = (phoneNumber        )         => phoneNumber.replace(EXTRA_CHAR_REGEXP, '');
-
-const getCallableNumber = (number        , country         )          => {
-  try {
-    if (country) {
-      return getDisplayableNumber(number, country).replace(EXTRA_CHAR_REGEXP, '');
-    }
-    return parsePhoneNumber(number);
-  } catch (_) {
-    return number;
-  }
-};
-
+import { getDisplayableNumber, getCallableNumber } from '../PhoneNumberUtil';
 describe('Formatting phone numbers', () => {
-  it('should not format all phone numbers', () => {
-    expect(getDisplayableNumber('*143450', 'FR')).toBe('*143450');
-    expect(getDisplayableNumber('*10', 'US')).toBe('*10');
-    expect(getDisplayableNumber('Wazo Fax', 'US')).toBe('Wazo Fax');
-    expect(getDisplayableNumber('#23445433', 'DE')).toBe('#23445433');
-    expect(getDisplayableNumber('0080510', 'FR')).toBe('0080510');
-  });
-
-  it('should format real phone numbers', () => {
-    expect(getDisplayableNumber('+33675456545', 'FR')).toBe('06 75 45 65 45');
-    expect(getDisplayableNumber('0675456545', 'FR')).toBe('06 75 45 65 45');
-    expect(getDisplayableNumber('+33675456545', 'US')).toBe('+33 6 75 45 65 45');
-    expect(getDisplayableNumber('0675456545', 'US')).toBe('+1 0675456545');
-    expect(getDisplayableNumber('4188884356', 'US')).toBe('(418) 888-4356');
-  });
-
-  it('should format real phone numbers when typing', () => {
-    expect(getDisplayableNumber('+3367545', 'FR', true)).toBe('+33 6 75 45');
-    expect(getDisplayableNumber('067545', 'FR', true)).toBe('06 75 45');
-    expect(getDisplayableNumber('+3367545', 'US', true)).toBe('+33 6 75 45');
-    expect(getDisplayableNumber('067545', 'US', true)).toBe('067545');
-    expect(getDisplayableNumber('418808', 'US', true)).toBe('418-808');
-  });
-
-  it('should use the international number if the country number is different from the given country', () => {
-    expect(getDisplayableNumber('00201005803648', 'FR')).toBe('+20 100 580 3648');
-    expect(getDisplayableNumber('+14188004554', 'FR')).toBe('+1 418-800-4554');
-    expect(getDisplayableNumber('00201005803648', 'EG')).toBe('0100 580 3648');
-    expect(getDisplayableNumber('0634543450', 'FR')).toBe('06 34 54 34 50');
-    expect(getDisplayableNumber('4188034302', 'US')).toBe('(418) 803-4302');
-    expect(getDisplayableNumber('8775863230', 'CA')).toBe('(877) 586-3230');
-    expect(getDisplayableNumber('8775863230', 'US')).toBe('(877) 586-3230');
-  });
+    it('should not format all phone numbers', () => {
+        expect(getDisplayableNumber('*143450', 'FR')).toBe('*143450');
+        expect(getDisplayableNumber('*10', 'US')).toBe('*10');
+        expect(getDisplayableNumber('Wazo Fax', 'US')).toBe('Wazo Fax');
+        expect(getDisplayableNumber('#23445433', 'DE')).toBe('#23445433');
+        expect(getDisplayableNumber('0080510', 'FR')).toBe('0080510');
+    });
+    it('should format real phone numbers', () => {
+        expect(getDisplayableNumber('+33675456545', 'FR')).toBe('06 75 45 65 45');
+        expect(getDisplayableNumber('0675456545', 'FR')).toBe('06 75 45 65 45');
+        expect(getDisplayableNumber('+33675456545', 'US')).toBe('+33 6 75 45 65 45');
+        expect(getDisplayableNumber('0675456545', 'US')).toBe('+1 0675456545');
+        expect(getDisplayableNumber('4188884356', 'US')).toBe('(418) 888-4356');
+    });
+    it('should format real phone numbers when typing', () => {
+        expect(getDisplayableNumber('+3367545', 'FR', true)).toBe('+33 6 75 45');
+        expect(getDisplayableNumber('067545', 'FR', true)).toBe('06 75 45');
+        expect(getDisplayableNumber('+3367545', 'US', true)).toBe('+33 6 75 45');
+        expect(getDisplayableNumber('067545', 'US', true)).toBe('067545');
+        expect(getDisplayableNumber('418808', 'US', true)).toBe('418-808');
+    });
+    it('should use the international number if the country number is different from the given country', () => {
+        expect(getDisplayableNumber('00201005803648', 'FR')).toBe('+20 100 580 3648');
+        expect(getDisplayableNumber('+14188004554', 'FR')).toBe('+1 418-800-4554');
+        expect(getDisplayableNumber('00201005803648', 'EG')).toBe('0100 580 3648');
+        expect(getDisplayableNumber('0634543450', 'FR')).toBe('06 34 54 34 50');
+        expect(getDisplayableNumber('4188034302', 'US')).toBe('(418) 803-4302');
+        expect(getDisplayableNumber('8775863230', 'CA')).toBe('(877) 586-3230');
+        expect(getDisplayableNumber('8775863230', 'US')).toBe('(877) 586-3230');
+    });
 });
-
 describe('getCallableNumber', () => {
-  it('works with a country', () => {
-    expect(getCallableNumber('+33 6 75 45 12 34', 'FR')).toBe('0675451234');
-    expect(getCallableNumber('06 75 45 12 34', 'FR')).toBe('0675451234');
-    expect(getCallableNumber('+1-202-555-0147', 'US')).toBe('2025550147');
-    expect(getCallableNumber('202-555-0113', 'US')).toBe('2025550113');
-    expect(getCallableNumber('8008', 'US')).toBe('8008');
-    expect(getCallableNumber('80.08', 'US')).toBe('8008');
-    expect(getCallableNumber('*10', 'US')).toBe('*10');
-    expect(getCallableNumber('9000', 'US')).toBe('9000');
-  });
-  it('works without a country', () => {
-    expect(getCallableNumber('06 75 45')).toBe('067545');
-    expect(getCallableNumber('067-545')).toBe('067545');
-    expect(getCallableNumber('8008')).toBe('8008');
-    expect(getCallableNumber('80.08')).toBe('8008');
-    expect(getCallableNumber('*10')).toBe('*10');
-    expect(getCallableNumber('9000')).toBe('9000');
-  });
+    it('works with a country', () => {
+        expect(getCallableNumber('+33 6 75 45 12 34', 'FR')).toBe('0675451234');
+        expect(getCallableNumber('06 75 45 12 34', 'FR')).toBe('0675451234');
+        expect(getCallableNumber('+1-202-555-0147', 'US')).toBe('2025550147');
+        expect(getCallableNumber('202-555-0113', 'US')).toBe('2025550113');
+        expect(getCallableNumber('8008', 'US')).toBe('8008');
+        expect(getCallableNumber('80.08', 'US')).toBe('8008');
+        expect(getCallableNumber('*10', 'US')).toBe('*10');
+        expect(getCallableNumber('9000', 'US')).toBe('9000');
+    });
+    it('works without a country', () => {
+        // @ts-expect-error
+        expect(getCallableNumber('06 75 45')).toBe('067545');
+        // @ts-expect-error
+        expect(getCallableNumber('067-545')).toBe('067545');
+        // @ts-expect-error
+        expect(getCallableNumber('8008')).toBe('8008');
+        // @ts-expect-error
+        expect(getCallableNumber('80.08')).toBe('8008');
+        // @ts-expect-error
+        expect(getCallableNumber('*10')).toBe('*10');
+        // @ts-expect-error
+        expect(getCallableNumber('9000')).toBe('9000');
+    });
 });