@voltro/plugin-broadcast 0.86.0 → 0.87.0

package/dist/providers.js

@@ -50,117 +50,46 @@ var n = (t, n, r) => new e({
 			for (let e of n) e();
 		})
 	};
-}, l = (e) => {
-	let a = null, o = i(), s = !0, c = () => a || (a = (async () => {
-		let t;
-		if (e.client) t = e.client;
-		else {
-			let n;
-			try {
-				n = (await import("ioredis")).default;
-			} catch (e) {
-				throw r("redis", "the 'redis' broadcast provider requires the 'ioredis' optional dependency. Install it to enable it.", e);
-			}
-			t = new n(e.url);
-		}
-		let n = t.duplicate();
-		return t.on("error", () => {}), n.on("error", () => {}), n.on("reconnecting", () => {
-			s && (s = !1, o.emit({
-				kind: "disconnected",
-				detail: "ioredis is re-dialling"
-			}));
-		}), n.on("ready", () => {
-			s || (s = !0, o.emit({ kind: "reconnected" }));
-		}), {
-			pub: t,
-			sub: n
-		};
-	})().catch((e) => {
-		throw a = null, e;
-	}), a);
-	return {
-		name: "redis",
-		onTransportEvent: o.subscribe,
-		publish: (e, r) => t.tryPromise({
-			try: async () => {
-				let { pub: t } = await c();
-				await t.publish(e, r);
-			},
-			catch: (e) => n("redis", `publish failed: ${String(e?.message ?? e)}`, e)
-		}),
-		subscribe: (e, r) => t.tryPromise({
-			try: async () => {
-				let { sub: t } = await c(), n = (t, n) => {
-					t === e && r(n);
-				};
-				return t.on("message", n), await t.subscribe(e), () => {
-					t.off("message", n), t.unsubscribe(e).catch(() => void 0);
-				};
-			},
-			catch: (e) => n("redis", `subscribe failed: ${String(e?.message ?? e)}`, e)
-		}),
-		close: () => t.promise(async () => {
-			if (a) try {
-				let { pub: t, sub: n } = await a;
-				await n.quit(), e.client || await t.quit();
-			} catch {}
-		})
+}, l = (e, a) => {
+	let o = i(), s = /* @__PURE__ */ new Set(), c, l, u = !1, d, f = (e) => (s.add(e), e.then(() => s.delete(e), () => s.delete(e)), e), p = (n) => {
+		if (u) return Promise.reject(r(e, "Broadcast consumer is closed"));
+		if (c !== void 0) return c;
+		let i = t.runPromiseWith(n)(a.pubsub).then((e) => (l = e.onTransportEvent(o.emit), e));
+		return c = i, i.catch(() => {
+			c === i && (c = void 0);
+		}), i;
 	};
-}, u = new TextEncoder(), d = new TextDecoder(), f = (e) => {
-	let a = null, o = i(), s = !0, c = (e) => {
-		(async () => {
-			try {
-				for await (let t of e.status()) t.type === "disconnect" && s ? (s = !1, o.emit({
-					kind: "disconnected",
-					detail: "nats disconnected"
-				})) : t.type === "reconnect" && !s && (s = !0, o.emit({ kind: "reconnected" }));
-			} catch {}
-		})();
-	}, l = () => import("@nats-io/transport-node").catch((e) => {
-		throw r("nats", "the 'nats' broadcast provider requires the '@nats-io/transport-node' optional dependency. Install it to enable it.", e);
-	}), f = () => a || (a = (async () => {
-		if (e.connection) return e.connection;
-		let t = await (await l()).connect({
-			servers: e.url,
-			maxReconnectAttempts: -1,
-			waitOnFirstConnect: !0,
-			reconnectTimeWait: 2e3
-		});
-		return c(t), t;
-	})().catch((e) => {
-		throw a = null, e;
-	}), a);
 	return {
-		name: "nats",
+		name: e,
 		onTransportEvent: o.subscribe,
-		publish: (e, r) => t.tryPromise({
-			try: async () => {
-				(await f()).publish(e, u.encode(r));
-			},
-			catch: (e) => n("nats", `publish failed: ${String(e?.message ?? e)}`, e)
-		}),
-		subscribe: (e, r) => t.tryPromise({
-			try: async () => {
-				let t = (await f()).subscribe(e), n = !1;
-				return (async () => {
-					for await (let e of t) r(d.decode(e.data));
-					!n && s && (s = !1, o.emit({
-						kind: "disconnected",
-						detail: `the nats subscription to '${e}' ended while the connection was up`
-					}));
-				})(), () => {
-					n = !0, t.unsubscribe();
+		publish: (i, a) => t.flatMap(t.context(), (o) => t.tryPromise({
+			try: () => f((async () => {
+				let n = await p(o);
+				if (u) throw r(e, "Broadcast consumer is closed");
+				await t.runPromiseWith(o)(n.publish(i, a));
+			})()),
+			catch: () => n(e, `${e} publication failed`)
+		})),
+		subscribe: (i, a) => t.flatMap(t.context(), (o) => t.tryPromise({
+			try: () => f((async () => {
+				let n = await p(o);
+				if (u) throw r(e, "Broadcast consumer is closed");
+				let s = !0, c = await t.runPromiseWith(o)(n.subscribe(i, (e) => {
+					s && !u && a(e);
+				}));
+				if (u) throw s = !1, await t.runPromiseWith(o)(c), r(e, "Broadcast consumer is closed");
+				return () => {
+					s && (s = !1, f(t.runPromiseWith(o)(c)).catch(() => void 0));
 				};
-			},
-			catch: (e) => n("nats", `subscribe failed: ${String(e?.message ?? e)}`, e)
-		}),
-		close: () => t.promise(async () => {
-			if (a) try {
-				let t = await a;
-				e.connection || await t.drain();
+			})()),
+			catch: () => n(e, `${e} subscription failed`)
+		})),
+		close: () => t.flatMap(t.context(), (e) => t.promise(() => d ??= (async () => {
+			if (u = !0, await Promise.allSettled([...s]), l?.(), c !== void 0) try {
+				await t.runPromiseWith(e)((await c).close);
 			} catch {}
-		})
+		})()))
 	};
-};
+}, u = (e) => l("redis", e), d = (e) => l("nats", e);
 //#endregion
-export { c as memoryProvider, f as natsProvider, l as redisProvider, s as resetMemoryBus };
+export { c as memoryProvider, d as natsProvider, u as redisProvider, s as resetMemoryBus };

package/dist/resolve.js

@@ -1,53 +1,70 @@
 import { memoryProvider as e, natsProvider as t, redisProvider as n } from "./providers.js";
+import { Effect as r } from "effect";
 //#region src/resolve.ts
-var r = (e, t) => t[`${e.toUpperCase().replace(/[^A-Z0-9]+/g, "_")}_REDIS_URL`], i = (i, a) => {
-	if (i.provider && typeof i.provider == "object") {
-		let e = i.provider;
-		return {
-			provider: e,
-			url: i.url ?? null,
-			crossReplica: e.name !== "memory"
-		};
+var i = (e) => {
+	if (!/^(redis|nats):[A-Za-z][A-Za-z0-9_-]*$/.test(e)) throw Error("Broadcast connections require redis:name or nats:name references");
+	return e.startsWith("nats:") ? "nats" : "redis";
+}, a = (a, o, s = () => r.fail(/* @__PURE__ */ Error("Broadcast requires the app connection registry"))) => {
+	let c = [], l = (e, i, a) => {
+		c.push({
+			kind: e,
+			role: i,
+			...a === void 0 ? {} : { reference: a }
+		});
+		let o = r.suspend(() => s(i));
+		return e === "nats" ? t({ pubsub: o }) : n({ pubsub: o });
+	}, u;
+	if (typeof a.provider == "object") {
+		if (a.connection !== void 0) throw Error("A custom Broadcast provider cannot also select a registry connection");
+		u = a.provider;
+	} else {
+		let t = a.provider ?? o.BROADCAST_PROVIDER;
+		if (t !== void 0 && ![
+			"redis",
+			"nats",
+			"memory"
+		].includes(t)) throw Error("Broadcast provider must be redis, nats or memory");
+		let n = a.connection === void 0 ? void 0 : i(a.connection), r = t ?? n ?? (o.BROADCAST_NATS_URL || o.NATS_URL ? "nats" : o.BROADCAST_REDIS_URL || o.REDIS_URL ? "redis" : "memory");
+		if (n !== void 0 && r !== n) throw Error("Broadcast provider must match its connection kind");
+		u = r === "memory" ? e() : l(r === "nats" ? "nats" : "redis", "broadcast", a.connection);
 	}
-	let o = i.url ?? a.BROADCAST_URL ?? null, s = r(i.connection ?? "broadcast", a), c = (i.provider ?? a.BROADCAST_PROVIDER)?.toLowerCase() ?? (o?.startsWith("nats://") ? "nats" : o?.startsWith("redis://") || o?.startsWith("rediss://") || s || a.REDIS_URL ? "redis" : void 0), l = (i.provider ?? a.BROADCAST_PROVIDER)?.toLowerCase();
-	if (l !== void 0 && l !== "redis" && l !== "nats" && l !== "memory") throw Error(`broadcastPlugin: unknown provider "${l}".\n  Valid: 'redis', 'nats', 'memory'.
-  A name we do not recognise used to fall through to the in-process bus, which boots fine on one replica and drops cross-replica traffic on the second.`);
-	if (o !== null && o !== "" && !/^(redis|rediss|nats):\/\//.test(o)) throw Error(`broadcastPlugin: url "${o}" names no provider we support.\n  Expected a redis://, rediss:// or nats:// url.`);
-	switch (c) {
-		case "redis": {
-			let t = o ?? s ?? a.REDIS_URL;
-			if (!t) {
-				if (l === "redis") throw Error("broadcastPlugin: provider \"redis\" was requested but no url resolves.\n  Set BROADCAST_URL, BROADCAST_REDIS_URL or REDIS_URL, or pass `url`.\n  Falling back to the in-process bus here would answer a stated requirement with a silent downgrade.");
-				return {
-					provider: e(),
-					url: null,
-					crossReplica: !1
-				};
-			}
-			return {
-				provider: n({ url: t }),
-				url: t,
-				crossReplica: !0
-			};
-		}
-		case "nats": {
-			let n = o ?? a.NATS_URL;
-			return n ? {
-				provider: t({ url: n }),
-				url: n,
-				crossReplica: !0
-			} : {
-				provider: e(),
-				url: null,
-				crossReplica: !1
-			};
-		}
-		default: return {
-			provider: e(),
-			url: null,
-			crossReplica: !1
-		};
+	let d = /* @__PURE__ */ new Map();
+	for (let e of [
+		"events",
+		"members",
+		"presence",
+		"revalidate"
+	]) {
+		let t = a[e];
+		t !== void 0 && d.set(e, l(i(t), e, t));
 	}
+	if (d.size === 0) return {
+		provider: u,
+		crossReplica: u.name !== "memory",
+		selections: c
+	};
+	let f = [.../* @__PURE__ */ new Set([u, ...d.values()])], p = (e) => {
+		let t = e.slice(e.indexOf(":") + 1).split(":")[0];
+		return d.get(t) ?? u;
+	};
+	return {
+		provider: {
+			name: [...new Set(f.map((e) => e.name))].join("+"),
+			publish: (e, t) => p(e).publish(e, t),
+			subscribe: (e, t) => p(e).subscribe(e, t),
+			onTransportEvent: (e) => {
+				let t = /* @__PURE__ */ new WeakSet(), n = f.flatMap((n) => n.onTransportEvent === void 0 ? [] : [n.onTransportEvent((n) => {
+					t.has(n) || (t.add(n), e(n));
+				})]);
+				return () => {
+					for (let e of n) e();
+				};
+			},
+			close: () => r.forEach(f, (e) => e.close(), { discard: !0 }).pipe(r.asVoid)
+		},
+		crossReplica: f.some((e) => e.name !== "memory"),
+		selections: c
+	};
 };
 //#endregion
-export { i as resolveBroadcastProvider };
+export { a as resolveBroadcastProvider };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/plugin-broadcast",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "description": "Cross-replica reactivity — a pub/sub message bus (Redis / NATS / memory) that fans out app-mutation ChangeEvents to every replica behind a load balancer. ADDITIVE to inline emit: local reactivity survives a broker outage; cross-replica degrades gracefully. Closes the single-instance gap for every non-postgres dialect (postgres keeps native LISTEN/NOTIFY).",
   "keywords": [
     "voltro",
@@ -33,12 +33,9 @@
     "node": ">=24.0.0"
   },
   "dependencies": {
-    "@voltro/database": "0.86.0",
-    "@voltro/protocol": "0.86.0"
-  },
-  "optionalDependencies": {
-    "@nats-io/transport-node": "^3.4.0",
-    "ioredis": "^5.11.1"
+    "@voltro/database": "0.87.0",
+    "@voltro/protocol": "0.87.0",
+    "@voltro/kv": "0.87.0"
   },
   "peerDependencies": {
     "effect": "4.0.1"