astroidjs 0.19.0 → 0.20.0

package/dist/worker/generate.js

@@ -18,6 +18,7 @@ import { ASTROID_HEALTH_CRON, astroidCron, astroidUsesQueues } from "../queues/m
 import { ASTROID_EDIT_SESSION_CLASS, ASTROID_REALTIME_BINDING, usesRealtime, } from "../realtime/scaffold.js";
 import { capturesInquiries } from "../schema/framework.js";
 import { astroidCspStyleSrc } from "../security/csp-origins.js";
+import { astroidHasEditor } from "../shape.js";
 import { ASTROID_REWRITE_EXCLUDE, ASTROID_TENANT_PREFIX } from "../tenancy/index.js";
 import { astroidEditorRoutePlan } from "./routes.js";
 // Astroid's default editable site_settings surface—the columns the Settings
@@ -52,6 +53,8 @@ export const ASTROID_SETTINGS_IMAGE_KEYS = ["logoUrl", "faviconUrl", "defaultOgI
  * emitted only when a brand captures inquiries.
  */
 export function generateAstroidWorker(config) {
+    if (!astroidHasEditor(config))
+        return generateAppWorker(config);
     const inquiries = capturesInquiries(config);
     const queues = astroidUsesQueues(config);
     const cron = astroidCron(config);
@@ -564,6 +567,111 @@ export function generateAstroidWorker(config) {
     }
     return lines.join("\n");
 }
+/**
+ * The worker of an app with no editor (`editor: false`): the public status
+ * route, the SSR fallback, and whatever the config's modules add (a queue
+ * consumer, the crons), with no editor route and no auth seam.
+ *
+ * The gate stays, with a resolver that never finds an editor. Nothing under
+ * `/api/louise` belongs to one here, so it refuses everything there except the
+ * public status probe, and it gives route responses the security headers the
+ * middleware never sees.
+ */
+function generateAppWorker(config) {
+    const queues = astroidUsesQueues(config);
+    const cron = astroidCron(config);
+    const customCrons = config.crons ?? [];
+    const scheduled = cron !== null || customCrons.length > 0;
+    const lines = [];
+    const p = (s = "") => lines.push(s);
+    p("// Generated by astroidjs—do not hand-edit.");
+    p("// Source: your defineAstroid config. This app has no editor (`editor: false`),");
+    p("// so it serves no editor routes and resolves no editor session.");
+    p('import { handle } from "@astrojs/cloudflare/handler";');
+    p('import { d1Check, statusRoute } from "louise-toolkit/editor";');
+    if (queues)
+        p('import { processBatch } from "louise-toolkit/queues";');
+    p('import { composeWorker, type WorkerRoute, withEdgeCache } from "louise-toolkit/worker";');
+    if (queues)
+        p('import type { AstroidQueueMessage } from "astroidjs";');
+    if (config.status?.checks) {
+        p("// Your STATUS seam: the app's own checks for the public status route.");
+        p("// Scaffolded once and yours to edit.");
+        p('import { statusChecks } from "./status-checks.js";');
+    }
+    if (queues) {
+        p("// Your QUEUE seam: what each message actually does. Scaffolded once and");
+        p("// yours to edit.");
+        p('import { handleQueueMessage } from "./queue.js";');
+    }
+    p();
+    p("// --- public status ---------------------------------------------------------");
+    p("// What statusRoute answers an outside probe with: 200 when every check");
+    p("// passes, 503 when any fails, throws, or takes over two seconds. Anyone can");
+    p("// make these run, so each is one cheap read, and a burst of probes reuses one");
+    p("// result per isolate for STATUS_REUSE_MS.");
+    p("const STATUS_REUSE_MS = 10_000;");
+    p("const STATUS_CHECKS = {");
+    p("  // D1 answers `SELECT 1`.");
+    p("  d1: d1Check((env: CloudflareEnv) => env.DB),");
+    if (config.status?.checks) {
+        p("  // The app's own, from src/status-checks.ts. Spread last, so a check with");
+        p("  // the same name replaces Astroid's on purpose.");
+        p("  ...statusChecks,");
+    }
+    p("};");
+    p();
+    p("const routes: WorkerRoute<CloudflareEnv>[] = [");
+    p("  // Public status for an outside probe (GET/HEAD /api/louise/status). A");
+    p("  // publicRoute, so the gate below lets an anonymous probe through.");
+    p("  statusRoute({ checks: STATUS_CHECKS, reuseMs: STATUS_REUSE_MS }),");
+    p("];");
+    p();
+    p(queues
+        ? "export default composeWorker<CloudflareEnv, AstroidQueueMessage>({"
+        : "export default composeWorker<CloudflareEnv>({");
+    p("  routes,");
+    p("  // No editor, so no request under /api/louise resolves to one. The gate");
+    p("  // refuses everything there except the public status probe, and gives route");
+    p("  // responses the security headers the middleware never sees.");
+    p("  gate: { resolveEditor: () => null },");
+    p("  // The SSR fallback, in the Worker cache (ADR 0004). It stores only a");
+    p("  // response that opts in with `Astro.cache.set(...)`, and it strips the CDN");
+    p("  // directive from every other one, so Cloudflare's cookie-blind edge cache");
+    p("  // never stores a signed-in customer's page.");
+    p("  fetch: withEdgeCache((request, env, ctx) => handle(request, env, ctx)),");
+    if (queues) {
+        p("  // Queue consumer. `processBatch` acks or retries each message");
+        p("  // INDEPENDENTLY, so one poisoned message can't block the rest of the");
+        p("  // batch; Cloudflare routes it to the DLQ once it exceeds max_retries.");
+        p("  queue: (batch, env) => processBatch(batch, (message) => handleQueueMessage(env, message)),");
+    }
+    if (scheduled) {
+        p("  // Cron. Cloudflare fires this for EVERY trigger in wrangler.jsonc and");
+        p("  // identifies which by `controller.cron`, so dispatch on it.");
+        p("  scheduled: (controller, env, ctx) => {");
+        if (cron) {
+            p(`    if (controller.cron === ${JSON.stringify(cron)}) {`);
+            p("      // Catalog safety net: a missed webhook leaves the catalog stale only");
+            p("      // until the next tick. Enqueued, so it takes the retry + DLQ path.");
+            p('      ctx.waitUntil(env.COMMERCE_QUEUE.send({ kind: "catalog_refresh" }));');
+            p("      return;");
+            p("    }");
+        }
+        for (const custom of customCrons) {
+            p(`    if (controller.cron === ${JSON.stringify(custom.expression)}) {`);
+            p("      // Enqueued, not run inline: same retry + DLQ path as everything");
+            p("      // else, and a slow job can't hold the scheduled handler open.");
+            p(`      ctx.waitUntil(env.COMMERCE_QUEUE.send(${JSON.stringify(custom.message)}));`);
+            p("      return;");
+            p("    }");
+        }
+        p("  },");
+    }
+    p("});");
+    p();
+    return lines.join("\n");
+}
 /**
  * Generate the Astro middleware (`middleware.ts`) from an Astroid config: the
  * shared Louise flow (rate-limit the unauthenticated POST surface → resolve editor
@@ -592,6 +700,8 @@ export function generateAstroidMiddleware(config) {
     // origins (the Square SDK's stylesheet) are baked in here; `astroid build`
     // regenerates this file, so a config change lands on the next deploy.
     const cspStyleSrc = astroidCspStyleSrc(config);
+    // An app with no editor has no auth seam and no pages to redirect between.
+    const editor = astroidHasEditor(config);
     const portal = astroidPortal(config);
     const tenancy = config.tenancy;
     const rewritePrefix = tenancy?.rewritePrefix ?? ASTROID_TENANT_PREFIX;
@@ -599,13 +709,17 @@ export function generateAstroidMiddleware(config) {
     return [
         "// Generated by astroidjs—do not hand-edit.",
         "// The shared Louise middleware: rate-limit the unauthenticated POST surfaces,",
-        "// then resolve the editor session + sticky ?louise edit mode, then apply",
+        ...(editor
+            ? ["// then resolve the editor session + sticky ?louise edit mode, then apply"]
+            : ["// then (this app has no editor, so there's no session to resolve) apply"]),
         "// content-freshness + transport-security headers, and rewrite the style-src of",
         "// the CSP header Astro's security.csp emits so Louise's data-driven inline",
         "// styles + inlined data: brand font are allowed.",
         'import { env } from "cloudflare:workers";',
         'import { createLouiseMiddleware } from "@louise-toolkit/astro";',
-        'import { db, pageRedirects, resolvePageRedirect } from "louise-toolkit/db";',
+        ...(editor
+            ? ['import { db, pageRedirects, resolvePageRedirect } from "louise-toolkit/db";']
+            : []),
         // One `astroidjs` import, composed from what this config actually uses—two
         // import statements for the same module is legal and reads as an
         // oversight in a file nobody is supposed to hand-edit.
@@ -623,15 +737,21 @@ export function generateAstroidMiddleware(config) {
                 'import { resolveTenant } from "./tenancy.js";',
             ]
             : []),
-        "// TODO(astroid): your AUTH seam—same resolveEditor as the generated worker.ts.",
-        'import { resolveEditor } from "./auth.js";',
+        ...(editor
+            ? [
+                "// TODO(astroid): your AUTH seam—same resolveEditor as the generated worker.ts.",
+                'import { resolveEditor } from "./auth.js";',
+            ]
+            : []),
         // The portal's resolver lives in its OWN module, not the editor's auth
         // seam—they're separate Better Auth instances and must not share a file.
         ...(portal ? ['import { resolvePortalUser } from "./portal-auth.js";'] : []),
         "",
         "// Rate-limit the public, unauthenticated POST surface, keyed by client IP",
         "// (fixed-window KV counter that fails open). Derived from your config: the",
-        "// editor magic-link always, plus the portal credential surfaces and checkout",
+        ...(editor
+            ? ["// editor magic-link always, plus the portal credential surfaces and checkout"]
+            : ["// versioned API under /api/v1, plus the portal credential surfaces and checkout"]),
         "// when those are enabled. Add your own via `security.rateRules` in the config—",
         "// they're matched first, so they can also override a default's budget.",
         "// `env.RL` is read per request (a getter)—a KV binding is only valid in",
@@ -657,15 +777,27 @@ export function generateAstroidMiddleware(config) {
             : []),
         "",
         "export const onRequest = createLouiseMiddleware({",
-        "  resolveEditor: (request) => resolveEditor(request),",
+        ...(editor
+            ? ["  resolveEditor: (request) => resolveEditor(request),"]
+            : [
+                "  // No editor (`editor: false`), so no request resolves to one and edit",
+                "  // mode never turns on.",
+                "  resolveEditor: () => null,",
+            ]),
         "  rateLimit: { rules: RATE_RULES, kv: () => env.RL },",
         "  // The same deny-by-default gate for /api/louise routes that reach Astro—",
         "  // anything the worker's routes didn't answer. A second check behind the",
-        "  // worker's gate, and free: the editor is resolved here on every request.",
+        editor
+            ? "  // worker's gate, and free: the editor is resolved here on every request."
+            : "  // worker's gate: with no editor, it refuses all but the public routes.",
         "  apiGate: true,",
-        "  // A renamed page's old URL answers a 301 to the new one. It runs only after",
-        "  // the page answered 404, so a page later created on the old path wins.",
-        "  redirectFor: (path) => resolvePageRedirect(db(env.DB), pageRedirects, path),",
+        ...(editor
+            ? [
+                "  // A renamed page's old URL answers a 301 to the new one. It runs only after",
+                "  // the page answered 404, so a page later created on the old path wins.",
+                "  redirectFor: (path) => resolvePageRedirect(db(env.DB), pageRedirects, path),",
+            ]
+            : []),
         // `extend` runs once and may need to populate BOTH—a tenanted site with a
         // portal resolves a tenant and a customer on the same request.
         ...(portal || tenancy

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astroidjs",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Astroid — an opinionated meta-framework over Louise Toolkit and Astro for building editable, multi-editor sites on Cloudflare Workers.",
   "keywords": [
     "astro",
@@ -64,14 +64,14 @@
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
     "@vitest/coverage-v8": "4.1.11",
     "astro": "^7.2.9",
-    "louise-toolkit": "^0.36.0",
+    "louise-toolkit": "^0.37.0",
     "solid-js": "^1.9.15",
     "typescript": "^6.0.3",
     "vitest": "^4.1.11"
   },
   "peerDependencies": {
     "astro": "^7.0.9",
-    "louise-toolkit": "^0.36.0",
+    "louise-toolkit": "^0.37.0",
     "solid-js": "^1.9.0"
   },
   "peerDependenciesMeta": {

package/src/components/Credit.astro

@@ -0,0 +1,70 @@
+---
+// `<Credit>`—the agency credit from `config.credit`, for the site's footer.
+// Renders nothing when the config has no `credit`, so it's safe to leave in a
+// footer permanently.
+//
+// The mark is a CSS mask filled with `currentColor`, not an `<img>`. An SVG
+// loaded through `<img>` renders in its own document and can't see the page's
+// text color, so it would stay whatever color it was drawn in on every theme.
+// As a mask, only its shape counts and the fill follows the theme. It's
+// `aria-hidden` because the name beside it already says who it is, so a screen
+// reader reads the name once.
+//
+// The styles are scoped here rather than written as Tailwind utilities: a site
+// may not scan node_modules, and the credit has to look the same either way.
+import type { AstroidConfig } from "astroidjs";
+
+interface Props {
+  config: AstroidConfig;
+  class?: string;
+}
+
+const { config, class: className } = Astro.props;
+const credit = config.credit;
+// `defineAstroid` limits `logo` to a root-relative path or an https URL, and
+// JSON quoting keeps a space or parenthesis in the path from ending the `url()`.
+const markStyle = credit?.logo ? `--astroid-credit-mark:url(${JSON.stringify(credit.logo)})` : "";
+---
+
+{
+  credit && (
+    <p class:list={["astroid-credit", className]}>
+      <a href={credit.href} rel={credit.rel}>
+        {credit.logo && <span class="astroid-credit__mark" aria-hidden="true" style={markStyle} />}
+        <span>
+          {credit.label ?? "Site by"} {credit.name}
+        </span>
+      </a>
+    </p>
+  )
+}
+
+<style>
+  .astroid-credit {
+    margin: 0;
+    font-size: 0.75rem;
+    line-height: 1.5;
+  }
+  /* Low contrast, not illegible: 70% of the theme's text color stays above
+     WCAG AA on daisyUI's light and dark base colors. */
+  .astroid-credit a {
+    display: inline-flex;
+    align-items: center;
+    gap: 0.4em;
+    color: inherit;
+    opacity: 0.7;
+    text-decoration: none;
+  }
+  .astroid-credit a:hover,
+  .astroid-credit a:focus-visible {
+    opacity: 1;
+    text-decoration: underline;
+  }
+  .astroid-credit__mark {
+    flex: none;
+    width: 1.25em;
+    height: 1.25em;
+    background-color: currentColor;
+    mask: var(--astroid-credit-mark) center / contain no-repeat;
+  }
+</style>