@signalwire/js 4.0.0-beta.2 → 4.0.0-beta.3

package/dist/index.cjs

@@ -598,8 +598,9 @@ const selectDevice = (devices = [], selected, preferred) => {
 	return selected;
 };
 var NavigatorDeviceController = class extends Destroyable {
-	constructor() {
+	constructor(webRTCApiProvider) {
 		super();
+		this.webRTCApiProvider = webRTCApiProvider;
 		this.deviceChangeHandler = () => {
 			logger$18.debug("[DeviceController] Device change detected");
 			this.enumerateDevices();
@@ -681,24 +682,22 @@ var NavigatorDeviceController = class extends Destroyable {
 		});
 	}
 	init() {
-		if (navigator.mediaDevices) {
-			this.subscribeTo(this._devicesState$.pipe((0, rxjs.debounceTime)(PreferencesContainer.instance.deviceDebounceTime)), (devicesState) => {
-				const currentSelected = this._selectedDevicesState$.value;
-				const newAudioInput = selectDevice(devicesState.audioinput, currentSelected.audioinput, PreferencesContainer.instance.preferredAudioInput);
-				const newAudioOutput = selectDevice(devicesState.audiooutput, currentSelected.audiooutput, PreferencesContainer.instance.preferredAudioOutput);
-				const newVideoInput = selectDevice(devicesState.videoinput, currentSelected.videoinput, PreferencesContainer.instance.preferredVideoInput);
-				if (newAudioInput !== currentSelected.audioinput || newAudioOutput !== currentSelected.audiooutput || newVideoInput !== currentSelected.videoinput) this._selectedDevicesState$.next({
-					audioinput: newAudioInput,
-					audiooutput: newAudioOutput,
-					videoinput: newVideoInput
-				});
+		this.subscribeTo(this._devicesState$.pipe((0, rxjs.debounceTime)(PreferencesContainer.instance.deviceDebounceTime)), (devicesState) => {
+			const currentSelected = this._selectedDevicesState$.value;
+			const newAudioInput = selectDevice(devicesState.audioinput, currentSelected.audioinput, PreferencesContainer.instance.preferredAudioInput);
+			const newAudioOutput = selectDevice(devicesState.audiooutput, currentSelected.audiooutput, PreferencesContainer.instance.preferredAudioOutput);
+			const newVideoInput = selectDevice(devicesState.videoinput, currentSelected.videoinput, PreferencesContainer.instance.preferredVideoInput);
+			if (newAudioInput !== currentSelected.audioinput || newAudioOutput !== currentSelected.audiooutput || newVideoInput !== currentSelected.videoinput) this._selectedDevicesState$.next({
+				audioinput: newAudioInput,
+				audiooutput: newAudioOutput,
+				videoinput: newVideoInput
 			});
-			this.enumerateDevices();
-		}
+		});
+		this.enumerateDevices();
 	}
 	enableDeviceMonitoring() {
 		this.disableDeviceMonitoring();
-		navigator.mediaDevices.addEventListener("devicechange", this.deviceChangeHandler);
+		this.webRTCApiProvider.mediaDevices.addEventListener("devicechange", this.deviceChangeHandler);
 		if (PreferencesContainer.instance.devicePollingInterval > 0) this._devicesPoolingSubscription = (0, rxjs.interval)(PreferencesContainer.instance.devicePollingInterval).subscribe(() => {
 			logger$18.debug("[DeviceController] Polling devices due to interval");
 			this.enumerateDevices();
@@ -706,7 +705,7 @@ var NavigatorDeviceController = class extends Destroyable {
 		this.enumerateDevices();
 	}
 	disableDeviceMonitoring() {
-		navigator.mediaDevices.removeEventListener("devicechange", this.deviceChangeHandler);
+		this.webRTCApiProvider.mediaDevices.removeEventListener("devicechange", this.deviceChangeHandler);
 		if (this._devicesPoolingSubscription) {
 			this._devicesPoolingSubscription.unsubscribe();
 			this._devicesPoolingSubscription = void 0;
@@ -714,7 +713,7 @@ var NavigatorDeviceController = class extends Destroyable {
 	}
 	async enumerateDevices() {
 		try {
-			const devicesByKind = (await navigator.mediaDevices.enumerateDevices()).reduce((acc, device) => {
+			const devicesByKind = (await this.webRTCApiProvider.mediaDevices.enumerateDevices()).reduce((acc, device) => {
 				acc[device.kind].push(device);
 				return acc;
 			}, {
@@ -737,7 +736,7 @@ var NavigatorDeviceController = class extends Destroyable {
 		if (deviceInfo.kind === "audiooutput") return null;
 		try {
 			const constraints = this.deviceInfoToConstraints(deviceInfo);
-			const stream = await navigator.mediaDevices.getUserMedia({
+			const stream = await this.webRTCApiProvider.mediaDevices.getUserMedia({
 				audio: deviceInfo.kind === "audioinput" ? constraints : false,
 				video: deviceInfo.kind === "videoinput" ? constraints : false
 			});
@@ -909,9 +908,23 @@ var DependencyContainer = class {
 		this._webSocketConstructor = WebSocketConstructor;
 	}
 	get deviceController() {
-		this._deviceController ??= new NavigatorDeviceController();
+		this._deviceController ??= new NavigatorDeviceController(this.webRTCApiProvider);
 		return this._deviceController;
 	}
+	get webRTCApiProvider() {
+		if (!this._webRTCApiProvider) {
+			if (typeof RTCPeerConnection === "undefined" || typeof navigator === "undefined") throw new require_operators.DependencyError("WebRTCApiProvider: RTCPeerConnection or navigator.mediaDevices is not available. Please provide a custom webRTCApiProvider in SignalWireOptions.");
+			this._webRTCApiProvider = {
+				RTCPeerConnection,
+				mediaDevices: navigator.mediaDevices
+			};
+		}
+		return this._webRTCApiProvider;
+	}
+	set webRTCApiProvider(webRTCApiProvider) {
+		this._webRTCApiProvider = webRTCApiProvider;
+		this._deviceController = void 0;
+	}
 	get authorizationStateKey() {
 		return `sw:${this.subscriberId}:as`;
 	}
@@ -1905,7 +1918,7 @@ function isJSONRPCRequest(value) {
 	return isObject(value) && hasProperty(value, "jsonrpc") && value.jsonrpc === "2.0" && hasProperty(value, "id") && typeof value.id === "string" && hasProperty(value, "method") && typeof value.method === "string";
 }
 function isJSONRPCResponse(value) {
-	return isObject(value) && hasProperty(value, "jsonrpc") && value.jsonrpc === "2.0" && hasProperty(value, "id") && typeof value.id === "string" && hasProperty(value, "result");
+	return isObject(value) && hasProperty(value, "jsonrpc") && value.jsonrpc === "2.0" && hasProperty(value, "id") && typeof value.id === "string" && (hasProperty(value, "result") || hasProperty(value, "error"));
 }
 
 //#endregion
@@ -2827,7 +2840,7 @@ var RTCPeerConnectionController = class extends Destroyable {
 						logger$11.debug(`[RTCPeerConnectionController] ${kind} input device selected: none`);
 						return;
 					}
-					const streamTrack = (await navigator.mediaDevices.getUserMedia({ [kind]: {
+					const streamTrack = (await this.getUserMedia({ [kind]: {
 						...track.getConstraints(),
 						...this.deviceController.deviceInfoToConstraints(deviceInfo)
 					} })).getTracks().find((t) => t.kind === kind);
@@ -3018,7 +3031,7 @@ var RTCPeerConnectionController = class extends Destroyable {
 		};
 	}
 	get WebRTCPeerConnectionConstructor() {
-		return this.options.WebRTCPeerConnectionConstructor ?? RTCPeerConnection;
+		return this.options.webRTCApiProvider?.RTCPeerConnection ?? RTCPeerConnection;
 	}
 	get offerOptions() {
 		const options = { iceRestart: this.firstSDPExchangeCompleted ? true : void 0 };
@@ -3285,10 +3298,12 @@ var RTCPeerConnectionController = class extends Destroyable {
 		}
 	}
 	async getUserMedia(constraints) {
-		return this.options.getUserMedia?.(constraints) ?? navigator.mediaDevices.getUserMedia(constraints);
+		return (this.options.webRTCApiProvider?.mediaDevices ?? navigator.mediaDevices).getUserMedia(constraints);
 	}
 	async getDisplayMedia(options) {
-		return this.options.getDisplayMedia?.(options) ?? navigator.mediaDevices.getDisplayMedia(options);
+		const mediaDevices = this.options.webRTCApiProvider?.mediaDevices ?? navigator.mediaDevices;
+		if (!mediaDevices.getDisplayMedia) throw new require_operators.DependencyError("getDisplayMedia is not supported by the current WebRTC provider");
+		return mediaDevices.getDisplayMedia(options);
 	}
 	async setupRemoteTracks() {
 		if (!this.peerConnection) throw new require_operators.DependencyError("RTCPeerConnection is not initialized");
@@ -3452,11 +3467,12 @@ var VertoManager = class extends Destroyable {
 	}
 };
 var WebRTCVertoManager = class extends VertoManager {
-	constructor(webRtcCallSession, attachManager, deviceController, options = {}) {
+	constructor(webRtcCallSession, attachManager, deviceController, webRTCApiProvider, options = {}) {
 		super(webRtcCallSession);
 		this.webRtcCallSession = webRtcCallSession;
 		this.attachManager = attachManager;
 		this.deviceController = deviceController;
+		this.webRTCApiProvider = webRTCApiProvider;
 		this._rtcPeerConnections$ = this.createBehaviorSubject([]);
 		this._selfId$ = this.createBehaviorSubject(null);
 		this._signalingStatus$ = this.createBehaviorSubject(null);
@@ -3619,7 +3635,7 @@ var WebRTCVertoManager = class extends VertoManager {
 	}
 	async sendLocalDescription(message, rtcPeerConnController) {
 		const vertoMethod = message.method;
-		const optionalsParams = this.getSendLocalSDPOptionalParams(rtcPeerConnController);
+		const optionalsParams = this.getSendLocalSDPOptionalParams(rtcPeerConnController, vertoMethod);
 		try {
 			const response = await this.executeVerto(message, optionalsParams);
 			switch (vertoMethod) {
@@ -3696,6 +3712,7 @@ var WebRTCVertoManager = class extends VertoManager {
 			inputVideoStream: options.inputVideoStream,
 			receiveAudio: options.receiveAudio,
 			receiveVideo: options.receiveVideo,
+			webRTCApiProvider: this.webRTCApiProvider,
 			...this.RTCPeerConnectionConfig
 		}, options.initOffer, this.deviceController);
 		this.setupLocalDescriptionHandler(rtcPeerConnController);
@@ -3762,18 +3779,18 @@ var WebRTCVertoManager = class extends VertoManager {
 			this.callSession?.destroy();
 		});
 	}
-	getSendLocalSDPOptionalParams(rtcPeerConnController) {
+	getSendLocalSDPOptionalParams(rtcPeerConnController, vertoMethod) {
 		let subscribe = void 0;
-		const initial = !rtcPeerConnController.firstSDPExchangeCompleted;
-		if (initial) {
+		if (!rtcPeerConnController.firstSDPExchangeCompleted) {
 			subscribe = [];
 			if (rtcPeerConnController.isMainDevice) subscribe.push(...PreferencesContainer.instance.inviteSubscribeMainDevice);
 			else if (rtcPeerConnController.isAdditionalDevice) subscribe.push(...PreferencesContainer.instance.inviteSubscribeAdditionalDevice);
 			else if (rtcPeerConnController.isScreenShare) subscribe.push(...PreferencesContainer.instance.inviteSubscribeScreenshare);
 		}
+		const isInvite = vertoMethod === "verto.invite";
 		return {
 			callID: rtcPeerConnController.id,
-			node_id: initial ? "" : this._nodeId$.value ?? "",
+			node_id: isInvite ? "" : this._nodeId$.value ?? "",
 			subscribe
 		};
 	}
@@ -3874,7 +3891,8 @@ var WebRTCVertoManager = class extends VertoManager {
 			rtcPeerConnController = new RTCPeerConnectionController({
 				...options,
 				...this.RTCPeerConnectionConfig,
-				propose
+				propose,
+				webRTCApiProvider: this.webRTCApiProvider
 			}, void 0, this.deviceController);
 			this.setupLocalDescriptionHandler(rtcPeerConnController);
 			if (propose === "screenshare") this._screenShareId = rtcPeerConnController.id;
@@ -4403,10 +4421,11 @@ var WebRTCCall = class extends Destroyable {
 * Eliminates circular dependencies by centralizing Call and Manager creation.
 */
 var CallFactory = class {
-	constructor(sessionManager, deviceController, attachManager) {
+	constructor(sessionManager, deviceController, attachManager, webRTCApiProvider) {
 		this.sessionManager = sessionManager;
 		this.deviceController = deviceController;
 		this.attachManager = attachManager;
+		this.webRTCApiProvider = webRTCApiProvider;
 	}
 	/**
 	* Create a new WebRTCCall with properly initialized managers
@@ -4415,7 +4434,7 @@ var CallFactory = class {
 		return new WebRTCCall(this.sessionManager, options, {
 			initializeManagers: (callInstance) => {
 				return {
-					vertoManager: new WebRTCVertoManager(callInstance, this.attachManager, this.deviceController, {
+					vertoManager: new WebRTCVertoManager(callInstance, this.attachManager, this.deviceController, this.webRTCApiProvider, {
 						nodeId: options.nodeId,
 						onError: (error) => {
 							callInstance.emitError(error);
@@ -4827,7 +4846,7 @@ const getAddressSearchURI = (options) => {
 	return name;
 };
 var ClientSessionManager = class extends Destroyable {
-	constructor(credential, transport, storage, authorizationStateKey, deviceController, attachManager) {
+	constructor(credential, transport, storage, authorizationStateKey, deviceController, attachManager, webRTCApiProvider) {
 		super();
 		this.credential = credential;
 		this.transport = transport;
@@ -4850,7 +4869,7 @@ var ClientSessionManager = class extends Destroyable {
 		this._calls$ = this.createBehaviorSubject({});
 		this._iceServers$ = this.createBehaviorSubject([]);
 		attachManager.setSession(this);
-		this.callFactory = new CallFactory(this, deviceController, attachManager);
+		this.callFactory = new CallFactory(this, deviceController, attachManager, webRTCApiProvider);
 		this.initialized$ = (0, rxjs.defer)(() => (0, rxjs.from)(this.init())).pipe((0, rxjs.shareReplay)(1), (0, rxjs.takeUntil)(this.destroyed$));
 	}
 	get incomingCalls$() {
@@ -5737,6 +5756,7 @@ var SignalWire = class extends Destroyable {
 		if (this._options.storageImplementation) this._deps.storageImpl = this._options.storageImplementation;
 		if (this._options.webSocketConstructor) this._deps.WebSocket = this._options.webSocketConstructor;
 		if (this._options.savePreferences) this.preferences.enableSavePreferences(this._deps.storage);
+		if (this._options.webRTCApiProvider) this._deps.webRTCApiProvider = this._options.webRTCApiProvider;
 		this._deviceController = this._deps.deviceController;
 		if (!this._options.skipDeviceMonitoring) this._deviceController.enableDeviceMonitoring();
 		this.subscribeTo(this._deviceController.errors$, (error) => {
@@ -5861,7 +5881,7 @@ var SignalWire = class extends Destroyable {
 		};
 		this._transport = new TransportManager(this._deps.storage, this._deps.protocolKey, this._deps.WebSocket, PreferencesContainer.instance.relayHost ?? this._deps.relayHost, errorHandler);
 		this._attachManager = new AttachManager(this._deps.storage, this._deps.deviceController, PreferencesContainer.instance.reconnectCallsTimeout, this._deps.attachedCallsKey);
-		this._clientSession = new ClientSessionManager(this._deps.credential, this._transport, this._deps.storage, this._deps.authorizationStateKey, this._deps.deviceController, this._attachManager);
+		this._clientSession = new ClientSessionManager(this._deps.credential, this._transport, this._deps.storage, this._deps.authorizationStateKey, this._deps.deviceController, this._attachManager, this._deps.webRTCApiProvider);
 		this._publicSession = new ClientSessionWrapper(this._clientSession);
 		this.subscribeTo(this._clientSession.errors$, (error) => {
 			this._errors$.next(error);