@wazo/sdk 1.0.0-alpha.2 → 1.0.0-alpha.3

package/lib/types/voice/softphone.d.ts

@@ -30,6 +30,7 @@ export type CallOptions = {
     withCamera?: boolean;
     audioOnly?: boolean;
     conference?: boolean;
+    extraHeaders?: Record<string, any>;
 };
 export declare class Softphone extends EventEmitter {
     audioOutputDeviceId?: string;
@@ -46,6 +47,7 @@ export declare class Softphone extends EventEmitter {
     ringingEnabled: boolean;
     constructor();
     connect(options?: Partial<WebRtcConfig>): Promise<void>;
+    hangupAllCalls(): Promise<boolean[]>;
     disconnect(): Promise<void | null>;
     getPrimaryWebRtcLine(): SipLine | null;
     connectWithCredentials(server: string, sipLine: SipLine, displayName: string, rawOptions?: Partial<WebRtcConfig>): Promise<void>;
@@ -67,8 +69,10 @@ export declare class Softphone extends EventEmitter {
     changeAudioVolume(volume: number): void;
     changeRingVolume(volume: number): void;
     getCurrentCall(): Call | undefined;
+    getActiveCalls(): Call[];
     getIncomingCalls(): Call[];
     get state(): StateTypes;
+    get user(): string | undefined;
     getUserAgent(): string;
     isRegistered(): boolean;
     _bindEvents(): void;

package/lib/types/voice/softphone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"softphone.d.ts","sourceRoot":"","sources":["../../../src/voice/softphone.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"softphone.d.ts","sourceRoot":"","sources":["../../../src/voice/softphone.ts"],"names":[],"mappings":"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"}

package/lib/voice/call.js

@@ -35,13 +35,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MESSAGE_TRACK_UPDATED = exports.MESSAGE_TYPE_SIGNAL = exports.MESSAGE_TYPE_CHAT = exports.EVENT_CAMERA_DISABLED = exports.EVENT_CAMERA_RESUMED = exports.EVENT_WEB_RTC_STATS = exports.EVENT_SHARE_SCREEN_ENDED = exports.EVENT_SHARE_SCREEN_STARTED = exports.EVENT_SHARE_SCREEN_ENDING = exports.EVENT_REMOVE_STREAM = exports.EVENT_VIDEO_STREAM = exports.EVENT_AUDIO_STREAM = exports.EVENT_TRACK = exports.EVENT_REINVITE = exports.EVENT_CALL_RESUMED = exports.EVENT_CALL_HELD = exports.EVENT_CALL_UN_MUTED = exports.EVENT_CALL_MUTED = exports.EVENT_CALL_ENDED = exports.EVENT_CALL_TERMINATING = exports.EVENT_CALL_REJECTED = exports.EVENT_CALL_ERROR = exports.EVENT_EARLY_MEDIA = exports.EVENT_PROGRESS = exports.EVENT_CALL_CANCELED = exports.EVENT_CALL_ACCEPTED = void 0;
+exports.MESSAGE_TRACK_UPDATED = exports.MESSAGE_TYPE_SIGNAL = exports.MESSAGE_TYPE_CHAT = exports.EVENT_CAMERA_DISABLED = exports.EVENT_CAMERA_RESUMED = exports.EVENT_WEB_RTC_STATS = exports.EVENT_SHARE_SCREEN_ENDED = exports.EVENT_SHARE_SCREEN_STARTED = exports.EVENT_SHARE_SCREEN_ENDING = exports.EVENT_REMOVE_STREAM = exports.EVENT_VIDEO_STREAM = exports.EVENT_AUDIO_STREAM = exports.EVENT_TRACK = exports.EVENT_REINVITE = exports.EVENT_CALL_RESUMED = exports.EVENT_CALL_HELD = exports.EVENT_CALL_UN_MUTED = exports.EVENT_CALL_MUTED = exports.EVENT_CALL_ENDED = exports.EVENT_CALL_TERMINATING = exports.EVENT_CALL_REJECTED = exports.EVENT_CALL_ERROR = exports.EVENT_EARLY_MEDIA = exports.EVENT_PROGRESS = exports.EVENT_CALL_CANCELED = exports.EVENT_CALL_LOCALLY_ACCEPTED = exports.EVENT_CALL_REMOTLY_ACCEPTED = void 0;
 /* eslint-disable no-underscore-dangle */
 const events_1 = require("events");
 const xstate_1 = require("xstate");
 const invitation_1 = require("sip.js/lib/api/invitation");
 const session_state_1 = require("sip.js/lib/api/session-state");
 const call_state_machine_1 = __importStar(require("../state-machine/call-state-machine"));
+const new_from_1 = __importDefault(require("../utils/new-from"));
+const update_from_1 = __importDefault(require("../utils/update-from"));
 const IssueReporter_1 = __importDefault(require("../service/IssueReporter"));
 const softphone_1 = __importStar(require("./softphone"));
 const sdp_1 = require("../utils/sdp");
@@ -49,7 +51,8 @@ const utils_1 = require("../state-machine/utils");
 const webrtc_1 = require("../utils/webrtc");
 const logger = IssueReporter_1.default.loggerFor('call');
 // Events
-exports.EVENT_CALL_ACCEPTED = 'accepted';
+exports.EVENT_CALL_REMOTLY_ACCEPTED = 'remotelyAccepted';
+exports.EVENT_CALL_LOCALLY_ACCEPTED = 'locallyAccepted';
 exports.EVENT_CALL_CANCELED = 'canceled';
 exports.EVENT_PROGRESS = 'progress';
 exports.EVENT_EARLY_MEDIA = 'earlyMedia';
@@ -76,6 +79,9 @@ exports.MESSAGE_TYPE_CHAT = 'message/TYPE_CHAT';
 exports.MESSAGE_TYPE_SIGNAL = 'message/TYPE_SIGNAL';
 exports.MESSAGE_TRACK_UPDATED = 'onTrackUpdated';
 class Call extends events_1.EventEmitter {
+    static newFrom(call) {
+        return (0, new_from_1.default)(call, Call);
+    }
     static parseCall(apiCall) {
         const sipCall = {
             id: apiCall.sipCallId,
@@ -141,6 +147,7 @@ class Call extends events_1.EventEmitter {
             this.answerTime = new Date();
             return this.phone.client.answer(this.sipCall, options.withCamera).then(() => {
                 logger.info('call - accepted', Object.assign({ id: this.id }, options));
+                this.emit(exports.EVENT_CALL_LOCALLY_ACCEPTED, this);
                 return this.id;
             }).catch(e => {
                 logger.error(e);
@@ -279,9 +286,21 @@ class Call extends events_1.EventEmitter {
     isHeld() {
         return this._hasEstablishedState(call_state_machine_1.EstablishedStates.HELD);
     }
+    isEstablishing() {
+        return this.sipCall.state === session_state_1.SessionState.Establishing;
+    }
     isEstablished() {
         return call_state_machine_1.States.ESTABLISHED in this.state;
     }
+    isRinging() {
+        return this.state === call_state_machine_1.States.RINGING;
+    }
+    isOutgoing() {
+        return this.sipCall instanceof invitation_1.Invitation;
+    }
+    isIncoming() {
+        return !this.isOutgoing();
+    }
     isConference() {
         var _a;
         return (_a = (0, webrtc_1.getPeerConnection)(this.sipCall)) === null || _a === void 0 ? void 0 : _a.sfu;
@@ -289,7 +308,7 @@ class Call extends events_1.EventEmitter {
     transfer(target) {
         (0, utils_1.assertState)(this.callActor, call_state_machine_1.States.ESTABLISHED);
         logger.info('call - transfer', { id: this.id, target });
-        this.phone.client.transfer(this.sipCall, target);
+        return this.phone.client.transfer(this.sipCall, target);
     }
     atxfer() {
         (0, utils_1.assertState)(this.callActor, call_state_machine_1.States.ESTABLISHED);
@@ -429,7 +448,7 @@ class Call extends events_1.EventEmitter {
     }
     onAccepted() {
         this._sendAction(call_state_machine_1.Actions.REMOTLY_ACCEPTED);
-        this.emit(exports.EVENT_CALL_ACCEPTED);
+        this.emit(exports.EVENT_CALL_REMOTLY_ACCEPTED);
     }
     onProgress() {
         this.emit(exports.EVENT_PROGRESS);
@@ -478,12 +497,15 @@ class Call extends events_1.EventEmitter {
     isVideoRemotelyHeld() {
         return (0, webrtc_1.isVideoRemotelyHeld)(this.sipCall);
     }
-    isRinging() {
-        return this.state === call_state_machine_1.States.RINGING;
-    }
     onReinvite(request, updatedCalleeName, updatedNumber, hadRemoteVideo) {
         this.emit(exports.EVENT_REINVITE, request, updatedCalleeName, updatedNumber, hadRemoteVideo);
     }
+    updateFrom(call) {
+        (0, update_from_1.default)(this, call);
+    }
+    is(otherCall) {
+        return otherCall && this.id && this.id === otherCall.id;
+    }
     get id() {
         return (0, sdp_1.getSipSessionId)(this.sipCall);
     }

package/lib/voice/softphone.js

@@ -91,6 +91,11 @@ class Softphone extends events_1.EventEmitter {
         this.options.userUuid = session.uuid || '';
         return this.connectWithCredentials(server, this.sipLine, session.displayName(), options);
     }
+    hangupAllCalls() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Promise.all(this.calls.map(call => call.hangup()));
+        });
+    }
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
             (0, utils_1.assertCan)(this.softphoneActor, softphone_state_machine_1.Actions.UNREGISTER);
@@ -98,7 +103,7 @@ class Softphone extends events_1.EventEmitter {
                 return null;
             }
             // Terminate all calls
-            yield Promise.all(this.calls.map(call => call.hangup()));
+            yield this.hangupAllCalls();
             return this.client.unregister();
         });
     }
@@ -275,7 +280,10 @@ class Softphone extends events_1.EventEmitter {
         this.audioRingVolume = volume;
     }
     getCurrentCall() {
-        return this.calls.find(call => call.isEstablished());
+        return this.getActiveCalls()[0];
+    }
+    getActiveCalls() {
+        return this.calls.filter(call => call.isEstablished());
     }
     getIncomingCalls() {
         return this.calls.filter(call => call.isRinging());
@@ -283,6 +291,10 @@ class Softphone extends events_1.EventEmitter {
     get state() {
         return (0, utils_1.getState)(this.softphoneActor);
     }
+    get user() {
+        var _a, _b, _c, _d;
+        return (_d = (_c = (_b = (_a = this.client) === null || _a === void 0 ? void 0 : _a.userAgent) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.uri) === null || _d === void 0 ? void 0 : _d.user;
+    }
     getUserAgent() {
         var _a, _b;
         return ((_b = (_a = this.client) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.userAgentString) || 'softphone';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wazo/sdk",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "description": "Wazo's JavaScript Software Development Kit.",
   "main": "index.js",
   "types": "lib/types/index.d.ts",

package/src/__tests__/__voice__/call.test.ts

@@ -79,6 +79,7 @@ describe('Call', () => {
       expect(call.answerTime).toStrictEqual(apiCall.startingTime);
       expect(call.isMuted()).toBeTruthy();
       expect(call.state).toStrictEqual({ [States.ESTABLISHED]: EstablishedStates.MUTED });
+      expect(call.isEstablished()).toBeTruthy();
     });
   });
 

package/src/domain/Phone/CTIPhone.ts

@@ -1,5 +1,6 @@
 import Session from '../Session';
 import Call from '../Call';
+import SoftphoneCall from '../../voice/call';
 import Line from '../Line';
 import CallSession from '../CallSession';
 import type { Phone, AvailablePhoneOptions } from './Phone';
@@ -141,7 +142,7 @@ export default class CTIPhone extends Emitter implements Phone {
     });
 
     try {
-      await CallApi.cancelCall(callSession);
+      await CallApi.cancelCall({ apiId: callSession.getId() } as SoftphoneCall);
 
       if (this.currentCall && callSession.callId === this.currentCall.id) {
         this.endCurrentCall(callSession);
@@ -167,7 +168,7 @@ export default class CTIPhone extends Emitter implements Phone {
       callId: callSession.getId(),
       number: callSession.number,
     });
-    await CallApi.cancelCall(callSession);
+    await CallApi.cancelCall({ id: callSession.getId() } as SoftphoneCall);
     this.eventEmitter.emit('onCallEnded', callSession);
   }
 

package/src/index.ts

@@ -7,7 +7,7 @@ export { default as ServerError } from './domain/ServerError';
 export { default as InvalidStateTransition } from './domain/InvalidStateTransition';
 export { default as InvalidState } from './domain/InvalidState';
 export { default as SFUNotAvailableError } from './domain/SFUNotAvailableError';
-export { default as Call } from './domain/Call';
+export { default as ApiCall } from './domain/Call';
 export { default as CallLog } from './domain/CallLog';
 export { default as Recording } from './domain/Recording';
 export { default as ChatMessage } from './domain/ChatMessage';

package/src/service/CallApi.ts

@@ -1,9 +1,9 @@
-import Call from '../domain/Call';
+import ApiCall from '../domain/Call';
+import Call from '../voice/call';
 import CallLog from '../domain/CallLog';
 import Line from '../domain/Line';
 import Session from '../domain/Session';
 import Relocation from '../domain/Relocation';
-import CallSession from '../domain/CallSession';
 import getApiClient from './getApiClient';
 import Transfer from '../domain/IndirectTransfer';
 
@@ -16,7 +16,7 @@ export default class CallApi {
     return getApiClient().callLogd.listDistinctCallLogs(offset, limit, distinct);
   }
 
-  static async fetchActiveCalls(): Promise<Call[]> {
+  static async fetchActiveCalls(): Promise<ApiCall[]> {
     return getApiClient().calld.listCalls();
   }
 
@@ -37,14 +37,14 @@ export default class CallApi {
     return getApiClient().confd.getUserLineSip(session.uuid as string, lineToUse ? <unknown>lineToUse.id as string : '');
   }
 
-  static async cancelCall(callSession: CallSession): Promise<boolean> {
-    return getApiClient().calld.cancelCall(callSession.callId);
+  static async cancelCall(call: Call): Promise<boolean> {
+    return getApiClient().calld.cancelCall(call.apiId || '');
   }
 
-  static async makeCall(callFromLine: Line, extension: string, isMobile = false, callbackAllLines = false): Promise<Call | null | undefined> {
+  static async makeCall(callFromLine: Line, extension: string, isMobile = false, callbackAllLines = false): Promise<ApiCall | null | undefined> {
     const lineId = callFromLine ? callFromLine.id : null;
     const response = await getApiClient().calld.makeCall(extension, isMobile, lineId, callbackAllLines);
-    return Call.parse(response);
+    return ApiCall.parse(response);
   }
 
   static async relocateCall(callId: string, line: number, contactIdentifier?: string): Promise<Relocation> {

package/src/voice/call.ts

@@ -11,7 +11,8 @@ import type { IncomingRequestMessage } from 'sip.js/lib/core/messages/incoming-r
 import callStateMachine, { type ActionTypes, Actions, type EstablishedActionTypes, EstablishedActions, States, type StateTypes, EstablishedStates, type EstablishedStateTypes, type CallActorRef } from '../state-machine/call-state-machine';
 import { SipCall, PeerConnection } from '../domain/types';
 import ApiCall from '../domain/Call';
-
+import newFrom from '../utils/new-from';
+import updateFrom from '../utils/update-from';
 import IssueReporter from '../service/IssueReporter';
 import softphone, { EVENT_TERMINATE_SOUND, Softphone } from './softphone';
 import { getCallDisplayName, getCallNumber, getSipSessionId } from '../utils/sdp';
@@ -32,7 +33,8 @@ export type ReinviteOptions = {
 };
 
 // Events
-export const EVENT_CALL_ACCEPTED = 'accepted';
+export const EVENT_CALL_REMOTLY_ACCEPTED = 'remotelyAccepted';
+export const EVENT_CALL_LOCALLY_ACCEPTED = 'locallyAccepted';
 export const EVENT_CALL_CANCELED = 'canceled';
 export const EVENT_PROGRESS = 'progress';
 export const EVENT_EARLY_MEDIA = 'earlyMedia';
@@ -88,6 +90,10 @@ class Call extends EventEmitter {
 
   currentScreenShare: Record<string, any> | null;
 
+  static newFrom(call: Call) {
+    return newFrom(call, Call);
+  }
+
   static parseCall(apiCall: ApiCall): Call {
     const sipCall = {
       id: apiCall.sipCallId,
@@ -170,6 +176,8 @@ class Call extends EventEmitter {
     return this.phone.client.answer(this.sipCall as Invitation, options.withCamera).then(() => {
       logger.info('call - accepted', { id: this.id, ...options });
 
+      this.emit(EVENT_CALL_LOCALLY_ACCEPTED, this);
+
       return this.id;
     }).catch(e => {
       logger.error(e);
@@ -343,10 +351,26 @@ class Call extends EventEmitter {
     return this._hasEstablishedState(EstablishedStates.HELD);
   }
 
+  isEstablishing() {
+    return this.sipCall.state === SessionState.Establishing;
+  }
+
   isEstablished() {
     return States.ESTABLISHED in (this.state as Record<StateTypes, EstablishedStateTypes>);
   }
 
+  isRinging() {
+    return this.state === States.RINGING;
+  }
+
+  isOutgoing() {
+    return this.sipCall instanceof Invitation;
+  }
+
+  isIncoming() {
+    return !this.isOutgoing();
+  }
+
   isConference(): boolean {
     return (getPeerConnection(this.sipCall) as PeerConnection)?.sfu;
   }
@@ -355,7 +379,7 @@ class Call extends EventEmitter {
     assertState(this.callActor, States.ESTABLISHED);
     logger.info('call - transfer', { id: this.id, target });
 
-    this.phone.client.transfer(this.sipCall, target);
+    return this.phone.client.transfer(this.sipCall, target);
   }
 
   atxfer(): Record<string, any> | null | undefined {
@@ -528,7 +552,7 @@ class Call extends EventEmitter {
 
   onAccepted() {
     this._sendAction(Actions.REMOTLY_ACCEPTED);
-    this.emit(EVENT_CALL_ACCEPTED);
+    this.emit(EVENT_CALL_REMOTLY_ACCEPTED);
   }
 
   onProgress() {
@@ -595,14 +619,18 @@ class Call extends EventEmitter {
     return isVideoRemotelyHeld(this.sipCall);
   }
 
-  isRinging() {
-    return this.state === States.RINGING;
-  }
-
   onReinvite(request: IncomingRequestMessage, updatedCalleeName: string, updatedNumber: string, hadRemoteVideo: boolean) {
     this.emit(EVENT_REINVITE, request, updatedCalleeName, updatedNumber, hadRemoteVideo);
   }
 
+  updateFrom(call: Call) {
+    updateFrom(this, call);
+  }
+
+  is(otherCall: Call) {
+    return otherCall && this.id && this.id === otherCall.id;
+  }
+
   get id() {
     return getSipSessionId(this.sipCall);
   }

package/src/voice/softphone.ts

@@ -44,6 +44,7 @@ export type CallOptions = {
   // If audioOnly is set to true, all video stream will be deactivated, even remotes ones.
   audioOnly?: boolean,
   conference?: boolean,
+  extraHeaders?: Record<string, any>,
 };
 
 const logger = IssueReporter.loggerFor('softphone');
@@ -107,6 +108,10 @@ export class Softphone extends EventEmitter {
     return this.connectWithCredentials(server, this.sipLine, session.displayName(), options);
   }
 
+  async hangupAllCalls() {
+    return Promise.all(this.calls.map(call => call.hangup()));
+  }
+
   async disconnect() {
     assertCan(this.softphoneActor, Actions.UNREGISTER);
     if (!this.client) {
@@ -114,7 +119,7 @@ export class Softphone extends EventEmitter {
     }
 
     // Terminate all calls
-    await Promise.all(this.calls.map(call => call.hangup()));
+    await this.hangupAllCalls();
 
     return this.client.unregister();
   }
@@ -348,7 +353,11 @@ export class Softphone extends EventEmitter {
   }
 
   getCurrentCall(): Call | undefined {
-    return this.calls.find(call => call.isEstablished());
+    return this.getActiveCalls()[0];
+  }
+
+  getActiveCalls(): Call[] {
+    return this.calls.filter(call => call.isEstablished());
   }
 
   getIncomingCalls(): Call[] {
@@ -359,6 +368,10 @@ export class Softphone extends EventEmitter {
     return getState(this.softphoneActor) as StateTypes;
   }
 
+  get user() {
+    return this.client?.userAgent?.contact?.uri?.user;
+  }
+
   getUserAgent() {
     return this.client?.config?.userAgentString || 'softphone';
   }