@tablecraft-app/plugin-etcd 1.18.0 → 1.18.2

package/index.js

@@ -41289,6 +41289,18 @@ function createEtcd(settings) {
 	if (settings.tls !== null) useTls(etcd, settings.tls);
 	return etcd;
 }
+/**
+* Stops a watch or keep-alive stream the plugin no longer needs. etcd3 takes an error on a stream
+* that is still writable for a failed host and closes every gRPC client of the connection
+* (`stream.writable && this.client.markFailed(resource, err)` in etcd3 1.1.2 lib/rpc.js, see
+* https://github.com/microsoft/etcd3/blob/v1.1.2/src/rpc.ts); a call queued behind that, such
+* as the next get over TLS, then fails with "Channel closed before call started". Half-closing
+* first turns the CANCELLED that `cancel()` raises into a local teardown.
+*/
+function closeStream(stream) {
+	stream.end();
+	stream.cancel();
+}
 function errorText(cause) {
 	return cause instanceof Error ? cause.message : String(cause);
 }
@@ -42155,7 +42167,7 @@ function namespaceCall(call, mapper, serializable = false) {
 								listener(mapResponse(response, mapper));
 							} catch (error) {
 								for (const handler of errors) handler(error);
-								raw.cancel();
+								closeStream(raw);
 							}
 						} : listener);
 						return scoped;
@@ -42943,7 +42955,7 @@ var EtcdLeases = class {
 			clearTimeout(timer);
 			clearTimeout(timeout);
 			if (reason !== null) stoppedReason = reason;
-			stream?.cancel();
+			if (stream !== void 0) closeStream(stream);
 			pending?.reject(new Error(reason ?? "Lease renewal stopped; the lease was not revoked."));
 			pending = void 0;
 			release();
@@ -42982,7 +42994,7 @@ var EtcdLeases = class {
 		try {
 			stream = await this.host.globalCall((etcd) => etcd.leaseClient.leaseKeepAlive());
 			if (closed) {
-				stream.cancel();
+				closeStream(stream);
 				return {
 					once,
 					close,
@@ -43062,6 +43074,7 @@ var MAX_RETRIES = 2;
 var DECIMAL = /^(0|[1-9]\d*)$/;
 var MAX_CURSOR_LENGTH = 2048;
 var SIGNING_KEY_BYTES = 32;
+var COMPACTED$1 = /required revision has been compacted/i;
 /** Session-private authentication keeps cursor state bounded without retaining searches. */
 var HistoryState = class {
 	#secret = randomBytes(SIGNING_KEY_BYTES);
@@ -43108,6 +43121,23 @@ function positionOf(cursor, key, state) {
 		return invalid("invalid cursor. Start a new history search.");
 	}
 }
+async function terminalVersion(call, key, position, deadline) {
+	const read = async (revision) => {
+		const kv = (await call((etcd) => etcd.kv.range({
+			key,
+			...revision === void 0 ? {} : { revision }
+		}, { deadline }))).kvs[0];
+		return kv?.mod_revision === position.terminal ? kv : null;
+	};
+	const current = await read();
+	if (current !== null) return current;
+	try {
+		return await read(position.snapshot);
+	} catch (cause) {
+		if (COMPACTED$1.test(errorText(cause))) return null;
+		throw cause;
+	}
+}
 /** Replay ends only at the pinned key's actual terminal event, never at a watch header. */
 async function keyHistory(call, request, state) {
 	state.checkOpen();
@@ -43152,7 +43182,7 @@ async function keyHistory(call, request, state) {
 		await call(async (etcd) => {
 			const stream = await etcd.watchClient.watch({ deadline });
 			if (state.signal.aborted || Date.now() >= deadline) {
-				stream.cancel();
+				closeStream(stream);
 				state.checkOpen();
 				return;
 			}
@@ -43163,7 +43193,7 @@ async function keyHistory(call, request, state) {
 					done = true;
 					clearTimeout(timer);
 					state.signal.removeEventListener("abort", onClose);
-					stream.cancel();
+					closeStream(stream);
 					if (error === void 0) resolve();
 					else reject(error instanceof Error ? error : new Error(errorText(error)));
 				};
@@ -43243,9 +43273,30 @@ async function keyHistory(call, request, state) {
 			unavailable: compactRevision,
 			next: (BigInt(compactRevision) + 1n).toString()
 		};
-		if (position.terminal !== null && BigInt(compactRevision) >= BigInt(position.terminal)) {
-			reachedEnd = true;
+		const terminalRevision = position.terminal;
+		if (terminalRevision !== null && BigInt(compactRevision) >= BigInt(terminalRevision)) {
 			stopReason = "compacted";
+			const terminal = await terminalVersion(call, key, position, deadline);
+			if (terminal !== null && events.at(-1)?.modRevision !== terminalRevision) {
+				const size = terminal.key.length + terminal.value.length;
+				if (size > maxBytes && events.length === 0) throw new PluginError("statementFailed", "etcd history event exceeds the byte limit. Increase maxBytes or inspect the current value.");
+				if (usedBytes + size > maxBytes || events.length >= count) {
+					stopReason = usedBytes + size > maxBytes ? "byteLimit" : "pageLimit";
+					position = {
+						...position,
+						next: terminalRevision
+					};
+					break;
+				}
+				usedBytes += size;
+				events.push({
+					...revisionOf(terminal),
+					kind: "PUT",
+					key: keyBytesOf(terminal.key),
+					value: keyBytesOf(terminal.value)
+				});
+			}
+			reachedEnd = true;
 			break;
 		}
 		if (++retries > MAX_RETRIES) {
@@ -43486,7 +43537,7 @@ var EtcdWatcher = class {
 			generation++;
 			const old = stream;
 			stream = void 0;
-			old?.cancel();
+			if (old !== void 0) closeStream(old);
 		};
 		const markGap = (reason, toRevision) => {
 			gap = {
@@ -43536,7 +43587,7 @@ var EtcdWatcher = class {
 			try {
 				const opened = await this.host.call((etcd) => etcd.watchClient.watch());
 				if (mine !== generation || state === "stopped" || state === "gap") {
-					opened.cancel();
+					closeStream(opened);
 					return;
 				}
 				stream = opened;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablecraft-app/plugin-etcd",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "description": "The etcd datasource plugin for TableCraft, downloaded by the app when a data source needs it.",
   "license": "MIT",
   "type": "module",

package/table-craft-plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "etcd",
   "name": "etcd",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "apiVersion": "1.8.0",
   "entry": "index.js",
   "capabilities": [