@loro-dev/streams-crdt 0.12.2 → 0.13.0

package/dist/flock.js

@@ -1,4 +1,4 @@
-import { a as InMemoryRemoteCursorStore, c as EphemeralStreamCrdt, i as StreamsCrdt, l as PayloadProtectionError, n as isValidBucketId, o as IndexedDbRemoteCursorStore, r as isValidRillId, s as createInitialRemoteCursor, t as createStreamUrl } from "./stream-id-D-UirMkk.js";
+import { a as InMemoryRemoteCursorStore, c as EphemeralStreamCrdt, i as StreamsCrdt, l as PayloadProtectionError, n as isValidBucketId, o as IndexedDbRemoteCursorStore, r as isValidRillId, s as createInitialRemoteCursor, t as createStreamUrl } from "./stream-id-CvJLq-0s.js";
 import { Flock } from "@loro-dev/flock-wasm";
 //#region src/flock.ts
 function isAfter(entry, current) {

package/dist/index.js

@@ -1,2 +1,2 @@
-import { a as InMemoryRemoteCursorStore, c as EphemeralStreamCrdt, i as StreamsCrdt, l as PayloadProtectionError, n as isValidBucketId, o as IndexedDbRemoteCursorStore, r as isValidRillId, s as createInitialRemoteCursor, t as createStreamUrl } from "./stream-id-D-UirMkk.js";
+import { a as InMemoryRemoteCursorStore, c as EphemeralStreamCrdt, i as StreamsCrdt, l as PayloadProtectionError, n as isValidBucketId, o as IndexedDbRemoteCursorStore, r as isValidRillId, s as createInitialRemoteCursor, t as createStreamUrl } from "./stream-id-CvJLq-0s.js";
 export { PayloadProtectionError as E2eeError, PayloadProtectionError, EphemeralStreamCrdt, InMemoryRemoteCursorStore, IndexedDbRemoteCursorStore, StreamsCrdt, createInitialRemoteCursor, createStreamUrl, isValidBucketId, isValidRillId };

package/dist/loro.js

@@ -1,4 +1,4 @@
-import { a as InMemoryRemoteCursorStore, c as EphemeralStreamCrdt, i as StreamsCrdt, l as PayloadProtectionError, n as isValidBucketId, o as IndexedDbRemoteCursorStore, r as isValidRillId, s as createInitialRemoteCursor, t as createStreamUrl } from "./stream-id-D-UirMkk.js";
+import { a as InMemoryRemoteCursorStore, c as EphemeralStreamCrdt, i as StreamsCrdt, l as PayloadProtectionError, n as isValidBucketId, o as IndexedDbRemoteCursorStore, r as isValidRillId, s as createInitialRemoteCursor, t as createStreamUrl } from "./stream-id-CvJLq-0s.js";
 import { LoroDoc, VersionVector, decodeImportBlobMeta } from "loro-crdt";
 //#region src/loro.ts
 function batchImportUpdates(doc, updates) {

package/dist/{stream-id-D-UirMkk.js → stream-id-CvJLq-0s.js}

@@ -1112,6 +1112,11 @@ var StreamsTransportClient = class {
 		const snapshotOffset = result.result.snapshotOffset;
 		return snapshotOffset == null || snapshotOffset.length === 0 ? null : snapshotOffset;
 	}
+	async streamSupportsAppendCas() {
+		const result = await this.client.streamSupportsAppendCas();
+		if (result.ok) return result.result;
+		throw this.toTransportFailure(result.result);
+	}
 	async putSnapshotAt(snapshotOffset, snapshot) {
 		const result = await this.client.putSnapshot({
 			offset: snapshotOffset,
@@ -1151,6 +1156,43 @@ var StreamsTransportClient = class {
 		};
 		throw this.toTransportFailure(error);
 	}
+	async appendUpdatesCas(expectedOffset, updates, producerSession) {
+		const result = await this.client.appendCas({
+			expectedOffset,
+			part: {
+				contentType: BINARY_CONTENT_TYPE,
+				body: encodeItems(updates)
+			},
+			producer: {
+				producerId: producerSession.producerId,
+				epoch: producerSession.producerEpoch,
+				seq: producerSession.nextProducerSeq
+			}
+		});
+		if (result.ok) {
+			if (result.result.kind === "mismatch") return {
+				kind: "cas-mismatch",
+				expectedOffset: result.result.expectedOffset,
+				currentOffset: result.result.currentOffset
+			};
+			return {
+				kind: "ok",
+				ackEpoch: result.result.value.producer?.epoch ?? producerSession.producerEpoch,
+				ackSeq: result.result.value.producer?.seq ?? producerSession.nextProducerSeq,
+				nextOffset: result.result.value.nextOffset
+			};
+		}
+		const error = result.result;
+		if (error.code === "conflict" && error.detail?.kind === "producer_seq_gap") return {
+			kind: "seq-gap",
+			expectedSeq: error.detail.expectedSeq
+		};
+		if (error.code === "forbidden" && error.detail?.kind === "stale_producer_epoch") return {
+			kind: "stale-epoch",
+			serverEpoch: error.detail.serverEpoch
+		};
+		throw this.toTransportFailure(error);
+	}
 	async appendItems(updates) {
 		const result = await this.client.append({ part: {
 			contentType: BINARY_CONTENT_TYPE,
@@ -1177,7 +1219,7 @@ var StreamsTransportClient = class {
 	* the first event must be `bootstrap`, and all following events must be live
 	* `data` updates.
 	*/
-	async readEphemeralSse(onBootstrap, onData, signal) {
+	async readEphemeralSse(onBootstrap, onData, signal, onActivity) {
 		const requestUrl = this.ephemeralReadEndpoint();
 		const response = await this.fetchAuthorized(requestUrl, {
 			method: "GET",
@@ -1198,7 +1240,7 @@ var StreamsTransportClient = class {
 		const dataEncoding = response.headers.get("Stream-SSE-Data-Encoding") ?? void 0;
 		const consume = async () => {
 			let sawBootstrap = false;
-			for await (const event of readSseEvents(response.body)) {
+			for await (const event of readSseEvents(response.body, { onActivity })) {
 				if (!sawBootstrap) {
 					if (event.event !== "bootstrap") throw new ProtocolError(`ephemeral sse must start with bootstrap, got '${event.event}'`);
 					await onBootstrap(decodeSsePayload(event.data, dataEncoding));
@@ -1689,15 +1731,35 @@ var EphemeralStreamCrdt = class {
 			state.requestController ??= new AbortController();
 			const capturedController = state.requestController;
 			let sseOpenedAtMs = 0;
+			let inactivityTimer = null;
+			let inactivityTriggered = false;
+			const clearInactivity = () => {
+				if (inactivityTimer != null) {
+					clearTimeout(inactivityTimer);
+					inactivityTimer = null;
+				}
+			};
+			const resetInactivity = () => {
+				clearInactivity();
+				const timeoutMs = this.reconnectConfig.liveInactivityTimeoutMs;
+				if (timeoutMs != null && timeoutMs > 0 && !state.closed) inactivityTimer = setTimeout(() => {
+					inactivityTriggered = true;
+					capturedController.abort();
+				}, timeoutMs);
+			};
 			try {
+				resetInactivity();
 				const result = await this.client.readEphemeralSse(async (bootstrap) => {
+					resetInactivity();
 					if (bootstrap.byteLength > 0) await this.adaptor.applyRemoteUpdates([bootstrap]);
 					sseOpenedAtMs = Date.now();
 					this.setReadStatus(state, "ok");
 					this.resolveFirstOpen(state);
 				}, async (update) => {
+					resetInactivity();
 					if (update.byteLength > 0) await this.adaptor.applyRemoteUpdates([update]);
-				}, capturedController.signal);
+				}, capturedController.signal, resetInactivity);
+				clearInactivity();
 				if (state.closed) return;
 				if (result.kind === "ok") {
 					state.retryAttempt = 0;
@@ -1708,10 +1770,25 @@ var EphemeralStreamCrdt = class {
 				if (result.kind === "unsupported") throw new Error("ephemeral stream requires SSE support");
 				if (result.kind === "not-found") throw new HttpError("ephemeral stream not found", 404);
 			} catch (error) {
+				clearInactivity();
 				if (state.closed) return;
 				if (capturedController.signal.aborted) {
 					state.requestController = new AbortController();
 					this.setReadStatus(state, "reconnecting");
+					if (!inactivityTriggered) continue;
+					if (sseOpenedAtMs > 0 && Date.now() - sseOpenedAtMs >= 5e3) state.retryAttempt = 0;
+					if (state.retryAttempt >= this.reconnectConfig.maxAttempts) {
+						this.logError("ephemeral live reconnect exhausted (inactivity)", error, {
+							streamUrl: this.streamUrl,
+							attempts: state.retryAttempt
+						});
+						this.setReadStatus(state, "disconnected");
+						this.rejectFirstOpen(state, toError(error));
+						return;
+					}
+					const delay = computeRetryDelay(state.retryAttempt, this.reconnectConfig);
+					state.retryAttempt += 1;
+					await sleep(delay, state.retrySleepController.signal);
 					continue;
 				}
 				const classified = classifyFetchError(error);
@@ -3122,6 +3199,7 @@ var StreamsCrdt = class StreamsCrdt {
 				};
 				continue;
 			}
+			if (result.kind === "cas-mismatch") throw new Error("unexpected CAS mismatch from unconditional append");
 			frozen.producerSession = {
 				...frozen.producerSession,
 				producerEpoch: result.serverEpoch + 1,
@@ -3692,4 +3770,4 @@ function createStreamUrl(input) {
 //#endregion
 export { InMemoryRemoteCursorStore as a, EphemeralStreamCrdt as c, StreamsCrdt as i, PayloadProtectionError as l, isValidBucketId as n, IndexedDbRemoteCursorStore as o, isValidRillId as r, createInitialRemoteCursor as s, createStreamUrl as t };
 
-//# sourceMappingURL=stream-id-D-UirMkk.js.map
+//# sourceMappingURL=stream-id-CvJLq-0s.js.map