@camera.ui/transport 0.0.13 → 0.0.16

package/dist/core/types.d.ts

@@ -38,6 +38,7 @@ export type ConnectionPhase = {
     readonly kind: 'discovering';
     readonly instanceId: string;
     readonly attempt: number;
+    readonly transports?: ReadonlyMap<TransportId, TransportStatus>;
 } | {
     readonly kind: 'online';
     readonly instanceId: string;

package/dist/effects/crossTab.d.ts

@@ -7,6 +7,7 @@ export interface CrossTabOptions {
     readonly kernel: Kernel;
     readonly key?: string;
     readonly source?: CrossTabSource;
+    readonly absorb?: (target: ConnectionTarget | null) => void;
     readonly onTokensReceived?: (tokens: ConnectionTarget['tokens']) => void;
     readonly onResetReceived?: () => void;
     readonly onError?: (op: 'parse', err: unknown) => void;

package/dist/effects/persistence.d.ts

@@ -16,6 +16,7 @@ export interface Persistence {
     readonly detach: Detach;
     peek(): ConnectionTarget | null;
     seed(target: ConnectionTarget): Promise<void>;
+    absorb(target: ConnectionTarget | null): void;
 }
 export interface PersistenceOptions {
     readonly kernel: Kernel;

package/dist/index.js

@@ -22,7 +22,8 @@ function reducer(phase, action, ctx) {
 			if (phase.kind === "reconnecting") return {
 				kind: "discovering",
 				instanceId: phase.instanceId,
-				attempt: 1
+				attempt: 1,
+				transports: phase.transports
 			};
 			if (phase.kind === "needs-auth") return {
 				kind: "discovering",
@@ -32,7 +33,8 @@ function reducer(phase, action, ctx) {
 			if (phase.kind === "online") return {
 				kind: "discovering",
 				instanceId: phase.instanceId,
-				attempt: 1
+				attempt: 1,
+				transports: phase.transports
 			};
 			return phase;
 		case "PROBE_SUCCEEDED":
@@ -43,7 +45,7 @@ function reducer(phase, action, ctx) {
 					endpoint: action.endpoint,
 					tokens: action.tokens
 				},
-				transports: EMPTY_TRANSPORTS
+				transports: phase.transports ?? EMPTY_TRANSPORTS
 			};
 			if (phase.kind === "reconnecting") return {
 				kind: "online",
@@ -89,6 +91,10 @@ function reducer(phase, action, ctx) {
 					transports: next
 				};
 			}
+			if (phase.kind === "discovering") return {
+				...phase,
+				transports: setStatus(phase.transports ?? EMPTY_TRANSPORTS, action.id, { up: true })
+			};
 			return phase;
 		case "TRANSPORT_DOWN":
 			if (phase.kind === "online" || phase.kind === "reconnecting") return {
@@ -99,6 +105,14 @@ function reducer(phase, action, ctx) {
 					downSince: ctx.now()
 				})
 			};
+			if (phase.kind === "discovering") return {
+				...phase,
+				transports: setStatus(phase.transports ?? EMPTY_TRANSPORTS, action.id, {
+					up: false,
+					lastError: action.reason,
+					downSince: ctx.now()
+				})
+			};
 			return phase;
 		case "TRANSPORT_DOWN_CONFIRMED":
 			if (phase.kind !== "online") return phase;
@@ -321,6 +335,7 @@ function attachCrossTab(options) {
 		const e = event;
 		if (e.key !== key) return;
 		if (e.newValue === null) {
+			options.absorb?.(null);
 			const k = options.kernel.phase.kind;
 			if (k !== "online" && k !== "reconnecting") return;
 			options.kernel.dispatch({ type: "RESET" });
@@ -336,7 +351,16 @@ function attachCrossTab(options) {
 		}
 		if (!parsed?.tokens?.access) return;
 		const k = options.kernel.phase.kind;
-		if (k !== "online" && k !== "reconnecting") return;
+		if (k !== "online" && k !== "reconnecting") {
+			if (parsed.endpoint?.url) {
+				options.absorb?.({
+					endpoint: parsed.endpoint,
+					tokens: parsed.tokens
+				});
+				options.onTokensReceived?.(parsed.tokens);
+			}
+			return;
+		}
 		options.kernel.dispatch({
 			type: "TOKENS_REFRESHED",
 			tokens: parsed.tokens
@@ -450,6 +474,10 @@ function attachPersistence(options) {
 		seed: async (target) => {
 			if (detached) return;
 			await persist(target);
+		},
+		absorb: (target) => {
+			if (detached) return;
+			cached = target;
 		}
 	};
 }
@@ -695,7 +723,7 @@ function attachProbeLoop(options) {
 			const underlying = err instanceof RaceFirstError ? err.cause : err;
 			if (isProbeFailure(underlying) && underlying.kind === "aborted") {
 				setTimeout(() => {
-					if (!detached) runRound();
+					if (!detached && options.kernel.phase.kind === "discovering") runRound();
 				}, 200);
 				return;
 			}
@@ -762,6 +790,7 @@ function attachReconnectWatchdog(options) {
 var DEFAULT_GRACE_MS$1 = 5e3;
 var DEFAULT_MAX_TRANSIENT_RETRIES = 3;
 var DEFAULT_TRANSIENT_RETRY_DELAY_MS = 2e3;
+var MAX_TIMER_DELAY_MS = 2 ** 31 - 1;
 function attachTokenLifecycle(options) {
 	const graceMs = options.graceMs ?? DEFAULT_GRACE_MS$1;
 	const isTransient = options.isTransientError ?? (() => false);
@@ -786,7 +815,7 @@ function attachTokenLifecycle(options) {
 		cancelTimer();
 		const exp = target.tokens.accessExpiresAt;
 		if (!exp) return;
-		const delayMs = Math.max(0, exp - now() - graceMs);
+		const delayMs = Math.min(Math.max(0, exp - now() - graceMs), MAX_TIMER_DELAY_MS);
 		options.onScheduled?.(delayMs, exp);
 		timer = setTimer(() => {
 			timer = void 0;
@@ -824,7 +853,13 @@ function attachTokenLifecycle(options) {
 						skipped: true
 					};
 				}
-				const tokens = await options.refresh(target, reason);
+				const livePhase = options.kernel.phase;
+				const base = (livePhase.kind === "online" ? livePhase.target : livePhase.kind === "reconnecting" ? livePhase.lastTarget : null) ?? target;
+				const refreshTarget = fresh ? {
+					...base,
+					tokens: fresh
+				} : base;
+				const tokens = await options.refresh(refreshTarget, reason);
 				if (detached) return {
 					tokens,
 					skipped: false
@@ -840,8 +875,11 @@ function attachTokenLifecycle(options) {
 			});
 			if (detached) return;
 			transientRetries = 0;
-			if (result.skipped) options.onRefreshSkipped?.(reason, result.tokens);
-			else options.onRefreshSuccess?.(reason, result.tokens);
+			if (result.skipped) {
+				options.onRefreshSkipped?.(reason, result.tokens);
+				const p = options.kernel.phase;
+				if (p.kind === "online" && timer === void 0) schedule(p.target);
+			} else options.onRefreshSuccess?.(reason, result.tokens);
 		} catch (err) {
 			if (detached) return;
 			const transient = isTransient(err);

package/dist/transports/nats.js

@@ -41,6 +41,8 @@ function createNatsTransport(options = {}) {
 	let statusAbort = null;
 	let disposed = false;
 	let connId = null;
+	let applyEpoch = 0;
+	let pendingConnectAbort = null;
 	function buildServers(target) {
 		const url = new URL(target.endpoint.url);
 		const wsProtocol = url.protocol === "https:" ? "wss:" : "ws:";
@@ -111,8 +113,9 @@ function createNatsTransport(options = {}) {
 		}
 		markDown(message);
 	}
-	async function rebuildClient(target) {
+	async function rebuildClient(target, epoch) {
 		stopStatusMonitor();
+		pendingConnectAbort?.abort();
 		if (proxy) {
 			try {
 				proxy.abortClose();
@@ -140,14 +143,25 @@ function createNatsTransport(options = {}) {
 			maxPingOut,
 			ignoreAuthErrorAbort: true
 		});
+		const connectAbort = new AbortController();
+		pendingConnectAbort = connectAbort;
 		try {
-			await next.connect();
+			await next.connect({ signal: connectAbort.signal });
 		} catch (err) {
 			try {
 				next.abortClose();
 			} catch {}
+			if (disposed || epoch !== applyEpoch) return;
 			markDown(err instanceof Error ? err.message : String(err));
 			throw err;
+		} finally {
+			if (pendingConnectAbort === connectAbort) pendingConnectAbort = null;
+		}
+		if (disposed || epoch !== applyEpoch) {
+			try {
+				next.abortClose();
+			} catch {}
+			return;
 		}
 		proxy = next;
 		markUp();
@@ -157,10 +171,13 @@ function createNatsTransport(options = {}) {
 	async function apply(target) {
 		if (disposed) throw new Error("nats-transport disposed");
 		if (isSameTarget(currentTarget, target)) return;
+		const epoch = ++applyEpoch;
 		const endpointChanged = isEndpointChange(currentTarget, target);
 		currentTarget = target;
 		if (!target) {
 			stopStatusMonitor();
+			pendingConnectAbort?.abort();
+			pendingConnectAbort = null;
 			if (proxy) {
 				try {
 					proxy.abortClose();
@@ -172,7 +189,12 @@ function createNatsTransport(options = {}) {
 			return;
 		}
 		if (endpointChanged || !proxy) {
-			await rebuildClient(target);
+			try {
+				await rebuildClient(target, epoch);
+			} catch (err) {
+				if (epoch === applyEpoch && currentTarget === target) currentTarget = null;
+				throw err;
+			}
 			return;
 		}
 		const newServers = buildServers(target);
@@ -190,7 +212,10 @@ function createNatsTransport(options = {}) {
 	}
 	async function dispose() {
 		disposed = true;
+		applyEpoch++;
 		stopStatusMonitor();
+		pendingConnectAbort?.abort();
+		pendingConnectAbort = null;
 		if (proxy) {
 			try {
 				proxy.abortClose();
@@ -203,11 +228,11 @@ function createNatsTransport(options = {}) {
 		emitter.clear();
 	}
 	function getClient() {
-		return proxy;
+		return status.up ? proxy : null;
 	}
 	function subscribeClient(listener) {
 		clientListeners.add(listener);
-		listener(proxy);
+		listener(status.up ? proxy : null);
 		return () => clientListeners.delete(listener);
 	}
 	async function probeAlive(timeoutMs = 5e3) {

package/dist/transports/ws.js

@@ -18,6 +18,7 @@ function createWsTransport(options = {}) {
 	const WsCtor = options.webSocketCtor ?? (typeof WebSocket !== "undefined" ? WebSocket : void 0);
 	const emitter = new TransportEmitter();
 	const handles = /* @__PURE__ */ new Set();
+	const closeDelivered = /* @__PURE__ */ new WeakSet();
 	let currentTarget = null;
 	let status = { up: false };
 	let disposed = false;
@@ -51,10 +52,14 @@ function createWsTransport(options = {}) {
 			for (const fn of [...handle.listeners.open]) fn();
 		};
 		ws.onclose = (event) => {
-			if (handle.ws === ws) {
+			const isCurrent = handle.ws === ws;
+			if (isCurrent) {
 				handle.ws = null;
 				handle.url = null;
 			}
+			if (closeDelivered.has(ws)) return;
+			closeDelivered.add(ws);
+			if (!isCurrent) return;
 			if (isAuthCloseEvent(event)) emitter.emit("auth-error", { message: event.reason || `ws close code ${event.code}` });
 			const info = {
 				code: event.code,
@@ -86,6 +91,8 @@ function createWsTransport(options = {}) {
 			handle.ws = null;
 			handle.url = null;
 		}
+		if (closeDelivered.has(ws)) return;
+		closeDelivered.add(ws);
 		const info = {
 			code,
 			reason,

package/dist/worker.js

@@ -20,7 +20,7 @@ function createWorkerKernelMirror(options) {
 		lastGeneration = msg.generation;
 		const prev = current;
 		current = msg.phase;
-		if (prev === current) return;
+		if (phaseEquals(prev, current)) return;
 		for (const l of [...listeners]) try {
 			l(current, prev);
 		} catch {}
@@ -31,6 +31,13 @@ function createWorkerKernelMirror(options) {
 		if (p.kind === "reconnecting") return p.lastTarget;
 		return null;
 	}
+	function phaseEquals(a, b) {
+		if (a.kind !== b.kind) return false;
+		const ta = targetOf(a);
+		const tb = targetOf(b);
+		if (ta === null || tb === null) return ta === tb;
+		return ta.endpoint.url === tb.endpoint.url && ta.endpoint.mode === tb.endpoint.mode && ta.tokens.access === tb.tokens.access && ta.tokens.proxySession === tb.tokens.proxySession && ta.tokens.refresh === tb.tokens.refresh;
+	}
 	return {
 		get phase() {
 			return current;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camera.ui/transport",
-  "version": "0.0.13",
+  "version": "0.0.16",
   "description": "camera.ui transport layer — framework-agnostic connection kernel, reducer state, pluggable transports (HTTP/WS/Socket.IO/NATS), lifecycle effects and worker bridge",
   "author": "seydx (https://github.com/cameraui/clients)",
   "type": "module",
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@camera.ui/logger": ">=0.0.3",
-    "@camera.ui/rpc": ">=1.0.6",
+    "@camera.ui/rpc": ">=1.0.8",
     "axios": ">=1.18.1",
     "socket.io-client": ">=4.8.3"
   },
@@ -73,8 +73,8 @@
     "typescript": "5.9.3",
     "typescript-eslint": "^8.62.1",
     "unplugin-dts": "^1.0.3",
-    "updates": "^17.18.1",
-    "vite": "^8.1.2",
+    "updates": "^17.18.2",
+    "vite": "^8.1.3",
     "vitest": "^4.1.9"
   },
   "overrides": {