experimental-a2 0.10.0 → 0.12.0

package/dist/{server-DlLyvaSH.js → server-BeNADlCI.js}

@@ -1,40 +1,10 @@
 import { n as validateSync } from "./validate-XKT4FSNn.js";
 import { n as NonRetriableError, r as asStoreUnavailable, t as A2Error } from "./errors-DCk6ch5n.js";
-import { c as STREAM_TIMINGS, g as serverInternals, h as nullProtoRecord, i as POLL_TIMINGS, m as markSchedulerSendFailure, o as RESERVED_PARTICIPANT_IDS, s as SOCKET_TIMINGS, t as DRAIN_TIMINGS } from "./internal-DRXJ56EI.js";
-import { t as defaultSleep } from "./store-polling-6DW7F1DT.js";
-import { _ as socketErrorAckFor, a as errorToWire, b as socketUnsubscribedFor, g as socketAckFor, h as presenceSnapshotToWire, i as errorStatus, n as asA2Error, p as presencePatchToWire, s as eventToWire, t as SOCKET_PING_FRAME, v as socketFrameFor, y as socketSubscribedFor } from "./wire--yji6mO3.js";
+import { c as STREAM_TIMINGS, g as serverInternals, h as nullProtoRecord, i as POLL_TIMINGS, m as markSchedulerSendFailure, o as RESERVED_PARTICIPANT_IDS, s as SOCKET_TIMINGS, t as DRAIN_TIMINGS } from "./internal-Dq2qYxou.js";
+import { i as streamActivities, r as createStreamActivity, t as defaultSleep } from "./store-polling-CmxUbV93.js";
+import { r as platformWaitUntil, t as invocationDeadlineMs } from "./platform-B4TnJtWu.js";
+import { _ as socketErrorAckFor, a as errorToWire, b as socketUnsubscribedFor, g as socketAckFor, h as presenceSnapshotToWire, i as errorStatus, n as asA2Error, p as presencePatchToWire, s as eventToWire, t as SOCKET_PING_FRAME, v as socketFrameFor, y as socketSubscribedFor } from "./wire-BO5wWCb1.js";
 import { t as retryableLazy } from "./retryable-lazy-DZWmHpii.js";
