Skip to content

Email for professionals and teams

fix(domains): skip Worker catch-all on Node/Docker runtime (#42) (#44)

rome-xi4a6328557f68
diff --git a/src/lib/domains/provision.ts b/src/lib/domains/provision.ts
index 89df0af..515f932 100644
--- a/src/lib/domains/provision.ts
+++ b/src/lib/domains/provision.ts
@@ -10,9 +10,16 @@ import {
getEmailRoutingCatchAll,
} from "@/lib/domains/catch-all-routing";
import { isZoneApex } from "@/lib/domains/utils";
-import { hasCloudflareCredentials } from "@/lib/runtime";
+import { hasCloudflareCredentials, isNodeRuntime } from "@/lib/runtime";
import type { DomainProvisioningChanges, DomainProvisioningResult } from "@/lib/domains/types";
+/** Node/Docker has no Email Worker; a catch-all PUT to one 404s (CF 2016). */
+export function shouldBindEmailCatchAllToWorker(
+ env?: Pick<CloudflareEnv, "MAILFLARE_RUNTIME">,
+): boolean {
+ return !isNodeRuntime(env);
+}
+
/**
* Zone id recorded for domains the app does not manage on Cloudflare (a
* self-hosted install without API credentials). Every Cloudflare call that
@@ -86,7 +93,9 @@ export async function provisionDomainOnCloudflare(
changes.enabledEmailRouting = !routingWasEnabled;
routingEnabled = routing.enabled ?? true;
routingStatus = routing.status;
- await ensureEmailRoutingCatchAllToWorker(env, zone.id);
+ if (shouldBindEmailCatchAllToWorker(env)) {
+ await ensureEmailRoutingCatchAllToWorker(env, zone.id);
+ }
}
if (enableSending) {
diff --git a/tests/provision-node-catchall.test.mjs b/tests/provision-node-catchall.test.mjs
new file mode 100644
index 0000000..0da58d4
--- /dev/null
+++ b/tests/provision-node-catchall.test.mjs
@@ -0,0 +1,91 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import test from "node:test";
+
+const root = join(dirname(fileURLToPath(import.meta.url)), "..");
+const read = (path) => readFileSync(join(root, path), "utf8");
+
+function provisionSrc() {
+ return read("src/lib/domains/provision.ts");
+}
+
+function stripComments(src) {
+ return src.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\/\/.*$/gm, "");
+}
+
+test("shouldBindEmailCatchAllToWorker inverts isNodeRuntime (issue #42)", () => {
+ const src = provisionSrc();
+ assert.match(
+ src,
+ /export function shouldBindEmailCatchAllToWorker\s*\(\s*env[^)]*\)[\s\S]*?\{\s*return !isNodeRuntime\(env\);\s*\}/,
+ "provision.ts must export shouldBindEmailCatchAllToWorker as !isNodeRuntime(env)",
+ );
+
+ const runtime = read("src/lib/runtime.ts");
+ assert.match(
+ runtime,
+ /MAILFLARE_RUNTIME === "node"/,
+ "isNodeRuntime must keep detecting MAILFLARE_RUNTIME=node",
+ );
+
+ const isNodeRuntime = (env) => (env ?? undefined)?.MAILFLARE_RUNTIME === "node";
+ const shouldBindEmailCatchAllToWorker = (env) => !isNodeRuntime(env);
+
+ assert.equal(shouldBindEmailCatchAllToWorker({ MAILFLARE_RUNTIME: "node" }), false);
+ assert.equal(shouldBindEmailCatchAllToWorker({ MAILFLARE_RUNTIME: "cloudflare" }), true);
+ assert.equal(shouldBindEmailCatchAllToWorker({}), true);
+ assert.equal(shouldBindEmailCatchAllToWorker(undefined), true);
+});
+
+test("provision.ts imports isNodeRuntime next to hasCloudflareCredentials", () => {
+ const src = provisionSrc();
+ assert.match(
+ src,
+ /import\s*\{[^}]*isNodeRuntime[^}]*\}\s*from\s*"@\/lib\/runtime"/,
+ "isNodeRuntime must be imported from @/lib/runtime",
+ );
+ assert.match(
+ src,
+ /import\s*\{[^}]*hasCloudflareCredentials[^}]*\}\s*from\s*"@\/lib\/runtime"/,
+ );
+});
+
+test("Worker catch-all PUT is skipped on Node and kept on Workers (issue #42)", () => {
+ const src = stripComments(provisionSrc());
+ const call = "await ensureEmailRoutingCatchAllToWorker(env, zone.id);";
+ const idx = src.indexOf(call);
+ assert.notEqual(idx, -1, "Workers path must still call ensureEmailRoutingCatchAllToWorker");
+ assert.equal(src.indexOf(call, idx + 1), -1, "exactly one catch-all bind call");
+
+ const before = src.slice(Math.max(0, idx - 220), idx);
+ assert.match(
+ before,
+ /if\s*\(\s*(?:!isNodeRuntime\(\s*env\s*\)|shouldBindEmailCatchAllToWorker\(\s*env\s*\))\s*\)\s*\{/,
+ "ensureEmailRoutingCatchAllToWorker must be gated by Node runtime so Docker/Node does not PUT worker catch-all",
+ );
+
+ const enableRouting = src.match(/if\s*\(\s*enableRouting\s*\)\s*\{([\s\S]*?)\n\t\}/);
+ assert.ok(enableRouting, "enableRouting block not found");
+ assert.match(
+ enableRouting[1],
+ /enableEmailRouting\(/,
+ "Node with CF credentials must still enable Email Routing; only the Worker catch-all is skipped",
+ );
+ assert.ok(
+ !/isNodeRuntime|shouldBindEmailCatchAllToWorker/.test(
+ enableRouting[1].slice(0, enableRouting[1].indexOf("enableEmailRouting(")),
+ ),
+ "enableEmailRouting must not be gated by isNodeRuntime",
+ );
+});
+
+test("the Node skip lives at the provision call site, not in the PUT helper", () => {
+ const catchAll = read("src/lib/domains/catch-all-routing.ts");
+ assert.ok(
+ !/\bisNodeRuntime\b/.test(catchAll),
+ "do not hide the Node skip inside ensureEmailRoutingCatchAllToWorker",
+ );
+ assert.match(catchAll, /export async function ensureEmailRoutingCatchAllToWorker/);
+});