@wazo/sdk 0.37.42 → 0.38.1

package/lib/simple/utils.js

@@ -1921,13 +1921,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -1935,6 +1931,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -7487,8 +7492,10 @@ class WebRTCClient extends Emitter {
       conference: isConference,
     };
 
-    // Avoid sdh to created a new stream
-    session.sessionDescriptionHandler.localMediaStreamConstraints = options.constraints;
+    // Avoid sdh to create a new stream
+    if (session.sessionDescriptionHandler) {
+      session.sessionDescriptionHandler.localMediaStreamConstraints = options.constraints;
+    }
 
     // Send re-INVITE
     return session.invite(options);
@@ -8331,7 +8338,7 @@ class WebRTCClient extends Emitter {
   }
 
   async _onHeartbeatTimeout() {
-    logger$8.info('sdk webrtc heartbeat timed out', { userAgent: !!this.userAgent, cb: !!this.heartbeatTimeoutCb });
+    logger$8.warn('sdk webrtc heartbeat timed out', { userAgent: !!this.userAgent, cb: !!this.heartbeatTimeoutCb });
 
     if (this.heartbeatTimeoutCb) {
       this.heartbeatTimeoutCb();
@@ -11499,7 +11506,7 @@ class WebSocketClient extends Emitter {
       this.close();
     }
     const url = `wss://${this.host || ''}/api/websocketd/?token=${this.token || ''}&version=${this.version}`;
-    logger$5.log('Wazo WS url computed to reconnect', { url });
+    logger$5.info('Wazo WS url computed to reconnect', { url });
 
     return url;
   }
@@ -13958,6 +13965,334 @@ class Checker {
   }
 }
 
