statewire 0.18.0 → 0.18.2

package/dist/client/session.d.ts

@@ -65,7 +65,7 @@ type Session = {
   idle: boolean;
   onSessionLost: StatewireClient.OnSessionLost | undefined;
   onDone: (() => void) | undefined;
-  ctxOps: unknown[] | undefined;
+  ctxNextSeq: number;
   ctxPending: CtxPending[];
   lanesOnAttach: boolean;
   attachLaneSeqs: readonly [ReadonlySet<number>, ReadonlySet<number>];

package/dist/client/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","names":[],"sources":["../../src/client/session.ts"],"mappings":";;;;;;;;KA0CK;EACH;EACA,WAAW,YAAY,gBAAgB;EACvC;EACA;EACA;;KAGG;WACM;WACA,SAAS;WACT,KAAK;;EAEd;;EAEA;;EAEA;EACA,UAAU;EACV,SAAS;;KAGN;WACM;WACA;EACT;;KAeG;KAEO,0BAA0B,kBAAkB;EACtD,eAAe,gBAAgB;EAC/B,gBAAgB,gBAAgB;EAChC;;KAGG;EACH,KAAK;EACL,QAAQ,gBAAgB;EACxB;;KAGG;EACH,SAAS;EACT,WAAW,kBAAkB;EAC7B,kBAAkB,mBAAmB;EACrC,QAAQ,gBAAgB;EACxB,KAAK;EACL;EACA;EACA,OAAO;EACP;EACA,iBAAiB,gBAAgB;EACjC,OAAO,gBAAgB;EACvB,eAAe,mBAAmB;EAClC,QAAQ;EACR;;EAEA;EACA;EACA;EACA;EACA;EACA,eAAe,gBAAgB;EAC/B;EACA;EACA,YAAY;EACZ;EACA,0BAA0B,qBAAqB;EAC/C;EACA,SAAS;EACT;EACA,mBAAmB;EACnB,WAAW,mBAAmB;EAC9B;EACA,SAAS;EACT,QAAQ,UAAU;EAClB,QAAQ;EACR;EACA;EACA;EACA,WAAW;EACX;EACA,WAAW;EACX;EACA,UAAU,mBAAmB,sBAAsB;;cA8JxC,iBACX,GAAG,qBACO,gBAAgB;cA4tBtB,eAAgB,GAAG,SAAS,WAAW;cAmLhC,gBACX,GAAG,SACH,OAAO,gBAAgB;cAYZ,cACX,GAAG,SACH,OAAO,gBAAgB,kBACtB;cAyJU,gBAAiB,GAAG,SAAS;cAGpC,aACJ,GAAG,SACH,OAAO,yBACP;cAuBW,iBAAkB,GAAG,YAAU,mBAAmB;cA+BlD,iBACX,GAAG,SACH,kBACA,gBACA,+BAA0B;cAuEf,sBACX,SAAS,4BACR"}
+{"version":3,"file":"session.d.ts","names":[],"sources":["../../src/client/session.ts"],"mappings":";;;;;;;;KA0CK;EACH;EACA,WAAW,YAAY,gBAAgB;EACvC;EACA;EACA;;KAGG;WACM;WACA,SAAS;WACT,KAAK;;EAEd;;EAEA;;EAEA;EACA,UAAU;EACV,SAAS;;KAGN;WACM;WACA;EACT;;KAeG;KAEO,0BAA0B,kBAAkB;EACtD,eAAe,gBAAgB;EAC/B,gBAAgB,gBAAgB;EAChC;;KAGG;EACH,KAAK;EACL,QAAQ,gBAAgB;EACxB;;KAGG;EACH,SAAS;EACT,WAAW,kBAAkB;EAC7B,kBAAkB,mBAAmB;EACrC,QAAQ,gBAAgB;EACxB,KAAK;EACL;EACA;EACA,OAAO;EACP;EACA,iBAAiB,gBAAgB;EACjC,OAAO,gBAAgB;EACvB,eAAe,mBAAmB;EAClC,QAAQ;EACR;;EAEA;EACA;EACA;EACA;EACA;EACA,eAAe,gBAAgB;EAC/B;EACA;EACA,YAAY;EACZ;EACA,0BAA0B,qBAAqB;EAC/C;EACA,SAAS;EACT;EACA,mBAAmB;EACnB,WAAW,mBAAmB;EAC9B;EACA,SAAS;EACT,QAAQ,UAAU;EAClB,QAAQ;EACR;EACA;EACA;EACA,WAAW;EACX;EACA,WAAW;EACX;EACA,UAAU,mBAAmB,sBAAsB;;cAgJxC,iBACX,GAAG,qBACO,gBAAgB;cAqqBtB,eAAgB,GAAG,SAAS,WAAW;cAmLhC,gBACX,GAAG,SACH,OAAO,gBAAgB;cAYZ,cACX,GAAG,SACH,OAAO,gBAAgB,kBACtB;cA4GU,gBAAiB,GAAG,SAAS;cAGpC,aACJ,GAAG,SACH,OAAO,yBACP;cAuBW,iBAAkB,GAAG,YAAU,mBAAmB;cA+BlD,iBACX,GAAG,SACH,kBACA,gBACA,+BAA0B;cAsEf,sBACX,SAAS,4BACR"}

package/dist/client/session.js

@@ -93,21 +93,7 @@ const transact = (s, fn) => {
 	const result = shared.txq.then(() => s.store.lock(async () => {
 		const stored = s.store.load();
 		if (stored !== null && stored.clientId !== s.record.clientId) adoptReset(s, stored);
-		else if (stored !== null) {
-			s.record = stored;
-			if (stored.context !== void 0) {
-				const posted = new Set(s.ctxPending.filter((p) => p.posted).map((p) => p.seq));
-				s.ctxOps = stored.context.ops;
-				s.contextDocuments = applyDocumentOps({
-					mode: "mounted",
-					documents: /* @__PURE__ */ new Map()
-				}, stored.context.ops);
-				s.ctxPending = stored.context.pending.map((p) => ({
-					...p,
-					posted: posted.has(p.seq)
-				}));
-			}
-		}
+		else if (stored !== null) s.record = stored;
 		fn();
 		const persistence = s.store.flush?.();
 		if (persistence) await persistence;
@@ -203,20 +189,6 @@ const settleAll = (s, detach) => {
 		});
 	}
 };
-const restateContext = (s) => {
-	s.ctxPending = [];
-	if (s.ctxOps === void 0) return;
-	const seq = s.record.ctxNextSeq;
-	setRecord(s, {
-		...s.record,
-		ctxNextSeq: seq + 1
-	});
-	s.ctxPending.push({
-		seq,
-		ops: s.ctxOps,
-		posted: false
-	});
-};
 const settleLost = (s, entries) => {
 	for (const entry of entries) {
 		s.lifecycle?.onCovered?.(entry.inv);
@@ -245,7 +217,6 @@ const rebaseRecord = (s, adopt) => {
 		s.lifecycle?.onCovered?.(old.inv);
 		enqueueInner(s, old.command, old.inv.params, old.resolve, old.reject);
 	}
-	restateContext(s);
 	publish(s);
 	wake(s);
 	pump(s);
@@ -253,7 +224,6 @@ const rebaseRecord = (s, adopt) => {
 const resetRecord = (s, clientId) => rebaseRecord(s, () => setRecord(s, {
 	clientId,
 	nextSeq: 1,
-	ctxNextSeq: 1,
 	commands: []
 }));
 const adoptReset = (s, stored) => rebaseRecord(s, () => {
@@ -389,47 +359,7 @@ const publishIngested = (s) => {
 	for (const listener of s.documentListeners) listener();
 	wake(s);
 };
-const snapCtxClock = (s, ctxWm) => {
-	if (s.record.context?.recover === "version-1") {
-		const document = s.contextDocuments.documents.get(0);
-		if (s.contextDocuments.documents.size !== 1 || !document?.main) throw new Error("statewire: version-1 context recovery requires one main document at doc 0");
-		const encoded = encodeDocument(document.value);
-		const ops = [{
-			...ctxWm === 0 ? {
-				op: "mount",
-				protocol: document.protocol,
-				main: true
-			} : {
-				op: "replace",
-				path: []
-			},
-			...encoded
-		}];
-		s.ctxPending = [{
-			seq: ctxWm + 1,
-			ops,
-			posted: false
-		}];
-		setRecord(s, {
-			...s.record,
-			ctxNextSeq: ctxWm + 2,
-			context: {
-				ops: contextSnapshot(s.contextDocuments),
-				pending: s.ctxPending
-			}
-		});
-		return;
-	}
-	if (!(s.ctxPending.every((c, i) => c.seq === ctxWm + 1 + i) && s.record.ctxNextSeq === ctxWm + s.ctxPending.length + 1)) {
-		if (ctxWm > 0) throw new Error("statewire: context history is missing; use a new client id");
-		setRecord(s, {
-			...s.record,
-			ctxNextSeq: ctxWm + 1
-		});
-		restateContext(s);
-	}
-};
-const sessionLostInner = (s, seqWm, ctxWm) => {
+const sessionLostInner = (s, seqWm) => {
 	const held = [...s.pending];
 	settleLost(s, held);
 	s.pending = [];
@@ -437,17 +367,16 @@ const sessionLostInner = (s, seqWm, ctxWm) => {
 	setRecord(s, {
 		clientId: s.record.clientId,
 		nextSeq: seqWm + 1,
-		ctxNextSeq: s.record.ctxNextSeq,
 		commands: [],
 		...s.record.failed !== void 0 && { failed: s.record.failed }
 	});
-	snapCtxClock(s, ctxWm);
 	if (held.length > 0 && s.onSessionLost?.(held.map((p) => p.inv)) === "requeue") for (const old of held) enqueueInner(s, old.command, old.inv.params, () => {}, () => {});
 	publish(s);
 	wake(s);
 };
 const handleHello = (s, { ops, syn }) => {
 	if (syn.record !== void 0 && syn.record !== "ephemeral") protocolError(`unknown record: ${String(syn.record)}`);
+	if (syn.ctxSeq !== void 0 && syn.ctxSeq !== 0) protocolError(`hello ctxSeq must be 0, got ${syn.ctxSeq}`);
 	s.selection = syn.version === void 0 || syn.protocols === void 0 ? void 0 : {
 		version: syn.version,
 		protocols: syn.protocols
@@ -469,11 +398,7 @@ const handleHello = (s, { ops, syn }) => {
 		if (s.shared) adoptStored(s);
 		s.durableSeq = syn.seq ?? 0;
 		for (const entry of s.pending) entry.posted = attachCmd.has(entry.seq);
-		const ctxWatermark = syn.ctxSeq ?? 0;
-		s.ctxPending = s.ctxPending.filter((c) => c.seq > ctxWatermark);
 		for (const c of s.ctxPending) c.posted = attachCtx.has(c.seq);
-		snapCtxClock(s, ctxWatermark);
-		if (s.ctxOps !== void 0) persistContext(s);
 		syncBacklogInner(s);
 		s.sessionKnown = true;
 	};
@@ -503,7 +428,8 @@ const handleRefusal = (s, syn) => {
 	if (typeof ctxSeq === "number") {
 		s.ctxPending = s.ctxPending.filter((c) => c.seq > ctxSeq);
 		for (const c of s.ctxPending) c.posted = false;
-		if (s.ctxOps !== void 0) persistContext(s);
+		const firstCtx = s.ctxPending.find((c) => !c.posted);
+		if (firstCtx !== void 0 && firstCtx.seq > ctxSeq + 1) protocolError(`ctx gap on a live attach: seq ${firstCtx.seq} after watermark ${ctxSeq}`);
 	}
 	if (typeof syn.retry === "number") {
 		s.resumeAt = Date.now() + syn.retry;
@@ -512,14 +438,8 @@ const handleRefusal = (s, syn) => {
 		return;
 	}
 	const firstCmd = s.pending.find((p) => !p.posted);
-	const firstCtx = s.ctxPending.find((c) => !c.posted);
-	const cmdGap = typeof seq === "number" && firstCmd !== void 0 && firstCmd.seq > Math.max(seq, s.durableSeq) + 1;
-	const ctxGap = typeof ctxSeq === "number" && firstCtx !== void 0 && firstCtx.seq > ctxSeq + 1;
-	if (cmdGap || ctxGap) {
-		transactBackground(s, () => {
-			if (cmdGap) sessionLostInner(s, seq, ctxSeq ?? 0);
-			else snapCtxClock(s, ctxSeq);
-		}, () => {
+	if (typeof seq === "number" && firstCmd !== void 0 && firstCmd.seq > Math.max(seq, s.durableSeq) + 1) {
+		transactBackground(s, () => sessionLostInner(s, seq), () => {
 			wake(s);
 			pump(s);
 		});
@@ -541,19 +461,19 @@ const handleFinish = (s, { reason }) => {
 	wake(s);
 };
 const isFinished = (s) => s.attach === "finished";
-const buildLanes = (s, persisted = false) => {
+const buildLanes = (s, cmdGate = "all") => {
 	const ctxEntries = [];
 	for (const entry of s.ctxPending) {
 		if (entry.posted) continue;
-		if (persisted && (s.persistedRecord?.clientId !== s.record.clientId || entry.seq >= s.persistedRecord.ctxNextSeq)) break;
 		if (ctxEntries.length >= 256) break;
 		if (ctxEntries.length > 0 && entry.seq !== ctxEntries.at(-1).seq + 1) break;
 		ctxEntries.push(entry);
 	}
 	const cmdEntries = [];
 	for (const entry of s.pending) {
+		if (cmdGate === "none") break;
 		if (entry.posted) continue;
-		if (persisted && (s.persistedRecord?.clientId !== s.record.clientId || entry.seq >= s.persistedRecord.nextSeq)) break;
+		if (cmdGate === "persisted" && (s.persistedRecord?.clientId !== s.record.clientId || entry.seq >= s.persistedRecord.nextSeq)) break;
 		if (cmdEntries.length >= 256) break;
 		if (cmdEntries.length > 0 && entry.seq !== cmdEntries.at(-1).seq + 1) break;
 		cmdEntries.push(entry);
@@ -577,12 +497,21 @@ const buildLanes = (s, persisted = false) => {
 		ctxEntries
 	};
 };
+const resetContextLane = (s) => {
+	const ops = contextSnapshot(s.contextDocuments);
+	s.ctxPending = ops.length === 0 ? [] : [{
+		seq: 1,
+		ops,
+		posted: false
+	}];
+	s.ctxNextSeq = s.ctxPending.length + 1;
+};
 const takeAttachLanes = (s) => {
 	s.attachLaneSeqs = [/* @__PURE__ */ new Set(), /* @__PURE__ */ new Set()];
+	resetContextLane(s);
 	const wanted = s.lanesOnAttach;
 	s.lanesOnAttach = false;
-	if (!wanted || !s.sessionKnown || s.record.context?.recover !== void 0) return null;
-	const lanes = buildLanes(s, true);
+	const lanes = buildLanes(s, wanted && s.sessionKnown ? "persisted" : "none");
 	if (!lanes) return null;
 	s.attachLaneSeqs = [new Set(lanes.cmdEntries.map((p) => p.seq)), new Set(lanes.ctxEntries.map((c) => c.seq))];
 	for (const entry of lanes.cmdEntries) entry.attempted = true;
@@ -715,7 +644,7 @@ const setTransport = (s, transport) => {
 	wake(s);
 };
 const enqueueInner = (s, command, params, resolve, reject) => {
-	const seq = s.record.nextSeq;
+	const seq = Math.max(s.record.nextSeq, s.durableSeq + 1);
 	const entry = {
 		seq,
 		command,
@@ -925,67 +854,25 @@ const contextSnapshot = (documents) => [...documents.documents].map(([doc, d]) =
 		...encoded.meta === void 0 ? {} : { meta: encoded.meta }
 	};
 });
-const persistContext = (s) => {
-	const ops = contextSnapshot(s.contextDocuments);
-	s.ctxOps = ops;
-	setRecord(s, {
-		...s.record,
-		context: {
-			ops,
-			...s.record.context?.recover === void 0 ? {} : { recover: s.record.context.recover },
-			pending: s.ctxPending.map(({ seq, ops }) => ({
-				seq,
-				ops
-			}))
-		}
-	});
-};
 const changeContext = (s, build) => {
-	if (!s.hydrated) {
-		s.ready.then(() => changeContext(s, build)).catch((cause) => {
-			const error = wrapStorageError(cause);
-			s.storageError = error;
-			s.transport?.storageFailed(error);
-		});
-		return;
-	}
 	if (!s.running || isFinished(s)) return;
-	const submit = () => {
-		if (!s.running || isFinished(s)) return;
-		const previous = s.record.context === void 0 ? s.contextDocuments : applyDocumentOps({
-			mode: "mounted",
-			documents: /* @__PURE__ */ new Map()
-		}, s.record.context.ops);
-		const operations = build(previous);
-		if (!operations.length) throw new Error("statewire: context operations must not be empty");
-		const offers = protocolOffers(s.options);
-		const protocols = s.selection?.protocols ?? (offers === "*" ? void 0 : offers);
-		s.contextDocuments = applyDocumentOps(previous, operations, protocols, true);
-		const seq = s.record.ctxNextSeq;
-		s.ctxPending = [...s.ctxPending, {
-			seq,
-			ops: operations.map((op) => {
-				const value = op;
-				if (value["doc"] !== 0) return value;
-				const { doc: _doc, ...rest } = value;
-				return rest;
-			}),
-			posted: false
-		}];
-		s.record = {
-			...s.record,
-			ctxNextSeq: seq + 1
-		};
-		persistContext(s);
-	};
-	if (!s.shared) {
-		submit();
-		wake(s);
-		pump(s);
-	} else transactBackground(s, submit, () => {
-		wake(s);
-		pump(s);
-	});
+	const operations = build(s.contextDocuments);
+	if (!operations.length) throw new Error("statewire: context operations must not be empty");
+	const offers = protocolOffers(s.options);
+	const protocols = s.selection?.protocols ?? (offers === "*" ? void 0 : offers);
+	s.contextDocuments = applyDocumentOps(s.contextDocuments, operations, protocols, true);
+	s.ctxPending = [...s.ctxPending, {
+		seq: s.ctxNextSeq++,
+		ops: operations.map((op) => {
+			const value = op;
+			if (value["doc"] !== 0) return value;
+			const { doc: _doc, ...rest } = value;
+			return rest;
+		}),
+		posted: false
+	}];
+	wake(s);
+	pump(s);
 };
 const updateContext = (s, operations) => changeContext(s, () => operations);
 const setContext = (s, value, protocol = s.options.protocol ?? "default") => {
@@ -1061,14 +948,10 @@ const loadSessionRecord = (store, options) => {
 	const record = stored ?? {
 		clientId: randomId(),
 		nextSeq: 1,
-		ctxNextSeq: 1,
 		commands: []
 	};
 	if (stored === null) store.save(record);
-	return {
-		record,
-		stored
-	};
+	return record;
 };
 const useStatewireSession = (options) => {
 	const [defaultStore] = useState(createMemorySessionStore);
@@ -1078,25 +961,18 @@ const useStatewireSession = (options) => {
 	const store = options.sessionStore ?? mounted ?? defaultStore;
 	if (store.lock === void 0 !== (store.subscribe === void 0)) throw new Error("statewire: session storage must provide lock and subscribe together");
 	const [s] = useState(() => {
-		const { record, stored } = store.ready === void 0 ? loadSessionRecord(store, options) : {
-			record: {
-				clientId: randomId(),
-				nextSeq: 1,
-				ctxNextSeq: 1,
-				commands: []
-			},
-			stored: null
+		const record = store.ready === void 0 ? loadSessionRecord(store, options) : {
+			clientId: randomId(),
+			nextSeq: 1,
+			commands: []
 		};
 		const session = {
 			options,
 			selection: void 0,
-			contextDocuments: stored?.context === void 0 ? {
+			contextDocuments: {
 				mode: "mounted",
 				documents: /* @__PURE__ */ new Map()
-			} : applyDocumentOps({
-				mode: "mounted",
-				documents: /* @__PURE__ */ new Map()
-			}, stored.context.ops),
+			},
 			record,
 			ctx: {
 				beforeAttach: () => persistBeforeSend(session),
@@ -1132,11 +1008,8 @@ const useStatewireSession = (options) => {
 			idle: false,
 			onSessionLost: void 0,
 			onDone: void 0,
-			ctxOps: stored?.context?.ops,
-			ctxPending: stored?.context?.pending.map((p) => ({
-				...p,
-				posted: false
-			})) ?? [],
+			ctxNextSeq: 1,
+			ctxPending: [],
 			lanesOnAttach: false,
 			attachLaneSeqs: [/* @__PURE__ */ new Set(), /* @__PURE__ */ new Set()],
 			frameFailures: 0,
@@ -1172,20 +1045,7 @@ const useStatewireSession = (options) => {
 		};
 		if (store.ready !== void 0) {
 			session.ready = store.ready.then(() => {
-				const { record: record_0 } = loadSessionRecord(store, session.options);
-				session.record = record_0;
-				session.contextDocuments = record_0.context === void 0 ? {
-					mode: "mounted",
-					documents: /* @__PURE__ */ new Map()
-				} : applyDocumentOps({
-					mode: "mounted",
-					documents: /* @__PURE__ */ new Map()
-				}, record_0.context.ops);
-				session.ctxOps = record_0.context?.ops;
-				session.ctxPending = record_0.context?.pending.map((entry) => ({
-					...entry,
-					posted: false
-				})) ?? [];
+				session.record = loadSessionRecord(store, session.options);
 				session.recordPersisted = true;
 				session.hydrated = true;
 				if (session.running) session.notify();