@voltro/plugin-queue 0.83.1 → 0.85.0

package/dist/index.d.ts

@@ -114,7 +114,7 @@ export declare interface QueueConsumerDefinition<A = unknown> {
      *  to parse or decode goes STRAIGHT to the dead-letter topic with the
      *  reason — never into the retry loop (a decode failure is deterministic;
      *  retrying it is an infinite loop with extra steps). */
-    readonly schema: Schema.Schema<A, any, never>;
+    readonly schema: Schema.Codec<A, any, never, never>;
     /**
      * The handler. Runs SERIALLY PER PARTITION; its offset commits only after
      * it resolves. It MUST be idempotent: delivery is at-least-once, and a
@@ -247,7 +247,7 @@ export declare interface QueueRunnerLogger {
 export declare class QueueService extends QueueService_base {
 }
 
-declare const QueueService_base: Context.TagClass<QueueService, "@voltro/plugin-queue/QueueService", QueueServiceApi>;
+declare const QueueService_base: Context.ServiceClass<QueueService, "@voltro/plugin-queue/QueueService", QueueServiceApi>;
 
 export declare interface QueueServiceApi {
     /** Produce a batch to a topic (one transport round-trip). NOT transactional

package/dist/index.js

@@ -1,45 +1,45 @@
-import { Cause as e, Context as t, Effect as n, Exit as r, Layer as i, Metric as a, Schema as o } from "effect";
-import { definePlugin as s } from "@voltro/protocol";
-import { Kafka as c, logLevel as l } from "kafkajs";
-import { externalSpanFromTraceparent as u, withServerTracer as d } from "@voltro/runtime";
+import { Cause as e, Context as t, Effect as n, Exit as r, Layer as i, Metric as a, Result as o, Schema as s } from "effect";
+import { definePlugin as c } from "@voltro/protocol";
+import { Kafka as l, logLevel as u } from "kafkajs";
+import { externalSpanFromTraceparent as d, withServerTracer as f } from "@voltro/runtime";
 //#region src/consumer.ts
-var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
+var p = Symbol.for("@voltro/plugin-queue:consumers"), m = () => {
 	let e = globalThis;
-	return e[f] ??= /* @__PURE__ */ new Map();
-}, m = (e) => {
+	return e[p] ??= /* @__PURE__ */ new Map();
+}, h = (e) => {
 	if (e.topic.trim() === "") throw Error("defineQueueConsumer: `topic` must be a non-empty name");
 	if (e.maxAttempts !== void 0 && e.maxAttempts < 1) throw Error(`defineQueueConsumer("${e.topic}"): maxAttempts must be >= 1`);
-	let t = `${e.topic}|${e.groupId ?? ""}`, n = p().get(t);
+	let t = `${e.topic}|${e.groupId ?? ""}`, n = m().get(t);
 	if (n !== void 0 && n !== e) throw Error(`defineQueueConsumer: topic '${e.topic}'${e.groupId ? ` group '${e.groupId}'` : ""} is declared twice — two consumers in one group on one topic would split its partitions unpredictably. Use a distinct groupId for an independent consumer.`);
-	return p().set(t, e), e;
-}, h = () => [...p().values()], g = () => {
-	p().clear();
-}, _ = () => Object.create(null), v = Symbol.for("@voltro/plugin-queue:metrics"), y = () => {
+	return m().set(t, e), e;
+}, g = () => [...m().values()], _ = () => {
+	m().clear();
+}, v = () => Object.create(null), y = Symbol.for("@voltro/plugin-queue:metrics"), b = () => {
 	let e = globalThis;
-	return e[v] ??= {
-		consumed: _(),
-		dlq: _(),
-		retried: _(),
-		lastError: _(),
-		produced: _()
+	return e[y] ??= {
+		consumed: v(),
+		dlq: v(),
+		retried: v(),
+		lastError: v(),
+		produced: v()
 	};
-}, b = (e, t, n = 1) => {
+}, x = (e, t, n = 1) => {
 	e[t] = (e[t] ?? 0) + n;
-}, x = a.counter("voltro_queue_consumed_total", { description: "Messages a consumer finished with, by topic and outcome (ok | dead-lettered)." }), S = a.counter("voltro_queue_retries_total", { description: "In-process handler retries, by topic. A retry BLOCKS its partition." }), C = a.counter("voltro_queue_produced_total", { description: "Messages produced through the outbox bridge and QueueService, by topic." }), w = a.gauge("voltro_queue_lag_messages", { description: "Messages between the offset just picked up and the partition high watermark, by topic and partition. Sampled at pickup; holds its last value for an idle or revoked partition." }), T = [], E = /* @__PURE__ */ new Map(), D = /* @__PURE__ */ new Map(), O = /* @__PURE__ */ new Map(), k = /* @__PURE__ */ new Map(), A = (e, t, n) => {
+}, S = a.counter("voltro_queue_consumed_total", { description: "Messages a consumer finished with, by topic and outcome (ok | dead-lettered)." }), C = a.counter("voltro_queue_retries_total", { description: "In-process handler retries, by topic. A retry BLOCKS its partition." }), w = a.counter("voltro_queue_produced_total", { description: "Messages produced through the outbox bridge and QueueService, by topic." }), T = a.gauge("voltro_queue_lag_messages", { description: "Messages between the offset just picked up and the partition high watermark, by topic and partition. Sampled at pickup; holds its last value for an idle or revoked partition." }), E = t.empty(), D = /* @__PURE__ */ new Map(), O = /* @__PURE__ */ new Map(), k = /* @__PURE__ */ new Map(), A = /* @__PURE__ */ new Map(), j = (e, t, n) => {
 	let r = e.get(t);
 	if (r !== void 0) return r;
 	let i = n();
 	return e.set(t, i), i;
-}, j = (e) => {
-	b(y().consumed, e), A(E, `ok\u0000${e}`, () => a.tagged(a.tagged(x, "topic", e), "outcome", "ok")).unsafeUpdate(1, T);
-}, M = (e, t) => {
-	let n = y();
-	b(n.dlq, e), n.lastError[e] = t.slice(0, 500), A(E, `dlq\u0000${e}`, () => a.tagged(a.tagged(x, "topic", e), "outcome", "dead-lettered")).unsafeUpdate(1, T);
-}, N = (e) => {
-	b(y().retried, e), A(D, e, () => a.tagged(S, "topic", e)).unsafeUpdate(1, T);
-}, P = (e, t) => {
-	t <= 0 || (b(y().produced, e, t), A(O, e, () => a.tagged(C, "topic", e)).unsafeUpdate(t, T));
-}, F = (e, t, n, r) => {
+}, M = (e) => {
+	x(b().consumed, e), j(D, `ok\u0000${e}`, () => a.withAttributes(a.withAttributes(S, { topic: e }), { outcome: "ok" })).updateUnsafe(1, E);
+}, N = (e, t) => {
+	let n = b();
+	x(n.dlq, e), n.lastError[e] = t.slice(0, 500), j(D, `dlq\u0000${e}`, () => a.withAttributes(a.withAttributes(S, { topic: e }), { outcome: "dead-lettered" })).updateUnsafe(1, E);
+}, P = (e) => {
+	x(b().retried, e), j(O, e, () => a.withAttributes(C, { topic: e })).updateUnsafe(1, E);
+}, F = (e, t) => {
+	t <= 0 || (x(b().produced, e, t), j(k, e, () => a.withAttributes(w, { topic: e })).updateUnsafe(t, E));
+}, I = (e, t, n, r) => {
 	let i;
 	try {
 		let e = BigInt(n) - BigInt(r) - 1n;
@@ -47,16 +47,16 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 	} catch {
 		return;
 	}
-	A(k, `${e}\u0000${t}`, () => a.tagged(a.tagged(w, "topic", e), "partition", String(t))).unsafeUpdate(i, T);
-}, I = (e) => {
+	j(A, `${e}\u0000${t}`, () => a.withAttributes(a.withAttributes(T, { topic: e }), { partition: String(t) })).updateUnsafe(i, E);
+}, L = (e) => {
 	let t = {};
 	for (let [n, r] of Object.entries(e ?? {})) r != null && (t[n] = Buffer.isBuffer(r) ? r.toString("utf8") : String(r));
 	return t;
-}, L = (e) => {
-	let t = new c({
+}, R = (e) => {
+	let t = new l({
 		clientId: e.clientId ?? "voltro",
 		brokers: [...e.brokers],
-		logLevel: l.ERROR,
+		logLevel: u.ERROR,
 		...e.ssl === void 0 ? {} : { ssl: e.ssl },
 		...e.sasl === void 0 ? {} : { sasl: e.sasl }
 	}), n = null, r = /* @__PURE__ */ new Set();
@@ -113,10 +113,10 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 							offset: s.offset,
 							key: s.key === null ? null : s.key.toString("utf8"),
 							value: s.value === null ? null : s.value.toString("utf8"),
-							headers: I(s.headers),
+							headers: L(s.headers),
 							timestamp: s.timestamp
 						};
-						F(e.topic, e.partition, e.highWatermark, s.offset), await n.onMessage(c, {
+						I(e.topic, e.partition, e.highWatermark, s.offset), await n.onMessage(c, {
 							heartbeat: i,
 							isStale: o
 						}), t(s.offset), await r();
@@ -127,9 +127,9 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 			} };
 		}
 	};
-}, R = "queue.consume", z = (e, t) => (r) => {
-	let i = u(e.traceparent);
-	return r.pipe(n.tap((e) => t === void 0 ? n.void : n.annotateCurrentSpan(t(e))), n.withSpan(R, {
+}, z = "queue.consume", B = (e, t) => (r) => {
+	let i = d(e.traceparent);
+	return r.pipe(n.tap((e) => t === void 0 ? n.void : n.annotateCurrentSpan(t(e))), n.withSpan(z, {
 		attributes: {
 			"messaging.system": e.system,
 			"messaging.operation": "process",
@@ -140,17 +140,17 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 		},
 		...i ? { parent: i } : {}
 	}));
-}, B = async (t, i, a) => {
+}, V = async (t, i, a) => {
 	let o, s = await n.runPromiseExit(n.tryPromise({
 		try: i,
 		catch: (e) => (o = { value: e }, e)
-	}).pipe(z(t, a), d));
+	}).pipe(B(t, a), f));
 	if (r.isSuccess(s)) return s.value;
 	throw o === void 0 ? e.squash(s.cause) : o.value;
-}, V = (e) => new Promise((t) => setTimeout(t, e)), H = async (e) => {
+}, H = (e) => new Promise((t) => setTimeout(t, e)), U = async (e) => {
 	let { provider: t, log: n } = e, r = { current: !1 }, i = /* @__PURE__ */ new Set(), a = async (r) => {
-		let i = r.groupId ?? `${e.appName}.${r.topic}`, a = r.dlqTopic ?? `${r.topic}.dlq`, s = r.maxAttempts ?? 3, c = o.decodeUnknownEither(r.schema), l = async (e, i, o) => {
-			M(r.topic, `${e}: ${i}`), n.warn("queue: dead-lettered", {
+		let i = r.groupId ?? `${e.appName}.${r.topic}`, a = r.dlqTopic ?? `${r.topic}.dlq`, c = r.maxAttempts ?? 3, l = s.decodeUnknownResult(r.schema), u = async (e, i, o) => {
+			N(r.topic, `${e}: ${i}`), n.warn("queue: dead-lettered", {
 				topic: r.topic,
 				dlqTopic: a,
 				reason: e,
@@ -168,12 +168,12 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 					"x-voltro-dlq-source-offset": o.offset
 				}
 			}]);
-		}, u = await t.consume({
+		}, d = await t.consume({
 			topic: r.topic,
 			groupId: i,
 			...r.fromBeginning === void 0 ? {} : { fromBeginning: r.fromBeginning },
-			onMessage: async (a, o) => {
-				await B({
+			onMessage: async (a, s) => {
+				await V({
 					system: t.name,
 					topic: r.topic,
 					groupId: i,
@@ -185,14 +185,14 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 					try {
 						t = a.value === null ? null : JSON.parse(a.value);
 					} catch (e) {
-						return await l("decode-failed", `invalid JSON: ${e instanceof Error ? e.message : String(e)}`, a), "dead-lettered";
+						return await u("decode-failed", `invalid JSON: ${e instanceof Error ? e.message : String(e)}`, a), "dead-lettered";
 					}
-					let i = c(t);
-					if (i._tag === "Left") return await l("decode-failed", String(i.left), a), "dead-lettered";
-					for (let t = 1; t <= s; t++) {
-						if (o.isStale()) return "stale";
+					let i = l(t);
+					if (o.isFailure(i)) return await u("decode-failed", String(i.failure), a), "dead-lettered";
+					for (let t = 1; t <= c; t++) {
+						if (s.isStale()) return "stale";
 						try {
-							return await r.handler(i.right, {
+							return await r.handler(i.success, {
 								topic: a.topic,
 								partition: a.partition,
 								offset: a.offset,
@@ -205,16 +205,16 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 									if (t === null) throw Error("queue: store not bound yet — the retry loop absorbs a message arriving before boot finished");
 									return t;
 								}
-							}), j(r.topic), "ok";
+							}), M(r.topic), "ok";
 						} catch (i) {
-							let c = i instanceof Error ? i.message : String(i);
-							if (t >= s) return await l("handler-failed", c, a), "dead-lettered";
-							N(r.topic), n.warn("queue: handler failed, retrying", {
+							let o = i instanceof Error ? i.message : String(i);
+							if (t >= c) return await u("handler-failed", o, a), "dead-lettered";
+							P(r.topic), n.warn("queue: handler failed, retrying", {
 								topic: r.topic,
 								attempt: t,
-								maxAttempts: s,
-								detail: c
-							}), await o.heartbeat().catch(() => {}), await V((e.retryBaseMs ?? 1e3) * 2 ** (t - 1));
+								maxAttempts: c,
+								detail: o
+							}), await s.heartbeat().catch(() => {}), await H((e.retryBaseMs ?? 1e3) * 2 ** (t - 1));
 						}
 					}
 					return "stale";
@@ -225,8 +225,8 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 			topic: r.topic,
 			groupId: i,
 			dlqTopic: a
-		}), u;
-	}, s = e.consumers.map((e) => {
+		}), d;
+	}, c = e.consumers.map((e) => {
 		let t = { handle: null }, o = () => {
 			a(e).then((e) => {
 				if (r.current) {
@@ -251,10 +251,10 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 	return { stop: async () => {
 		r.current = !0;
 		for (let e of i) clearTimeout(e);
-		i.clear(), await Promise.all(s.map((e) => e.handle?.stop() ?? Promise.resolve()));
+		i.clear(), await Promise.all(c.map((e) => e.handle?.stop() ?? Promise.resolve()));
 	} };
-}, U = (e) => {
-	let t = () => e.provider ?? q();
+}, W = (e) => {
+	let t = () => e.provider ?? J();
 	return {
 		name: `kafka(${e.topic})`,
 		...e.provider !== void 0 && e.provider.hosts[0] !== void 0 ? { outboundHost: e.provider.hosts[0] } : {},
@@ -271,43 +271,43 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 			})));
 		}
 	};
-}, W = class extends t.Tag("@voltro/plugin-queue/QueueService")() {}, G = Symbol.for("@voltro/plugin-queue:active-provider"), K = () => {
+}, G = class extends t.Service()("@voltro/plugin-queue/QueueService") {}, K = Symbol.for("@voltro/plugin-queue:active-provider"), q = () => {
 	let e = globalThis;
-	return e[G] ??= { current: null };
-}, q = () => {
-	let e = K().current;
+	return e[K] ??= { current: null };
+}, J = () => {
+	let e = q().current;
 	if (e === null) throw Error("[voltro] no active queue provider — is queuePlugin({...}) in this app's plugins? The outbox handler and kafkaSink need the plugin's connected provider.");
 	return e;
-}, J = () => ({
+}, Y = () => ({
 	effect: "queue.produce",
 	maxAttempts: 8,
 	handler: async ({ payload: e }) => {
 		let t = e.topic, n = e.messages;
 		if (typeof t != "string" || !Array.isArray(n)) throw Error("queue.produce payload must be { topic: string, messages: QueueOutgoingMessage[] }");
-		await q().produce(t, n), P(t, n.length);
+		await J().produce(t, n), F(t, n.length);
 	}
-}), Y = (e) => {
-	let t = e.name ?? "queue", r = L(e), a = ["inspect:read", ...r.hosts.map((e) => `network:outbound:${e}`)], o = null, c = { current: null };
-	return s({
+}), X = (e) => {
+	let t = e.name ?? "queue", r = R(e), a = ["inspect:read", ...r.hosts.map((e) => `network:outbound:${e}`)], o = null, s = { current: null };
+	return c({
 		name: t,
 		baseName: "queue",
 		description: "Queue interop — consume and produce against an existing Kafka: Schema-decoded consumers (at-least-once, serial per partition, retry + dead-letter), batched producing via a handler service or transactionally through the outbox, and a kafkaSink for plugin-cdc-out.",
 		permissions: a,
-		services: i.succeed(W, { produce: async (e, t) => {
-			await r.produce(e, t), P(e, t.length);
+		services: i.succeed(G, { produce: async (e, t) => {
+			await r.produce(e, t), F(e, t.length);
 		} }),
 		bindDataStore: (e) => {
-			c.current = e;
+			s.current = e;
 		},
 		onActivate: (t) => n.tryPromise(async () => {
-			await r.connect(), K().current = r;
-			let n = h();
-			o = await H({
+			await r.connect(), q().current = r;
+			let n = g();
+			o = await U({
 				provider: r,
 				consumers: n,
 				appName: e.groupPrefix ?? t.app.name,
 				log: t.logger,
-				store: () => c.current,
+				store: () => s.current,
 				...e.retryBaseMs === void 0 ? {} : { retryBaseMs: e.retryBaseMs }
 			}), t.logger.info("queue: connected", {
 				brokers: r.hosts,
@@ -315,7 +315,7 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 			});
 		}),
 		onDeactivate: () => n.tryPromise(async () => {
-			await o?.stop(), o = null, K().current === r && (K().current = null), await r.disconnect();
+			await o?.stop(), o = null, q().current === r && (q().current = null), await r.disconnect();
 		}),
 		inspectEndpoints: [{
 			method: "GET",
@@ -323,13 +323,13 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 			scope: "process",
 			description: "Registered consumers + per-topic consumed/retried/dead-lettered/produced counters (this replica).",
 			handler: () => n.sync(() => {
-				let e = y();
+				let e = b();
 				return {
 					kind: "json",
 					data: {
-						producerSelected: K().current === r,
+						producerSelected: q().current === r,
 						brokers: r.hosts,
-						consumers: h().map((t) => ({
+						consumers: g().map((t) => ({
 							topic: t.topic,
 							groupId: t.groupId ?? null,
 							dlqTopic: t.dlqTopic ?? `${t.topic}.dlq`,
@@ -347,4 +347,4 @@ var f = Symbol.for("@voltro/plugin-queue:consumers"), p = () => {
 	});
 };
 //#endregion
-export { W as QueueService, q as activeQueueProvider, m as defineQueueConsumer, L as kafkaProvider, U as kafkaSink, y as queueMetrics, J as queueOutboxHandler, Y as queuePlugin, h as registeredQueueConsumers, g as resetQueueConsumersForTest, H as startQueueConsumers };
+export { G as QueueService, J as activeQueueProvider, h as defineQueueConsumer, R as kafkaProvider, W as kafkaSink, b as queueMetrics, Y as queueOutboxHandler, X as queuePlugin, g as registeredQueueConsumers, _ as resetQueueConsumersForTest, U as startQueueConsumers };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/plugin-queue",
-  "version": "0.83.1",
+  "version": "0.85.0",
   "description": "Queue interop — consume and produce against an existing Kafka: Schema-decoded consumers via defineQueueConsumer (*.consumer.ts; at-least-once, serial per partition, retry + dead-letter), batched producing via QueueService or transactionally through the outbox (queueOutboxHandler), and a kafkaSink for plugin-cdc-out.",
   "keywords": [
     "voltro",
@@ -33,13 +33,13 @@
     "node": ">=24.0.0"
   },
   "dependencies": {
-    "@voltro/database": "0.83.1",
-    "@voltro/protocol": "0.83.1",
-    "@voltro/runtime": "0.83.1",
+    "@voltro/database": "0.85.0",
+    "@voltro/protocol": "0.85.0",
+    "@voltro/runtime": "0.85.0",
     "kafkajs": "^2.2.4"
   },
   "peerDependencies": {
-    "effect": "^3.22.2"
+    "effect": "4.0.1"
   },
   "publishConfig": {
     "access": "public"