@signalwire/js 4.0.0-dev-20260804221355 → 4.0.0-dev-20260826210511

package/dist/browser.mjs

@@ -14508,6 +14508,33 @@ function throwOnRPCError() {
 	});
 }
 
+//#endregion
+//#region src/utils/unwrapVertoReply.ts
+/**
+* Unwrap a method's own reply from a `webrtc.verto` envelope.
+*
+* A control verb sent in-dialog comes back nested two levels deep:
+*
+* ```
+* { result: { node_id, code, result: { jsonrpc, id, result: <method payload> } } }
+* ```
+*
+* whereas the routed transport resolves the method payload directly under
+* `.result`. Readers want the latter shape, and the difference is silent when it
+* is wrong — `response.result.layouts` simply evaluates to `undefined` against the
+* envelope, so the data arrives, nothing throws, and the caller sees an empty
+* value. That exact failure produced an empty layout dropdown with a successful
+* request behind it.
+*
+* Accepting both shapes here keeps every reader indifferent to which transport
+* produced the response. Anything that is not a nested envelope (a plain ack, or
+* an already-unwrapped reply) passes through untouched.
+*/
+function unwrapVertoReply(response) {
+	const inner = getValueFrom(response, "result.result");
+	return inner && typeof inner === "object" && "result" in inner ? inner : response;
+}
+
 //#endregion
 //#region src/managers/CallEventsManager.ts
 var import_cjs$20 = require_cjs();
