@signalwire/js 4.0.0-dev-20260911182554 → 4.0.0-dev-20260911205444

package/dist/browser.mjs

@@ -9094,6 +9094,8 @@ const MEDIA_ACCESS_DENIAL_NAMES = [
 	"SecurityError",
 	"PermissionDeniedError"
 ];
+/** Error names browsers use when the capture hardware is already held exclusively. */
+const MEDIA_DEVICE_IN_USE_NAMES = ["NotReadableError", "TrackStartError"];
 /** Default polling interval for RTCPeerConnection.getStats() in milliseconds. */
 const DEFAULT_STATS_POLLING_INTERVAL_MS = 1e3;
 /** Number of initial samples used to build a baseline for spike detection. */
@@ -9432,6 +9434,10 @@ var MediaTrackError = class extends Error {
 function isMediaAccessDenial(originalError) {
 	return originalError instanceof Error && MEDIA_ACCESS_DENIAL_NAMES.includes(originalError.name);
 }
+/** True when a `getUserMedia` rejection means the hardware is already held exclusively. */
+function isMediaDeviceInUse(originalError) {
+	return originalError instanceof Error && MEDIA_DEVICE_IN_USE_NAMES.includes(originalError.name);
+}
 /**
 * Failure to acquire local media (camera, microphone, or screen capture)
 * via `getUserMedia`/`getDisplayMedia`.
@@ -14248,6 +14254,8 @@ var SelfParticipant = class extends Participant {
 	*
 	* The call is unaffected when acquisition fails.
 	*
+	* @param options - Pass `{ audio: true }` to also request the shared
+	* surface's audio. Defaults to video only.
 	* @throws {ScreenShareAlreadyActiveError} When this call is already
 	* sharing a screen. Call {@link stopScreenShare} before starting another.
 	* @throws {AuxiliaryLegCancelledError} When {@link stopScreenShare} removes
@@ -14256,9 +14264,9 @@ var SelfParticipant = class extends Participant {
 	* permission denial rejects with a `NotAllowedError` `DOMException` —
 	* inspect `error.name` to tell benign cancels apart from real failures.
 	*/
-	async startScreenShare() {
+	async startScreenShare(options) {
 		try {
-			await this.vertoManager.addScreenMedia();
+			await this.vertoManager.addScreenMedia(options);
 		} catch (error) {
 			if (error instanceof AuxiliaryLegCancelledError) logger$25.debug("[Participant.startScreenShare] Screen share cancelled before connecting.");
 			else logger$25.error("[Participant.startScreenShare] Screen share error:", error);
@@ -15608,10 +15616,11 @@ var LocalStreamController = class extends Destroyable {
 			stream = new MediaStream(tracks);
 			this.tagTracks(tracks, "application");
 		} else if (this.options.propose === "screenshare") {
-			logger$19.debug("[LocalStreamController] Requesting display media for screen sharing with audio:", Boolean(this.options.inputAudioDeviceConstraints));
+			const audio = this.options.screenShareAudio ?? false;
+			logger$19.debug("[LocalStreamController] Requesting display media for screen sharing with audio:", audio);
 			stream = await this.options.getDisplayMedia({
 				video: true,
-				audio: Boolean(this.options.inputAudioDeviceConstraints)
+				audio
 			});
 			logger$19.debug("[LocalStreamController] Screen share media obtained:", stream);
 			this.tagTracks(stream.getTracks(), "display");
@@ -16047,38 +16056,32 @@ var RTCPeerConnectionController = class extends Destroyable {
 			this.negotiationNeeded$.next();
 		};
 		this.updateSelectedInputDevice = async (kind, deviceInfo) => {
+			const { localStream } = this;
+			if (!localStream) {
+				logger$17.warn("[RTCPeerConnectionController] No local stream available to update input device.");
+				return;
+			}
+			const currentTrack = localStream.getTracks().find((track) => track.kind === kind);
+			if (!currentTrack) {
+				logger$17.debug(`[RTCPeerConnectionController] No ${kind} track to switch.`);
+				return;
+			}
+			if (!deviceInfo) {
+				logger$17.debug(`[RTCPeerConnectionController] ${kind} input device selected: none`);
+				this.stopTrackSender(kind);
+				return;
+			}
+			const constraints = {
+				...currentTrack.getConstraints(),
+				...this.deviceController.deviceInfoToConstraints(deviceInfo)
+			};
 			try {
-				const { localStream } = this;
-				if (!localStream) {
-					logger$17.warn("[RTCPeerConnectionController] No local stream available to update input device.");
-					return;
-				}
-				logger$17.debug(`[RTCPeerConnectionController] Updating selected ${kind} input device:`, localStream.getTracks());
-				const track = localStream.getTracks().find((track$1) => track$1.kind === kind);
-				if (track) {
-					this.transceiverController?.stopTrackSender(kind);
-					this.localStreamController.removeTrack(track.id);
-					logger$17.debug(`[RTCPeerConnectionController] Stopped existing ${kind} track: ${track.id}`, localStream.getTracks());
-					if (!deviceInfo) {
-						logger$17.debug(`[RTCPeerConnectionController] ${kind} input device selected: none`);
-						return;
-					}
-					const streamTrack = (await this.getUserMedia({ [kind]: {
-						...track.getConstraints(),
-						...this.deviceController.deviceInfoToConstraints(deviceInfo)
-					} })).getTracks().find((t) => t.kind === kind);
-					if (streamTrack) {
-						logger$17.debug(`[RTCPeerConnectionController] Adding new ${kind} track: ${streamTrack.id}`);
-						this.localStreamController.addTrack(streamTrack);
-						await this.transceiverController?.replaceSenderTrack(kind, streamTrack);
-						logger$17.debug(`[RTCPeerConnectionController] Added new ${kind} track: ${streamTrack.id}`, this.localStream?.getTracks());
-					}
-				}
-				logger$17.debug(`[RTCPeerConnectionController] ${kind} input device selected:`, deviceInfo?.label);
+				const newTrack = await this.acquireInputTrack(kind, constraints, deviceInfo, currentTrack);
+				await this.attachInputTrack(kind, newTrack, currentTrack);
+				logger$17.debug(`[RTCPeerConnectionController] ${kind} input device selected:`, deviceInfo.label, newTrack.id);
 			} catch (error) {
 				logger$17.error(`[RTCPeerConnectionController] Failed to select ${kind} input device:`, error);
 				this._errors$.next(new MediaTrackError("updateSelectedInputDevice", kind, error));
-				throw error;
 			}
 		};
 		this._isNegotiating$ = this.createBehaviorSubject(false);
@@ -16123,6 +16126,7 @@ var RTCPeerConnectionController = class extends Destroyable {
 			inputVideoStream: this.options.inputVideoStream,
 			inputAudioDeviceConstraints: this.inputAudioDeviceConstraints,
 			inputVideoDeviceConstraints: this.inputVideoDeviceConstraints,
+			screenShareAudio: this.options.screenShareAudio,
 			getUserMedia: async (constraints) => this.getUserMedia(constraints),
 			getDisplayMedia: async (options$1) => this.getDisplayMedia(options$1)
 		});
@@ -16780,6 +16784,61 @@ var RTCPeerConnectionController = class extends Destroyable {
 		this._localAudioPipeline.setInputTrack(newTrack);
 	}
 	/**
+	* Capture the newly selected device, leaving the current capture running.
+	*
+	* A rejection must leave the current track sending, so nothing is released
+	* until the replacement is in hand. The one exception is hardware that admits
+	* a single opener — a phone's front and back cameras, typically — which
+	* rejects the second capture until the first is closed.
+	*/
+	async acquireInputTrack(kind, constraints, deviceInfo, currentTrack) {
+		try {
+			return await this.captureTrack(kind, constraints, deviceInfo.deviceId);
+		} catch (error) {
+			if (!isMediaDeviceInUse(error)) throw error;
+			logger$17.warn(`[RTCPeerConnectionController] ${kind} device is held exclusively; releasing the current capture to retry:`, error);
+			const previousDeviceId = currentTrack.getSettings().deviceId;
+			this.stopTrackSender(kind);
+			try {
+				return await this.captureTrack(kind, constraints, deviceInfo.deviceId);
+			} catch (retryError) {
+				await this.restorePreviousInputTrack(kind, constraints, previousDeviceId, currentTrack);
+				throw retryError;
+			}
+		}
+	}
+	async captureTrack(kind, constraints, deviceId) {
+		const { stream, fallbackLevel } = await getUserMediaWithFallback({ getUserMedia: async (c) => this.getUserMedia(c) }, { [kind]: constraints }, kind, deviceId);
+		const track = stream.getTracks().find((t) => t.kind === kind);
+		if (!track) {
+			stream.getTracks().forEach((t) => t.stop());
+			throw new MediaTrackError("updateSelectedInputDevice", kind, /* @__PURE__ */ new Error("getUserMedia returned no track of the requested kind"));
+		}
+		if (fallbackLevel !== "exact") logger$17.warn(`[RTCPeerConnectionController] ${kind} device acquired at fallback level '${fallbackLevel}'; the capture may not be the requested device.`);
+		return track;
+	}
+	/** Best-effort return to the device that was released for an exclusive retry. */
+	async restorePreviousInputTrack(kind, constraints, previousDeviceId, releasedTrack) {
+		try {
+			const restored = await this.captureTrack(kind, constraints, previousDeviceId);
+			await this.attachInputTrack(kind, restored, releasedTrack);
+		} catch (error) {
+			logger$17.error(`[RTCPeerConnectionController] Failed to restore the previous ${kind} device:`, error);
+		}
+	}
+	async attachInputTrack(kind, newTrack, oldTrack) {
+		const pipelineOwnsAudio = kind === "audio" && this._localAudioPipeline;
+		if (!pipelineOwnsAudio) try {
+			await this.transceiverController?.replaceSenderTrack(kind, newTrack);
+		} catch (error) {
+			newTrack.stop();
+			throw error;
+		}
+		this.localStreamController.removeTrack(oldTrack.id);
+		this.localStreamController.addTrack(newTrack);
+		if (pipelineOwnsAudio) this._localAudioPipeline?.setInputTrack(newTrack);
+	}
+	/**
 	* Return the lazily-created {@link LocalAudioPipeline}, constructing it on
 	* first access. On creation the current audio sender's track is routed
 	* through the pipeline (input → gain → analyser → destination) and the
@@ -17855,8 +17914,11 @@ var WebRTCVertoManager = class extends VertoManager {
 			throw error;
 		}
 	}
-	async addScreenMedia(options = { audio: false }) {
-		await this.initAdditionalPeerConnection("screenshare", options);
+	async addScreenMedia(options = {}) {
+		await this.initAdditionalPeerConnection("screenshare", {
+			audio: false,
+			screenShareAudio: options.audio ?? false
+		});
 	}
 	async initAdditionalPeerConnection(propose, options) {
 		const isScreenShare = propose === "screenshare";