@sanoma-ai/connector-cloudflare 0.6.0 → 0.6.2

package/worker/instance.js

@@ -1,30 +1,43 @@
-// The company's Durable Object, `SanomaInstance`, without the platform: `index.js` extends
-// `DurableObject` from `cloudflare:workers` with it, and the connector's fake runs it in Node over
-// a stubbed `ctx`, so both kits check this code. No imports, so Node loads it as it is.
+// The company's Worker script without the platform: its fetch handler (`serve`) and its Durable
+// Object (`Instance`). `index.js` binds them to `cloudflare:workers` and to the app bundle the
+// deploy uploaded under `app/`; the connector's fake runs this file in Node over a stubbed `ctx`,
+// so both kits check the code Cloudflare runs. No imports, so Node loads it as it is.
 //
-// The object runs the company's container (`ctx.container`): it starts it on a request, at the
-// Worker's `SANOMA_REVISION` and the image its upload names (`ctx.container.images.runtime`, as
-// the `durable_object` scheduling policy has it: the object says what runs), a running one at
-// 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`. `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 Worker script is the app: every request but the object's own routes and `/wake` goes to the
+// app bundle's fetch, with the visitor's address from `cf-connecting-ip` and the object's
+// `startNow` as its host. The object runs the company's worker in its container (`ctx.container`),
+// never a visitor's request: it starts it at the Worker's `SANOMA_REVISION` and the image its upload
+// names (`ctx.container.images.runtime`, as the `durable_object` scheduling policy has it), drains
+// and replaces one running at another (a deploy's restart), holds the company's one wake as an
+// alarm, and answers three routes: its health, its wake, and the app bundle the worker builds,
+// pulled from the container's port with the instance token.
 
-/** The object's own route: the wake it holds. */
+/** The object's route that holds the company's wake, with the instance token. */
 export const WAKE_PATH = "/__sanoma/wake";
-/** The object's route that answers `{ revision, running }`; with `?start=1`, once the container answers `/healthz`: what a deploy waits for. */
+/** The object's route that answers what the Worker runs; with `?start=1` and the instance token, it starts the container at it. */
 export const HEALTH_PATH = "/__sanoma/health";
-/** How long the container keeps running after the last request: Cloudflare stops it then. */
+/** The worker port's route of the app bundle at `?revision=`, which the object passes on with the instance token (`APP_BUNDLE_PATH` in `@sanoma-ai/workflows/shared`). */
+export const APP_BUNDLE_PATH = "/__sanoma/app-bundle";
+/** The Host contract's wake: the Worker has the worker started now (a wakeup's `GET {url}/wake`). */
+const HOST_WAKE_PATH = "/wake";
+/** The header the app reads the visitor's address from (`CLIENT_IP_HEADER` in `@sanoma-ai/workflows`). */
+export const CLIENT_IP_HEADER = "x-sanoma-client-ip";
+/** How long the container keeps running after the object's last request: Cloudflare stops it then. */
 export const INACTIVITY_MS = 10 * 60 * 1000;
-/** How long a start may take to answer `/healthz`: a cold start clones the source and installs it. */
+/** 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. */
+export const IMAGE = "runtime";
+/** How long a start may take to answer `/healthz`: the image pulled, the source cloned and installed. */
 const START_TIMEOUT_MS = 10 * 60 * 1000;
+/** How long a drained worker has to stop on its own before its container is destroyed. */
+const DRAIN_MS = 30 * 1000;
+/** SIGTERM: the worker's own stop (it stops dequeuing, closes and exits). */
+const SIGTERM = 15;
 /** How long one try of a starting container's `/healthz` may take. */
 const TRY_MS = 5_000;
-/** How long between two tries of a starting container's `/healthz`. */
+/** How long between two tries of a starting container's `/healthz`, doubling to `MAX_POLL_MS`. */
 const POLL_MS = 250;
-/** The longest wait between two tries. */
 const MAX_POLL_MS = 1_000;
 /** Where the wake is kept, in the object's storage. */
 const WAKE_KEY = "wake";
@@ -35,10 +48,6 @@ const START_KEY = "start";
  * 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. */
-export const IMAGE = "runtime";
 /** The container's size, one of the named types `start` takes: ½ vCPU, 4 GiB (`basic`, ¼ vCPU, is refused under this policy). */
 const INSTANCE_TYPE = "standard-1";
 
@@ -53,9 +62,9 @@ function containerEnv(env) {
   return Object.fromEntries(Object.entries(env).filter(([, value]) => typeof value === "string"));
 }
 
