@authhero/cloudflare-adapter 3.2.5 → 3.4.0

package/dist/workflows.mjs

@@ -1,14 +1,14 @@
-import { r as e, t } from "./sync-defaults-errors-BlLZh6Gt.mjs";
-import { buildEngineInstanceId as n, createOperationRecorder as r, isTerminalStatus as i } from "@authhero/multi-tenancy";
+import { r as e, t } from "./sync-defaults-errors-CKdx0nzD.mjs";
+import { buildEngineInstanceId as n, createOperationRecorder as r, isTerminalStatus as i, runDetachStep as a, runSyncDefaultsStep as o } from "@authhero/multi-tenancy";
 //#region src/workflows/provision-operation.ts
-var a = {
+var s = {
 	retries: {
 		limit: 5,
 		delay: "5 seconds",
 		backoff: "exponential"
 	},
 	timeout: "2 minutes"
-}, o = {
+}, c = {
 	retries: {
 		limit: 8,
 		delay: "10 seconds",
@@ -16,23 +16,23 @@ var a = {
 	},
 	timeout: "1 minute"
 };
-function s(e) {
+function l(e) {
 	return e instanceof Error ? e.message : String(e);
 }
-async function c(e, n, i) {
-	let c = r(e.stores), l = e.shouldProvision ?? ((e) => e.deployment_type === "wfp"), u = (t) => e.stepConfig?.[t] ?? (t === "verify" ? o : a), d = n.operation_id, f = n.tenant_id, p = await i.do("mark-running", u("mark-running"), async () => {
+async function u(e, n, i) {
+	let a = r(e.stores), o = e.shouldProvision ?? ((e) => e.deployment_type === "wfp"), u = (t) => e.stepConfig?.[t] ?? (t === "verify" ? c : s), d = n.operation_id, f = n.tenant_id, p = await i.do("mark-running", u("mark-running"), async () => {
 		let t = await e.tenants.get(f);
-		if (!t || !l(t)) return await c.appendEvent(d, {
+		if (!t || !o(t)) return await a.appendEvent(d, {
 			step: "mark-running",
 			outcome: "skipped",
 			detail: { reason: t ? "tenant is not WFP-provisioned" : "tenant row missing (rolled back?)" }
-		}), await c.markSucceeded(d), {
+		}), await a.markSucceeded(d), {
 			skipped: !0,
 			scriptName: "",
 			databaseName: ""
 		};
 		let n = e.steps.validate(), r = e.steps.names(f);
-		return await c.markRunning(d, "mark-running"), await c.appendEvent(d, {
+		return await a.markRunning(d, "mark-running"), await a.appendEvent(d, {
 			step: "mark-running",
 			outcome: "succeeded"
 		}), {
@@ -50,9 +50,9 @@ async function c(e, n, i) {
 	};
 	try {
 		let n = await i.do("create-database", u("create-database"), async () => {
-			await c.setCurrentStep(d, "create-database");
+			await a.setCurrentStep(d, "create-database");
 			let { id: t, created: n } = await e.steps.findOrCreateDatabase(p.databaseName);
-			return await c.appendEvent(d, {
+			return await a.appendEvent(d, {
 				step: "create-database",
 				outcome: "succeeded",
 				detail: {
@@ -65,29 +65,29 @@ async function c(e, n, i) {
 			};
 		});
 		if (m.d1_database_id = n.databaseId, await i.do("apply-migrations", u("apply-migrations"), async () => {
-			await c.setCurrentStep(d, "apply-migrations"), await e.steps.applyMigrations(n.databaseId, n.created), await c.appendEvent(d, {
+			await a.setCurrentStep(d, "apply-migrations"), await e.steps.applyMigrations(n.databaseId, n.created), await a.appendEvent(d, {
 				step: "apply-migrations",
 				outcome: "succeeded",
 				detail: { database_version: p.databaseVersion }
 			});
 		}), await i.do("upload-script", u("upload-script"), async () => {
-			await c.setCurrentStep(d, "upload-script"), await e.steps.uploadScript(p.scriptName, n.databaseId), await c.appendEvent(d, {
+			await a.setCurrentStep(d, "upload-script"), await e.steps.uploadScript(p.scriptName, n.databaseId), await a.appendEvent(d, {
 				step: "upload-script",
 				outcome: "succeeded",
 				detail: { worker_version: p.workerVersion }
 			});
 		}), await i.do("upload-secrets", u("upload-secrets"), async () => {
-			await c.setCurrentStep(d, "upload-secrets"), await e.steps.uploadSecrets(p.scriptName, f), await c.appendEvent(d, {
+			await a.setCurrentStep(d, "upload-secrets"), await e.steps.uploadSecrets(p.scriptName, f), await a.appendEvent(d, {
 				step: "upload-secrets",
 				outcome: "succeeded"
 			});
 		}), e.syncDefaults) {
 			let n = e.syncDefaults;
 			await i.do("seed-defaults", u("seed-defaults"), async () => {
-				await c.setCurrentStep(d, "seed-defaults");
+				await a.setCurrentStep(d, "seed-defaults");
 				let e = t(await n(f));
 				if (e.length > 0) throw Error(`sync-defaults seed reported ${e.length} error(s): ${e.join("; ")}`);
-				await c.appendEvent(d, {
+				await a.appendEvent(d, {
 					step: "seed-defaults",
 					outcome: "succeeded"
 				});
@@ -96,26 +96,26 @@ async function c(e, n, i) {
 		if (e.verify) {
 			let t = e.verify;
 			await i.do("verify", u("verify"), async () => {
-				await c.setCurrentStep(d, "verify"), await t(n.databaseId, f), await c.appendEvent(d, {
+				await a.setCurrentStep(d, "verify"), await t(n.databaseId, f), await a.appendEvent(d, {
 					step: "verify",
 					outcome: "succeeded"
 				});
 			});
 		}
 		await i.do("mark-ready", u("mark-ready"), async () => {
-			await c.setCurrentStep(d, "mark-ready"), await e.tenants.update(f, {
+			await a.setCurrentStep(d, "mark-ready"), await e.tenants.update(f, {
 				...m,
 				provisioning_state: "ready",
 				provisioning_error: void 0,
 				provisioning_state_changed_at: (/* @__PURE__ */ new Date()).toISOString()
-			}), await c.appendEvent(d, {
+			}), await a.appendEvent(d, {
 				step: "mark-ready",
 				outcome: "succeeded"
-			}), await c.markSucceeded(d);
+			}), await a.markSucceeded(d);
 		});
 	} catch (t) {
 		throw await i.do("mark-failed", u("mark-failed"), async () => {
-			let n = s(t);
+			let n = l(t);
 			try {
 				await e.tenants.update(f, {
 					...m,
@@ -126,23 +126,119 @@ async function c(e, n, i) {
 			} catch (t) {
 				e.logger?.warn(`Failed to write provisioning_state="failed" for tenant ${f}:`, t);
 			}
-			await c.appendEvent(d, {
+			await a.appendEvent(d, {
 				step: "mark-failed",
 				outcome: "failed",
 				detail: { message: n }
-			}), await c.markFailed(d, t);
+			}), await a.markFailed(d, t);
 		}), t;
 	}
 }
 //#endregion
+//#region src/workflows/sync-defaults-operation.ts
+var d = {
+	retries: {
+		limit: 3,
+		delay: "5 seconds",
+		backoff: "exponential"
+	},
+	timeout: "2 minutes"
+};
+function f(e) {
+	return e instanceof Error ? e.message : String(e);
+}
+async function p(e, t, n) {
+	let i = r(e.stores), a = (t) => e.stepConfig?.[t] ?? d, s = t.operation_id;
+	try {
+		await n.do("mark-running", a("mark-running"), async () => {
+			await i.markRunning(s, "sync-defaults");
+		}), await n.do("sync-defaults", a("sync-defaults"), async () => {
+			await i.setCurrentStep(s, "sync-defaults");
+			let t = await e.stores.tenantOperations.get(s);
+			if (!t) throw Error(`Operation "${s}" not found`);
+			let n = await o({
+				operation: t,
+				syncConfig: e.syncConfig,
+				recorder: i
+			});
+			await i.appendEvent(s, {
+				step: "sync-defaults",
+				outcome: "succeeded",
+				detail: n
+			});
+		}), await n.do("mark-succeeded", a("mark-succeeded"), async () => {
+			await i.markSucceeded(s);
+		});
+	} catch (e) {
+		throw await n.do("mark-failed", a("mark-failed"), async () => {
+			await i.appendEvent(s, {
+				step: "mark-failed",
+				outcome: "failed",
+				detail: { message: f(e) }
+			}), await i.markFailed(s, e);
+		}), e;
+	}
+}
+//#endregion
+//#region src/workflows/detach-operation.ts
+var m = {
+	retries: {
+		limit: 3,
+		delay: "5 seconds",
+		backoff: "exponential"
+	},
+	timeout: "2 minutes"
+}, h = {
+	retries: {
+		limit: 0,
+		delay: "5 seconds"
+	},
+	timeout: "5 minutes"
+};
+function g(e) {
+	return e instanceof Error ? e.message : String(e);
+}
+async function _(e, t, n) {
+	let i = r(e.stores), o = (t) => e.stepConfig?.[t] ?? (t === "detach" ? h : m), s = t.operation_id;
+	try {
+		await n.do("mark-running", o("mark-running"), async () => {
+			await i.markRunning(s, "detach");
+		}), await n.do("detach", o("detach"), async () => {
+			await i.setCurrentStep(s, "detach");
+			let t = await e.stores.tenantOperations.get(s);
+			if (!t) throw Error(`Operation "${s}" not found`);
+			let n = await a({
+				operation: t,
+				detachTenant: e.detachTenant,
+				recorder: i
+			});
+			await i.appendEvent(s, {
+				step: "detach",
+				outcome: "succeeded",
+				detail: n
+			});
+		}), await n.do("mark-succeeded", o("mark-succeeded"), async () => {
+			await i.markSucceeded(s);
+		});
+	} catch (e) {
+		throw await n.do("mark-failed", o("mark-failed"), async () => {
+			await i.appendEvent(s, {
+				step: "mark-failed",
+				outcome: "failed",
+				detail: { message: g(e) }
+			}), await i.markFailed(s, e);
+		}), e;
+	}
+}
+//#endregion
 //#region src/workflows/verify.ts
-var l = class extends Error {
+var v = class extends Error {
 	checks;
 	constructor(e, t) {
 		super(e), this.name = "TenantProvisionVerificationError", this.checks = t;
 	}
 };
-function u(e, t) {
+function y(e, t) {
 	for (let n of e) for (let e of n.results ?? []) if (!(!e || typeof e != "object")) {
 		for (let [n, r] of Object.entries(e)) if (n === t) {
 			if (typeof r == "number") return r;
@@ -151,11 +247,11 @@ function u(e, t) {
 	}
 	return 0;
 }
-function d(t) {
+function b(t) {
 	let n = t.minKeys ?? 1;
 	return async (r, i) => {
-		let a = await t.client.execD1(r, `SELECT (SELECT COUNT(*) FROM keys) AS key_count, (SELECT COUNT(*) FROM tenants WHERE id = '${e(i)}') AS tenant_count;`), o = u(a, "key_count"), s = u(a, "tenant_count"), c = [];
-		if (o < n && c.push(`expected at least ${n} signing key(s) in "keys", found ${o}`), s < 1 && c.push(`tenant row "${i}" missing from "tenants"`), c.length > 0) throw new l(`Tenant D1 verification failed for "${i}": ${c.join("; ")}`, {
+		let a = await t.client.execD1(r, `SELECT (SELECT COUNT(*) FROM keys) AS key_count, (SELECT COUNT(*) FROM tenants WHERE id = '${e(i)}') AS tenant_count;`), o = y(a, "key_count"), s = y(a, "tenant_count"), c = [];
+		if (o < n && c.push(`expected at least ${n} signing key(s) in "keys", found ${o}`), s < 1 && c.push(`tenant row "${i}" missing from "tenants"`), c.length > 0) throw new v(`Tenant D1 verification failed for "${i}": ${c.join("; ")}`, {
 			keyCount: o,
 			tenantRowCount: s
 		});
@@ -163,16 +259,16 @@ function d(t) {
 }
 //#endregion
 //#region src/workflows/executor.ts
-function f(e) {
+function x(e) {
 	let t = e instanceof Error ? e.message : String(e ?? "");
 	return /already exists|already been created|duplicate/i.test(t);
 }
-function p(e) {
+function S(e) {
 	return {
 		engine: "cloudflare-workflows",
 		async start(t) {
-			if (t.kind !== "provision") throw Error(`The Cloudflare Workflows executor does not support "${t.kind}" operations yet (phase 2 covers provision only)`);
-			if (!t.tenant_id) throw Error("provision operations require a tenant_id");
+			if (t.kind !== "provision" && t.kind !== "sync-defaults" && t.kind !== "detach") throw Error(`The Cloudflare Workflows executor does not support "${t.kind}" operations yet (it runs provision, sync-defaults and detach)`);
+			if (!t.tenant_id) throw Error(`${t.kind} operations require a tenant_id`);
 			let r = t.engine_instance_id ?? n(t);
 			try {
 				await e.binding.create({
@@ -184,20 +280,20 @@ function p(e) {
 					}
 				});
 			} catch (e) {
-				if (!f(e)) throw e;
+				if (!x(e)) throw e;
 			}
 		}
 	};
 }
 //#endregion
 //#region src/workflows/types.ts
-var m = "cloudflare-workflows";
+var C = "cloudflare-workflows";
 //#endregion
 //#region src/workflows/reconcile.ts
-async function h(e) {
+async function w(e) {
 	let { stores: t, tenants: a, binding: o } = e, s = r(t), c = e.minAgeMs ?? 600 * 1e3, l = e.limit ?? 100, u = new Date(Date.now() - c).toISOString(), { operations: d } = await t.tenantOperations.list({
 		status: ["pending", "running"],
-		engine: m,
+		engine: C,
 		updated_before: u,
 		per_page: l
 	}), f = {
@@ -209,7 +305,7 @@ async function h(e) {
 		errors: 0
 	};
 	for (let t of d) try {
-		await h(t);
+		await m(t);
 	} catch (n) {
 		f.errors++, e.logger?.warn(`Failed to reconcile tenant operation ${t.id}:`, n);
 	}
@@ -228,7 +324,7 @@ async function h(e) {
 			provisioning_state_changed_at: (/* @__PURE__ */ new Date()).toISOString()
 		});
 	}
-	async function h(e) {
+	async function m(e) {
 		let r = await t.tenantOperations.get(e.id);
 		if (!r || i(r.status)) return;
 		let c = r.engine_instance_id ?? n(r), l;
@@ -245,6 +341,14 @@ async function h(e) {
 			return;
 		}
 		if (u.status === "complete") {
+			if (r.kind === "sync-defaults" || r.kind === "detach") {
+				f.markedSucceeded++, await s.appendEvent(r.id, {
+					step: r.current_step ?? "reconcile",
+					outcome: "reconciled",
+					detail: { resolution: "succeeded" }
+				}), await s.markSucceeded(r.id);
+				return;
+			}
 			(r.tenant_id ? await a.get(r.tenant_id) : null)?.provisioning_state === "ready" ? (f.markedSucceeded++, await s.appendEvent(r.id, {
 				step: r.current_step ?? "reconcile",
 				outcome: "reconciled",
@@ -257,7 +361,7 @@ async function h(e) {
 }
 //#endregion
 //#region src/workflows/enqueue-hook.ts
-function g(e) {
+function T(e) {
 	let t = e.shouldProvision ?? ((e) => e.deployment_type === "wfp");
 	return {
 		async onProvision(n, r) {
@@ -276,4 +380,4 @@ function g(e) {
 	};
 }
 //#endregion
-export { m as TENANT_OPERATION_ENGINE, l as TenantProvisionVerificationError, p as createCloudflareWorkflowsExecutor, d as createProvisionVerifier, g as createWfpWorkflowProvisioningHook, h as reconcileTenantOperations, c as runProvisionOperation };
+export { C as TENANT_OPERATION_ENGINE, v as TenantProvisionVerificationError, S as createCloudflareWorkflowsExecutor, b as createProvisionVerifier, T as createWfpWorkflowProvisioningHook, w as reconcileTenantOperations, _ as runDetachOperation, u as runProvisionOperation, p as runSyncDefaultsOperation };

package/package.json

@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/sesamyab/authhero"
   },
-  "version": "3.2.5",
+  "version": "3.4.0",
   "files": [
     "dist"
   ],
@@ -47,8 +47,8 @@
     "typescript": "^5.9.3",
     "vite": "^8.0.14",
     "vitest": "^4.1.7",
-    "@authhero/multi-tenancy": "15.2.0",
-    "authhero": "9.25.0"
+    "@authhero/multi-tenancy": "15.4.0",
+    "authhero": "9.27.0"
   },
   "peerDependencies": {
     "@authhero/multi-tenancy": "^14.0.0",
@@ -67,8 +67,8 @@
   "dependencies": {
     "nanoid": "^5.1.11",
     "wretch": "^3.0.8",
-    "@authhero/adapter-interfaces": "4.22.0",
-    "@authhero/kysely-adapter": "12.16.0"
+    "@authhero/adapter-interfaces": "4.24.0",
+    "@authhero/kysely-adapter": "12.18.0"
   },
   "license": "AGPL-3.0-only",
   "scripts": {