statewire 0.20.0 → 0.22.0

package/dist/host/socket.js

@@ -1,6 +1,6 @@
+import { DEFAULT_PROTOCOL, WIRE_VERSION, negotiateProtocols } from "../wire/protocol.js";
 import { encodeDocument, reviveDocumentValue } from "../document.js";
 import { COMMAND_CAPACITY_RETRY_MS, MAX_INFLIGHT_COMMANDS_PER_HOST } from "../wire/limits.js";
-import { DEFAULT_PROTOCOL, WIRE_VERSION, negotiateProtocols } from "../wire/protocol.js";
 import { captureContext, contextValue } from "../wire/context.js";
 import { sanitizeValue } from "../wire/ops.js";
 import { StatewireSendError } from "../types.js";
@@ -9,7 +9,7 @@ import { createMacrotaskPoster } from "../util/macrotask.js";
 import { frames, stream } from "./http.js";
 import { useEffect, useState } from "@assistant-ui/tap/react-shim";
 import { createTapRoot, flushTapSync, useResource } from "@assistant-ui/tap";
-//#region src/host/socket.ts
+// src/host/socket.ts
 const CLIENT_ID_RE = /^[A-Za-z0-9._~-]{1,256}$/;
 const PRINCIPAL_MISMATCH_MESSAGE = "client id is bound to another principal";
 /** Structural equality over auth values: primitives, Dates, arrays, and plain
@@ -149,11 +149,13 @@ const cmdOf = (adm, outcome) => {
 				...encodePayload(failure.payload)
 			};
 		}
-		default: return {
-			...at,
-			type: "failed",
-			message: outcome.error instanceof Error ? outcome.error.message : String(outcome.error)
-		};
+		default:
+			console.error("statewire command failed", outcome.error);
+			return {
+				...at,
+				type: "failed",
+				message: "the command failed"
+			};
 	}
 };
 const parseInitialFrame = (raw) => {
@@ -211,6 +213,10 @@ const closeConn = (h, conn, code, reason) => {
 	if (!conn.open) return;
 	conn.open = false;
 	h.conns.delete(conn);
+	if (conn.leaseTimer !== null) {
+		clearTimeout(conn.leaseTimer);
+		conn.leaseTimer = null;
+	}
 	try {
 		conn.socket.close(code, reason);
 	} catch {}
@@ -229,6 +235,35 @@ const sendTo = (h, conn, data) => {
 		closeConn(h, conn);
 	}
 };
+const expiredAt = (h, authorizedAt) => {
+	const now = Date.now();
+	return authorizedAt === void 0 || !Number.isFinite(authorizedAt) || authorizedAt < 0 || authorizedAt > now || h.maxLeaseLifetimeMs !== null && now - authorizedAt >= h.maxLeaseLifetimeMs;
+};
+const leaseExpiredFin = JSON.stringify({ fin: {
+	reason: "reconnect",
+	code: "lease-expired"
+} });
+const expireLease = (h, conn) => {
+	if (!conn.open || expiredAt(h, conn.authorizedAt)) {
+		if (conn.open) {
+			sendTo(h, conn, leaseExpiredFin);
+			closeConn(h, conn, 1e3, "lease-expired");
+		}
+		return true;
+	}
+	return false;
+};
+const armLeaseTimer = (h, conn) => {
+	if (conn.leaseTimer !== null) clearTimeout(conn.leaseTimer);
+	conn.leaseTimer = null;
+	if (h.disposed || h.maxLeaseLifetimeMs === null || expireLease(h, conn)) return;
+	const delay = h.maxLeaseLifetimeMs - (Date.now() - conn.authorizedAt);
+	conn.leaseTimer = setTimeout(() => {
+		conn.leaseTimer = null;
+		if (!expireLease(h, conn)) armLeaseTimer(h, conn);
+	}, Math.min(delay, 2147483647));
+	conn.leaseTimer.unref?.();
+};
 const violate = (h, conn, reason) => {
 	sendTo(h, conn, JSON.stringify({ fin: {
 		reason: "protocol-error",
@@ -319,6 +354,11 @@ const diffView = (h, conn) => {
 	}
 	return ops;
 };
+const notifyIncluded = (conn) => conn.onIncludedChange?.([...conn.included].map((id) => JSON.parse(id)));
+const restoredIncluded = (included) => new Set(included.map((entry) => {
+	if (!Array.isArray(entry) || entry.length !== 2 || typeof entry[0] !== "string" || !(entry[1] === null || Array.isArray(entry[1]) && entry[1].every((part) => typeof part === "string"))) throw new TypeError("statewire: invalid restored include");
+	return documentIdentity(entry[0], entry[1] ?? void 0);
+}));
 const attachOf = (h, conn) => {
 	const requireSelected = (protocol) => {
 		const entry = conn.selection.protocols.find((p) => p.name === protocol);
@@ -361,11 +401,15 @@ const attachOf = (h, conn) => {
 		},
 		include: (protocol, key) => {
 			if (requireSelected(protocol).record !== void 0) throw new Error(`statewire: protocol ${protocol} is not durable`);
-			conn.included.add(documentIdentity(protocol, key));
+			const id = documentIdentity(protocol, key);
+			if (conn.included.has(id)) return;
+			conn.included.add(id);
+			notifyIncluded(conn);
 			markViews(h);
 		},
 		exclude: (protocol, key) => {
-			conn.included.delete(documentIdentity(protocol, key));
+			if (!conn.included.delete(documentIdentity(protocol, key))) return;
+			notifyIncluded(conn);
 			markViews(h);
 		}
 	};
@@ -626,6 +670,7 @@ const installContexts = (h, conn, frame) => {
 	for (const entry of frame.ctx ?? []) h.current?.contextChanged?.(entry.protocol, captureContext(entry.value), conn.attach);
 };
 const admitFrame = (h, conn, frame) => {
+	if (expireLease(h, conn)) return { type: "expired" };
 	validateContexts(h, conn, frame);
 	installContexts(h, conn, frame);
 	const rec = h.clients.get(conn.clientId);
@@ -659,6 +704,7 @@ const admitFrame = (h, conn, frame) => {
 			return refusal(h, conn, retry);
 		}
 	}
+	if (expireLease(h, conn)) return { type: "expired" };
 	for (const s of fresh) admitCmd(h, lanes.get(s.protocol), conn, s);
 	for (const [protocol, lane] of lanes) {
 		const last = fresh.findLast((s) => s.protocol === protocol);
@@ -673,7 +719,7 @@ const admitFrame = (h, conn, frame) => {
 	return { type: "ok" };
 };
 const message = (h, conn, data) => {
-	if (!conn.open || h.disposed || h.finished !== null) return;
+	if (!conn.open || h.disposed || h.finished !== null || expireLease(h, conn)) return;
 	if (frameIsOversized(data)) {
 		sendTo(h, conn, JSON.stringify({ fin: {
 			reason: "protocol-error",
@@ -755,7 +801,18 @@ const normalizedHeaders = (headers) => {
 };
 const connectAuthorized = (h, clientId, socket, options) => {
 	const authorize = h.authorize;
-	if (options.authorized === true) return register(h, clientId, socket, options.authorized === true, options.auth, options.selection)?.connection ?? null;
+	if (options.authorized === true) {
+		if (expiredAt(h, options.authorizedAt)) {
+			try {
+				socket.send(leaseExpiredFin);
+			} catch {}
+			try {
+				socket.close(1e3, "lease-expired");
+			} catch {}
+			return null;
+		}
+		return register(h, clientId, socket, options.authorized === true, options.auth, options.selection, void 0, options.authorizedAt, options)?.connection ?? null;
+	}
 	const refuse = (code, reason) => {
 		try {
 			socket.close(code, reason);
@@ -846,19 +903,20 @@ const connectAuthorized = (h, clientId, socket, options) => {
 			pending.authorizing = true;
 			Promise.resolve().then(() => authorize?.({ headers })).then((auth) => {
 				if (!pending.open || h.disposed || h.finished !== null) return;
+				const authorizedAt = Date.now();
 				const selection = negotiateProtocols(new Headers(headers), h.wireVersion, [h.protocol]);
 				if ("fin" in selection) {
 					sendPending(pending, JSON.stringify(selection));
 					closePending(h, pending, 1008, selection.fin.message);
 					return;
 				}
-				options.onAuthorized?.(auth, selection);
+				options.onAuthorized?.(auth, selection, authorizedAt);
 				pending.open = false;
 				h.pendingConns.delete(pending);
 				if (pending.timer !== null) clearTimeout(pending.timer);
 				let registration;
 				try {
-					registration = register(h, clientId, socket, true, auth, selection, frame);
+					registration = register(h, clientId, socket, true, auth, selection, frame, authorizedAt, options.onIncludedChange === void 0 ? {} : { onIncludedChange: options.onIncludedChange });
 				} catch (error) {
 					if (violationReason(error) === null) throw error;
 					return;
@@ -902,7 +960,8 @@ const register = (h, clientId, socket, sawFrame = false, auth = void 0, selectio
 		name: h.protocol.name,
 		version: h.protocol.version
 	}]
-}, frame = { cmd: [] }) => {
+}, frame = { cmd: [] }, authorizedAt, included = {}) => {
+	const restored = restoredIncluded(included.included ?? []);
 	const refuse = (code, reason) => {
 		try {
 			socket.close(code, reason);
@@ -920,6 +979,12 @@ const register = (h, clientId, socket, sawFrame = false, auth = void 0, selectio
 		return null;
 	}
 	if (atSubscriberLimit(h)) return refuseSubscriberLimit(socket);
+	if (expiredAt(h, authorizedAt)) {
+		try {
+			socket.send(leaseExpiredFin);
+		} catch {}
+		return refuse(1e3, "lease-expired");
+	}
 	const known = h.clients.get(clientId);
 	if (known !== void 0 && !authEquals(known.principal, auth)) {
 		try {
@@ -952,10 +1017,13 @@ const register = (h, clientId, socket, sawFrame = false, auth = void 0, selectio
 		lastSentAt: 0,
 		lease: null,
 		auth,
+		authorizedAt,
+		leaseTimer: null,
 		lanes: /* @__PURE__ */ new Map(),
 		contexts: /* @__PURE__ */ new Map(),
 		documents: /* @__PURE__ */ new Map(),