-/** 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));
+/** A label of a value too long for one (a label holds 64 bytes; a pinned image is longer): a digest of it. */
+export async function digestLabel(value) {
+  const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(value));
   return [...new Uint8Array(digest).slice(0, 8)].map((b) => b.toString(16).padStart(2, "0")).join("");
 }
 
@@ -75,7 +84,7 @@ function parseRegistration(body) {
 }
 
 export class Instance {
-  /** The start in progress, which every request waits on. */
+  /** The start in progress, which every caller waits on. */
   #starting;
   /** True once a container this object started (or found) answered `/healthz`. */
   #ready = false;
@@ -98,46 +107,59 @@ export class Instance {
     return Number(this.env.PORT);
   }
 
+  /** The object's routes; never a visitor's request, which the app answers on the Worker. */
   async fetch(request) {
     const url = new URL(request.url);
     if (url.pathname === WAKE_PATH) return this.wake(request);
-    const health = url.pathname === HEALTH_PATH;
-    // A read asks without starting the container: a stopped host is a healthy one.
-    if (health && !url.searchParams.has("start")) return this.health();
-    try {
-      await this.ensureRunning();
-    } catch (error) {
-      return problem(503, `the company's container did not start: ${error?.message ?? error}`, this.#exit);
+    if (url.pathname === HEALTH_PATH && !url.searchParams.has("start")) return this.health(200);
+    if (url.pathname !== HEALTH_PATH && url.pathname !== APP_BUNDLE_PATH) {
+      return problem(404, `the object answers ${WAKE_PATH}, ${HEALTH_PATH} and ${APP_BUNDLE_PATH} alone`);
     }
-    if (health) return this.health();
-    const headers = new Headers(request.headers);
-    // The port's fetch reaches the container whatever the URL's host, which becomes the request's
-    // Host header: the one asked for, so the company serves the public site declared on it.
-    headers.set("x-forwarded-proto", url.protocol.slice(0, -1));
-    const body = request.method === "GET" || request.method === "HEAD" ? undefined : request.body;
-    const forwarded = new Request(new URL(url.pathname + url.search, `http://${url.host}`), {
-      method: request.method,
-      headers,
-      body,
-      redirect: "manual",
-      ...(body && { duplex: "half" }),
-    });
+    const refused = this.#refuse(request);
+    if (refused) return refused;
+    // A container that started and ended is the answer: asking again would only start it again.
+    // Told once: the next ask starts it again.
+    const exit = this.#starting ? undefined : this.#exit;
+    if (exit) {
+      this.#exit = undefined;
+      return problem(503, `the company's container did not start: ${exit}`, exit);
+    }
+    if (!this.#ready || !this.ctx.container.running) {
+      // Started from an alarm, which outlives this request (the caller may be the worker this
+      // start drains): the caller asks again until it is ready. One already under way is not asked again.
+      if (!this.#starting) await this.startNow();
+      return url.pathname === HEALTH_PATH ? this.health(202) : json(202, { starting: true });
+    }
+    if (url.pathname === HEALTH_PATH) return this.health(200);
+    // The worker builds the bundle at the revision asked for, in a checkout of its own.
     try {
-      return await this.ctx.container.getTcpPort(this.port).fetch(forwarded);
+      return await this.ctx.container.getTcpPort(this.port).fetch(`http://container${url.pathname}${url.search}`, {
+        headers: { authorization: `Bearer ${this.env.SANOMA_WAKEUP_TOKEN}` },
+      });
     } catch (error) {
-      // Stopped since it started (it crashed, or Cloudflare stopped it): the next request starts it again.
+      // Stopped since it answered (Cloudflare's own stop, a crash): the next ask starts it again.
       this.#ready = false;
       return problem(503, `the company's container did not answer: ${error?.message ?? error}`);
     }
   }
 
-  /** What the Worker runs, and whether its container does. */
-  health() {
-    return json(200, {
+  /** Why a request without the company's instance token is refused, if it is. */
+  #refuse(request) {
+    const token = this.env.SANOMA_WAKEUP_TOKEN;
+    if (!token) return problem(404, "no instance token here: SANOMA_WAKEUP_TOKEN is not among the host's secrets");
+    if (!sameToken(request.headers.get("authorization") ?? "", `Bearer ${token}`)) {
+      return problem(401, "the token is not this host's SANOMA_WAKEUP_TOKEN");
+    }
+    return undefined;
+  }
+
+  /** What the Worker runs, and whether its container does and answered at it. */
+  health(status) {
+    return json(status, {
       revision: this.env.SANOMA_REVISION ?? "",
       ...(this.env.SANOMA_CONFIG_REVISION && { configurationRevision: this.env.SANOMA_CONFIG_REVISION }),
       running: this.ctx.container.running,
-      ready: this.#ready,
+      ready: this.#ready && this.ctx.container.running,
       ...(this.#last !== undefined && !this.#ready && { last: this.#last }),
       ...(this.#exit !== undefined && { exit: this.#exit }),
     });
@@ -159,10 +181,10 @@ export class Instance {
     if (!image) throw new Error(`the Worker names no "${IMAGE}" image among its containers' images`);
     const labels = {
       revision: this.env.SANOMA_REVISION ?? "",
-      image: await imageLabel(image),
+      image: await digestLabel(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) }),
+      // The sites' domains, which the worker's environment, and the bundles it builds, name.
+      ...(this.env.SANOMA_DOMAINS && { domains: await digestLabel(this.env.SANOMA_DOMAINS) }),
     };
     const until = Date.now() + START_TIMEOUT_MS;
     let last;
@@ -183,7 +205,8 @@ export class Instance {
       }
       try {
         if (!checked && container.running) {
-          // One running from before: kept only if it says it started at these (a deploy otherwise).
+          // One running from before: kept only if it says it started at these; else the deploy's
+          // restart, its worker drained first, so it stops dequeuing before its container goes.
           const info = await container.inspect();
           const same =
             info &&
@@ -191,7 +214,7 @@ export class Instance {
             (info.labels?.image ?? "") === labels.image &&
             (info.labels?.configuration ?? "") === (labels.configuration ?? "") &&
             (info.labels?.domains ?? "") === (labels.domains ?? "");
-          if (!same) await container.destroy("a new revision, image, configuration or domains");
+          if (!same) await this.#replace(container);
         }
         checked = true;
         if (!container.running) {
@@ -206,7 +229,7 @@ export class Instance {
           // that exits, is what `monitor` tells, and the next try reports it. Only this start's, and
           // only until it answered: an earlier container's monitor may settle after this one started,
           // and one that answered and then stopped (Cloudflare's own stop, a crash) is started again
-          // by the next request, not reported as a start that failed.
+          // by the next ask, not reported as a start that failed.
           this.#exit = undefined;
           const started = (this.#started = {});
           const ended = (how) => void (this.#started === started && !this.#ready && (this.#exit = how));
@@ -215,7 +238,7 @@ export class Instance {
             (error) => ended(`the container failed: ${error?.message ?? error}`),
           );
         }
-        // A try of its own time: a hung one would hold every request past the deadline.
+        // A try of its own time: a hung one would hold every caller past the deadline.
         const res = await container
           .getTcpPort(this.port)
           .fetch("http://container/healthz", { signal: AbortSignal.timeout(TRY_MS) });
@@ -235,16 +258,23 @@ export class Instance {
       wait = Math.min(wait * 2, MAX_POLL_MS);
     }
     const ended = this.#exit ? `; ${this.#exit}` : "";
-    throw new Error(`no answer from /healthz on port ${this.port} in ${START_TIMEOUT_MS / 1000} s (${last}${ended})`);
+    throw new Error(
+      `still starting after ${START_TIMEOUT_MS / 1000} s: no answer from /healthz on port ${this.port} (${last}${ended})`,
+    );
+  }
+
+  /** Drains the running container's worker (SIGTERM: its own stop), then destroys what is left of it. */
+  async #replace(container) {
+    container.signal(SIGTERM);
+    const until = Date.now() + DRAIN_MS;
+    while (container.running && Date.now() < until) await sleep(POLL_MS);
+    if (container.running) await container.destroy("a new revision, image, configuration or domains");
   }
 
   /** `/__sanoma/wake`, with the company's `SANOMA_WAKEUP_TOKEN`: the wake this object holds. */
   async wake(request) {
-    const token = this.env.SANOMA_WAKEUP_TOKEN;
-    if (!token) return problem(404, "no wakeup here: SANOMA_WAKEUP_TOKEN is not among the host's secrets");
-    if (!sameToken(request.headers.get("authorization") ?? "", `Bearer ${token}`)) {
-      return problem(401, "the token is not this host's SANOMA_WAKEUP_TOKEN");
-    }
+    const refused = this.#refuse(request);
+    if (refused) return refused;
     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.
@@ -266,8 +296,9 @@ export class Instance {
 
   /**
    * 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.
+   * it (the app's call over RPC), a wake came, or a deploy asks for its bundle or its restart. 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;
@@ -277,8 +308,9 @@ export class Instance {
 
   /**
    * 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.
+   * `/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;
@@ -299,13 +331,13 @@ export class Instance {
     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() });
+    const held = await storage.get(WAKE_KEY);
+    if (held?.at === wake.at) await 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.
+   * worker that stopped itself, which only a wake starts again.
    */
   async #wakeContainer() {
     await this.ensureRunning();
@@ -324,10 +356,28 @@ async function alarmBy(storage, at) {
   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 one object. */
+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) => instanceOf(env).fetch(request),
-};
+/**
+ * The Worker script's fetch: the object's routes to the object, the Host contract's `/wake` as a
+ * start now, and everything else to the app bundle (`loadApp`, imported on the first request, so
+ * the object's isolate never evaluates it), its visitor's address set from Cloudflare's
+ * `cf-connecting-ip`, a client's own copy overwritten: the one trust decision the app relies on.
+ */
+export async function serve(request, env, ctx, loadApp) {
+  const url = new URL(request.url);
+  const object = instanceOf(env);
+  if (url.pathname === WAKE_PATH || url.pathname === HEALTH_PATH || url.pathname === APP_BUNDLE_PATH) {
+    return object.fetch(request);
+  }
+  if (url.pathname === HOST_WAKE_PATH && request.method === "GET") {
+    await object.startNow();
+    return new Response(null, { status: 204, headers: { "cache-control": "no-store" } });
+  }
+  const headers = new Headers(request.headers);
+  headers.set(CLIENT_IP_HEADER, request.headers.get("cf-connecting-ip") ?? "");
+  const { default: app } = await loadApp();
+  // The object's stub is the app's host: its `startNow` over RPC.
+  return app.fetch(new Request(request, { headers }), env, ctx, object);
+}

package/worker/no-app.js

@@ -0,0 +1,10 @@
+// The app bundle of a Worker made before its first bundle was built (a create's first uploads,
+// as `app/index.js`): the worker builds the bundle once its container runs, and the create
+// uploads the Worker with it. Nothing was served here before, so a visitor is told to come back.
+export default {
+  fetch: () =>
+    new Response("The company's app is being set up: try again in a minute.\n", {
+      status: 503,
+      headers: { "content-type": "text/plain; charset=utf-8", "retry-after": "30" },
+    }),
+};

package/dist/sites.d.ts

@@ -1,58 +0,0 @@
-import { type SitesBundle } from "@sanoma-ai/workflows/shared";
-import type { CloudflareApi, Upload } from "./ops.ts";
-/** The binding the bundle reads its assets through (`WorkerEnv.ASSETS`). */
-export declare 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 declare 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 declare const ASSETS_CONFIG: {
-    readonly html_handling: "none";
-    readonly not_found_handling: "none";
-    readonly run_worker_first: readonly ["/*", "!/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 declare const assetHash: (base64: string, path: string) => string;
-interface Polling {
-    /** How long the container may take to build the bundle. */
-    startTimeoutMs: number;
-    /** How long between two asks. */
-    pollMs: number;
-}
-/**
- * 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 declare function sitesBundle(cf: CloudflareApi, script: string, url: string, token: string, { startTimeoutMs, pollMs }: Polling): Promise<SitesBundle | undefined>;
-/** Puts `assets` in through an upload session for `script`'s next upload: the completion jwt that upload redeems. */
-export declare function uploadAssets(cf: CloudflareApi, script: string, assets: SitesBundle["assets"]): Promise<string>;
-/** What `serveSites` uploads again: the Worker as the deploy uploaded it. */
-interface Deployed extends Polling {
-    script: string;
-    url: string;
-    /** The instance token (`SANOMA_WAKEUP_TOKEN`), which the container's bundle route takes. */
-    token: string;
-    metadata: Omit<Upload, "migrations">;
-}
-/**
- * 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 declare function serveSites(cf: CloudflareApi, { script, url, token, metadata, ...polling }: Deployed): Promise<void>;
-export {};

package/dist/sites.js

@@ -1,153 +0,0 @@
-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

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

package/dist/worker.d.ts

@@ -1,19 +0,0 @@
-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 | 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

@@ -1,29 +0,0 @@
-import { readFile } from "node:fs/promises";
-// The company's Worker, as the package ships it in `worker/`: the files `cloudflare.container`
-// uploads, and the object's code, which the fake runs in this process.
-const WORKER = new URL("../worker/", import.meta.url);
-/** The Worker's entry module, which imports `cloudflare:workers` and `instance.js`. */
-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;
-/** The Worker's modules, read from the package once. */
-export function workerModules() {
-    modules ??= Promise.all(MODULES.map(async (name) => ({ name, content: await readFile(new URL(name, WORKER), "utf8") }))).catch((err) => {
-        modules = undefined;
-        throw err;
-    });
-    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 +0,0 @@
-{"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"}