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

package/dist/browser.mjs

@@ -6934,7 +6934,7 @@ var require_switchMap = /* @__PURE__ */ __commonJSMin(((exports) => {
 	var innerFrom_1$6 = require_innerFrom();
 	var lift_1$13 = require_lift();
 	var OperatorSubscriber_1$11 = require_OperatorSubscriber();
-	function switchMap$2(project, resultSelector) {
+	function switchMap$3(project, resultSelector) {
 		return lift_1$13.operate(function(source, subscriber) {
 			var innerSubscriber = null;
 			var index = 0;
@@ -6958,7 +6958,7 @@ var require_switchMap = /* @__PURE__ */ __commonJSMin(((exports) => {
 			}));
 		});
 	}
-	exports.switchMap = switchMap$2;
+	exports.switchMap = switchMap$3;
 }));
 
 //#endregion
@@ -12515,7 +12515,7 @@ var CallEventsManager = class extends Destroyable {
 			});
 			this.updateParticipants(sessionState.members);
 			this._self$.value?.capabilities.updateFromRaw(capabilities);
-			this.updateLayouts();
+			if (this._self$.value?.capabilities.setLayout) this.updateLayouts();
 		});
 		this.subscribeTo(this.memberUpdates$, (member) => {
 			logger$15.debug("[CallEventsManager] Handling member update event for member ID:", member);
@@ -13847,7 +13847,10 @@ function isVertoAttachMessage(value) {
 	return value.method === "verto.attach";
 }
 function isVertoAnswerInnerParams(value) {
-	return isObject(value) && hasProperty(value, "jsonrpc") && value.jsonrpc === "2.0" && hasProperty(value, "method") && value.method === "verto.answer" && isObject(value.params) && hasProperty(value.params, "callID") && hasProperty(value.params, "sdp");
+	return isObject(value) && hasProperty(value, "jsonrpc") && value.jsonrpc === "2.0" && hasProperty(value, "method") && value.method === "verto.answer" && isObject(value.params) && hasProperty(value.params, "callID");
+}
+function isVertoMediaInnerParams(value) {
+	return isObject(value) && hasProperty(value, "jsonrpc") && value.jsonrpc === "2.0" && hasProperty(value, "method") && value.method === "verto.media" && isObject(value.params) && hasProperty(value.params, "callID") && hasProperty(value.params, "sdp");
 }
 function isVertoMediaParamsInnerParams(value) {
 	return isObject(value) && hasProperty(value, "jsonrpc") && value.jsonrpc === "2.0" && hasProperty(value, "method") && value.method === "verto.mediaParams" && isObject(value.params) && hasProperty(value.params, "mediaParams");
@@ -13957,10 +13960,19 @@ var WebRTCVertoManager = class extends VertoManager {
 		].includes(connectionState)))));
 	}
 	initSubscriptions() {
+		this.subscribeTo(this.vertoMedia$, (event) => {
+			logger$10.debug("[WebRTCManager] Received Verto media event (early media SDP):", event);
+			this._signalingStatus$.next("ringing");
+			const { sdp, callID } = event;
+			this._rtcPeerConnectionsMap.get(callID)?.updateAnswerStatus({
+				status: "received",
+				sdp
+			});
+		});
 		this.subscribeTo(this.vertoAnswer$, (event) => {
 			logger$10.debug("[WebRTCManager] Received Verto answer event:", event);
-			const { sdp } = event;
-			this._rtcPeerConnectionsMap.get(event.callID)?.updateAnswerStatus({
+			const { sdp, callID } = event;
+			this._rtcPeerConnectionsMap.get(callID)?.updateAnswerStatus({
 				status: "received",
 				sdp
 			});
@@ -14001,6 +14013,9 @@ var WebRTCVertoManager = class extends VertoManager {
 	get selfId() {
 		return this._selfId$.value;
 	}
+	get vertoMedia$() {
+		return this.webRtcCallSession.webrtcMessages$.pipe(filterAs(isVertoMediaInnerParams, "params"), (0, import_cjs$10.takeUntil)(this.destroyed$));
+	}
 	get vertoAnswer$() {
 		return this.cachedObservable("vertoAnswer$", () => this.webRtcCallSession.webrtcMessages$.pipe(filterAs(isVertoAnswerInnerParams, "params"), (0, import_cjs$10.takeUntil)(this.destroyed$)));
 	}
@@ -14084,7 +14099,6 @@ var WebRTCVertoManager = class extends VertoManager {
 			this._selfId$.next(memberId);
 			rtcPeerConnController.setMemberId(memberId);
 			if (callId) this.webRtcCallSession.addCallId(callId);
-			this._signalingStatus$.next("ringing");
 			this.attachManager.attach(this.webRtcCallSession);
 			logger$10.info("[WebRTCManager] Verto invite successful");
 			logger$10.debug(`[WebRTCManager] nodeid: ${this._nodeId$.value}, selfId: ${this._selfId$.value}`);
@@ -14179,6 +14193,7 @@ var WebRTCVertoManager = class extends VertoManager {
 	}
 	setupVertoByeHandler() {
 		this.subscribeTo(this.vertoBye$, () => {
+			this._signalingStatus$.next("disconnected");
 			this.attachManager.detach(this.webRtcCallSession);
 			this.callSession?.destroy();
 		});
@@ -14206,7 +14221,12 @@ var WebRTCVertoManager = class extends VertoManager {
 			this.callSession?.destroy();
 		} else if (!vertoByeOrAccepted) {
 			logger$10.info("[WebRTCManager] Call was not accepted, sending verto.bye.");
-			await this.bye("USER_BUSY");
+			try {
+				await this.bye("USER_BUSY");
+			} finally {
+				this._signalingStatus$.next("disconnected");
+				this.callSession?.destroy();
+			}
 		} else {
 			logger$10.debug("[WebRTCManager] Call accepted, sending answer");
 			try {
@@ -14236,8 +14256,7 @@ var WebRTCVertoManager = class extends VertoManager {
 			userVariables: {
 				memberCallId: this.webRtcCallSession.id,
 				memberId,
-				...this.webRtcCallSession.options.userVariables,
-				...PreferencesContainer.instance.userVariables
+				...this.webRtcCallSession.userVariables
 			},
 			screenShare: rtcPeerConnectionController.isScreenShare,
 			additionalDevice: rtcPeerConnectionController.isAdditionalDevice,
@@ -14436,6 +14455,20 @@ var ParticipantFactory = class {
 //#region src/core/entities/Call.ts
 var import_cjs$9 = require_cjs();
 const logger$9 = getLogger();
+const fromDestinationParams = (destination) => {
+	if (!destination) return {};
+	try {
+		const url = new URL(`destination:${destination}`);
+		const params = {};
+		url.searchParams.forEach((value, key) => {
+			params[key] = value;
+		});
+		return params;
+	} catch (error) {
+		logger$9.warn(`Failed to parse destination URI: ${destination}`, error);
+		return {};
+	}
+};
 /**
 * Concrete WebRTC call implementation.
 *
@@ -14453,8 +14486,21 @@ var WebRTCCall = class extends Destroyable {
 		this._errors$ = this.createSubject();
 		this._answered$ = this.createReplaySubject();
 		this._holdState = false;
+		this._userVariables$ = this.createBehaviorSubject({ ...PreferencesContainer.instance.userVariables });
 		this.id = options.callId ?? v4_default();
 		this.to = options.to;
+		this._userVariables$.next({
+			...this._userVariables$.value,
+			...fromDestinationParams(options.to),
+			...options.userVariables
+		});
+		this.subscribeTo(this.webrtcMessages$, (message) => {
+			const userVars = getValueFrom(message, "params.userVariables");
+			if (userVars) this._userVariables$.next({
+				...this._userVariables$.value,
+				...userVars
+			});
+		});
 		const managers = initialization.initializeManagers(this);
 		this.vertoManager = managers.vertoManager;
 		this.callEventsManager = managers.callEventsManager;
@@ -14668,6 +14714,21 @@ var WebRTCCall = class extends Destroyable {
 	get remoteStream() {
 		return this.vertoManager.remoteStream;
 	}
+	/** Observable of custom user variables associated with the call. */
+	get userVariables$() {
+		return this._userVariables$.asObservable();
+	}
+	/** a copy of the current custom user variables of the call. */
+	get userVariables() {
+		return { ...this._userVariables$.value };
+	}
+	/** Merge current custom user variables of the call. */
+	set userVariables(variables) {
+		this._userVariables$.next({
+			...this._userVariables$.value,
+			...variables
+		});
+	}
 	/** @internal */
 	createParticipant(memberId, selfId) {
 		if (memberId === (selfId ?? this.vertoManager.selfId)) return this.participantFactory.createSelfParticipant(memberId);
@@ -14773,7 +14834,6 @@ var WebRTCCall = class extends Destroyable {
 		try {
 			await this.vertoManager.bye();
 		} finally {
-			this._status$.next("destroyed");
 			this.destroy();
 		}
 	}
@@ -14812,6 +14872,7 @@ var WebRTCCall = class extends Destroyable {
 	}
 	/** Destroys the call, releasing all resources and subscriptions. */
 	destroy() {
+		this._status$.next("destroyed");
 		this.vertoManager.destroy();
 		this.callEventsManager.destroy();
 		this.participantsMap.clear();
@@ -14866,7 +14927,10 @@ var Fetcher = class {
 		this.nextUrl = `${this.endpoint}?${params}`;
 	}
 	async next() {
-		if (!this.nextUrl) return [];
+		if (!this.nextUrl) {
+			this.hasMore = false;
+			return [];
+		}
 		const response = await this.http.request({
 			...GET_PARAMS,
 			url: this.nextUrl
@@ -14874,6 +14938,7 @@ var Fetcher = class {
 		if (response.ok && !!response.body) {
 			const result = JSON.parse(response.body);
 			this.nextUrl = result.links.next;
+			this.hasMore = !!this.nextUrl;
 			return result.data.filter(this.filter).map(this.mapper);
 		}
 		logger$8.error("Failed to fetch entity");
@@ -14907,10 +14972,11 @@ var EntityCollection = class extends Destroyable {
 			this.observablesRegistry.get(data.id)?.next(updated);
 			this.values$.next(Array.from(this.collectionData.values()));
 		};
+		this._hasMore$ = this.createBehaviorSubject(true);
 		this._destroy$ = new import_cjs$8.Subject();
 		this.updateSubscription = this.update$.subscribe(this.upsertData);
 		this.loading$.next(false);
-		this.hasMore$ = (0, import_cjs$8.defer)(() => (0, import_cjs$8.from)(this.init())).pipe((0, import_cjs$8.shareReplay)(1), (0, import_cjs$8.takeUntil)(this._destroy$));
+		this.hasMore$ = (0, import_cjs$8.defer)(() => (0, import_cjs$8.from)(this.init())).pipe((0, import_cjs$8.switchMap)(() => this._hasMore$), (0, import_cjs$8.distinctUntilChanged)(), (0, import_cjs$8.shareReplay)(1), (0, import_cjs$8.takeUntil)(this._destroy$));
 	}
 	get loading() {
 		return this.loading$.value;
@@ -14925,17 +14991,21 @@ var EntityCollection = class extends Destroyable {
 		return Array.from(this.collectionData.values());
 	}
 	async init() {
-		if (this.fetchController.hasMore === false) return Promise.resolve(false);
+		if (this.fetchController.hasMore === false) {
+			this._hasMore$.next(false);
+			return;
+		}
 		await this.fetchMore();
-		return this.fetchController.hasMore ?? true;
 	}
 	async fetchMore() {
 		try {
 			this.loading$.next(true);
 			(await this.fetchController.next()).forEach(this.upsertData);
+			this._hasMore$.next(this.fetchController.hasMore ?? false);
 			this.loading$.next(false);
 		} catch (error) {
 			logger$8.error(`Failed to fetch initial collection data`, error);
+			this._hasMore$.next(this.fetchController.hasMore ?? false);
 			this.loading$.next(false);
 			this.onError?.(new CollectionFetchError("fetchMore", error));
 		}
@@ -15507,7 +15577,8 @@ var ClientSessionManager = class extends Destroyable {
 			to: invite.callee_id_number,
 			fromName: invite.caller_id_name,
 			from: invite.caller_id_number,
-			displayDirection: invite.display_direction
+			displayDirection: invite.display_direction,
+			userVariables: invite.userVariables
 		});
 		await (0, import_cjs$5.firstValueFrom)(callSession.status$);
 		this._calls$.next({
@@ -15539,12 +15610,14 @@ var ClientSessionManager = class extends Destroyable {
 		try {
 			const addressURI = getAddressSearchURI(options);
 			let address;
-			if (!addressURI.startsWith("+")) {
+			try {
 				if (!this._directory) throw new DependencyError("Directory not initialized");
 				const addressId = await this._directory.findAddressIdByURI(addressURI);
 				if (!addressId) throw new DependencyError(`Address name: ${addressURI} not found`);
 				address = this._directory.get(addressId);
 				if (!address) throw new DependencyError(`Address ID: ${addressId} not found`);
+			} catch (error) {
+				logger$6.warn(`[Session] Directory lookup failed for ${addressURI}, proceeding with raw URI`);
 			}
 			const callSession = this.callFactory.createCall(address, { ...options });
 			callSession.status$.pipe((0, import_cjs$5.filter)((status) => status === "destroyed"), (0, import_cjs$5.take)(1)).subscribe(() => {