statewire 0.18.1 → 0.18.2

package/dist/host/socket.d.ts

@@ -31,10 +31,7 @@ type Admission = {
 type ClientRec = {
   id: string;
   lastSeq: number;
-  ctxSeq: number;
   touched: number;
-  context: Record<string, unknown> | null;
-  contextDocuments: StatewireDocuments.State;
   results: Map<number, {
     ts: number;
     cmd: StatewireCmd;
@@ -53,6 +50,9 @@ type Conn = {
   lease: string | null;
   /** The awaited `authorize` return captured at this attach's authorization. */
   auth: unknown;
+  ctxSeq: number;
+  context: Record<string, unknown> | null;
+  contextDocuments: StatewireDocuments.State;
 };
 type PendingConn = {
   socket: StatewireHostInternal.Socket;
@@ -128,9 +128,8 @@ type FrameAdmission = {
     };
   };
 };
-declare const admitFrame: (h: SocketHostState, rec: ClientRec, frame: ParsedFrame, auth: unknown, selection?: StatewireProtocol.Selection) => FrameAdmission;
+declare const admitFrame: (h: SocketHostState, conn: Conn, frame: ParsedFrame) => FrameAdmission;
 type Registration = {
-  rec: ClientRec;
   conn: Conn;
   connection: StatewireHostInternal.SocketConnection;
 };

package/dist/host/socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","names":[],"sources":["../../src/host/socket.ts"],"mappings":";;;;;;;;;;;cAiCa,cAAY;cACZ;;;cAKA,aAAc,YAAY;cAoC1B;KAGR;EACH;EACA,OAAO;EACP;EACA,OAAO,kBAAkB;;KAGtB;EACH;EACA;EACA;EACA;EACA;;KAGU;EACV;EACA;EACA;EACA;EACA,SAAS;EACT,kBAAkB,mBAAmB;EACrC,SAAS;IAAc;IAAY,KAAK;;EACxC,UAAU,YAAY;;EAEtB;;KAGU;EACV,WAAW,kBAAkB;EAC7B;EACA,QAAQ,sBAAsB;EAC9B;EACA;EACA;EACA;;EAEA;;KAGG;EACH,QAAQ,sBAAsB;EAC9B;EACA;EACA;EACA,OAAO,kBAAkB;EACzB,YAAY,sBAAsB;;KAc/B;EAAiB;EAAa;;KAC9B;EACH;EACA;EACA;EACA;EACA;;KAGU;EACV,KAAK;EACL,KAAK;;cA0BM,kBAAmB,mBAAiB;cAoDpC,aAAc,gBAAc;KAiG7B;EACV,UAAU,kBAAkB;EAC5B,aAAa,kBAAkB;EAC/B;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,WAAW,sBAAsB;EACjC,SAAS,YAAY;EACrB,OAAO,IAAI;EACX,cAAc,IAAI;EAClB,YAAY;EACZ,gBAAgB;EAChB,aAAa,YAAY;EACzB;EACA,UAAU,cAAc;EACxB;EACA;EACA,gBAAgB,kBAAkB;EAClC,WAAW,cAAc;EACzB,cAAc;EACd,SAAS;EACT,aAAa,sBAAsB;EACnC;EACA,UACE,kBACA,QAAQ,sBAAsB,QAC9B,UAAU,sBAAsB,yBAC7B,sBAAsB;EAC3B,SAAS,KAAK,cAAc;EAC5B,SAAS,SAAS,YAAY,QAAQ;EACtC,SAAS,SAAS,YAAY,QAAQ;;cA+C3B,YACX,GAAG,iBACH,MAAM,MACN,eACA;cAgBW,SAAU,GAAG,iBAAiB,MAAM,MAAM;cAU1C,oBAAqB,GAAG;cAkCxB,QAAS,GAAG,iBAAiB,MAAM,cAAc;KAsRlD;EACN;;EAEA;EACA;IACE;MAAO;MAAa;MAAgB;;;;cAI/B,aACX,GAAG,iBACH,KAAK,WACL,OAAO,aACP,eACA,YAAW,kBAAkB,cAI5B;KAsbS;EACV,KAAK;EACL,MAAM;EACN,YAAY,sBAAsB;;cAGvB,WACX,GAAG,iBACH,kBACA,QAAQ,sBAAsB,QAC9B,oBACA,gBACA,YAAW,kBAAkB,cAI5B;;;;;;;;;cA0QU,sBACX,WAAW,gBAAgB,YAC3B,UAAU,sBAAsB,mBAChC,cAAc,sBAAsB,0BACnC,sBAAsB"}
+{"version":3,"file":"socket.d.ts","names":[],"sources":["../../src/host/socket.ts"],"mappings":";;;;;;;;;;;cAiCa,cAAY;cACZ;;;cAKA,aAAc,YAAY;cAoC1B;KAGR;EACH;EACA,OAAO;EACP;EACA,OAAO,kBAAkB;;KAGtB;EACH;EACA;EACA;EACA;EACA;;KAGU;EACV;EACA;EACA;EACA,SAAS;IAAc;IAAY,KAAK;;EACxC,UAAU,YAAY;;EAEtB;;KAKU;EACV,WAAW,kBAAkB;EAC7B;EACA,QAAQ,sBAAsB;EAC9B;EACA;EACA;EACA;;EAEA;EACA;EACA,SAAS;EACT,kBAAkB,mBAAmB;;KAGlC;EACH,QAAQ,sBAAsB;EAC9B;EACA;EACA;EACA,OAAO,kBAAkB;EACzB,YAAY,sBAAsB;;KAc/B;EAAiB;EAAa;;KAC9B;EACH;EACA;EACA;EACA;EACA;;KAGU;EACV,KAAK;EACL,KAAK;;cA0BM,kBAAmB,mBAAiB;cAoDpC,aAAc,gBAAc;KAiG7B;EACV,UAAU,kBAAkB;EAC5B,aAAa,kBAAkB;EAC/B;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,WAAW,sBAAsB;EACjC,SAAS,YAAY;EACrB,OAAO,IAAI;EACX,cAAc,IAAI;EAClB,YAAY;EACZ,gBAAgB;EAChB,aAAa,YAAY;EACzB;EACA,UAAU,cAAc;EACxB;EACA;EACA,gBAAgB,kBAAkB;EAClC,WAAW,cAAc;EACzB,cAAc;EACd,SAAS;EACT,aAAa,sBAAsB;EACnC;EACA,UACE,kBACA,QAAQ,sBAAsB,QAC9B,UAAU,sBAAsB,yBAC7B,sBAAsB;EAC3B,SAAS,KAAK,cAAc;EAC5B,SAAS,SAAS,YAAY,QAAQ;EACtC,SAAS,SAAS,YAAY,QAAQ;;cA+C3B,YACX,GAAG,iBACH,MAAM,MACN,eACA;cAgBW,SAAU,GAAG,iBAAiB,MAAM,MAAM;cAU1C,oBAAqB,GAAG;cAkCxB,QAAS,GAAG,iBAAiB,MAAM,cAAc;KAmRlD;EACN;;EAEA;EACA;IACE;MAAO;MAAa;MAAgB;;;;cAI/B,aACX,GAAG,iBACH,MAAM,MACN,OAAO,gBACN;KAsbS;EACV,MAAM;EACN,YAAY,sBAAsB;;cAGvB,WACX,GAAG,iBACH,kBACA,QAAQ,sBAAsB,QAC9B,oBACA,gBACA,YAAW,kBAAkB,cAI5B;;;;;;;;;cAyQU,sBACX,WAAW,gBAAgB,YAC3B,UAAU,sBAAsB,mBAChC,cAAc,sBAAsB,0BACnC,sBAAsB"}

package/dist/host/socket.js

@@ -301,10 +301,7 @@ const notifyClientRecords = (h) => {
 	h.persistence?.onClientRecordsChange?.([...h.clients.values()].map((rec) => ({
 		id: rec.id,
 		lastSeq: admittedThrough(rec),
-		ctxSeq: rec.ctxSeq,
 		touched: rec.touched,
-		context: rec.context,
-		contextDocuments: [...rec.contextDocuments.documents],
 		results: [...rec.results].map(([seq, entry]) => ({
 			seq,
 			ts: entry.ts,
@@ -356,11 +353,11 @@ const settleCmd = (h, rec, adm, cmd) => {
 	notifyClientRecords(h);
 };
 const settleWire = (h, rec, adm, outcome) => settleCmd(h, rec, adm, cmdOf(adm, outcome));
-const callerOf = (h, rec, auth) => ({
+const callerOf = (h, rec, conn) => ({
 	clientId: rec.id,
-	auth,
+	auth: conn.auth,
 	get context() {
-		return rec.context;
+		return conn.context;
 	},
 	get isConnected() {
 		if (h.clients.get(rec.id) !== rec) return false;
@@ -374,7 +371,7 @@ const rejectStatement = (h, rec, adm, message) => settleCmd(h, rec, adm, {
 	code: "invalid-params",
 	message
 });
-const admitCmd = (h, rec, statement, auth, selection) => {
+const admitCmd = (h, rec, conn, statement) => {
 	const adm = {
 		seq: statement.seq,
 		method: statement.method,
@@ -384,7 +381,7 @@ const admitCmd = (h, rec, statement, auth, selection) => {
 	};
 	rec.inflight.set(statement.seq, adm);
 	notifyClientRecords(h);
-	if (statement.protocol !== h.protocol.name || !selection.protocols.some((p) => p.name === statement.protocol)) {
+	if (statement.protocol !== h.protocol.name || !conn.selection.protocols.some((p) => p.name === statement.protocol)) {
 		settleCmd(h, rec, adm, {
 			seq: adm.seq,
 			type: "rejected",
@@ -421,7 +418,7 @@ const admitCmd = (h, rec, statement, auth, selection) => {
 		method: statement.method,
 		params,
 		clientId: rec.id,
-		caller: callerOf(h, rec, auth),
+		caller: callerOf(h, rec, conn),
 		onApplied: () => {
 			if (adm.settled || adm.applied) return;
 			adm.applied = true;
@@ -437,25 +434,20 @@ const admitCmd = (h, rec, statement, auth, selection) => {
 		});
 	});
 };
-const admitFrame = (h, rec, frame, auth, selection = {
-	version: h.wireVersion.version,
-	protocols: [{
-		name: h.protocol.name,
-		version: h.protocol.version
-	}]
-}) => {
+const admitFrame = (h, conn, frame) => {
+	const rec = h.clients.get(conn.clientId);
 	rec.touched = Date.now();
 	const through = admittedThrough(rec);
 	for (const statement of frame.cmd) if (statement.seq <= through) reemit(h, rec, statement.seq);
-	const ctxNew = frame.ctx.filter((s) => s.seq > rec.ctxSeq);
+	const ctxNew = frame.ctx.filter((s) => s.seq > conn.ctxSeq);
 	const cmdNew = frame.cmd.filter((s) => s.seq > through);
-	if (ctxNew.length > 0 && ctxNew[0].seq !== rec.ctxSeq + 1 || cmdNew.length > 0 && cmdNew[0].seq !== through + 1) {
+	if (ctxNew.length > 0 && ctxNew[0].seq !== conn.ctxSeq + 1 || cmdNew.length > 0 && cmdNew[0].seq !== through + 1) {
 		notifyClientRecords(h);
 		return {
 			type: "refused",
 			syn: { syn: {
 				seq: through,
-				ctxSeq: rec.ctxSeq
+				ctxSeq: conn.ctxSeq
 			} }
 		};
 	}
@@ -466,7 +458,7 @@ const admitFrame = (h, rec, frame, auth, selection = {
 			type: "refused",
 			syn: { syn: {
 				seq: through,
-				ctxSeq: rec.ctxSeq,
+				ctxSeq: conn.ctxSeq,
 				retry: COMMAND_CAPACITY_RETRY_MS
 			} }
 		};
@@ -479,23 +471,23 @@ const admitFrame = (h, rec, frame, auth, selection = {
 				type: "refused",
 				syn: { syn: {
 					seq: through,
-					ctxSeq: rec.ctxSeq,
+					ctxSeq: conn.ctxSeq,
 					retry
 				} }
 			};
 		}
 	}
-	let contextDocuments = rec.contextDocuments;
+	let contextDocuments = conn.contextDocuments;
 	try {
-		for (const statement of ctxNew) contextDocuments = applyDocumentOps(contextDocuments, statement.ops, selection.protocols, true);
+		for (const statement of ctxNew) contextDocuments = applyDocumentOps(contextDocuments, statement.ops, conn.selection.protocols, true);
 		if (frameEncoder.encode(JSON.stringify([...contextDocuments.documents])).byteLength > 65536) return violation("oversized-context");
 	} catch {
 		return violation("invalid-context");
 	}
-	rec.contextDocuments = contextDocuments;
-	rec.context = mainDocument(contextDocuments, h.protocol.name)?.value ?? null;
-	if (ctxNew.length) rec.ctxSeq = ctxNew.at(-1).seq;
-	for (const statement of cmdNew) admitCmd(h, rec, statement, auth, selection);
+	conn.contextDocuments = contextDocuments;
+	conn.context = mainDocument(contextDocuments, h.protocol.name)?.value ?? null;
+	if (ctxNew.length) conn.ctxSeq = ctxNew.at(-1).seq;
+	for (const statement of cmdNew) admitCmd(h, rec, conn, statement);
 	if (cmdNew.length > 0) queueCmd(h, rec.id, {
 		seq: cmdNew.at(-1).seq,
 		dur: true
@@ -530,10 +522,9 @@ const message = (h, conn, data) => {
 		return;
 	}
 	if (frame.ctx.length === 0 && frame.cmd.length === 0) return;
-	const rec = h.clients.get(conn.clientId);
 	let admission;
 	try {
-		admission = admitFrame(h, rec, frame, conn.auth, conn.selection);
+		admission = admitFrame(h, conn, frame);
 	} catch (error) {
 		const reason = violationReason(error);
 		if (reason === null) throw error;
@@ -773,13 +764,7 @@ const register = (h, clientId, socket, sawFrame = false, auth = void 0, selectio
 		const created = {
 			id: clientId,
 			lastSeq: 0,
-			ctxSeq: 0,
 			touched: Date.now(),
-			context: null,
-			contextDocuments: {
-				mode: "mounted",
-				documents: /* @__PURE__ */ new Map()
-			},
 			results: /* @__PURE__ */ new Map(),
 			inflight: /* @__PURE__ */ new Map(),
 			principal: auth
@@ -796,7 +781,13 @@ const register = (h, clientId, socket, sawFrame = false, auth = void 0, selectio
 		sawFrame,
 		lastSentAt: 0,
 		lease: null,
-		auth
+		auth,
+		ctxSeq: 0,
+		context: null,
+		contextDocuments: {
+			mode: "mounted",
+			documents: /* @__PURE__ */ new Map()
+		}
 	};
 	h.conns.add(conn);
 	gcClients(h);
@@ -814,14 +805,13 @@ const register = (h, clientId, socket, sawFrame = false, auth = void 0, selectio
 		syn: {
 			...selection,
 			seq: admittedThrough(rec),
-			ctxSeq: rec.ctxSeq,
+			ctxSeq: 0,
 			...h.idleWire && { idle: true }
 		}
 	};
 	if (!selection.protocols.some((p) => p.name === h.protocol.name)) hello.ops = [];
 	sendTo(h, conn, JSON.stringify(hello));
 	return {
-		rec,
 		conn,
 		connection: {
 			clientId,
@@ -857,16 +847,15 @@ const suspend = (h) => {
 	h.stateHost?.setOnOp(null);
 };
 const restoreClientRecords = (records = []) => new Map(records.map((record) => [record.id, {
-	...record,
-	contextDocuments: {
-		mode: "mounted",
-		documents: new Map(record.contextDocuments ?? [])
-	},
+	id: record.id,
+	lastSeq: record.lastSeq,
+	touched: record.touched,
 	results: new Map(record.results.map(({ seq, ts, cmd }) => [seq, {
 		ts,
 		cmd
 	}])),
-	inflight: /* @__PURE__ */ new Map()
+	inflight: /* @__PURE__ */ new Map(),
+	principal: record.principal
 }]));
 const useSocketHost = (transport, options, persistence) => {
 	const [h] = useState(() => {