@@ -14700,9 +14727,10 @@ var CallEventsManager = class extends Destroyable {
 	updateLayouts() {
 		if (!this.selfId) return;
 		this.webRtcCallSession.executeMethod(this.selfId, "call.layout.list", {}).then((response) => {
+			const { result } = unwrapVertoReply(response);
 			this._sessionState$.next({
 				...this._sessionState$.value,
-				layouts: response.result.layouts
+				layouts: result.layouts
 			});
 		}).catch((error) => {
 			logger$22.error("[CallEventsManager] Error fetching layouts:", error);
@@ -16707,6 +16735,48 @@ const logger$16 = getLogger();
 function resolveInviteNodeId(args) {
 	return args.isInvite && !args.reattach && !args.explicitNodeId ? "" : args.currentNodeId ?? "";
 }
+/**
+* Surface the real outcome of a `webrtc.verto` reply.
+*
+* A webrtc.verto response nests several envelopes, each keyed by a verto-style
+* string `code` ("200" ok, "400"/etc. fail) rather than a JSON-RPC `error`. An outer
+* layer reports only whether the frame was delivered; an inner layer carries the op's
+* own outcome:
+*
+*   response.result = { code:"200", result:{…} }            ← delivery acknowledgement
+*     .result       = { jsonrpc, id, result:{…} }           ← the reply payload
+*       .result     = { code:"400", message:"Bad request" } ← the actual op outcome
+*
+* A failure can appear at any layer (delivery refused, or the op itself rejected
+* deeper down), so walk every nested `.result` object and return the FIRST non-2xx
+* `code` with its message. Returns null when every `code` seen is 2xx or absent —
+* i.e. the op succeeded. This is the only way to detect that e.g. a mute/kick was
+* rejected, since the outer delivery `code` is "200" (delivered) even then.
+*
+* Pure function — exported for unit testing.
+*/
+function findNestedVertoFailure(response) {
+	let node = response;
+	while (node !== null && typeof node === "object") {
+		const obj = node;
+		const err = obj.error;
+		if (err !== null && typeof err === "object") {
+			const e = err;
+			const errCode = typeof e.code === "string" || typeof e.code === "number" ? String(e.code) : void 0;
+			if (errCode !== void 0 && !/^2\d\d$/.test(errCode)) return {
+				code: errCode,
+				message: typeof e.message === "string" ? e.message : void 0
+			};
+		}
+		const code = typeof obj.code === "string" || typeof obj.code === "number" ? String(obj.code) : void 0;
+		if (code !== void 0 && !/^2\d\d$/.test(code)) return {
+			code,
+			message: typeof obj.message === "string" ? obj.message : void 0
+		};
+		node = obj.result !== null && typeof obj.result === "object" ? obj.result : null;
+	}
+	return null;
+}
 var VertoManager = class extends Destroyable {
 	constructor(callSession) {
 		super();
@@ -17031,6 +17101,33 @@ var WebRTCVertoManager = class extends VertoManager {
 	get vertoPing$() {
 		return this.cachedObservable("vertoPing$", () => this.webRtcCallSession.webrtcMessages$.pipe(filterAs(isVertoPingInnerParams, "params"), (0, import_cjs$15.takeUntil)(this.destroyed$)));
 	}
+	/**
+	* Send a member-control op in-dialog via verto.info.
+	*
+	* The control payload rides in `params.command` — a sibling of `dialogParams`,
+	* at the same level as `dtmf` in {@link sendDigits} — and the inner verto.info
+	* is matched to this call's channel by `dialogParams.callID`, the in-dialog
+	* convention for member-scoped frames. Because it is delivered on the dialog
+	* itself, control lands on the call's own channel with no {node_id,call_id,member_id}
+	* "self" tuple to get wrong. The outer webrtc.verto envelope (added by executeVerto)
+	* still carries the own-leg callID + node_id for session routing.
+	*
+	* Keep `command` OUT of `dialogParams`: it is read at the params level, and
+	* filterVertoParams rewrites/filters dialogParams keys but passes params-level
+	* keys through verbatim.
+	*/
+	async sendCallControl(method, params) {
+		const response = await this.executeVerto(VertoInfo({
+			dialogParams: { callID: this.webRtcCallSession.id },
+			command: {
+				method,
+				params
+			}
+		}));
+		const failure = findNestedVertoFailure(response);
+		if (failure) throw new JSONRPCError(Number.parseInt(failure.code, 10) || 0, failure.message ?? `Call control "${method}" failed (code ${failure.code})`, void 0);
+		return response;
+	}
 	async executeVerto(message, optionals = {}) {
 		const webrtcVertoMessage = WebrtcVerto({
 			callID: optionals.callID ?? this.webRtcCallSession.id,
@@ -17039,15 +17136,16 @@ var WebRTCVertoManager = class extends VertoManager {
 			subscribe: optionals.subscribe
 		});
 		const response = await this.webRtcCallSession.execute(webrtcVertoMessage);
+		const nonFatal = message.method === "verto.info" ? { fatal: false } : void 0;
 		if (response.error) {
 			const error = new JSONRPCError(response.error.code, response.error.message, response.error.data);
-			this.onError?.(error);
+			this.onError?.(error, nonFatal);
 			return response;
 		}
 		const innerResult = getValueFrom(response, "result.result");
 		if (innerResult?.error) {
 			const error = new JSONRPCError(innerResult.error.code, innerResult.error.message, innerResult.error.data);
-			this.onError?.(error);
+			this.onError?.(error, nonFatal);
 			return response;
 		}
 		return response;
@@ -18434,8 +18532,11 @@ var WebRTCCall = class extends Destroyable {
 	emitError(callError) {
 		if (this._status$.value === "destroyed" || this._status$.value === "failed") return;
 		this._errors$.next(callError);
-		if (callError.fatal) {
+		if (callError.fatal && this._status$.value !== "disconnecting") {
 			this._status$.next("failed");
+			this.vertoManager.bye().catch((error) => {
+				logger$12.debug("[Call] fatal-teardown bye failed (signaling likely already dead):", error);
+			});
 			this.destroy();
 		}
 	}
@@ -18552,6 +18653,7 @@ var WebRTCCall = class extends Destroyable {
 	async executeMethod(target, method, args) {
 		const self = this.callSelf;
 		if (typeof target === "string" && target !== self.member_id) throw new InvalidParams(`Target member ID ${target} does not match call's self member ID ${self.member_id}`);
+		if (this.clientSession.callControl === "in-dialog") return this.executeMethodInDialog(target, method, args);
 		const params = {
 			...args,
 			self,
@@ -18571,6 +18673,81 @@ var WebRTCCall = class extends Destroyable {
 		}
 	}
 	/**
+	* `executeMethod` for a call opened with `callControl: 'in-dialog'`.
+	*
+	* Translates the routed transport's calling convention into the in-dialog one. No
+	* `self` tuple is sent, but a `target` is — the same {call_id, member_id} the routed
+	* transport puts in `target` (minus node_id), for self-ops and cross-member ops alike.
+	*
+	* Target shapes are per-verb and irregular, so they are centralised here rather
+	* than left to callers: most verbs take a singular `target`, `call.member.remove`
+	* takes a plural `targets` array, and `call.member.position.set` takes a flat
+	* `targets` of `{call_id, position}` — the one verb keyed on call_id rather than
+	* member_id, so the member triple `Participant.setPosition` built is unwrapped.
+	*/
+	async executeMethodInDialog(target, method, args) {
+		const control = { ...args };
+		if (method === "call.member.position.set") control.targets = (args.targets ?? []).map((entry) => ({
+			call_id: entry.target?.call_id ?? entry.call_id,
+			position: entry.position
+		}));
+		else {
+			const member = typeof target === "object" ? {
+				call_id: target.call_id,
+				member_id: target.member_id
+			} : {
+				call_id: this.id,
+				member_id: target
+			};
+			if (method === "call.member.remove") control.targets = [member];
+			else control.target = member;
+		}
+		return this.sendCommand(method, control);
+	}
+	/**
+	* Sends a `call.*` control verb **in-dialog** via `verto.info`, as an alternative
+	* to the routed {@link executeMethod} transport.
+	*
+	* Why both exist: `executeMethod` addresses the member with an explicit
+	* `{node_id, call_id, member_id}` tuple, which does not resolve for every conference,
+	* so the op can fail. An in-dialog frame carries the verb on the member's own
+	* signaling channel instead, so control works without the client needing to know how
+	* the conference is hosted.
+	*
+	* The trade-off is reach: the in-dialog transport is only accepted for calls that
+	* join a conference over SWML (e.g. an SWML `join_conference`); use the routed
+	* default otherwise.
+	*
+	* `params` are sent verbatim — nothing is built for you, which includes the target.
+	* **A self-directed op still needs one**, or it is refused; name yourself explicitly:
+	*
+	* ```ts
+	* const { call_id, member_id } = call.self.target;
+	* await call.sendCommand('call.mute', { channels: ['audio'], target: { call_id, member_id } });
+	* ```
+	*
+	* Never include `node_id` — only the two ids. The shapes are per-verb: most take a
+	* singular `target`, `call.member.remove` takes a plural `targets` array, and
+	* `call.member.position.set` takes a flat `targets: [{call_id, position}]` (the one
+	* verb keyed on `call_id` rather than `member_id`). Verbs that act on the call as a
+	* whole, or that the SDK does not wrap at all, take no target.
+	*
+	* For the typed alternative that handles all of this, create the client with
+	* `callControl: 'in-dialog'` and use the ordinary `Call`/`Participant` methods.
+	*
+	* @internal Not part of the supported surface while the in-dialog transport is still
+	* rolling out. `WebRTCCall` is exported from the package entry, so without this tag
+	* TypeDoc publishes the method — and the example above — as public API.
+	*
+	* @param method - A `call.*` method name (e.g. `'call.mute'`).
+	* @param params - Method parameters, sent verbatim.
+	* @returns The method's own reply, unwrapped from the `verto.info` envelope.
+	* @throws {JSONRPCError} If the control op fails.
+	*/
+	async sendCommand(method, params = {}) {
+		return unwrapVertoReply(await this.vertoManager.sendCallControl(method, params));
+	}
+	/**
 	* The local leg's member triple — sent as `self` in every member RPC
 	* envelope, and as the `target` of call-scoped self-operations (e.g. lock,
 	* layout).
@@ -19901,6 +20078,7 @@ var ClientSessionManager = class extends Destroyable {
 			minor: 0,
 			revision: 0
 		};
+		this.callControl = "routed";
 		this._authorization$ = this.createBehaviorSubject(void 0);
 		this._errors$ = this.createReplaySubject(1);
 		this._authState$ = this.createBehaviorSubject({ kind: "unauthenticated" });
@@ -20374,6 +20552,9 @@ var ClientSessionWrapper = class {
 	get iceServers() {
 		return this.clientSessionManager.iceServers;
 	}
+	get callControl() {
+		return this.clientSessionManager.callControl;
+	}
 	async execute(request, options) {
 		return this.clientSessionManager.execute(request, options);
 	}
@@ -20614,7 +20795,7 @@ var DeviceTokenManager = class extends Destroyable {
 			method: "POST",
 			uri: DEVICE_TOKEN_ENDPOINT
 		});
-		const response = await this.http.request({
+		const response = await this.http().request({
 			url: DEVICE_TOKEN_ENDPOINT,
 			...POST_PARAMS,
 			body: JSON.stringify({
@@ -20641,7 +20822,7 @@ var DeviceTokenManager = class extends Destroyable {
 			uri: DEVICE_REFRESH_ENDPOINT,
 			accessToken: currentToken
 		});
-		const response = await this.http.request({
+		const response = await this.http().request({
 			url: DEVICE_REFRESH_ENDPOINT,
 			...POST_PARAMS,
 			body: JSON.stringify({
@@ -21806,6 +21987,16 @@ var SignalWire = class extends Destroyable {
 		});
 	}
 	/**
+	* Build the refresh path's own HTTP controller, against whatever host is current.
+	*
+	* Called on first use rather than up front, so `apiHost` already reflects the
+	* token's `ch` claim. Same credential source as the container's controller — only
+	* the instance, and therefore its observable streams, is separate.
+	*/
+	createRefreshHttpController() {
+		return new HTTPRequestController(this._deps.apiHost, () => this._deps.credential);
+	}
+	/**
 	* Initializes DPoP if not already set up. Returns the fingerprint on success.
 	*/
 	async initDPoP() {
@@ -21832,7 +22023,14 @@ var SignalWire = class extends Destroyable {
 	async resolveCredentials() {
 		const fingerprint = await this.initDPoP();
 		this._refreshCoordinator = new CredentialRefreshCoordinator(this._dpopManager, {
-			http: this._deps.http,
+			http: () => {
+				if (!this._refreshHttp || this._refreshHttpHost !== this._deps.apiHost) {
+					this._refreshHttp?.destroy();
+					this._refreshHttp = this.createRefreshHttpController();
+					this._refreshHttpHost = this._deps.apiHost;
+				}
+				return this._refreshHttp;
+			},
 			notifier: {
 				onError: (error) => this._errors$.next(error),
 				onWarning: (warning) => this._warnings$.next(warning),
@@ -22098,6 +22296,7 @@ var SignalWire = class extends Destroyable {
 		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._deps.webRTCApiProvider, this._dpopManager, this._networkMonitor?.networkChange$);
 		this._publicSession = new ClientSessionWrapper(this._clientSession);
+		this._clientSession.callControl = this._options.callControl ?? "routed";
 		this._clientSession.onBeforeReconnect = async () => this.refreshCredentialForReconnect();
 		this.subscribeTo(this._clientSession.errors$, (error) => {
 			this._errors$.next(error);
@@ -22714,6 +22913,8 @@ var SignalWire = class extends Destroyable {
 	destroy() {
 		this._refreshCoordinator?.destroy();
 		this._refreshCoordinator = void 0;
+		this._refreshHttp?.destroy();
+		this._refreshHttp = void 0;
 		this._dpopManager?.destroy();
 		const session = this._clientSession;
 		session?.teardownSessionState();