-//#region src/platform.ts
-const SYMBOL_FOR_REQ_CONTEXT = Symbol.for("@vercel/request-context");
-function requestContext() {
-	try {
-		return Reflect.get(globalThis, SYMBOL_FOR_REQ_CONTEXT)?.get?.() ?? {};
-	} catch {
-		return {};
-	}
-}
-/** The current invocation's Vercel deployment identity, when available. */
-function platformVercelOidcToken() {
-	try {
-		const token = requestContext().headers?.["x-vercel-oidc-token"];
-		return typeof token === "string" && token.length > 0 ? token : null;
-	} catch {
-		return null;
-	}
-}
-function platformWaitUntil(promise) {
-	try {
-		requestContext().waitUntil?.(promise);
-	} catch {}
-}
-/** The invocation's termination time in epoch ms, or null if unknowable. */
-function invocationDeadlineMs() {
-	const deadline = requestContext().deadline;
-	if (deadline === void 0 || deadline === null) return null;
-	const ms = new Date(deadline).getTime();
-	return Number.isNaN(ms) ? null : ms;
-}
-//#endregion
 //#region src/push-envelope.ts
 /**
 * The push envelope's trust boundary for `{ sessionId, events, presence? }`,
@@ -242,7 +212,7 @@ const pumpSubscription = async (shell, subscription, frameFor) => {
 		shell.send(frameFor(value));
 	}
 };
-const handleSocketPush = async (shell, target, sessionId, frame, req, ackSessionId, gatePush) => {
+const handleSocketPush = async (shell, target, sessionId, frame, req, ackSessionId, gatePush, activate) => {
 	try {
 		const events = parsePushEvents(frame["events"]);
 		const denial = await gatePush?.(sessionId, events, void 0) ?? null;
@@ -250,7 +220,9 @@ const handleSocketPush = async (shell, target, sessionId, frame, req, ackSession
 			shell.send(socketErrorAckFor(req, denial, ackSessionId));
 			return;
 		}
+		activate();
 		const appended = await target.append(...events);
+		activate();
 		shell.send(socketAckFor(req, appended, ackSessionId));
 	} catch (error) {
 		shell.send(socketErrorAckFor(req, asA2Error(error), ackSessionId));
@@ -300,7 +272,7 @@ function sessionSocket(sessionId, session, socket, options) {
 					shell.send(socketErrorAckFor(req, new A2Error("STORE_UNAVAILABLE", "push shed: too many in flight on this socket")));
 					return;
 				}
-				shell.track(handleSocketPush(shell, target, sessionId, frame, req, void 0, options?.gatePush));
+				shell.track(handleSocketPush(shell, target, sessionId, frame, req, void 0, options?.gatePush, () => streamActivities.get(subscription.iterator)?.activate()));
 				return;
 			}
 			case "presence":
@@ -355,29 +327,31 @@ function sessionsSocket(resolve, socket, options) {
 			if (shell.torn() || subscription.stopped) return;
 			retire(id, subscription);
 			shell.send(socketUnsubscribedFor(id));
-		} catch {
+		} catch (error) {
 			if (shell.torn() || subscription.stopped) return;
 			retire(id, subscription);
-			shell.send(socketUnsubscribedFor(id, "stream failed"));
+			shell.send(socketUnsubscribedFor(id, "stream failed", asA2Error(error)));
 		}
 	};
 	const startSubscription = async (id, index) => {
+		const existing = subscriptions.get(id);
+		if (existing) {
+			stopSubscription(existing);
+			subscriptions.delete(id);
+		}
 		let session;
 		try {
 			session = await resolve(id, index);
-		} catch {
-			if (!shell.torn()) shell.send(socketUnsubscribedFor(id, "stream failed"));
+		} catch (error) {
+			if (!shell.torn()) shell.send(socketUnsubscribedFor(id, "stream failed", asA2Error(error)));
 			return;
 		}
 		if (shell.torn()) return;
 		if (session === null) {
-			shell.send(socketUnsubscribedFor(id, "subscribe rejected"));
+			shell.send(socketUnsubscribedFor(id, "subscribe rejected", new A2Error("FORBIDDEN", "the subscription is not authorized")));
 			return;
 		}
-		const target = session;
-		const existing = subscriptions.get(id);
-		if (existing) stopSubscription(existing);
-		const subscription = socketSubscription(target, index, presence);
+		const subscription = socketSubscription(session, index, presence);
 		subscriptions.set(id, subscription);
 		shell.send(socketSubscribedFor(id));
 		runSubscription(id, subscription);
@@ -392,7 +366,10 @@ function sessionsSocket(resolve, socket, options) {
 			shell.send(socketErrorAckFor(req, new A2Error("STORE_UNAVAILABLE", "session is not subscribed on this socket"), sessionId));
 			return;
 		}
-		await handleSocketPush(shell, subscription.target, sessionId, frame, req, sessionId, options?.gatePush);
+		await handleSocketPush(shell, subscription.target, sessionId, frame, req, sessionId, options?.gatePush, () => {
+			const current = subscriptions.get(sessionId);
+			if (current) streamActivities.get(current.iterator)?.activate();
+		});
 	};
 	const handlePresence = async (frame, sessionId) => {
 		const subscription = subscriptions.get(sessionId);
@@ -493,7 +470,10 @@ function sseResponse(iterable) {
 	let deadlineTimer;
 	let closed = false;
 	let iteratorReturned = false;
+	let stopActivity;
 	const stopTimers = () => {
+		stopActivity?.();
+		stopActivity = void 0;
 		if (heartbeat !== void 0) clearInterval(heartbeat);
 		if (deadlineTimer !== void 0) clearTimeout(deadlineTimer);
 		heartbeat = void 0;
@@ -507,6 +487,15 @@ function sseResponse(iterable) {
 	const stream = new ReadableStream({
 		start(controller) {
 			controller.enqueue(encoder.encode(": connected\n\n"));
+			const activity = streamActivities.get(iterator);
+			if (activity) {
+				const announce = (idle) => {
+					if (closed) return;
+					controller.enqueue(encoder.encode(`event: a2-activity\ndata: ${idle ? "idle" : "active"}\n\n`));
+				};
+				stopActivity = activity.subscribe(announce);
+				if (activity.idle) announce(true);
+			}
 			heartbeat = setInterval(() => {
 				try {
 					controller.enqueue(encoder.encode(": ping\n\n"));
@@ -827,6 +816,9 @@ async function deliverSchedulerAppend(server, task) {
 	if (!internals) throw new TypeError(`a2 scheduler: server for contract '${task.contract}' cannot receive scheduled appends`);
 	await internals.schedulerAppend(task.sessionId, task.events);
 }
+function handler(entry) {
+	return typeof entry === "function" ? { handler: entry } : entry;
+}
 const MAX_FAILURES = 10;
 /** Default: how long a presence value survives without a refreshing set. */
 const PRESENCE_TTL_MS = 6e4;