+//      
+/* eslint-disable no-unused-vars */
+/* global window, document */
+const BRIDGE_CONFIG_RETRIEVED = 'bridge/CONFIG_RETRIEVED';
+const BRIDGE_ENABLE_CARD = 'bridge/ENABLE_CARD';
+const BRIDGE_CHANGE_REQUIRED_SUBSCRIPTION_TYPE = 'bridge/CHANGE_REQUIRED_SUBSCRIPTION_TYPE';
+const BRIDGE_CREATE_OR_UPDATE_CARD = 'bridge/BRIDGE_CREATE_OR_UPDATE_CARD';
+const BRIDGE_OPTIONS_FETCHED = 'bridge/BRIDGE_OPTIONS_FETCHED';
+const BRIDGE_OPTIONS_FOUND = 'bridge/BRIDGE_OPTIONS_FOUND';
+const BRIDGE_SEARCH_OPTIONS = 'bridge/BRIDGE_SEARCH_OPTIONS';
+const BRIDGE_DISPLAY_LINKED_OPTION = 'bridge/DISPLAY_LINKED_OPTION';
+const BRIDGE_UPDATE_FORM_SCHEMA = 'bridge/BRIDGE_UPDATE_FORM_SCHEMA';
+const BRIDGE_WAZO_CONTACT_SEARCH = 'bridge/BRIDGE_WAZO_CONTACT_SEARCH';
+const BRIDGE_ON_AGENT_LOGGED_IN = 'bridge/BRIDGE_ON_AGENT_LOGGED_IN';
+const BRIDGE_ON_AGENT_LOGGED_OUT = 'bridge/BRIDGE_ON_AGENT_LOGGED_OUT';
+const BRIDGE_ON_AGENT_PAUSED = 'bridge/BRIDGE_ON_AGENT_PAUSED';
+const BRIDGE_ON_AGENT_RESUMED = 'bridge/BRIDGE_ON_AGENT_RESUMED';
+const BRIDGE_ON_LANGUAGE_CHANGED = 'bridge/BRIDGE_ON_LANGUAGE_CHANGED';
+const BRIDGE_ON_CALL_HELD = 'bridge/BRIDGE_ON_CALL_HELD';
+const BRIDGE_ON_CALL_RESUMED = 'bridge/BRIDGE_ON_CALL_RESUMED';
+const BRIDGE_ON_CALL_MUTED = 'bridge/BRIDGE_ON_CALL_MUTED';
+const BRIDGE_ON_CALL_UN_MUTED = 'bridge/BRIDGE_ON_CALL_UN_MUTED';
+const BRIDGE_ON_DTMF = 'bridge/BRIDGE_ON_DTMF';
+const BRIDGE_ON_DIRECT_TRANSFER = 'bridge/BRIDGE_ON_DIRECT_TRANSFER';
+const BRIDGE_ON_CREATE_INDIRECT_TRANSFER = 'bridge/BRIDGE_ON_CREATE_INDIRECT_TRANSFER';
+const BRIDGE_ON_CANCEL_INDIRECT_TRANSFER = 'bridge/BRIDGE_ON_CANCEL_INDIRECT_TRANSFER';
+const BRIDGE_ON_CONFIRM_INDIRECT_TRANSFER = 'bridge/BRIDGE_ON_CONFIRM_INDIRECT_TRANSFER';
+const BRIDGE_ON_INDIRECT_TRANSFER_CALL_MADE = 'bridge/BRIDGE_ON_INDIRECT_TRANSFER_CALL_MADE';
+const BRIDGE_ON_INDIRECT_TRANSFER_DONE = 'bridge/BRIDGE_ON_INDIRECT_TRANSFER_DONE';
+const BRIDGE_ON_START_RECORDING = 'bridge/BRIDGE_ON_START_RECORDING';
+const BRIDGE_ON_STOP_RECORDING = 'bridge/BRIDGE_ON_STOP_RECORDING';
+
+const SDK_CLICK_TO_CALL = 'sdk/CLICK_TO_CALL';
+const SDK_ON_CALL_MADE = 'sdk/SDK_ON_CALL_MADE';
+const SDK_CALL_ENDED = 'sdk/ON_CALL_ENDED';
+const SDK_CALL_INCOMING = 'sdk/SDK_CALL_INCOMING';
+const SDK_AUTHENTICATED = 'sdk/SDK_AUTHENTICATED';
+const SDK_LOGGED_OUT = 'sdk/SDK_LOGGED_OUT';
+
+class Softphone {
+  url         = 'https://softphone.wazo.io';
+  width         = 500;
+  height         = 600;
+  displayed          = false;
+  iframe          = null;
+
+  onLinkEnabled(link        ) {}
+  onIFrameLoaded() {}
+
+  onCallMade(call        ) {}
+  onCallIncoming(call        ) {}
+  onCallEnded(call        , card        , direction        , fromExtension        ) {}
+  onCardSaved(card        ) {}
+  onAuthenticated(session        ) {}
+  onLoggedOut() {}
+  onSearchOptions(fieldId        , query        ) {}
+  onDisplayLinkedOption(optionId        ) {}
+  onWazoContactSearch(query        ) {}
+  onAgentLoggedIn() {}
+  onAgentLoggedOut() {}
+  onAgentPaused() {}
+  onAgentResumed() {}
+  onLanguageChanged(language        ) {}
+  onCallHeld() {}
+  onCallResumed() {}
+  onCallMuted() {}
+  onCallUnMuted() {}
+  onDtmfSent(tone        ) {}
+  onDirectTransfer(number        ) {}
+  onCreateIndirectTransfer(number        ) {}
+  onCancelIndirectTransfer() {}
+  onConfirmIndirectTransfer() {}
+  onIndirectCallMade(call        ) {}
+  onIndirectTransferDone(call        ) {}
+  onStartRecording() {}
+  onStopRecording() {}
+  onUnHandledEvent(event        ) {}
+
+  init({ url, width, height, server, port, language, wrapUpDuration, shouldDisplayLinkedEntities,
+    allowContactCreation, withCard, subscriptionType, enableAgent }         = {}) {
+    if (url) {
+      this.url = url;
+    }
+    if (width) {
+      this.width = width;
+    }
+    if (height) {
+      this.height = height;
+    }
+
+    window.addEventListener('message', this._onMessage.bind(this), false);
+
+    if (!server) {
+      // eslint-disable-next-line no-param-reassign
+      server = 'stack.dev.wazo.io';
+    }
+
+    this._createIframe(() => {
+      this._sendMessage(BRIDGE_CONFIG_RETRIEVED, {
+        config: {
+          server,
+          port,
+          language,
+          wrapUpDuration,
+          shouldDisplayLinkedEntities,
+          allowContactCreation,
+        },
+      });
+
+      if (withCard) {
+        this._sendMessage(BRIDGE_ENABLE_CARD);
+      }
+
+      if (subscriptionType) {
+        this._sendMessage(BRIDGE_CHANGE_REQUIRED_SUBSCRIPTION_TYPE, { subscriptionType });
+      }
+
+      this.onIFrameLoaded();
+    });
+  }
+
+  parseLinks() {
+    const links = this._getLinks();
+
+    links.forEach(link => {
+      link.setAttribute('data-wazo-parsed', true);
+      link.addEventListener('click', this._onLinkClick.bind(this));
+      this.onLinkEnabled(link);
+    });
+  }
+
+  makeCall(number        ) {
+    this.displaySoftphone();
+
+    this._sendMessage(SDK_CLICK_TO_CALL, { number });
+  }
+
+  toggleSoftphoneDisplay() {
+    if (this.displayed) {
+      this.hideSoftphone();
+    } else {
+      this.displaySoftphone();
+    }
+  }
+
+  displaySoftphone() {
+    if (!this.iframe) {
+      this._createIframe();
+    }
+
+    if (this.iframe) {
+      this.iframe.style.display = 'block';
+    }
+
+    this.displayed = true;
+  }
+
+  hideSoftphone() {
+    if (this.iframe) {
+      this.iframe.style.display = 'none';
+    }
+    this.displayed = false;
+  }
+
+  optionsFetched(fieldId        , options       ) {
+    this._sendMessage(BRIDGE_OPTIONS_FETCHED, { fieldId, options });
+  }
+
+  onOptionsResults(fieldId        , options       ) {
+    this._sendMessage(BRIDGE_OPTIONS_FOUND, { fieldId, options });
+  }
+
+  setFormSchema(schema        , uiSchema        ) {
+    this._sendMessage(BRIDGE_UPDATE_FORM_SCHEMA, { schema, uiSchema });
+  }
+
+  _createIframe(cb           = () => {}) {
+    this.iframe = document.createElement('iframe');
+    // $FlowFixMe
+    this.iframe.width = this.width;
+    // $FlowFixMe
+    this.iframe.height = this.height;
+    // $FlowFixMe
+    this.iframe.allow = 'camera *; microphone *; autoplay *; display-capture *';
+    this.iframe.style.position = 'absolute';
+    this.iframe.style.left = '0';
+    this.iframe.style.bottom = '0';
+    this.iframe.style.border = '1px solid #aaa';
+    this.iframe.style.backgroundColor = 'white';
+    this.iframe.src = this.url;
+    this.iframe.style.display = 'none';
+    this.iframe.id = 'wazo-softphone';
+
+    this.iframe.onload = cb;
+
+    // $FlowFixMe
+    document.body.appendChild(this.iframe);
+  }
+
+  _getLinks() {
+    return [].slice.call(document.querySelectorAll('a:not([data-wazo-parsed])'), 0)
+      .filter(link => link.href.indexOf('tel:') === 0 || link.href.indexOf('callto:') === 0);
+  }
+
+  _onLinkClick(e        ) {
+    e.preventDefault();
+    const number = e.target.href.split(':')[1];
+
+    this.makeCall(number);
+  }
+
+  _onAuthenticated() {
+    this.parseLinks();
+  }
+
+  _onMessage(event        ) {
+    if (!event.data) {
+      return;
+    }
+
+    switch (event.data.type) {
+      case SDK_ON_CALL_MADE:
+        this.onCallMade(event.data.callSession);
+        break;
+      case SDK_CALL_ENDED: {
+        const { callSession, content, direction, userExtension } = event.data;
+        this.onCallEnded(callSession, content, direction, userExtension);
+        break;
+      }
+      case SDK_CALL_INCOMING:
+        this.onCallIncoming(event.data.callSession);
+        break;
+      case SDK_AUTHENTICATED:
+        // $FlowFixMe
+        this._onAuthenticated(event.data.session);
+        this.onAuthenticated(event.data.session);
+        break;
+      case SDK_LOGGED_OUT:
+        this.onLoggedOut();
+        break;
+      case BRIDGE_CREATE_OR_UPDATE_CARD: {
+        const { content } = event.data;
+        this.onCardSaved(content);
+        break;
+      }
+      case BRIDGE_SEARCH_OPTIONS: {
+        const { fieldId, query } = event.data;
+        this.onSearchOptions(fieldId, query);
+        break;
+      }
+      case BRIDGE_DISPLAY_LINKED_OPTION:
+        this.onDisplayLinkedOption(event.data.linkedOptionId);
+        break;
+      case BRIDGE_WAZO_CONTACT_SEARCH:
+        this.onWazoContactSearch(event.data.query);
+        break;
+      case BRIDGE_ON_AGENT_LOGGED_IN:
+        this.onAgentLoggedIn();
+        break;
+      case BRIDGE_ON_AGENT_LOGGED_OUT:
+        this.onAgentLoggedOut();
+        break;
+      case BRIDGE_ON_AGENT_PAUSED:
+        this.onAgentPaused();
+        break;
+      case BRIDGE_ON_AGENT_RESUMED:
+        this.onAgentResumed();
+        break;
+      case BRIDGE_ON_LANGUAGE_CHANGED:
+        this.onLanguageChanged(event.data.language);
+        break;
+      case BRIDGE_ON_CALL_HELD:
+        this.onCallHeld();
+        break;
+      case BRIDGE_ON_CALL_RESUMED:
+        this.onCallResumed();
+        break;
+      case BRIDGE_ON_CALL_MUTED:
+        this.onCallMuted();
+        break;
+      case BRIDGE_ON_CALL_UN_MUTED:
+        this.onCallUnMuted();
+        break;
+      case BRIDGE_ON_DTMF:
+        this.onDtmfSent(event.data.tone);
+        break;
+      case BRIDGE_ON_DIRECT_TRANSFER:
+        this.onDirectTransfer(event.data.number);
+        break;
+      case BRIDGE_ON_CREATE_INDIRECT_TRANSFER:
+        this.onCreateIndirectTransfer(event.data.number);
+        break;
+      case BRIDGE_ON_CANCEL_INDIRECT_TRANSFER:
+        this.onCancelIndirectTransfer();
+        break;
+      case BRIDGE_ON_CONFIRM_INDIRECT_TRANSFER:
+        this.onConfirmIndirectTransfer();
+        break;
+      case BRIDGE_ON_INDIRECT_TRANSFER_CALL_MADE:
+        this.onIndirectCallMade(event.data.call);
+        break;
+      case BRIDGE_ON_INDIRECT_TRANSFER_DONE:
+        this.onIndirectTransferDone(event.data.call);
+        break;
+      case BRIDGE_ON_START_RECORDING:
+        this.onStartRecording();
+        break;
+      case BRIDGE_ON_STOP_RECORDING:
+        this.onStopRecording();
+        break;
+      default:
+        this.onUnHandledEvent(event);
+        break;
+    }
+  }
+
+  _sendMessage(type        , payload         = {}) {
+    if (!this.iframe) {
+      console.warn(`Could not send message of type ${type} to the Wazo Softphone, iframe not created yet`);
+      return;
+    }
+
+    this.iframe.contentWindow.postMessage({ type, ...payload }, '*');
+  }
+}
+
+var Softphone$1 = new Softphone();
+
 /* global window */
 
 const Wazo = {
@@ -13978,6 +14313,7 @@ const Wazo = {
   loggerFor: IssueReporter$1.loggerFor.bind(IssueReporter$1),
   Features: Features$1,
   Checker,
+  Softphone: Softphone$1,
 
   // Domain
   domain: {

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

@@ -398,13 +398,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -412,6 +408,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);

package/lib/utils/api-requester.js

@@ -400,13 +400,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -414,6 +410,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);

package/lib/web-rtc-client.js

@@ -689,13 +689,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -703,6 +699,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -6116,8 +6121,10 @@ class WebRTCClient extends Emitter {
       conference: isConference,
     };
 
-    // Avoid sdh to created a new stream
-    session.sessionDescriptionHandler.localMediaStreamConstraints = options.constraints;
+    // Avoid sdh to create a new stream
+    if (session.sessionDescriptionHandler) {
+      session.sessionDescriptionHandler.localMediaStreamConstraints = options.constraints;
+    }
 
     // Send re-INVITE
     return session.invite(options);
@@ -6960,7 +6967,7 @@ class WebRTCClient extends Emitter {
   }
 
   async _onHeartbeatTimeout() {
-    logger.info('sdk webrtc heartbeat timed out', { userAgent: !!this.userAgent, cb: !!this.heartbeatTimeoutCb });
+    logger.warn('sdk webrtc heartbeat timed out', { userAgent: !!this.userAgent, cb: !!this.heartbeatTimeoutCb });
 
     if (this.heartbeatTimeoutCb) {
       this.heartbeatTimeoutCb();

package/lib/websocket-client.js

@@ -397,13 +397,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -411,6 +407,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message                 , count        )                  {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1        , level2        ) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);
@@ -871,7 +876,7 @@ class WebSocketClient extends Emitter {
       this.close();
     }
     const url = `wss://${this.host || ''}/api/websocketd/?token=${this.token || ''}&version=${this.version}`;
-    logger.log('Wazo WS url computed to reconnect', { url });
+    logger.info('Wazo WS url computed to reconnect', { url });
 
     return url;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "0.37.42",
+  "version": "0.38.1",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "dist/wazo-sdk.js",
   "author": "Wazo (http://wazo.io)",

package/src/service/IssueReporter.js

@@ -330,13 +330,9 @@ class IssueReporter {
 
       setTimeout(() => {
         if (isArray) {
-          payload = payload.map(message => {
-            message._retry = retry + 1;
-            return message;
-          });
-        } else {
-          // $FlowFixMe
-          payload._retry = retry + 1;
+          payload = payload.map(message => this._writeRetryCount(message, retry + 1));
+        } else if (payload && typeof payload === 'object') {
+          payload = this._writeRetryCount(payload, retry + 1);
         }
 
         this._sendDebugToGrafana(payload, retry + 1);
@@ -344,6 +340,15 @@ class IssueReporter {
     });
   }
 
+  _writeRetryCount(message: string | Object, count: number): string | Object {
+    if (message && typeof message === 'object') {
+      // $FlowFixMe
+      message._retry = count;
+    }
+
+    return message;
+  }
+
   _isLevelAbove(level1: string, level2: string) {
     const index1 = LOG_LEVELS.indexOf(level1);
     const index2 = LOG_LEVELS.indexOf(level2);

package/src/service/__tests__/IssueReporter.test.js

@@ -100,4 +100,10 @@ describe('IssueReporter', () => {
     expect(IssueReporter.removeSlashes('\"')).toBe("'");
     expect(IssueReporter.removeSlashes('\\\"')).toBe("'");
   });
+
+  it('Add retry count', () => {
+    expect(IssueReporter._writeRetryCount('', 1)).toBe('');
+    expect(IssueReporter._writeRetryCount('{}', 1)).toBe('{}');
+    expect(IssueReporter._writeRetryCount({}, 1)).toEqual({ _retry: 1 });
+  });
 });