@wazo/sdk 0.38.2 → 0.38.5

package/package.json

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

package/src/domain/__tests__/Line.test.js

@@ -11,7 +11,7 @@ describe('Line domain', () => {
         username: 'ipcor1pj',
         links: [
           {
-            href: 'https://stack.dev.wazo.io/api/confd/1.1/endpoints/sip/19',
+            href: 'https://stack.example.com/api/confd/1.1/endpoints/sip/19',
             rel: 'endpoint_sip',
           },
         ],
@@ -25,7 +25,7 @@ describe('Line domain', () => {
           context: 'default',
           links: [
             {
-              href: 'https://stack.dev.wazo.io/api/confd/1.1/extensions/59',
+              href: 'https://stack.example.com/api/confd/1.1/extensions/59',
               rel: 'extensions',
             },
           ],
@@ -33,7 +33,7 @@ describe('Line domain', () => {
       ],
       links: [
         {
-          href: 'https://stack.dev.wazo.io/api/confd/1.1/lines/8',
+          href: 'https://stack.example.com/api/confd/1.1/lines/8',
           rel: 'lines',
         },
       ],
@@ -51,7 +51,7 @@ describe('Line domain', () => {
             context: 'default',
             links: [
               {
-                href: 'https://stack.dev.wazo.io/api/confd/1.1/extensions/59',
+                href: 'https://stack.example.com/api/confd/1.1/extensions/59',
                 rel: 'extensions',
               },
             ],
@@ -61,7 +61,7 @@ describe('Line domain', () => {
           id: 19,
           links: [
             {
-              href: 'https://stack.dev.wazo.io/api/confd/1.1/endpoints/sip/19',
+              href: 'https://stack.example.com/api/confd/1.1/endpoints/sip/19',
               rel: 'endpoint_sip',
             },
           ],

package/src/lib/WazoSessionDescriptionHandler.js

@@ -110,6 +110,14 @@ class WazoSessionDescriptionHandler extends SessionDescriptionHandler {
       wazoLogger.trace('onicecandidate', event.candidate ? event.candidate.candidate : { done: true });
       if (event.candidate) {
         this.gatheredCandidates.push(parseCandidate(event.candidate.candidate));
+
+        // When receiving a `srflx` or a `relay` candidate, consider the negotiation done.
+        if (event.candidate.candidate.indexOf('srflx') !== -1 || event.candidate.candidate.indexOf('relay') !== -1) {
+          wazoLogger.info('A valid ice was found, triggering ice gathering complete callback.', {
+            ice: event.candidate.candidate,
+          });
+          this.iceGatheringComplete();
+        }
       }
     };
 

package/src/simple/Softphone.js

@@ -14,7 +14,9 @@ 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_ANSWERED = 'bridge/BRIDGE_ON_CALL_ANSWERED';
+const BRIDGE_ON_CALL_LOCALLY_ACCEPTED = 'bridge/BRIDGE_ON_CALL_LOCALLY_ACCEPTED';
+const BRIDGE_ON_CALL_REJECTED = 'bridge/BRIDGE_ON_CALL_REJECTED';
+const BRIDGE_ON_CALL_ESTABLISHED = 'bridge/BRIDGE_ON_CALL_ESTABLISHED';
 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';
@@ -31,12 +33,13 @@ const BRIDGE_ON_STOP_RECORDING = 'bridge/BRIDGE_ON_STOP_RECORDING';
 const BRIDGE_ON_CARD_CANCELED = 'bridge/BRIDGE_ON_CARD_CANCELED';
 const BRIDGE_ENABLE_AGENT = 'bridge/BRIDGE_ENABLE_AGENT';
 const BRIDGE_SET_CARD_CONTENT = 'bridge/BRIDGE_SET_CARD_CONTENT';
+const BRIDGE_ENABLE_DEBUG = 'bridge/BRIDGE_ENABLE_DEBUG';
 
 const BRIDGE_INJECT_CSS = 'bridge/BRIDGE_INJECT_CSS';
 const BRIDGE_CUSTOMIZE_APPEARANCE = 'bridge/BRIDGE_CUSTOMIZE_APPEARANCE';
 
 const SDK_CLICK_TO_CALL = 'sdk/CLICK_TO_CALL';
-const SDK_ON_CALL_MADE = 'sdk/SDK_ON_CALL_MADE';
+const SDK_ON_OUTGOING_CALL_MADE = 'sdk/SDK_ON_OUTGOING_CALL_MADE';
 const SDK_CALL_ENDED = 'sdk/ON_CALL_ENDED';
 const SDK_CALL_INCOMING = 'sdk/SDK_CALL_INCOMING';
 const SDK_AUTHENTICATED = 'sdk/SDK_AUTHENTICATED';
@@ -56,10 +59,13 @@ class Softphone {
   onLinkEnabled(link: Object) {}
   onIFrameLoaded() {}
 
-  onCallAnswered() {}
-  onCallMade(call: Object) {}
+  onCallLocallyAnswered(call: Object) {}
+  onCallEstablished(call: Object) {}
+  onOutgoingCallMade(call: Object) {}
   onCallIncoming(call: Object) {}
+  onCallRejected(call: Object) {}
   onCallEnded(call: Object, card: Object, direction: string, fromExtension: string) {}
+
   onCardSaved(card: Object) {}
   onCardCanceled() {}
   onAuthenticated(session: Object) {}
@@ -91,7 +97,18 @@ class Softphone {
   onStopRecording() {}
   onUnHandledEvent(event: Object) {}
 
-  init({ url, width, height, server, port, language, wrapUpDuration, enableAgent = true }: Object = {}) {
+  init({
+    url,
+    width,
+    height,
+    server,
+    port,
+    language,
+    wrapUpDuration,
+    enableAgent = true,
+    tenantId,
+    debug = false,
+  }: Object = {}) {
     this.url = url || 'https://softphone.wazo.io';
     this.width = width || 500;
     this.height = height || 600;
@@ -103,8 +120,7 @@ class Softphone {
     window.addEventListener('message', this._onMessage.bind(this), false);
 
     if (!server) {
-      // eslint-disable-next-line no-param-reassign
-      server = 'stack.dev.wazo.io';
+      throw new Error('`server` is not set');
     }
 
     const config: Object = { server };
@@ -114,6 +130,9 @@ class Softphone {
     if (port) {
       config.port = port;
     }
+    if (tenantId) {
+      config.tenantId = tenantId;
+    }
     if (wrapUpDuration) {
       config.wrapUpDuration = wrapUpDuration;
     }
@@ -124,6 +143,10 @@ class Softphone {
       this._sendMessage(BRIDGE_ENABLE_AGENT);
     }
 
+    if (debug) {
+      this._sendMessage(BRIDGE_ENABLE_DEBUG);
+    }
+
     this._createIframe(() => {
       this.iframeLoaded = true;
       this._pendingMessages.forEach(([type, payload]) => this._sendMessage(type, payload));
@@ -244,8 +267,8 @@ class Softphone {
     }
 
     switch (event.data.type) {
-      case SDK_ON_CALL_MADE:
-        this.onCallMade(event.data.callSession);
+      case SDK_ON_OUTGOING_CALL_MADE:
+        this.onOutgoingCallMade(event.data.callSession);
         break;
       case SDK_CALL_ENDED: {
         const { callSession, content, direction, userExtension } = event.data;
@@ -336,8 +359,14 @@ class Softphone {
       case BRIDGE_ON_CARD_CANCELED:
         this.onCardCanceled();
         break;
-      case BRIDGE_ON_CALL_ANSWERED:
-        this.onCallAnswered();
+      case BRIDGE_ON_CALL_LOCALLY_ACCEPTED:
+        this.onCallLocallyAnswered(event.data.call);
+        break;
+      case BRIDGE_ON_CALL_REJECTED:
+        this.onCallRejected(event.data.call);
+        break;
+      case BRIDGE_ON_CALL_ESTABLISHED:
+        this.onCallEstablished(event.data.call);
         break;
       default:
         this.onUnHandledEvent(event);