@reddoorla/maintenance 0.54.0 → 0.54.2

package/README.md

@@ -294,6 +294,8 @@ RESEND_API_KEY=re_XXXX
 RESEND_WEBHOOK_SECRET=whsec_XXXX  # only for the deployed webhook
 ```
 
+> The above is the **report CLI** env. The **deployed Netlify functions** (dashboard + form-ingest) additionally require `TURSO_DATABASE_URL` (+ optional `TURSO_AUTH_TOKEN`) — submissions live in libSQL/Turso, not Airtable. See [Site deployment](#site-deployment-netlify--resend) for the full env table.
+
 ### Operator flow
 
 0. **Prereq: refresh Lighthouse scores on each Websites row.** From each site's checkout:
@@ -334,25 +336,28 @@ RESEND_WEBHOOK_SECRET=whsec_XXXX  # only for the deployed webhook
 
    Renders + sends every Reports row with `Draft ready=true && Approved to send=true && Sent at IS NULL`. Stamps `Sent at` + `Delivery status=pending` on each.
 
-5. **Delivery status updates automatically** via the Resend webhook (Netlify Function at `netlify/functions/resend-webhook.mts`) — `Delivery status` flips to `delivered` / `bounced` / `complained` as events arrive. Deploy procedure: see [Webhook deployment](#webhook-deployment-netlify--resend) below.
+5. **Delivery status updates automatically** via the Resend webhook (Netlify Function at `netlify/functions/resend-webhook.mts`) — `Delivery status` flips to `delivered` / `bounced` / `complained` as events arrive. Deploy procedure: see [Site deployment](#site-deployment-netlify--resend) below.
 
-### Webhook deployment (Netlify + Resend)
+### Site deployment (Netlify + Resend)
 
-The Resend delivery webhook lives at `netlify/functions/resend-webhook.mts` in this repo. Deploying it is a one-time operation per environment: connect the repo to a Netlify site, set three env vars, register the deployed URL with Resend.
+This repo's Netlify site hosts the whole dashboard + forms surface: the Resend delivery webhook (`netlify/functions/resend-webhook.mts`), the cockpit/per-site dashboard, the `/submissions` page, and the form-ingest + submission-status endpoints. Deploying is a one-time operation per environment: connect the repo to a Netlify site, set its env vars, register the deployed URL with Resend.
 
 **1. Create the Netlify site:**
 
-- New site → Import from Git → pick `tucksravin/reddoor-maintenance`.
+- New site → Import from Git → pick `reddoorla/reddoor-maintenance`.
 - Branch to deploy: `main`. Build settings are read from [`netlify.toml`](netlify.toml) (no build command needed — functions-only).
 - Site name: pick something stable (e.g. `reddoor-webhooks`) since it ends up in the public webhook URL.
 
 **2. Set env vars** in Site settings → Environment variables:
 
-| Variable                | Value                                                                       |
-| ----------------------- | --------------------------------------------------------------------------- |
-| `AIRTABLE_PAT`          | Same PAT used by the CLI (read+write on the Websites + Reports tables)      |
-| `AIRTABLE_BASE_ID`      | `appHG8nLOzULzXOER`                                                         |
-| `RESEND_WEBHOOK_SECRET` | Generated by Resend in step 4 — paste back here after creating the endpoint |
+| Variable                | Value                                                                                                                  |
+| ----------------------- | ---------------------------------------------------------------------------------------------------------------------- |
+| `AIRTABLE_PAT`          | Same PAT used by the CLI (read+write on the Websites + Reports tables)                                                 |
+| `AIRTABLE_BASE_ID`      | `appHG8nLOzULzXOER`                                                                                                    |
+| `RESEND_WEBHOOK_SECRET` | Generated by Resend in step 4 — paste back here after creating the endpoint                                            |
+| `TURSO_DATABASE_URL`    | `libsql://<db>-<org>.turso.io` — submissions + spam counters live here; the dashboard + forms functions 500 without it |
+| `TURSO_AUTH_TOKEN`      | Auth token for that Turso url (required for a remote `libsql://` url)                                                  |
+| `FORMS_INGEST_TOKEN`    | Shared secret gating `POST /api/forms/:slug` — the SAME value is set on each fleet site                                |
 
 **3. Trigger a deploy** (Deploys → Trigger deploy → Deploy site). When it goes green, curl the health endpoint:
 

