@voltro/workflow 0.33.0 → 0.35.0

package/dist/{cluster-CyIyBO39.js → cluster-CVyPUB9X.js}

@@ -1,62 +1,71 @@
 import { Context as e, Duration as t, Effect as n, Layer as r, Option as i } from "effect";
 import { ClusterCron as a, ClusterSchema as o, ClusterWorkflowEngine as s, EntityAddress as c, EntityId as l, EntityType as u, MessageStorage as d, RunnerAddress as f, Sharding as p, ShardingConfig as m, SingleRunner as h, SqlMessageStorage as g, SqlRunnerStorage as _ } from "@effect/cluster";
 import { SqlClient as v } from "@effect/sql";
+import { fnv1a64 as y, resolveMigrationLockSchema as b } from "@voltro/database/sql";
 //#region src/clusterMigrationGate.ts
-var y = 6322741009312601n, b = `voltro_cluster_migration_${y.toString(36)}`, x = () => {
+var x = 6322741009312601n, S = () => {
+	let e = b();
+	return e === void 0 ? x : y(`voltro_cluster_migration_lock:${e}`) & 9223372036854775807n;
+}, C = () => {
+	let e = `voltro_cluster_migration_${x.toString(36)}`, t = b();
+	if (t === void 0) return e;
+	let n = `${e}_${t}`;
+	return /^[A-Za-z0-9_]+$/.test(t) && n.length <= 64 ? n : `${e}_h${y(`voltro_cluster_migration_lock:${t}`).toString(16)}`;
+}, w = () => {
 	let e = Number(process.env.VOLTRO_CLUSTER_MIGRATION_LOCK_TIMEOUT_MS);
 	return Number.isFinite(e) && e > 0 ? e : 6e4;
-}, S = 250, C = (e) => e[0]?.[0], w = (e, t) => e.onDialectOrElse({
+}, T = 250, E = (e) => e[0]?.[0], D = (e, t) => e.onDialectOrElse({
 	sqlite: () => n.void,
-	mysql: () => t.executeValues(`SELECT GET_LOCK('${b}', ${Math.ceil(x() / 1e3)})`, []).pipe(n.flatMap((e) => C(e) === 1 || C(e) === "1" ? n.void : n.die(/* @__PURE__ */ Error(`could not acquire cluster migration lock '${b}' (GET_LOCK timed out)`)))),
-	mssql: () => t.executeValues(`DECLARE @res int; EXEC @res = sp_getapplock @Resource = '${b}', @LockMode = 'Exclusive', @LockOwner = 'Session', @LockTimeout = ${x()}; SELECT @res`, []).pipe(n.flatMap((e) => Number(C(e) ?? -999) >= 0 ? n.void : n.die(/* @__PURE__ */ Error(`could not acquire cluster migration lock '${b}' (sp_getapplock ${String(C(e))})`)))),
+	mysql: () => t.executeValues(`SELECT GET_LOCK('${C()}', ${Math.ceil(w() / 1e3)})`, []).pipe(n.flatMap((e) => E(e) === 1 || E(e) === "1" ? n.void : n.die(/* @__PURE__ */ Error(`could not acquire cluster migration lock '${C()}' (GET_LOCK timed out)`)))),
+	mssql: () => t.executeValues(`DECLARE @res int; EXEC @res = sp_getapplock @Resource = '${C()}', @LockMode = 'Exclusive', @LockOwner = 'Session', @LockTimeout = ${w()}; SELECT @res`, []).pipe(n.flatMap((e) => Number(E(e) ?? -999) >= 0 ? n.void : n.die(/* @__PURE__ */ Error(`could not acquire cluster migration lock '${C()}' (sp_getapplock ${String(E(e))})`)))),
 	orElse: () => {
-		let e = y.toString(), r = Date.now(), i = t.executeValues(`SELECT pg_try_advisory_lock(${e}::bigint)`, []).pipe(n.flatMap((e) => {
-			let t = C(e);
-			return t === !0 || t === "t" || t === 1 ? n.void : Date.now() - r >= x() ? n.die(/* @__PURE__ */ Error(`could not acquire the cluster migration advisory lock within ${Math.round(x() / 1e3)}s. Another runner is migrating the cluster schema, or a prior boot wedged while holding it. (Raise VOLTRO_CLUSTER_MIGRATION_LOCK_TIMEOUT_MS, or inspect pg_locks for the holder.)`)) : n.sleep(`${S} millis`).pipe(n.zipRight(i));
+		let e = S().toString(), r = Date.now(), i = t.executeValues(`SELECT pg_try_advisory_lock(${e}::bigint)`, []).pipe(n.flatMap((e) => {
+			let t = E(e);
+			return t === !0 || t === "t" || t === 1 ? n.void : Date.now() - r >= w() ? n.die(/* @__PURE__ */ Error(`could not acquire the cluster migration advisory lock within ${Math.round(w() / 1e3)}s. Another runner is migrating the cluster schema, or a prior boot wedged while holding it. (Raise VOLTRO_CLUSTER_MIGRATION_LOCK_TIMEOUT_MS, or inspect pg_locks for the holder.)`)) : n.sleep(`${T} millis`).pipe(n.zipRight(i));
 		}));
 		return i;
 	}
-}), T = (e, t) => e.onDialectOrElse({
+}), O = (e, t) => e.onDialectOrElse({
 	sqlite: () => n.void,
-	mysql: () => n.asVoid(t.executeValues(`SELECT RELEASE_LOCK('${b}')`, [])),
-	mssql: () => n.asVoid(t.executeValues(`EXEC sp_releaseapplock @Resource = '${b}', @LockOwner = 'Session'`, [])),
-	orElse: () => n.asVoid(t.executeValues(`SELECT pg_advisory_unlock(${y.toString()}::bigint)`, []))
-}), E = (e, t) => e.onDialectOrElse({
+	mysql: () => n.asVoid(t.executeValues(`SELECT RELEASE_LOCK('${C()}')`, [])),
+	mssql: () => n.asVoid(t.executeValues(`EXEC sp_releaseapplock @Resource = '${C()}', @LockOwner = 'Session'`, [])),
+	orElse: () => n.asVoid(t.executeValues(`SELECT pg_advisory_unlock(${S().toString()}::bigint)`, []))
+}), k = (e, t) => e.onDialectOrElse({
 	sqlite: () => !0,
 	orElse: () => !1
 }) ? t : n.scoped(n.gen(function* () {
 	let r = yield* e.reserve;
-	return yield* n.acquireRelease(w(e, r), () => T(e, r).pipe(n.orDie)), yield* t;
-})), D = (e) => e === "sql" ? ["cluster_messages", "cluster_runners"] : ["cluster_messages"], O = (e, t) => n.forEach(D(t), (t) => e`SELECT 1 FROM ${e(t)}`.pipe(n.as(!0), n.catchAll(() => n.succeed(!1))), { concurrency: 1 }).pipe(n.map((e) => e.every(Boolean))), k = (e, t) => n.scoped(n.asVoid(r.build(t.pipe(r.provide(m.layerDefaults), r.provide(r.succeed(v.SqlClient, e)))))), A = (e, t) => k(e, g.layer).pipe(n.zipRight(t === "sql" ? k(e, _.layer) : n.void)), j = (e) => r.effect(v.SqlClient, n.gen(function* () {
+	return yield* n.acquireRelease(D(e, r), () => O(e, r).pipe(n.orDie)), yield* t;
+})), A = (e) => e === "sql" ? ["cluster_messages", "cluster_runners"] : ["cluster_messages"], j = (e, t) => n.forEach(A(t), (t) => e`SELECT 1 FROM ${e(t)}`.pipe(n.as(!0), n.catchAll(() => n.succeed(!1))), { concurrency: 1 }).pipe(n.map((e) => e.every(Boolean))), M = (e, t) => n.scoped(n.asVoid(r.build(t.pipe(r.provide(m.layerDefaults), r.provide(r.succeed(v.SqlClient, e)))))), N = (e, t) => M(e, g.layer).pipe(n.zipRight(t === "sql" ? M(e, _.layer) : n.void)), P = (e) => r.effect(v.SqlClient, n.gen(function* () {
 	let t = yield* v.SqlClient;
-	return (yield* O(t, e.runnerStorage)) || (yield* E(t, A(t, e.runnerStorage))), t;
-})), M = 34e3, N = (e) => {
+	return (yield* j(t, e.runnerStorage)) || (yield* k(t, N(t, e.runnerStorage))), t;
+})), F = 34e3, I = (e) => {
 	let t = e.runnerListenHost ?? process.env.POD_IP ?? process.env.VOLTRO_WORKFLOW_RUNNER_HOST ?? "localhost";
 	return {
 		host: t,
 		port: e.runnerListenPort ?? 34e3,
 		localhostRisk: e.runnerStorage === "sql" && (t === "localhost" || t === "127.0.0.1")
 	};
-}, P = (e) => {
+}, L = (e) => {
 	let t = e.sqliteFamily ? "memory" : "sql", n = e.override ?? process.env.VOLTRO_WORKFLOW_RUNNER_STORAGE;
 	if (n === void 0 || n.trim() === "") return t;
 	let r = n.trim().toLowerCase();
 	if (r !== "memory" && r !== "sql") throw Error(`VOLTRO_WORKFLOW_RUNNER_STORAGE must be 'memory' or 'sql', got '${n}'.`);
 	if (r === "sql" && e.sqliteFamily) throw Error("VOLTRO_WORKFLOW_RUNNER_STORAGE='sql' is unsupported on sqlite / turso — @effect/cluster has no sqlite advisory-lock branch. Use 'memory'.");
 	return r;
-}, F = (e = process.env.VOLTRO_WORKFLOW_SHARD_LOCK) => {
+}, R = (e = process.env.VOLTRO_WORKFLOW_SHARD_LOCK) => {
 	if (e === void 0 || e.trim() === "") return "auto";
 	let t = e.trim().toLowerCase();
 	if (t === "auto" || t === "row" || t === "advisory") return t;
 	throw Error(`VOLTRO_WORKFLOW_SHARD_LOCK must be 'auto', 'row', or 'advisory', got '${e}'.`);
-}, I = n.gen(function* () {
+}, z = n.gen(function* () {
 	let e = yield* (yield* v.SqlClient)`SELECT @@wsrep_on AS wsrep`.pipe(n.catchAll(() => n.succeed([])));
 	if (e.length === 0) return !1;
 	let t = e[0].wsrep;
 	return t === 1 || t === "1" || t === !0 || t === "ON" || t === "on";
-}), L = (e) => n.gen(function* () {
-	return e.runnerStorage === "memory" ? !1 : e.mode === "row" ? !0 : e.mode === "advisory" || e.dialectId !== "mysql" && e.dialectId !== "mariadb" ? !1 : yield* I;
-}), R = () => {
+}), B = (e) => n.gen(function* () {
+	return e.runnerStorage === "memory" ? !1 : e.mode === "row" ? !0 : e.mode === "advisory" || e.dialectId !== "mysql" && e.dialectId !== "mariadb" ? !1 : yield* z;
+}), V = () => {
 	let e = (e) => {
 		if (e === void 0) return;
 		let t = Number(e);
@@ -67,15 +76,15 @@ var y = 6322741009312601n, b = `voltro_cluster_migration_${y.toString(36)}`, x =
 		...n === void 0 ? {} : { failoverHeartbeatSeconds: n },
 		...r === void 0 ? {} : { messagePollSeconds: r }
 	};
-}, z = n.flatMap(p.Sharding, (e) => e.pollStorage), B = /* @__PURE__ */ new Set(), V = (e) => {
-	let a = N({
+}, H = n.flatMap(p.Sharding, (e) => e.pollStorage), U = /* @__PURE__ */ new Set(), W = (e) => {
+	let a = I({
 		runnerStorage: e.runnerStorage,
 		runnerListenHost: e.runnerListenHost,
 		runnerListenPort: e.runnerListenPort
 	}), o = a.host, c = a.port;
-	a.localhostRisk && !B.has(o) && (B.add(o), process.stderr.write(`[voltro:workflow] runner host is '${o}' with SQL cluster storage — other pods cannot reach this runner, so a workflow cannot resume on another pod after a reschedule. Inject POD_IP via the K8s downward API (fieldRef: status.podIP) or set runnerListenHost / VOLTRO_WORKFLOW_RUNNER_HOST.
+	a.localhostRisk && !U.has(o) && (U.add(o), process.stderr.write(`[voltro:workflow] runner host is '${o}' with SQL cluster storage — other pods cannot reach this runner, so a workflow cannot resume on another pod after a reschedule. Inject POD_IP via the K8s downward API (fieldRef: status.podIP) or set runnerListenHost / VOLTRO_WORKFLOW_RUNNER_HOST.
 `));
-	let l = j({ runnerStorage: e.runnerStorage }).pipe(r.provide(e.sqlClientLayer)), u = e.shardLockMode ?? F(), d = r.unwrapEffect(L({
+	let l = P({ runnerStorage: e.runnerStorage }).pipe(r.provide(e.sqlClientLayer)), u = e.shardLockMode ?? R(), d = r.unwrapEffect(B({
 		dialectId: e.dialectId,
 		runnerStorage: e.runnerStorage,
 		mode: u
@@ -91,19 +100,19 @@ var y = 6322741009312601n, b = `voltro_cluster_migration_${y.toString(36)}`, x =
 		}
 	}))))).pipe(r.provide(l)), p = e.extraShardingLayers ?? [];
 	return (p.length === 0 ? s.layer : r.mergeAll(s.layer, ...p)).pipe(r.provideMerge(d));
-}, H = (e) => a.make({
+}, G = (e) => a.make({
 	name: e.name,
 	cron: e.cron,
 	execute: n.promise(() => e.execute()),
 	skipIfOlderThan: e.skipIfOlderThan ?? t.days(1)
-}), U = (e, t) => `${e}/${t}`, W = (t, n, r) => {
+}), K = (e, t) => `${e}/${t}`, q = (t, n, r) => {
 	let i = l.make(n), a = e.get(t.annotations, o.ShardGroup)(i);
 	return new c.EntityAddress({
 		entityType: u.EntityType.make(`Workflow/${t.name}`),
 		entityId: i,
 		shardId: r.getShardId(i, a)
 	});
-}, G = (e) => {
+}, J = (e) => {
 	let t = (e) => e && typeof e == "object" && "_tag" in e ? String(e._tag) : void 0, n = t(e);
 	if (n === "Failure" || n !== "Success") return "failed";
 	let r = e.value, i = t(r);
@@ -113,8 +122,8 @@ var y = 6322741009312601n, b = `voltro_cluster_migration_${y.toString(36)}`, x =
 		return t(e) === "Success" ? "succeeded" : "failed";
 	}
 	return "failed";
-}, K = (e) => J(e.workflow, e.executionId, e.failedActivities), q = (e) => J(e.workflow, e.executionId, e.resetActivities), J = (e, t, r) => n.gen(function* () {
-	let a = yield* p.Sharding, o = yield* d.MessageStorage, s = W(e, t, a), c = yield* o.requestIdForPrimaryKey({
+}, Y = (e) => Z(e.workflow, e.executionId, e.failedActivities), X = (e) => Z(e.workflow, e.executionId, e.resetActivities), Z = (e, t, r) => n.gen(function* () {
+	let a = yield* p.Sharding, o = yield* d.MessageStorage, s = q(e, t, a), c = yield* o.requestIdForPrimaryKey({
 		address: s,
 		tag: "run",
 		id: ""
@@ -132,7 +141,7 @@ var y = 6322741009312601n, b = `voltro_cluster_migration_${y.toString(36)}`, x =
 		activitiesReset: 0,
 		reason: "no-reply"
 	};
-	if (G(l.exit) === "succeeded") return {
+	if (J(l.exit) === "succeeded") return {
 		redriven: !1,
 		runReplyCleared: !1,
 		activitiesReset: 0,
@@ -143,7 +152,7 @@ var y = 6322741009312601n, b = `voltro_cluster_migration_${y.toString(36)}`, x =
 		let t = yield* o.requestIdForPrimaryKey({
 			address: s,
 			tag: "activity",
-			id: U(e.name, e.attempt)
+			id: K(e.name, e.attempt)
 		}).pipe(n.orElseSucceed(() => i.none()));
 		i.isSome(t) && (yield* a.reset(t.value)) && (u += 1);
 	}
@@ -156,4 +165,4 @@ var y = 6322741009312601n, b = `voltro_cluster_migration_${y.toString(36)}`, x =
 	};
 });
 //#endregion
-export { M as a, z as c, P as d, L as f, H as i, R as l, K as n, I as o, V as p, q as r, F as s, U as t, N as u };
+export { F as a, H as c, L as d, B as f, G as i, V as l, Y as n, z as o, W as p, X as r, R as s, K as t, I as u };

package/dist/cluster.js

@@ -1,2 +1,2 @@
-import { a as e, c as t, d as n, f as r, i, l as a, n as o, o as s, p as c, r as l, s as u, t as d, u as f } from "./cluster-CyIyBO39.js";
+import { a as e, c as t, d as n, f as r, i, l as a, n as o, o as s, p as c, r as l, s as u, t as d, u as f } from "./cluster-CVyPUB9X.js";
 export { e as DEFAULT_RUNNER_LISTEN_PORT, d as activityPrimaryKey, s as detectWsrepCluster, i as makeClusterCronLayer, u as parseShardLockMode, t as pollWorkflowStorage, o as redriveFailedRun, a as resolveFailoverTuning, f as resolveRunnerIdentity, n as resolveRunnerStorage, r as resolveShardLockDisableAdvisory, l as resumeRunFromStep, c as workflowEngineLayer };

package/dist/clusterTestSuite.js

@@ -1,6 +1,6 @@
-import { E as e, _ as t, h as n, w as r, x as i } from "./primitives-Bp98_F5L.js";
-import { i as a } from "./src-CP61KZ9V.js";
-import { i as o, p as s } from "./cluster-CyIyBO39.js";
+import { I as e, P as t, S as n, g as r, v as i } from "./primitives-CyQZeT1t.js";
+import { o as a } from "./src-DPkbBZDD.js";
+import { i as o, p as s } from "./cluster-CVyPUB9X.js";
 import { Cron as c, Deferred as l, Effect as u, Fiber as d, Layer as f, Schema as p } from "effect";
 import { SqlClient as m } from "@effect/sql";
 import { beforeAll as h, describe as g, expect as _, test as v } from "vitest";
@@ -59,39 +59,39 @@ var y = async (e, t, n = 750) => {
 			await x(m);
 		}, 3e4), v("a two-step workflow runs end-to-end", async () => {
 			if (!s) return;
-			let e = `clusterTwoStep_${y}`, n = i({
+			let e = `clusterTwoStep_${y}`, t = n({
 				name: e,
 				payload: { id: p.String },
 				success: p.Number,
 				idempotencyKey: ({ id: t }) => `${e}:${t}`
-			}), r = n.toLayer(() => u.gen(function* () {
-				let e = yield* t({
+			}), r = t.toLayer(() => u.gen(function* () {
+				let e = yield* i({
 					name: "first",
 					success: p.Number,
 					execute: u.succeed(40)
 				});
-				return yield* t({
+				return yield* i({
 					name: "second",
 					success: p.Number,
 					execute: u.succeed(e + 2)
 				});
 			}));
-			_(await u.runPromise(u.scoped(n.execute({ id: `e2e-${y}` }).pipe(u.provide(r.pipe(f.provideMerge(b(m.runnerPort)))))))).toBe(42);
+			_(await u.runPromise(u.scoped(t.execute({ id: `e2e-${y}` }).pipe(u.provide(r.pipe(f.provideMerge(b(m.runnerPort)))))))).toBe(42);
 		}, 3e4), v("idempotency-key journal — same payload returns same result", async () => {
 			if (!s) return;
-			let e = `clusterIdempotency_${y}`, n = 0, r = i({
+			let e = `clusterIdempotency_${y}`, t = 0, r = n({
 				name: e,
 				payload: { id: p.String },
 				success: p.Number,
 				idempotencyKey: ({ id: t }) => `${e}:${t}`
-			}), a = r.toLayer(() => t({
+			}), a = r.toLayer(() => i({
 				name: "compute",
 				success: p.Number,
-				execute: u.sync(() => (n++, n * 100))
+				execute: u.sync(() => (t++, t * 100))
 			})).pipe(f.provideMerge(b(m.runnerPort))), [o, c] = await u.runPromise(u.scoped(u.gen(function* () {
 				return [yield* r.execute({ id: `same-${y}` }), yield* r.execute({ id: `same-${y}` })];
 			}).pipe(u.provide(a))));
-			_(o).toBe(c), _(n).toBe(1);
+			_(o).toBe(c), _(t).toBe(1);
 		}, 3e4), v("ClusterCron fires its execute on the shard owner", async () => {
 			if (!s) return;
 			let e = await u.runPromise(l.make()), t = 0, n = o({
@@ -108,32 +108,32 @@ var y = async (e, t, n = 750) => {
 		let g = m.clusterResume ? v : (() => {});
 		g("a sleeping workflow resumes on a fresh runner after the first is torn down", async () => {
 			if (!s) return;
-			let e = `dormancyResume_${y}`, r = [], a = [], o = [], c = () => i({
+			let e = `dormancyResume_${y}`, t = [], a = [], o = [], c = () => n({
 				name: e,
 				payload: { id: p.String },
 				success: p.String,
 				idempotencyKey: ({ id: t }) => `${e}:${t}`
-			}), l = (e, i) => e.toLayer(() => u.gen(function* () {
-				return yield* t({
+			}), l = (e, n) => e.toLayer(() => u.gen(function* () {
+				return yield* i({
 					name: "step1",
 					success: p.Void,
 					execute: u.sync(() => {
-						r.push(i);
+						t.push(n);
 					})
-				}), yield* t({
+				}), yield* i({
 					name: "armed",
 					success: p.Void,
 					execute: u.sync(() => {
-						o.push(i);
+						o.push(n);
 					})
-				}), yield* n({
+				}), yield* r({
 					name: "nap",
 					duration: S
-				}), yield* t({
+				}), yield* i({
 					name: "step2",
 					success: p.Void,
 					execute: u.sync(() => {
-						a.push(i);
+						a.push(n);
 					})
 				}), "done";
 			})), h = m.runnerPort + 2, g = (e) => {
@@ -146,10 +146,10 @@ var y = async (e, t, n = 750) => {
 				let { wf: e, layer: t } = g("A"), n = yield* f.build(t), r = yield* u.forkDaemon(e.execute(v).pipe(u.provide(n), u.ignore));
 				return (yield* w(() => o.length > 0, 6e4)) ? r : yield* u.die(/* @__PURE__ */ Error("runner A never journaled step1"));
 			})));
-			await u.runPromise(d.interrupt(x).pipe(u.ignore)), _(r).toEqual(["A"]), _(a).toEqual([]), _(await u.runPromise(u.scoped(u.gen(function* () {
+			await u.runPromise(d.interrupt(x).pipe(u.ignore)), _(t).toEqual(["A"]), _(a).toEqual([]), _(await u.runPromise(u.scoped(u.gen(function* () {
 				let { wf: e, layer: t } = g("B"), n = yield* f.build(t);
 				return yield* e.execute(v).pipe(u.provide(n), u.timeout("240 seconds"), u.orElseSucceed(() => "TIMEOUT"));
-			})))).toBe("done"), _(r).toEqual(["A"]), _(a).toEqual(["B"]);
+			})))).toBe("done"), _(t).toEqual(["A"]), _(a).toEqual(["B"]);
 		}, 48e4), g("dormancy loop: a wake signal survives teardown and is cleared on resume", async () => {
 			if (!s) return;
 			let o = `dormancyLoop_${y}`, c = `wr_${o}`, l = [], h = /* @__PURE__ */ new Map(), g = a({
@@ -166,27 +166,27 @@ var y = async (e, t, n = 750) => {
 						h.delete(e);
 					}
 				}
-			}), v = () => i({
+			}), v = () => n({
 				name: o,
 				payload: { id: p.String },
 				success: p.String,
 				idempotencyKey: ({ id: e }) => `${o}:${e}`
-			}), x = (i, a) => i.toLayer(() => u.gen(function* () {
-				return yield* t({
+			}), x = (n, a) => n.toLayer(() => u.gen(function* () {
+				return yield* i({
 					name: "step1",
 					success: p.Void,
 					execute: u.void
-				}), yield* n({
+				}), yield* r({
 					name: "nap",
 					duration: C
-				}), yield* t({
+				}), yield* i({
 					name: "step2",
 					success: p.Void,
 					execute: u.sync(() => {
 						l.push(a);
 					})
 				}), "done";
-			}).pipe(u.locally(r, c), u.provideService(e, g))), S = m.runnerPort + 2, T = (e) => {
+			}).pipe(u.locally(t, c), u.provideService(e, g))), S = m.runnerPort + 2, T = (e) => {
 				let t = v();
 				return {
 					wf: t,