experimental-a2 0.9.0 → 0.10.0

package/dist/{server-CBET-jSz.js → server-DlLyvaSH.js}

@@ -116,10 +116,9 @@ async function parsePushBody(req) {
 /**
 * The A2 socket protocol's server half (specs/a2-api.md §13): the
 * per-socket shell — teardown, backpressure, heartbeat, the malformed
-* budget, the in-flight bound — and `sessionsSocket`, the multiplexed
-* frame handler riding it. Internal module: `handle`'s upgrade lane is
-* the sanctioned mount; only `A2Socket` (the structural socket the
-* platform hands over) is re-exported as public surface.
+* budget, and the in-flight bound. `sessionSocket` binds one session to
+* one socket; `sessionsSocket` is the opt-in multiplexed handler. Only
+* `A2Socket`, the structural socket the platform hands over, is public.
 */
 const messageText = (data) => {
 	if (typeof data === "string") return data;
@@ -222,10 +221,101 @@ function socketShell(socket, release, onFrame, deadlineAt) {
 		track
 	};
 }
+const socketSubscription = (target, startAfter, presence) => ({
+	target,
+	iterator: (presence ? target.stream({
+		startAfter,
+		presence: true
+	}) : target.stream({ startAfter }))[Symbol.asyncIterator](),
+	stopped: false
+});
 const stopSubscription = (subscription) => {
 	subscription.stopped = true;
 	subscription.iterator.return?.()?.catch(() => {});
 };
+const pumpSubscription = async (shell, subscription, frameFor) => {
+	for (;;) {
+		while (!shell.torn() && !subscription.stopped && shell.buffered() > SOCKET_TIMINGS.highWaterMarkBytes) await new Promise((wake) => setTimeout(wake, SOCKET_TIMINGS.resumePollMs));
+		if (shell.torn() || subscription.stopped) return;
+		const { value, done } = await subscription.iterator.next();
+		if (shell.torn() || subscription.stopped || done) return;
+		shell.send(frameFor(value));
+	}
+};
+const handleSocketPush = async (shell, target, sessionId, frame, req, ackSessionId, gatePush) => {
+	try {
+		const events = parsePushEvents(frame["events"]);
+		const denial = await gatePush?.(sessionId, events, void 0) ?? null;
+		if (denial !== null) {
+			shell.send(socketErrorAckFor(req, denial, ackSessionId));
+			return;
+		}
+		const appended = await target.append(...events);
+		shell.send(socketAckFor(req, appended, ackSessionId));
+	} catch (error) {
+		shell.send(socketErrorAckFor(req, asA2Error(error), ackSessionId));
+	}
+};
+const applySocketPresence = async (shell, target, sessionId, frame, gatePush) => {
+	if (typeof target.setPresence !== "function") {
+		shell.malformedFrame("presence frame on a presence-less session");
+		return;
+	}
+	let patch;
+	try {
+		patch = parsePresenceSibling(frame);
+	} catch {
+		shell.malformedFrame("invalid presence frame");
+		return;
+	}
+	if (!patch) return;
+	try {
+		if ((await gatePush?.(sessionId, [], patch) ?? null) !== null) return;
+		await target.setPresence(patch);
+	} catch (error) {
+		const failure = asA2Error(error);
+		if (failure.code === "INVALID_PAYLOAD" || failure.code === "UNKNOWN_PRESENCE_FIELD") {
+			shell.malformedFrame("invalid presence frame");
+			return;
+		}
+		shell.shutdown(1011, "internal error");
+	}
+};
+function sessionSocket(sessionId, session, socket, options) {
+	const target = session;
+	const subscription = socketSubscription(target, options?.startAfter ?? 0, options?.presence === true);
+	const handleFrame = (frame) => {
+		switch (frame["kind"]) {
+			case "push": {
+				const req = frame["req"];
+				if (typeof req !== "number") {
+					shell.malformedFrame("push frame without a numeric req");
+					return;
+				}
+				if (frame["sessionId"] !== void 0) {
+					shell.send(socketErrorAckFor(req, new A2Error("INVALID_PAYLOAD", "sessionId is not allowed on a single-session socket")));
+					return;
+				}
+				if (shell.overCap()) {
+					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));
+				return;
+			}
+			case "presence":
+				if (frame["sessionId"] !== void 0) {
+					shell.malformedFrame("sessionId is not allowed on a single-session socket");
+					return;
+				}
+				if (!shell.overCap()) shell.track(applySocketPresence(shell, target, sessionId, frame, options?.gatePush));
+				return;
+			default: return;
+		}
+	};
+	const shell = socketShell(socket, () => stopSubscription(subscription), handleFrame, options?.deadline);
+	pumpSubscription(shell, subscription, socketFrameFor).then(() => shell.shutdown(1e3), () => shell.shutdown(1011, "stream failed"));
+}
 const parseSubscribeEntries = (value) => {
 	if (!Array.isArray(value) || value.length === 0) return null;
 	const entries = [];
@@ -259,22 +349,9 @@ function sessionsSocket(resolve, socket, options) {
 	const retire = (id, subscription) => {
 		if (subscriptions.get(id) === subscription) subscriptions.delete(id);
 	};
-	const pump = async (id, subscription) => {
-		for (;;) {
-			for (;;) {
-				if (shell.torn() || subscription.stopped || shell.buffered() <= SOCKET_TIMINGS.highWaterMarkBytes) break;
-				await new Promise((wake) => setTimeout(wake, SOCKET_TIMINGS.resumePollMs));
-			}
-			if (shell.torn() || subscription.stopped) return;
-			const { value, done } = await subscription.iterator.next();
-			if (shell.torn() || subscription.stopped) return;
-			if (done) return;
-			shell.send(socketFrameFor(value, id));
-		}
-	};
 	const runSubscription = async (id, subscription) => {
 		try {
-			await pump(id, subscription);
+			await pumpSubscription(shell, subscription, (item) => socketFrameFor(item, id));
 			if (shell.torn() || subscription.stopped) return;
 			retire(id, subscription);
 			shell.send(socketUnsubscribedFor(id));
@@ -300,14 +377,7 @@ function sessionsSocket(resolve, socket, options) {
 		const target = session;
 		const existing = subscriptions.get(id);
 		if (existing) stopSubscription(existing);
-		const subscription = {
-			target,
-			iterator: (presence ? target.stream({
-				startAfter: index,
-				presence: true
-			}) : target.stream({ startAfter: index }))[Symbol.asyncIterator](),
-			stopped: false
-		};
+		const subscription = socketSubscription(target, index, presence);
 		subscriptions.set(id, subscription);
 		shell.send(socketSubscribedFor(id));
 		runSubscription(id, subscription);
@@ -322,45 +392,12 @@ function sessionsSocket(resolve, socket, options) {
 			shell.send(socketErrorAckFor(req, new A2Error("STORE_UNAVAILABLE", "session is not subscribed on this socket"), sessionId));
 			return;
 		}
-		try {
-			const events = parsePushEvents(frame["events"]);
-			const denial = await options?.gatePush?.(sessionId, events, void 0) ?? null;
-			if (denial !== null) {
-				shell.send(socketErrorAckFor(req, denial, sessionId));
-				return;
-			}
-			const appended = await subscription.target.append(...events);
-			shell.send(socketAckFor(req, appended, sessionId));
-		} catch (err) {
-			shell.send(socketErrorAckFor(req, asA2Error(err), sessionId));
-		}
+		await handleSocketPush(shell, subscription.target, sessionId, frame, req, sessionId, options?.gatePush);
 	};
 	const handlePresence = async (frame, sessionId) => {
 		const subscription = subscriptions.get(sessionId);
 		if (subscription === void 0) return;
-		if (typeof subscription.target.setPresence !== "function") {
-			shell.malformedFrame("presence frame on a presence-less session");
-			return;
-		}
-		let patch;
-		try {
-			patch = parsePresenceSibling(frame);
-		} catch {
-			shell.malformedFrame("invalid presence frame");
-			return;
-		}
-		if (!patch) return;
-		try {
-			if ((await options?.gatePush?.(sessionId, [], patch) ?? null) !== null) return;
-			await subscription.target.setPresence(patch);
-		} catch (error) {
-			const failure = asA2Error(error);
-			if (failure.code === "INVALID_PAYLOAD" || failure.code === "UNKNOWN_PRESENCE_FIELD") {
-				shell.malformedFrame("invalid presence frame");
-				return;
-			}
-			shell.shutdown(1011, "internal error");
-		}
+		await applySocketPresence(shell, subscription.target, sessionId, frame, options?.gatePush);
 	};
 	const handleFrame = (frame) => {
 		switch (frame["kind"]) {
@@ -591,7 +628,20 @@ function createServerFetch(server) {
 		const validateIngress = async (context) => {
 			await serverFetchHooks.get(fetch)?.validateIngress?.(context);
 		};
-		const attach = (socket) => {
+		const gateSocketPush = async (sessionId, events, pushedPresence) => {
+			try {
+				await authorize(freezePush(sessionId, events, pushedPresence, "websocket"));
+				await validateIngress({
+					sessionId,
+					events,
+					...pushedPresence === void 0 ? {} : { presence: pushedPresence }
+				});
+				return null;
+			} catch (error) {
+				return asA2Error(error);
+			}
+		};
+		const attachMultiplexed = (socket) => {
 			const deadline = invocationDeadlineMs();
 			sessionsSocket(async (sessionId, startAfter) => {
 				return await authorized({
@@ -603,25 +653,34 @@ function createServerFetch(server) {
 			}, socket, {
 				presence,
 				...deadline === null ? {} : { deadline },
-				gatePush: async (sessionId, events, pushedPresence) => {
-					try {
-						await authorize(freezePush(sessionId, events, pushedPresence, "websocket"));
-						await validateIngress({
-							sessionId,
-							events,
-							...pushedPresence === void 0 ? {} : { presence: pushedPresence }
-						});
-						return null;
-					} catch (error) {
-						return asA2Error(error);
-					}
-				}
+				gatePush: gateSocketPush
 			});
 		};
 		try {
 			if (request.method === "GET") {
 				if (request.headers.get("upgrade")?.toLowerCase() === "websocket") {
 					if (options?.upgradeWebSocket === void 0) return new Response("WebSocket upgrade requested, but server.fetch() has no upgrade implementation", { status: 426 });
+					if (options.multiplexWebSocket === true) return await options.upgradeWebSocket(attachMultiplexed);
+					const { searchParams } = new URL(request.url);
+					const sessionId = searchParams.get("sessionId");
+					if (sessionId === null || sessionId.length === 0) throw new A2Error("INVALID_PAYLOAD", "missing sessionId");
+					const startAfter = parseResumeIndex(searchParams.get("index"));
+					await authorize({
+						type: "stream",
+						sessionId,
+						startAfter,
+						transport: "websocket"
+					});
+					const target = server.session(sessionId);
+					const attach = (socket) => {
+						const deadline = invocationDeadlineMs();
+						sessionSocket(sessionId, target, socket, {
+							startAfter,
+							presence,
+							...deadline === null ? {} : { deadline },
+							gatePush: gateSocketPush
+						});
+					};
 					return await options.upgradeWebSocket(attach);
 				}
 				const { searchParams } = new URL(request.url);
@@ -2159,4 +2218,4 @@ function cloneInitial(initial) {
 //#endregion
 export { parsePresenceSibling as a, sseResponse as i, deliverSchedulerAppend as n, platformVercelOidcToken as o, setServerFetchHooks as r, createServer as t };
 
-//# sourceMappingURL=server-CBET-jSz.js.map
+//# sourceMappingURL=server-DlLyvaSH.js.map