package/dist/cli/bin.js

@@ -361,7 +361,7 @@ function securityFields(counts) {
 }
 function domainFields(result) {
   const fields = { "Domain checked at": result.checkedAt };
-  if (result.certDaysRemaining !== null) fields["Cert days remaining"] = result.certDaysRemaining;
+  fields["Cert days remaining"] = result.certDaysRemaining;
   return fields;
 }
 function browserFields(r) {
@@ -2430,266 +2430,30 @@ function readDbConfig() {
   const authToken = process.env.TURSO_AUTH_TOKEN;
   return authToken ? { url, authToken } : { url };
 }
+function ensureMigrated(url, client) {
+  if (url === ":memory:") return runMigrations(client).then(() => void 0);
+  const cached = migrationsByUrl.get(url);
+  if (cached) return cached;
+  const p = runMigrations(client).then(() => void 0).catch((err) => {
+    migrationsByUrl.delete(url);
+    throw err;
+  });
+  migrationsByUrl.set(url, p);
+  return p;
+}
 async function openDb(cfg) {
   const clientConfig = cfg.authToken ? { url: cfg.url, authToken: cfg.authToken } : { url: cfg.url };
   const client = createClient(clientConfig);
-  await runMigrations(client);
+  await ensureMigrated(cfg.url, client);
   return new Kysely({ dialect: new LibsqlDialect({ client }) });
 }
+var migrationsByUrl;
 var init_client2 = __esm({
   "src/db/client.ts"() {
     "use strict";
     init_credentials();
     init_migrate();
-  }
-});
-
-// src/forms/types.ts
-var SUBMISSION_FORM_TYPES;
-var init_types = __esm({
-  "src/forms/types.ts"() {
-    "use strict";
-    SUBMISSION_FORM_TYPES = [
-      "contact",
-      "inquiry",
-      "newsletter",
-      "rsvp",
-      "reserve"
-    ];
-  }
-});
-
-// src/reports/submission-row.ts
-function toFormType(raw) {
-  if (raw && SUBMISSION_FORM_TYPES.includes(raw)) return raw;
-  if (raw)
-    console.warn(`[submissions] unknown Form type ${JSON.stringify(raw)} \u2014 treating as contact`);
-  return "contact";
-}
-function toStatus(raw) {
-  if (raw && SUBMISSION_STATUSES.includes(raw))
-    return raw;
-  return "new";
-}
-function toNotifyStatus(raw) {
-  if (raw && NOTIFY_STATUSES.includes(raw)) return raw;
-  return "skipped";
-}
-var SUBMISSION_STATUSES, NOTIFY_STATUSES;
-var init_submission_row = __esm({
-  "src/reports/submission-row.ts"() {
-    "use strict";
-    init_types();
-    SUBMISSION_STATUSES = ["new", "read", "archived", "spam"];
-    NOTIFY_STATUSES = ["sent", "failed", "skipped"];
-  }
-});
-
-// src/reports/airtable/submissions.ts
-function mapRow3(rec) {
-  const f = rec.fields;
-  const linkSites = f["Site"] ?? [];
-  return {
-    id: rec.id,
-    submissionId: typeof f["Submission ID"] === "number" ? f["Submission ID"] : null,
-    siteId: linkSites[0] ?? "",
-    formType: toFormType(f["Form type"]),
-    name: String(f["Name"] ?? ""),
-    email: String(f["Email"] ?? ""),
-    phone: f["Phone"] ?? null,
-    message: f["Message"] ?? null,
-    extraFields: f["Extra fields"] ?? null,
-    sourceUrl: f["Source URL"] ?? null,
-    utm: f["UTM"] ?? null,
-    submittedAt: f["Submitted at"] ?? null,
-    status: toStatus(f["Status"]),
-    notifyStatus: toNotifyStatus(f["Notify status"]),
-    resendMessageId: f["Resend message ID"] ?? null
-  };
-}
-var SUBMISSIONS_TABLE;
-var init_submissions = __esm({
-  "src/reports/airtable/submissions.ts"() {
-    "use strict";
-    init_reports();
-    init_submission_row();
-    SUBMISSIONS_TABLE = "Submissions";
-  }
-});
-
-// src/reports/airtable/screenouts.ts
-function num(v) {
-  return typeof v === "number" && Number.isFinite(v) ? v : 0;
-}
-function siteIdOf(fields) {
-  const link = fields["Site"];
-  return link?.[0] ?? "";
-}
-async function listScreenOutsSince(base, sinceDate) {
-  const out = /* @__PURE__ */ new Map();
-  await base(SCREENOUTS_TABLE).select({ filterByFormula: `{Date} >= ${JSON.stringify(sinceDate)}`, pageSize: 100 }).eachPage((records, fetchNextPage) => {
-    for (const rec of records) {
-      const f = rec.fields;
-      const date = typeof f["Date"] === "string" ? f["Date"] : "";
-      if (date < sinceDate) continue;
-      const siteId = siteIdOf(f);
-      if (!siteId) continue;
-      const cur = out.get(siteId) ?? { honeypot: 0, tooFast: 0, markedSpam: 0 };
-      cur.honeypot += num(f["Honeypot"]);
-      cur.tooFast += num(f["Too-fast"]);
-      cur.markedSpam += num(f["Marked spam"]);
-      out.set(siteId, cur);
-    }
-    fetchNextPage();
-  });
-  return out;
-}
-var SCREENOUTS_TABLE;
-var init_screenouts = __esm({
-  "src/reports/airtable/screenouts.ts"() {
-    "use strict";
-    SCREENOUTS_TABLE = "Spam Screenouts";
-  }
-});
-
-// src/db/submissions.ts
-import { sql } from "kysely";
-async function backfillSubmission(db, row) {
-  await db.insertInto("submissions").values({
-    id: row.id,
-    submission_id: row.submissionId,
-    site_id: row.siteId,
-    form_type: row.formType,
-    name: row.name,
-    email: row.email,
-    phone: row.phone,
-    message: row.message,
-    extra_fields: row.extraFields,
-    source_url: row.sourceUrl,
-    utm: row.utm,
-    submitted_at: row.submittedAt,
-    status: row.status,
-    notify_status: row.notifyStatus,
-    resend_message_id: row.resendMessageId
-  }).onConflict((oc) => oc.column("id").doNothing()).execute();
-}
-var init_submissions2 = __esm({
-  "src/db/submissions.ts"() {
-    "use strict";
-    init_submission_row();
-  }
-});
-
-// src/db/screenouts.ts
-import { sql as sql2 } from "kysely";
-async function listScreenOutsSince2(db, sinceDate) {
-  const rows = await db.selectFrom("spam_screenouts").select((eb) => [
-    "site_id",
-    eb.fn.sum("honeypot").as("honeypot"),
-    eb.fn.sum("too_fast").as("too_fast"),
-    eb.fn.sum("marked_spam").as("marked_spam")
-  ]).where("date", ">=", sinceDate).groupBy("site_id").execute();
-  const out = /* @__PURE__ */ new Map();
-  for (const r of rows) {
-    out.set(r.site_id, {
-      honeypot: Number(r.honeypot) || 0,
-      tooFast: Number(r.too_fast) || 0,
-      markedSpam: Number(r.marked_spam) || 0
-    });
-  }
-  return out;
-}
-async function backfillScreenoutBucket(db, b) {
-  await sql2`
-    INSERT INTO spam_screenouts (site_id, date, honeypot, too_fast, marked_spam)
-    VALUES (${b.siteId}, ${b.date}, ${b.honeypot}, ${b.tooFast}, ${b.markedSpam})
-    ON CONFLICT (site_id, date) DO UPDATE SET
-      honeypot = excluded.honeypot,
-      too_fast = excluded.too_fast,
-      marked_spam = excluded.marked_spam
-  `.execute(db);
-}
-var init_screenouts2 = __esm({
-  "src/db/screenouts.ts"() {
-    "use strict";
-  }
-});
-
-// src/db/backfill.ts
-var backfill_exports = {};
-__export(backfill_exports, {
-  backfillScreenouts: () => backfillScreenouts,
-  backfillSubmissions: () => backfillSubmissions,
-  reconcile: () => reconcile
-});
-import { sql as sql3 } from "kysely";
-async function backfillSubmissions(base, db) {
-  const rows = [];
-  await base(SUBMISSIONS_TABLE).select({ pageSize: 100 }).eachPage((records, fetchNextPage) => {
-    for (const rec of records) rows.push(mapRow3({ id: rec.id, fields: rec.fields }));
-    fetchNextPage();
-  });
-  for (const row of rows) await backfillSubmission(db, row);
-  return rows.length;
-}
-function num2(v) {
-  return typeof v === "number" && Number.isFinite(v) ? v : 0;
-}
-async function backfillScreenouts(base, db) {
-  const agg = /* @__PURE__ */ new Map();
-  await base(SCREENOUTS_TABLE).select({ pageSize: 100 }).eachPage((records, fetchNextPage) => {
-    for (const rec of records) {
-      const f = rec.fields;
-      const siteId = f["Site"]?.[0] ?? "";
-      const date = typeof f["Date"] === "string" ? f["Date"] : "";
-      if (!siteId || !date) continue;
-      const key = `${siteId} ${date}`;
-      const cur = agg.get(key) ?? { siteId, date, honeypot: 0, tooFast: 0, markedSpam: 0 };
-      cur.honeypot += num2(f["Honeypot"]);
-      cur.tooFast += num2(f["Too-fast"]);
-      cur.markedSpam += num2(f["Marked spam"]);
-      agg.set(key, cur);
-    }
-    fetchNextPage();
-  });
-  for (const bucket of agg.values()) await backfillScreenoutBucket(db, bucket);
-  return agg.size;
-}
-async function reconcile(base, db) {
-  let airtableSubs = 0;
-  await base(SUBMISSIONS_TABLE).select({ pageSize: 100, fields: [] }).eachPage((records, fetchNextPage) => {
-    airtableSubs += records.length;
-    fetchNextPage();
-  });
-  const libCountRow = await sql3`SELECT COUNT(*) AS n FROM submissions`.execute(db);
-  const libsqlSubs = Number(libCountRow.rows[0]?.n ?? 0);
-  const aMap = await listScreenOutsSince(base, "0001-01-01");
-  const lMap = await listScreenOutsSince2(db, "0001-01-01");
-  const sumOf = (m) => {
-    const t = { honeypot: 0, tooFast: 0, markedSpam: 0 };
-    for (const v of m.values()) {
-      t.honeypot += v.honeypot;
-      t.tooFast += v.tooFast;
-      t.markedSpam += v.markedSpam;
-    }
-    return t;
-  };
-  const aScreen = sumOf(aMap);
-  const lScreen = sumOf(lMap);
-  const ok = airtableSubs === libsqlSubs && aScreen.honeypot === lScreen.honeypot && aScreen.tooFast === lScreen.tooFast && aScreen.markedSpam === lScreen.markedSpam;
-  return {
-    ok,
-    submissions: { airtable: airtableSubs, libsql: libsqlSubs },
-    screenouts: { airtable: aScreen, libsql: lScreen }
-  };
-}
-var init_backfill = __esm({
-  "src/db/backfill.ts"() {
-    "use strict";
-    init_submissions();
-    init_screenouts();
-    init_submissions2();
-    init_screenouts2();
+    migrationsByUrl = /* @__PURE__ */ new Map();
   }
 });
 
@@ -5350,7 +5114,12 @@ function makeGitHub(deps) {
       return r.stdout.split("\n").map((l) => l.trim()).filter((l) => l.length > 0);
     },
     async secretExists(repo, name) {
-      const out = await gh(["api", `repos/${repo}/actions/secrets`, "--jq", ".secrets[].name"]);
+      const out = await gh([
+        "api",
+        `repos/${repo}/actions/secrets?per_page=100`,
+        "--jq",
+        ".secrets[].name"
+      ]);
       return out.split("\n").map((l) => l.trim()).includes(name);
     },
     async autoMergeEnabled(repo) {
@@ -5360,7 +5129,7 @@ function makeGitHub(deps) {
     async findOpenSelfUpdatingPR(repo) {
       const out = await gh([
         "api",
-        `repos/${repo}/pulls?state=open`,
+        `repos/${repo}/pulls?state=open&per_page=100`,
         "--jq",
         '.[] | select(.head.ref | startswith("maint/self-updating-")) | .html_url'
       ]);
@@ -7229,7 +6998,7 @@ async function draftDueReports(base, today) {
       continue;
     }
     const pendingEarlier = reports.find(
-      (r) => r.siteId === item.site.id && r.reportType === item.reportType && r.sentAt === null && r.period !== null && r.period < period
+      (r) => r.siteId === item.site.id && r.reportType === item.reportType && r.draftReady && r.sentAt === null && r.period !== null && r.period < period
     );
     if (pendingEarlier) {
       skipped++;
@@ -7870,34 +7639,8 @@ async function runDbCommand(action, opts) {
       code: 0
     };
   }
-  if (action === "backfill") {
-    const { openDb: openDb2, readDbConfig: readDbConfig2 } = await Promise.resolve().then(() => (init_client2(), client_exports2));
-    const cfg = opts.url ? { url: opts.url } : readDbConfig2();
-    const { openBase: openBase2, readAirtableConfig: readAirtableConfig2 } = await Promise.resolve().then(() => (init_client(), client_exports));
-    const { backfillSubmissions: backfillSubmissions2, backfillScreenouts: backfillScreenouts2 } = await Promise.resolve().then(() => (init_backfill(), backfill_exports));
-    const base = openBase2(readAirtableConfig2());
-    const db = await openDb2(cfg);
-    const subs = await backfillSubmissions2(base, db);
-    const buckets = await backfillScreenouts2(base, db);
-    return { output: `Backfilled ${subs} submissions, ${buckets} screen-out buckets.`, code: 0 };
-  }
-  if (action === "reconcile") {
-    const { openDb: openDb2, readDbConfig: readDbConfig2 } = await Promise.resolve().then(() => (init_client2(), client_exports2));
-    const cfg = opts.url ? { url: opts.url } : readDbConfig2();
-    const { openBase: openBase2, readAirtableConfig: readAirtableConfig2 } = await Promise.resolve().then(() => (init_client(), client_exports));
-    const { reconcile: reconcile2 } = await Promise.resolve().then(() => (init_backfill(), backfill_exports));
-    const base = openBase2(readAirtableConfig2());
-    const db = await openDb2(cfg);
-    const r = await reconcile2(base, db);
-    const lines = [
-      `submissions: airtable=${r.submissions.airtable} libsql=${r.submissions.libsql}`,
-      `screenouts:  airtable=${JSON.stringify(r.screenouts.airtable)} libsql=${JSON.stringify(r.screenouts.libsql)}`,
-      r.ok ? "OK \u2014 parity confirmed." : "MISMATCH \u2014 do not cut over."
-    ];
-    return { output: lines.join("\n"), code: r.ok ? 0 : 1 };
-  }
   return {
-    output: `unknown db action '${action}'. Use: migrate | backfill | reconcile.`,
+    output: `unknown db action '${action}'. Use: migrate.`,
     code: 1
   };
 }