@sanoma-ai/connector-cloudflare 0.4.0 → 0.6.0

package/dist/sites.js

@@ -0,0 +1,153 @@
+import { createHash } from "node:crypto";
+import { extname } from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
+import { DriverError, errorMessage } from "@sanoma-ai/workflows";
+import { SITES_BUNDLE_HEADER, SITES_BUNDLE_PATH } from "@sanoma-ai/workflows/shared";
+import mime from "mime";
+import { refused } from "./errors.js";
+import { SITES_MODULE, sitesRouter } from "./worker.js";
+// The public sites on the company's Worker (sanoma#428): once a deploy's container answers at its
+// revision, the sites bundle it built (`buildWorker` in `@sanoma-ai/app/build`) is downloaded from
+// it with the instance token, its assets go in through an assets upload session, and the Worker is
+// uploaded again with the bundle's modules under `sites/`, the router `worker/sites.js` as its
+// entry and the assets bound as `ASSETS`. A page of a public site without a login then answers
+// from the Worker, never waiting for the container; everything else goes to the object as before.
+/** The binding the bundle reads its assets through (`WorkerEnv.ASSETS`). */
+export const ASSETS = "ASSETS";
+/**
+ * The plain-text binding of a Worker whose sites upload is still to be made: the deploy's upload
+ * sets it, `serveSites`' takes it off. A read that finds it plans an update, which makes that upload.
+ */
+export const SITES_PENDING = "SANOMA_SITES_PENDING";
+/**
+ * How the Worker serves its assets: the client build under `/assets/` straight from them (a path
+ * there they lack goes on to the Worker, as the app's own do), every other path through the
+ * Worker first, which answers a prerendered page from them itself; never an HTML rewrite or a
+ * fallback page of the assets' own.
+ */
+export const ASSETS_CONFIG = {
+    html_handling: "none",
+    not_found_handling: "none",
+    run_worker_first: ["/*", "!/assets/*"],
+};
+/** An asset's hash as a session's manifest names it: as the API reference's example has it, sha256 over its base64 and its extension, 32 hex digits. */
+export const assetHash = (base64, path) => createHash("sha256")
+    .update(base64 + extname(path).slice(1))
+    .digest("hex")
+    .slice(0, 32);
+/**
+ * The bundle the container at `url` built, asked with the instance token until it answers it
+ * (202 while it builds); undefined when it has no site to serve on the Worker (404), or the
+ * runtime has no such route: a 401 or a 404 without `SITES_BUNDLE_HEADER`, an image from before
+ * it, whose staff login refuses the path (or whose app has no page there). A failed build, or a
+ * token it refuses, is a refusal; any other answer (the object's 503 while the container starts
+ * again, an error of Cloudflare's, a body cut off) is asked again, and still one at the timeout
+ * is a retryable `DriverError`.
+ */
+export async function sitesBundle(cf, script, url, token, { startTimeoutMs, pollMs }) {
+    const until = Date.now() + startTimeoutMs;
+    for (;;) {
+        let last;
+        try {
+            const res = await cf.send(`${url}${SITES_BUNDLE_PATH}`, {
+                method: "GET",
+                headers: { authorization: `Bearer ${token}` },
+            });
+            const route = res.headers.has(SITES_BUNDLE_HEADER);
+            if (!route && (res.status === 401 || res.status === 404))
+                return void (await res.body?.cancel());
+            const text = await res.text();
+            const body = parsed(text);
+            if (route && res.status === 200 && body !== undefined)
+                return body;
+            const error = body?.error;
+            const said = typeof error === "string" ? error : `${SITES_BUNDLE_PATH} answered ${res.status}`;
+            if (route && res.status === 404)
+                return undefined;
+            if (route && res.status !== 200 && res.status !== 202) {
+                throw refused(`${script}: its container did not give the sites bundle (its sites are served from the container meanwhile): ${said}`);
+            }
+            last = !route ? said : res.status === 202 ? "it is building the bundle" : "its bundle was cut off";
+        }
+        catch (error) {
+            if (!(error instanceof TypeError || (error instanceof Error && error.name === "TimeoutError")))
+                throw error;
+            // No answer this time (the container stopped under it, a timeout, a body cut off): the next ask starts it again.
+            last = errorMessage(error);
+        }
+        if (Date.now() >= until) {
+            throw new DriverError(`cloudflare: ${script}: no sites bundle from its container in ${Math.round(startTimeoutMs / 1000)} s (its sites are served from the container meanwhile): ${last}`, { retryable: true });
+        }
+        await delay(pollMs);
+    }
+}
+/** `text` as JSON; undefined when it is none (a body cut off where the JSON is). */
+const parsed = (text) => {
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return undefined;
+    }
+};
+/** Puts `assets` in through an upload session for `script`'s next upload: the completion jwt that upload redeems. */
+export async function uploadAssets(cf, script, assets) {
+    const byHash = new Map();
+    const manifest = {};
+    for (const { path, content } of assets) {
+        const hash = assetHash(content, path);
+        manifest[path] = { hash, size: Buffer.byteLength(content, "base64") };
+        byHash.set(hash, { hash, base64: content, contentType: mime.getType(path) ?? "application/octet-stream" });
+    }
+    const { jwt, buckets } = await cf.assetsSession(script, manifest);
+    // Every asset already in: the session's jwt is the completion one.
+    if (!buckets.length)
+        return jwt;
+    // Every bucket's files first, so a hash no asset has is refused before any request starts.
+    const files = buckets.map((bucket) => bucket.map((hash) => {
+        const file = byHash.get(hash);
+        if (!file)
+            throw refused(`${script}: the assets upload session asks for ${hash}, which no asset hashes to`);
+        return file;
+    }));
+    // Independent requests under one jwt: the one that completes the set answers the completion jwt.
+    const answers = await Promise.all(files.map((bucket) => cf.uploadAssets(jwt, bucket)));
+    const completion = answers.find((answer) => answer !== undefined);
+    if (!completion)
+        throw refused(`${script}: the last bucket of assets was uploaded, and Cloudflare gave no completion jwt`);
+    return completion;
+}
+/**
+ * The public sites on the Worker: the bundle the container built, its assets uploaded, and the
+ * Worker uploaded again with them and the sites router as its entry (its bindings, image and
+ * revision as they were, so its container keeps running). When the container has none to give,
+ * the Worker is uploaded again as the deploy uploaded it. Either way without `SITES_PENDING`,
+ * which the deploy's upload carries: a Worker whose sites upload failed keeps it, which a read
+ * sees, so the next apply makes this upload again.
+ */
+export async function serveSites(cf, { script, url, token, metadata, ...polling }) {
+    const bundle = await sitesBundle(cf, script, url, token, polling);
+    const bindings = metadata.bindings.filter((b) => b.name !== SITES_PENDING);
+    if (!bundle)
+        return cf.upload(script, { ...metadata, bindings });
+    if (bundle.mainModule !== "index.js") {
+        throw refused(`${script}: the sites bundle's entry is ${bundle.mainModule}; the router imports sites/index.js`);
+    }
+    const jwt = await uploadAssets(cf, script, bundle.assets);
+    await cf.upload(script, {
+        ...metadata,
+        main_module: SITES_MODULE,
+        bindings: [...bindings, { type: "assets", name: ASSETS }],
+        assets: { jwt, config: ASSETS_CONFIG },
+        modules: [
+            ...metadata.modules,
+            await sitesRouter(),
+            ...bundle.modules.map(({ name, type, content }) => ({
+                name: `sites/${name}`,
+                type,
+                content: Buffer.from(content, "base64"),
+            })),
+        ],
+    });
+}
+//# sourceMappingURL=sites.js.map

