@wazo/sdk 1.0.0-alpha.16 → 1.0.0-alpha.18

package/src/state-machine/call-state-machine.ts

@@ -15,11 +15,19 @@ export const EstablishedStates = {
   ONGOING: 'ongoing',
   HELD: 'held',
   MUTED: 'muted',
+  UN_MUTED: 'unMuted',
+  UN_HELD: 'unHeld',
+} as const;
+
+export const EstablishedSubStates = {
+  MUTE: 'muteState',
+  HOLD: 'holdState',
 } as const;
 
 export type StateTypes = typeof States[keyof typeof States];
 
 export type EstablishedStateTypes = typeof EstablishedStates[keyof typeof EstablishedStates];
+export type EstablishedSubStateTypes = typeof EstablishedSubStates[keyof typeof EstablishedSubStates];
 
 export const Actions = {
   INCOMING_CALL: 'incomingCall',
@@ -88,35 +96,46 @@ const callMachine = setup({
     },
     [States.ESTABLISHED]: {
       initial: EstablishedStates.ONGOING,
+      type: 'parallel',
       on: {
         [Actions.HANGUP]: {
           guard: 'isRegistered',
           target: States.TERMINATED,
         },
-        [EstablishedActions.HOLD]: {
-          guard: 'isRegistered',
-          target: `.${EstablishedStates.HELD}`,
-        },
-        [EstablishedActions.MUTE]: {
-          guard: 'isRegistered',
-          target: `.${EstablishedStates.MUTED}`,
-        },
       },
       states: {
         [EstablishedStates.ONGOING]: { },
-        [EstablishedStates.HELD]: {
-          on: {
-            [EstablishedActions.RESUME]: {
-              guard: 'isRegistered',
-              target: EstablishedStates.ONGOING,
+
+        // Mute / Unmute
+        [EstablishedSubStates.MUTE]: {
+          initial: EstablishedStates.UN_MUTED,
+          states: {
+            [EstablishedStates.MUTED]: {
+              on: {
+                unMute: EstablishedStates.UN_MUTED,
+              },
+            },
+            [EstablishedStates.UN_MUTED]: {
+              on: {
+                mute: EstablishedStates.MUTED,
+              },
             },
           },
         },
-        [EstablishedStates.MUTED]: {
-          on: {
-            [EstablishedActions.UN_MUTE]: {
-              guard: 'isRegistered',
-              target: EstablishedStates.ONGOING,
+
+        // Hold / Resume
+        [EstablishedSubStates.HOLD]: {
+          initial: EstablishedStates.UN_HELD,
+          states: {
+            [EstablishedStates.HELD]: {
+              on: {
+                [EstablishedActions.RESUME]: EstablishedStates.UN_HELD,
+              },
+            },
+            [EstablishedStates.UN_HELD]: {
+              on: {
+                [EstablishedActions.HOLD]: EstablishedStates.HELD,
+              },
             },
           },
         },

package/src/voice/call.ts

@@ -9,7 +9,7 @@ import { SessionDescriptionHandler } from 'sip.js/lib/platform/web';
 import { SessionDescriptionHandlerOptions } from 'sip.js/lib/api';
 import type { IncomingRequestMessage } from 'sip.js/lib/core/messages/incoming-request-message';
 
-import callStateMachine, { type ActionTypes, Actions, type EstablishedActionTypes, EstablishedActions, States, type StateTypes, EstablishedStates, type EstablishedStateTypes, type CallActorRef } from '../state-machine/call-state-machine';
+import callStateMachine, { type ActionTypes, Actions, type EstablishedActionTypes, EstablishedActions, States, type StateTypes, EstablishedStates, type EstablishedStateTypes, type CallActorRef, EstablishedSubStateTypes } from '../state-machine/call-state-machine';
 import { SipCall, PeerConnection } from '../domain/types';
 import ApiCall from '../domain/Call';
 import newFrom from '../utils/new-from';
@@ -129,11 +129,23 @@ class Call extends EventEmitter {
     const snapshot = call.callActor.getSnapshot();
 
     if (apiCall.isUp()) {
-      snapshot.value = { [States.ESTABLISHED]: EstablishedStates.ONGOING };
+      snapshot.value = {
+        [States.ESTABLISHED]: {
+          [EstablishedStates.ONGOING]: {},
+          muteState: EstablishedStates.UN_MUTED,
+          holdState: EstablishedStates.UN_HELD,
+        },
+      };
     }
 
     if (apiCall.muted) {
-      snapshot.value = { [States.ESTABLISHED]: EstablishedStates.MUTED };
+      snapshot.value = {
+        [States.ESTABLISHED]: {
+          [EstablishedStates.ONGOING]: {},
+          muteState: EstablishedStates.MUTED,
+          holdState: EstablishedStates.UN_HELD,
+        },
+      };
     }
 
     if (apiCall.isRinging()) {
@@ -345,7 +357,7 @@ class Call extends EventEmitter {
   }
 
   isMuted() {
-    return this._hasEstablishedState(EstablishedStates.MUTED);
+    return this._hasEstablishedState('muteState', EstablishedStates.MUTED);
   }
 
   isCameraMuted() {
@@ -353,7 +365,7 @@ class Call extends EventEmitter {
   }
 
   isHeld() {
-    return this._hasEstablishedState(EstablishedStates.HELD);
+    return this._hasEstablishedState('holdState', EstablishedStates.HELD);
   }
 
   isEstablishing() {
@@ -644,10 +656,6 @@ class Call extends EventEmitter {
 
   updateFrom(call: Call) {
     updateFrom(this, call, attributesToUpdate);
-
-    // Update call state
-    // @ts-ignore
-    this.callActor.update(call.callActor.getSnapshot());
   }
 
   is(otherCall: Call) {
@@ -666,9 +674,17 @@ class Call extends EventEmitter {
     return getState(this.callActor) as StateTypes | Record<StateTypes, EstablishedStateTypes>;
   }
 
-  private _hasEstablishedState(establishedState: EstablishedStateTypes) {
-    const state = this.state as Record<StateTypes, EstablishedStateTypes>;
-    return typeof state === 'object' && States.ESTABLISHED in state && state[States.ESTABLISHED] === establishedState;
+  private _hasEstablishedState(subState: EstablishedSubStateTypes, establishedState: EstablishedStateTypes) {
+    const state = this.state as Record<StateTypes, EstablishedStateTypes | Record<EstablishedSubStateTypes, EstablishedStateTypes>>;
+    if (typeof state !== 'object') {
+      return false;
+    }
+
+    if (!(States.ESTABLISHED in state)) {
+      return false;
+    }
+
+    return (state[States.ESTABLISHED] as Record<EstablishedSubStateTypes, EstablishedStateTypes>)[subState] === establishedState;
   }
 
   private _bindEvents() {