-		included: /* @__PURE__ */ new Set(),
+		included: restored,
+		onIncludedChange: included.onIncludedChange,
 		view: /* @__PURE__ */ new Map(),
 		nextDoc: 1,
 		pendingApplied: [],
@@ -976,6 +1044,8 @@ const register = (h, clientId, socket, sawFrame = false, auth = void 0, selectio
 	}
 	gcClients(h);
 	ensureHeartbeat(h);
+	armLeaseTimer(h, conn);
+	if (!conn.open) return null;
 	const isEphemeral = (s) => selection.protocols.find((p) => p.name === s.protocol)?.record === "ephemeral";
 	const early = frame.cmd.filter(isEphemeral);
 	const late = frame.cmd.filter((s) => !isEphemeral(s));
@@ -993,6 +1063,7 @@ const register = (h, clientId, socket, sawFrame = false, auth = void 0, selectio
 	const earlyAdmission = admit(early);
 	if (early.length > 0) flush(h);
 	notifyClientRecords(h);
+	if (expireLease(h, conn)) return null;
 	const ops = [];
 	if (selects(conn, h.protocol.name)) {
 		const { value, meta } = encodeDocument(h.stateHost.snapshot());
@@ -1051,9 +1122,14 @@ const resume = (h) => {
 	h.disposed = false;
 	h.stateHost?.setOnOp((op) => recordOp(h, op));
 	h.stateHost?.setOnDocuments(() => markViews(h));
+	for (const conn of h.conns) armLeaseTimer(h, conn);
 };
 const suspend = (h) => {
 	h.disposed = true;
+	for (const conn of h.conns) {
+		if (conn.leaseTimer !== null) clearTimeout(conn.leaseTimer);
+		conn.leaseTimer = null;
+	}
 	if (h.heartbeatTimer !== null) {
 		clearInterval(h.heartbeatTimer);
 		h.heartbeatTimer = null;
@@ -1087,6 +1163,7 @@ const useSocketHost = (transport, options, persistence) => {
 			key: void 0,
 			wireVersion: { version: WIRE_VERSION },
 			heartbeatMs: 15e3,
+			maxLeaseLifetimeMs: 864e5,
 			wsInitTimeoutMs: 5e3,
 			maxSubscribers: MAX_SUBSCRIBERS,
 			maxInflightCommands: MAX_INFLIGHT_COMMANDS_PER_HOST,
@@ -1129,6 +1206,12 @@ const useSocketHost = (transport, options, persistence) => {
 	h.key = options?.key;
 	h.wireVersion = options?.wireVersion ?? { version: "2026-09-30" };
 	setHeartbeatMs(h, options?.heartbeatIntervalMs ?? 15e3);
+	const maxLeaseLifetimeMs = options?.maxLeaseLifetimeMs === void 0 ? 864e5 : options.maxLeaseLifetimeMs;
+	if (maxLeaseLifetimeMs !== null && (!Number.isFinite(maxLeaseLifetimeMs) || maxLeaseLifetimeMs <= 0)) throw new TypeError("maxLeaseLifetimeMs must be finite and positive or null");
+	if (h.maxLeaseLifetimeMs !== maxLeaseLifetimeMs) {
+		h.maxLeaseLifetimeMs = maxLeaseLifetimeMs;
+		for (const conn of [...h.conns]) armLeaseTimer(h, conn);
+	}
 	h.pushback = options?.pushback;
 	h.wsInitTimeoutMs = options?.wsInitTimeoutMs ?? 5e3;
 	const maxSubscribers = options?.maxSubscribers === void 0 ? MAX_SUBSCRIBERS : options.maxSubscribers;
@@ -1186,7 +1269,6 @@ const StatewireSocketHost = (transport, options, persistence) => {
 		}
 	};
 };
-//#endregion
-export { CLIENT_ID_RE, PRINCIPAL_MISMATCH_MESSAGE, SUBSCRIBER_LIMIT_MESSAGE, StatewireSocketHost, admitFrame, atSubscriberLimit, authEquals, closeConn, flush, parseFrame, parseFrameValue, register, sendTo };
+export { CLIENT_ID_RE, PRINCIPAL_MISMATCH_MESSAGE, SUBSCRIBER_LIMIT_MESSAGE, StatewireSocketHost, admitFrame, atSubscriberLimit, authEquals, closeConn, expireLease, flush, parseFrame, parseFrameValue, register, sendTo };
 
 //# sourceMappingURL=socket.js.map