package/dist/sites.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sites.js","sourceRoot":"","sources":["../src/sites.ts"],"names":[],"mappings":"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"}

package/dist/worker.d.ts

@@ -1,12 +1,19 @@
+import type { SitesBundle } from "@sanoma-ai/workflows/shared";
 /** The Worker's entry module, which imports `cloudflare:workers` and `instance.js`. */
 export declare const MAIN_MODULE = "index.js";
+/** The entry module of a Worker that serves the public sites, beside `MODULES` and the sites bundle under `sites/` (`sites.ts`). */
+export declare const SITES_MODULE = "sites.js";
 /** The Durable Object class the Worker exports, which the container application runs behind. */
 export declare const OBJECT_CLASS = "SanomaInstance";
 /** One module of the Worker: its file name, which the upload names it by, and its source. */
 export interface WorkerModule {
     name: string;
-    content: string;
+    content: string | Uint8Array<ArrayBuffer>;
+    /** What the module is, as the upload types its part: an ES module unless it says. */
+    type?: SitesBundle["modules"][number]["type"];
 }
 /** The Worker's modules, read from the package once. */
 export declare function workerModules(): Promise<WorkerModule[]>;
+/** The sites router, `worker/sites.js`, read from the package once. */
+export declare function sitesRouter(): Promise<WorkerModule>;
 export { HEALTH_PATH, IMAGE, INACTIVITY_MS, Instance, NAMESPACE, type ObjectState, worker, } from "../worker/instance.js";