@@ -978,8 +970,8 @@ function createServer(options) {
 	for (const [type, entry] of Object.entries(options.handlers ?? {})) {
 		if (entry === void 0) continue;
 		if (!Object.hasOwn(defs, type)) throw new TypeError(`contract '${name}' has no event type '${type}' — cannot register a handler for it`);
-		const handler = typeof entry === "function" ? entry : entry?.handler;
-		if (typeof handler !== "function") throw new TypeError(`handler for '${type}' must be a function`);
+		const callback = typeof entry === "function" ? entry : entry?.handler;
+		if (typeof callback !== "function") throw new TypeError(`handler for '${type}' must be a function`);
 		let abortOn = null;
 		const spec = typeof entry === "function" ? void 0 : entry.abortOn;
 		if (spec !== void 0) {
@@ -995,7 +987,7 @@ function createServer(options) {
 		const lane = typeof entry === "function" ? null : entry.lane ?? null;
 		if (lane !== null && typeof lane !== "function" && (typeof lane !== "string" || lane.length === 0)) throw new TypeError(`lane for '${type}' must be a non-empty string or a function`);
 		handlers.set(type, {
-			handler,
+			handler: callback,
 			abortOn,
 			lane
 		});
@@ -1405,12 +1397,57 @@ function createServer(options) {
 		createdAt: event.createdAt
 	});
 	const streamEvents = (id, startAfter) => {
-		const store = resolveStore();
+		let closed = false;
+		let inner;
+		let stopActivity;
+		const activity = createStreamActivity(() => {
+			if (inner && !closed) streamActivities.get(inner)?.activate();
+		});
+		let closing;
+		const close = () => {
+			closed = true;
+			closing ??= (async () => {
+				stopActivity?.();
+				await inner?.return?.();
+			})();
+			return closing;
+		};
 		const outer = async function* () {
-			const inner = (await store).stream(nsId(id), { startAfter });
-			for await (const event of inner) yield toSessionEvent(id, event);
+			const store = await resolveStore();
+			if (closed) return;
+			inner = store.stream(nsId(id), { startAfter })[Symbol.asyncIterator]();
+			const sourceActivity = streamActivities.get(inner);
+			if (sourceActivity) {
+				stopActivity = sourceActivity.subscribe(activity.setIdle);
+				activity.setIdle(sourceActivity.idle);
+			}
+			try {
+				for (;;) {
+					if (closed) return;
+					const result = await inner.next();
+					if (closed || result.done) return;
+					yield toSessionEvent(id, result.value);
+				}
+			} finally {
+				await close();
+			}
 		};
-		return outer();
+		const iterator = outer();
+		return { [Symbol.asyncIterator]() {
+			const stream = {
+				next: () => iterator.next(),
+				async return() {
+					await close();
+					return iterator.return(void 0);
+				},
+				async throw(error) {
+					await close();
+					return iterator.throw(error);
+				}
+			};
+			streamActivities.set(stream, activity);
+			return stream;
+		} };
 	};
 	const requirePresence = (store) => {
 		if (!store.presence) throw presenceNotSupported();
@@ -1462,8 +1499,39 @@ function createServer(options) {
 	*/
 	const streamWithPresence = (id, startAfter) => {
 		const ns = nsId(id);
+		let closed = false;
+		let events;
+		let unsubscribe;
+		let sleeper = null;
+		let wakeQueue = null;
+		let presenceInterval = Math.min(POLL_TIMINGS.activeFloorMs, POLL_TIMINGS.idleCeilingMs);
+		let presenceActivityVersion = 0;
+		let stopActivity;
+		const activity = createStreamActivity(() => {
+			if (closed) return;
+			presenceActivityVersion += 1;
+			presenceInterval = Math.min(POLL_TIMINGS.activeFloorMs, POLL_TIMINGS.idleCeilingMs);
+			sleeper?.cancel();
+			if (events) streamActivities.get(events)?.activate();
+		});
+		let closing;
+		const close = () => {
+			closed = true;
+			sleeper?.cancel();
+			wakeQueue?.();
+			closing ??= (async () => {
+				try {
+					stopActivity?.();
+					unsubscribe?.();
+				} finally {
+					await events?.return?.();
+				}
+			})();
+			return closing;
+		};
 		const outer = async function* () {
 			const store = await resolveStore();
+			if (closed) return;
 			const api = requirePresence(store);
 			const readRows = async () => {
 				try {
@@ -1538,8 +1606,9 @@ function createServer(options) {
 				if (fields?.size === 0) painted.delete(patch.participant);
 			};
 			const queue = /* @__PURE__ */ new Map();
-			let wakeQueue = null;
 			const enqueue = (patch) => {
+				if (closed) return;
+				activity.activate();
 				for (const [field, value] of Object.entries(patch.values)) {
 					if (value === void 0) continue;
 					let fields = queue.get(patch.participant);
@@ -1573,11 +1642,17 @@ function createServer(options) {
 				}
 				return null;
 			};
-			const unsubscribe = api.subscribe?.(ns, enqueue);
-			const events = store.stream(ns, { startAfter })[Symbol.asyncIterator]();
 			let pendingEvent = null;
 			try {
+				unsubscribe = api.subscribe?.(ns, enqueue);
+				events = store.stream(ns, { startAfter })[Symbol.asyncIterator]();
+				const sourceActivity = streamActivities.get(events);
+				if (sourceActivity) {
+					stopActivity = sourceActivity.subscribe(activity.setIdle);
+					activity.setIdle(sourceActivity.idle);
+				}
 				const snapshotRows = await readRows();
+				if (closed) return;
 				for (const row of snapshotRows) {
 					let fields = painted.get(row.participant);
 					if (!fields) {
@@ -1592,9 +1667,11 @@ function createServer(options) {
 				}
 				yield { snapshot: foldPresenceRows(snapshotRows) };
 				for (;;) {
+					if (closed) return;
 					for (;;) {
 						const patch = dequeue();
 						if (!patch) break;
+						if (closed) return;
 						paint(patch);
 						yield patch;
 					}
@@ -1606,28 +1683,57 @@ function createServer(options) {
 						});
 						woke = await Promise.race([pendingEvent.then(() => "event"), arrival.then(() => "patch")]);
 						wakeQueue = null;
+						if (closed) return;
 						if (woke === "patch") continue;
 					} else {
-						const sleeper = defaultSleep(POLL_TIMINGS.idleCeilingMs);
+						sleeper = defaultSleep(presenceInterval);
 						woke = await Promise.race([pendingEvent.then(() => "event"), sleeper.promise.then(() => "tick")]);
 						sleeper.cancel();
+						sleeper = null;
 					}
+					if (closed) return;
 					if (woke === "event") {
 						const result = await pendingEvent;
 						pendingEvent = null;
-						if (result.done) return;
+						if (closed || result.done) return;
+						activity.activate();
 						yield toSessionEvent(id, result.value);
 					}
-					if (!unsubscribe) for (const patch of diffRows(await readRows())) yield patch;
+					if (!closed && !unsubscribe) {
+						const version = presenceActivityVersion;
+						const rows = await readRows();
+						if (closed) return;
+						const patches = diffRows(rows);
+						if (patches.length > 0) activity.activate();
+						else if (version === presenceActivityVersion) presenceInterval = Math.min(presenceInterval * 2, POLL_TIMINGS.idleCeilingMs);
+						for (const patch of patches) {
+							if (closed) return;
+							yield patch;
+						}
+					}
 				}
 			} finally {
-				wakeQueue = null;
-				unsubscribe?.();
 				pendingEvent?.catch(() => {});
-				await events.return?.();
+				await close();
+				wakeQueue = null;
 			}
 		};
-		return outer();
+		const iterator = outer();
+		return { [Symbol.asyncIterator]() {
+			const stream = {
+				next: () => iterator.next(),
+				async return() {
+					await close();
+					return iterator.return(void 0);
+				},
+				async throw(error) {
+					await close();
+					return iterator.throw(error);
+				}
+			};
+			streamActivities.set(stream, activity);
+			return stream;
+		} };
 	};
 	const makeSession = (id, append, trigger) => ({
 		id,
@@ -2216,6 +2322,6 @@ function cloneInitial(initial) {
 	}
 }
 //#endregion
-export { parsePresenceSibling as a, sseResponse as i, deliverSchedulerAppend as n, platformVercelOidcToken as o, setServerFetchHooks as r, createServer as t };
+export { sseResponse as a, setServerFetchHooks as i, deliverSchedulerAppend as n, parsePresenceSibling as o, handler as r, createServer as t };
 
-//# sourceMappingURL=server-DlLyvaSH.js.map
+//# sourceMappingURL=server-BeNADlCI.js.map