package/dist/worker.js

@@ -6,6 +6,8 @@ const WORKER = new URL("../worker/", import.meta.url);
 export const MAIN_MODULE = "index.js";
 /** The modules uploaded, the entry first. */
 const MODULES = [MAIN_MODULE, "instance.js"];
+/** The entry module of a Worker that serves the public sites, beside `MODULES` and the sites bundle under `sites/` (`sites.ts`). */
+export const SITES_MODULE = "sites.js";
 /** The Durable Object class the Worker exports, which the container application runs behind. */
 export const OBJECT_CLASS = "SanomaInstance";
 let modules;
@@ -17,5 +19,11 @@ export function workerModules() {
     });
     return modules;
 }
+let router;
+/** The sites router, `worker/sites.js`, read from the package once. */
+export function sitesRouter() {
+    router ??= readFile(new URL(SITES_MODULE, WORKER), "utf8").then((content) => ({ name: SITES_MODULE, content }));
+    return router;
+}
 export { HEALTH_PATH, IMAGE, INACTIVITY_MS, Instance, NAMESPACE, worker, } from "../worker/instance.js";
 //# sourceMappingURL=worker.js.map

package/dist/worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,+FAA+F;AAC/F,uEAAuE;AAEvE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,YAAY,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AAEtD,uFAAuF;AACvF,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC;AACtC,6CAA6C;AAC7C,MAAM,OAAO,GAAG,CAAC,WAAW,EAAE,aAAa,CAAU,CAAC;AAEtD,gGAAgG;AAChG,MAAM,CAAC,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAQ7C,IAAI,OAA4C,CAAC;AAEjD,wDAAwD;AACxD,MAAM,UAAU,aAAa;IAC3B,OAAO,KAAK,OAAO,CAAC,GAAG,CACrB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAChG,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACvB,OAAO,GAAG,SAAS,CAAC;QACpB,MAAM,GAAG,CAAC;IACZ,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,OAAO,EACL,WAAW,EACX,KAAK,EACL,aAAa,EACb,QAAQ,EACR,SAAS,EAET,MAAM,GACP,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,+FAA+F;AAC/F,uEAAuE;AAEvE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,YAAY,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AAEtD,uFAAuF;AACvF,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC;AACtC,6CAA6C;AAC7C,MAAM,OAAO,GAAG,CAAC,WAAW,EAAE,aAAa,CAAU,CAAC;AACtD,oIAAoI;AACpI,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;AAEvC,gGAAgG;AAChG,MAAM,CAAC,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAU7C,IAAI,OAA4C,CAAC;AAEjD,wDAAwD;AACxD,MAAM,UAAU,aAAa;IAC3B,OAAO,KAAK,OAAO,CAAC,GAAG,CACrB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAChG,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACvB,OAAO,GAAG,SAAS,CAAC;QACpB,MAAM,GAAG,CAAC;IACZ,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,IAAI,MAAyC,CAAC;AAE9C,uEAAuE;AACvE,MAAM,UAAU,WAAW;IACzB,MAAM,KAAK,QAAQ,CAAC,IAAI,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAChH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,OAAO,EACL,WAAW,EACX,KAAK,EACL,aAAa,EACb,QAAQ,EACR,SAAS,EAET,MAAM,GACP,MAAM,uBAAuB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanoma-ai/connector-cloudflare",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Cloudflare for Sanoma: a Container host that stops when quiet, a Durable Object alarm that wakes it, from one Worker, and a zone's DNS records",
   "keywords": [
     "cloudflare",
@@ -58,16 +58,17 @@
   },
   "dependencies": {
     "cloudflare": "^7.3.0",
+    "mime": "^4.1.1",
     "srvx": "^0.11.22"
   },
   "devDependencies": {
-    "@sanoma-ai/testing": "0.1.0",
-    "@sanoma-ai/workflows": "0.11.2",
+    "@sanoma-ai/testing": "0.1.1",
+    "@sanoma-ai/workflows": "0.11.4",
     "msw": "^3.0.3",
     "zod": "^4.6.5"
   },
   "peerDependencies": {
-    "@sanoma-ai/workflows": "^0.11.2",
+    "@sanoma-ai/workflows": "^0.11.4",
     "zod": "^4"
   },
   "engines": {

package/worker/index.js

@@ -14,8 +14,13 @@ export class SanomaInstance extends DurableObject {
     return this.instance.fetch(request);
   }
 
-  alarm() {
-    return this.instance.alarm();
+  alarm(info) {
+    return this.instance.alarm(info);
+  }
+
+  /** Over RPC, from the sites router (`sites.js`): a page on the Worker queued a run. */
+  startNow() {
+    return this.instance.startNow();
   }
 }
 

package/worker/instance.d.ts

@@ -38,6 +38,7 @@ export interface ObjectState {
     get<T>(key: string): Promise<T | undefined>;
     put(key: string, value: unknown): Promise<void>;
     delete(key: string): Promise<boolean>;
+    getAlarm(): Promise<number | null>;
     setAlarm(at: number): Promise<void>;
     deleteAlarm(): Promise<void>;
   };
@@ -48,8 +49,17 @@ export interface ObjectState {
 export declare class Instance {
   constructor(ctx: ObjectState, env: Record<string, unknown>);
   fetch(request: Request): Promise<Response>;
-  alarm(): Promise<void>;
+  /** `info` as Cloudflare gives it: how many times this alarm was retried. */
+  alarm(info?: { retryCount: number; isRetry: boolean }): Promise<void>;
+  /** Starts the container from an alarm now, without waiting for it: a run was queued for it. */
+  startNow(): Promise<void>;
 }
 
+/** The Worker's one object, which every request and the sites router's `startNow` go to. */
+export declare function instanceOf(env: Record<string, unknown>): {
+  fetch(request: Request): Promise<Response>;
+  startNow(): Promise<void>;
+};
+
 /** The Worker's default export: every request goes to the one object. */
 export declare const worker: { fetch(request: Request, env: Record<string, unknown>): Promise<Response> };

package/worker/instance.js

@@ -8,7 +8,9 @@
 // another destroyed and started again (a deploy); it waits for `/healthz`, and proxies every
 // request to it. It answers `/__sanoma/health` without starting it (with `?start=1`, once it
 // runs), and holds the company's one wake (`/__sanoma/wake`) as an alarm, which starts the
-// container at `at` and calls its `/wake`.
+// container at `at` and calls its `/wake`. `startNow`, which the sites router calls over RPC
+// when a page on the Worker queued a run, starts the container from an alarm too, without the
+// caller waiting for it, and calls its `/wake`: a worker that stopped itself runs the queued run.
 
 /** The object's own route: the wake it holds. */
 export const WAKE_PATH = "/__sanoma/wake";
@@ -26,6 +28,13 @@ const POLL_MS = 250;
 const MAX_POLL_MS = 1_000;
 /** Where the wake is kept, in the object's storage. */
 const WAKE_KEY = "wake";
+/** Where a start `startNow` asked for is kept until the alarm that makes it rings. */
+const START_KEY = "start";
+/**
+ * The retries of an alarm whose start keeps failing before that start is given up, so the wake
+ * held for later is set again: Cloudflare retries an alarm that throws up to six times, then drops it.
+ */
+const START_RETRIES = 5;
 /** The binding that names the object, in the Worker's env. */
 export const NAMESPACE = "SANOMA_INSTANCE";
 /** The name the upload gives the runtime image (`containers[].images`), which the object starts. */
@@ -44,7 +53,7 @@ function containerEnv(env) {
   return Object.fromEntries(Object.entries(env).filter(([, value]) => typeof value === "string"));
 }
 
-/** The label naming an image: a digest of it, as a label holds 64 bytes and a pinned image is longer. */
+/** The label naming an image (or the sites' domains): a digest of it, as a label holds 64 bytes and a pinned image is longer. */
 export async function imageLabel(image) {
   const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(image));
   return [...new Uint8Array(digest).slice(0, 8)].map((b) => b.toString(16).padStart(2, "0")).join("");
@@ -152,6 +161,8 @@ export class Instance {
       revision: this.env.SANOMA_REVISION ?? "",
       image: await imageLabel(image),
       ...(this.env.SANOMA_CONFIG_REVISION && { configuration: this.env.SANOMA_CONFIG_REVISION }),
+      // The sites' domains, which its environment and the sites bundle it built name.
+      ...(this.env.SANOMA_DOMAINS && { domains: await imageLabel(this.env.SANOMA_DOMAINS) }),
     };
     const until = Date.now() + START_TIMEOUT_MS;
     let last;
@@ -178,8 +189,9 @@ export class Instance {
             info &&
             info.labels?.revision === labels.revision &&
             (info.labels?.image ?? "") === labels.image &&
-            (info.labels?.configuration ?? "") === (labels.configuration ?? "");
-          if (!same) await container.destroy("a new revision, image or configuration");
+            (info.labels?.configuration ?? "") === (labels.configuration ?? "") &&
+            (info.labels?.domains ?? "") === (labels.domains ?? "");
+          if (!same) await container.destroy("a new revision, image, configuration or domains");
         }
         checked = true;
         if (!container.running) {
@@ -235,9 +247,11 @@ export class Instance {
     }
     const storage = this.ctx.storage;
     if (request.method === "GET") return json(200, (await storage.get(WAKE_KEY)) ?? { at: null });
+    // A start `startNow` asked for keeps its alarm, which sets the wake's once it rang.
+    const starting = Boolean(await storage.get(START_KEY));
     if (request.method === "DELETE") {
       await storage.delete(WAKE_KEY);
-      await storage.deleteAlarm();
+      if (!starting) await storage.deleteAlarm();
       return new Response(null, { status: 204 });
     }
     if (request.method !== "PUT") return problem(405, "GET, PUT or DELETE");
@@ -245,14 +259,55 @@ export class Instance {
     if (!wake) return problem(400, "the body must be { at: an ISO 8601 time }");
     // Whatever it held is replaced: a wake that rings for an older one starts a worker with nothing to do.
     await storage.put(WAKE_KEY, wake);
-    await storage.setAlarm(Date.parse(wake.at));
+    if (starting) await alarmBy(storage, Date.parse(wake.at));
+    else await storage.setAlarm(Date.parse(wake.at));
     return new Response(null, { status: 204 });
   }
 
-  /** The wake is due: start the container and send it `/wake`, then note when. A throw makes Cloudflare retry the alarm. */
-  async alarm() {
-    const wake = await this.ctx.storage.get(WAKE_KEY);
-    if (!wake) return;
+  /**
+   * Starts the container soon and sends it `/wake`, without waiting for it: a run was queued for
+   * it (the sites router's call, over RPC, once a page on the Worker started one). An alarm now,
+   * which outlives the request that asked, makes the start; a wake held for later is set again once it is made.
+   */
+  async startNow() {
+    const storage = this.ctx.storage;
+    await storage.put(START_KEY, true);
+    await alarmBy(storage, Date.now());
+  }
+
+  /**
+   * A start `startNow` asked for, then the wake if it is due: start the container and send it
+   * `/wake` (once for both), then note when the wake rang. A wake not due yet is set again. A throw makes Cloudflare retry the
+   * alarm; a start that still fails after `START_RETRIES` is given up, the wake kept.
+   */
+  async alarm(info) {
+    const storage = this.ctx.storage;
+    let woke = false;
+    if (await storage.get(START_KEY)) {
+      try {
+        await this.#wakeContainer();
+        woke = true;
+      } catch (error) {
+        if ((info?.retryCount ?? 0) < START_RETRIES) throw error;
+        console.error(`starting the container for a queued run failed: ${error?.message ?? error}`);
+      }
+      await storage.delete(START_KEY);
+    }
+    const wake = await storage.get(WAKE_KEY);
+    if (!wake || wake.rang) return;
+    const at = Date.parse(wake.at);
+    if (at > Date.now()) return storage.setAlarm(at);
+    if (!woke) await this.#wakeContainer();
+    // When it rang, which a GET shows: unless another wake replaced it meanwhile.
+    const held = await this.ctx.storage.get(WAKE_KEY);
+    if (held?.at === wake.at) await this.ctx.storage.put(WAKE_KEY, { ...held, rang: new Date().toISOString() });
+  }
+
+  /**
+   * Starts the container unless it runs, then sends it `/wake`: a container that is up may hold a
+   * worker that stopped itself, which only a wake (or a write through its app) starts again.
+   */
+  async #wakeContainer() {
     await this.ensureRunning();
     const res = await this.ctx.container.getTcpPort(this.port).fetch("http://container/wake");
     await res.body?.cancel();
@@ -260,13 +315,19 @@ export class Instance {
       console.error(`GET /wake answered ${res.status}`);
       throw new Error(`the container answered /wake with ${res.status}`);
     }
-    // When it rang, which a GET shows: unless another wake replaced it meanwhile.
-    const held = await this.ctx.storage.get(WAKE_KEY);
-    if (held?.at === wake.at) await this.ctx.storage.put(WAKE_KEY, { ...held, rang: new Date().toISOString() });
   }
 }
 
+/** Sets the object's alarm to ring by `at`: an alarm set to ring sooner is left as it is. */
+async function alarmBy(storage, at) {
+  const set = await storage.getAlarm();
+  if (set === null || set > at) await storage.setAlarm(at);
+}
+
+/** The Worker's one object, which every request and the sites router's `startNow` go to. */
+export const instanceOf = (env) => env[NAMESPACE].getByName("instance");
+
 /** The Worker's default export: every request goes to the one object. */
 export const worker = {
-  fetch: (request, env) => env[NAMESPACE].getByName("instance").fetch(request),
+  fetch: (request, env) => instanceOf(env).fetch(request),
 };

package/worker/sites.js

@@ -0,0 +1,17 @@
+// The company's Worker when it serves public sites: the main module `cloudflare.container`
+// uploads in place of `index.js` once the container built the sites bundle (`sites/index.js`,
+// `buildWorker` in `@sanoma-ai/app/build`). A request the bundle serves (a page of a public site
+// without a login, on its domain) is answered here, on the Worker, and never waits for the
+// container; everything else goes to the one object, as `index.js` sends it. A run a page starts
+// has the object start the container (`startNow`), which runs it.
+import { instanceOf, worker } from "./instance.js";
+import sites from "./sites/index.js";
+
+export { SanomaInstance } from "./index.js";
+
+export default {
+  fetch(request, env, ctx) {
+    if (!sites.serves(request, env)) return worker.fetch(request, env);
+    return sites.fetch(request, env, ctx, { startNow: () => instanceOf(env).startNow() });
+  },
+};