@setzkasten-cms/astro-admin 1.4.2 → 1.5.0

package/src/api-routes/updater-register.ts

@@ -1,22 +1,26 @@
 import type { APIRoute } from 'astro'
+import { listAllWebsites } from './_website-resolver'
 
 // Vite-define injected by @setzkasten-cms/astro at build time. Available
 // in API-only Vercel cold-starts where the page-ssr injectScript that
 // writes globalThis.__SETZKASTEN_CONFIG__ does not fire.
-declare const __SETZKASTEN_BUILD_CONFIG__: {
-  adminPath?: string
-  updaterUrl?: string
-  version?: string
-  websiteUrl?: string
-  hasGitHub?: boolean
-  storage?: {
-    owner?: string
-    repo?: string
-    branch?: string
-    contentPath?: string
-    assetsPath?: string
-  }
-} | null | undefined
+declare const __SETZKASTEN_BUILD_CONFIG__:
+  | {
+      adminPath?: string
+      updaterUrl?: string
+      version?: string
+      websiteUrl?: string
+      hasGitHub?: boolean
+      storage?: {
+        owner?: string
+        repo?: string
+        branch?: string
+        contentPath?: string
+        assetsPath?: string
+      }
+    }
+  | null
+  | undefined
 
 /**
  * Registers this Setzkasten instance with the central updater backend.
@@ -45,9 +49,9 @@ export const POST: APIRoute = async ({ cookies, request }) => {
     websiteUrl?: string
     storage?: { owner?: string; repo?: string }
   }
-  const buildConfig = (typeof __SETZKASTEN_BUILD_CONFIG__ !== 'undefined'
-    ? __SETZKASTEN_BUILD_CONFIG__
-    : null) as ConfigShape | null
+  const buildConfig = (
+    typeof __SETZKASTEN_BUILD_CONFIG__ !== 'undefined' ? __SETZKASTEN_BUILD_CONFIG__ : null
+  ) as ConfigShape | null
   const runtimeConfig = (globalThis as any).__SETZKASTEN_CONFIG__ as ConfigShape | undefined
   const config: ConfigShape | null = runtimeConfig ?? buildConfig
 
@@ -74,7 +78,7 @@ export const POST: APIRoute = async ({ cookies, request }) => {
   let licenseKey: string | undefined
   try {
     if (request.headers.get('content-type')?.includes('application/json')) {
-      const parsed = await request.json() as { licenseEmail?: string; licenseKey?: string }
+      const parsed = (await request.json()) as { licenseEmail?: string; licenseKey?: string }
       licenseEmail = parsed.licenseEmail?.trim() || undefined
       licenseKey = parsed.licenseKey?.trim() || undefined
     }
@@ -82,6 +86,13 @@ export const POST: APIRoute = async ({ cookies, request }) => {
     // Empty / malformed body — treat as no UI input
   }
 
+  // Pull the current website list from the resolver so the updater backend
+  // sees every website this instance manages (multi-mode) — or the single
+  // synthesized entry in single-repo mode. Errors fall through to [] so a
+  // resolver glitch doesn't break the heartbeat itself.
+  const websitesResult = await listAllWebsites()
+  const managedWebsites = websitesResult.ok ? websitesResult.value.map((w) => w.id) : []
+
   try {
     const response = await fetch(`${updaterUrl}/api/register`, {
       method: 'POST',
@@ -93,7 +104,7 @@ export const POST: APIRoute = async ({ cookies, request }) => {
         licenseEmail,
         licenseKey,
         telemetryEnabled: true,
-        managedWebsites: [],
+        managedWebsites,
       }),
       signal: AbortSignal.timeout(5000),
     })
@@ -102,7 +113,10 @@ export const POST: APIRoute = async ({ cookies, request }) => {
       throw new Error(`HTTP ${response.status}`)
     }
 
-    const data = await response.json() as { firebaseConfig?: { apiKey: string; authDomain: string; projectId: string }; [key: string]: unknown }
+    const data = (await response.json()) as {
+      firebaseConfig?: { apiKey: string; authDomain: string; projectId: string }
+      [key: string]: unknown
+    }
 
     return Response.json({ ...data, currentVersion, _firebaseConfig: data.firebaseConfig ?? null })
   } catch {

package/src/api-routes/updater-transfer.ts

@@ -1,5 +1,5 @@
-import type { APIRoute } from 'astro'
 import { createHash } from 'node:crypto'
+import type { APIRoute } from 'astro'
 
 /**
  * Transfer a license to the current Setzkasten instance.
@@ -13,11 +13,13 @@ export const POST: APIRoute = async ({ cookies }) => {
     return new Response('Unauthorized', { status: 401 })
   }
 
-  const config = (globalThis as any).__SETZKASTEN_CONFIG__ as {
-    updaterUrl?: string
-    websiteUrl?: string
-    storage?: { owner?: string; repo?: string }
-  } | undefined
+  const config = (globalThis as any).__SETZKASTEN_CONFIG__ as
+    | {
+        updaterUrl?: string
+        websiteUrl?: string
+        storage?: { owner?: string; repo?: string }
+      }
+    | undefined
 
   const updaterUrl = config?.updaterUrl
   if (!updaterUrl) {

package/src/api-routes/updater-unbind.ts

@@ -1,5 +1,5 @@
-import type { APIRoute } from 'astro'
 import { createHash } from 'node:crypto'
+import type { APIRoute } from 'astro'
 
 /**
  * Release the license binding for this Setzkasten instance.
@@ -19,15 +19,19 @@ export const POST: APIRoute = async ({ cookies, request }) => {
     return new Response('Unauthorized', { status: 401 })
   }
 
-  const config = (globalThis as any).__SETZKASTEN_CONFIG__ as {
-    updaterUrl?: string
-    websiteUrl?: string
-    storage?: { owner?: string; repo?: string }
-  } | undefined
-
-  const fullConfig = (globalThis as any).__SETZKASTEN_FULL_CONFIG__ as {
-    license?: { email?: string; key?: string }
-  } | undefined
+  const config = (globalThis as any).__SETZKASTEN_CONFIG__ as
+    | {
+        updaterUrl?: string
+        websiteUrl?: string
+        storage?: { owner?: string; repo?: string }
+      }
+    | undefined
+
+  const fullConfig = (globalThis as any).__SETZKASTEN_FULL_CONFIG__ as
+    | {
+        license?: { email?: string; key?: string }
+      }
+    | undefined
 
   const updaterUrl = config?.updaterUrl
   if (!updaterUrl) {

package/src/api-routes/webhooks-test.ts

@@ -1,15 +1,11 @@
+import { type WebhookConfig, type WebhookPayload, parseWebhooksFile } from '@setzkasten-cms/core'
 import type { APIRoute } from 'astro'
-import {
-  parseWebhooksFile,
-  type WebhookConfig,
-  type WebhookPayload,
-} from '@setzkasten-cms/core'
-import { resolveStorageConfigForRequest } from './_storage-config'
-import { resolveGitHubTokenForRequest } from './_github-token'
 import { parseSession, requireAdmin } from './_auth-guard'
 import { gateFeature } from './_feature-gate'
-import { recordWebhookFire } from './_webhook-status-store'
+import { resolveGitHubTokenForRequest } from './_github-token'
+import { resolveStorageConfigForRequest } from './_storage-config'
 import { signPayload } from './_webhook-signing'
+import { recordWebhookFire } from './_webhook-status-store'
 
 const WEBHOOKS_FILE = (contentPath: string) => `${contentPath}/_webhooks.json`
 const TEST_TIMEOUT_MS = 10_000
@@ -51,9 +47,11 @@ export const POST: APIRoute = async ({ request, cookies }) => {
   }
   const { owner, repo, branch } = storage
 
-  const serverConfig = (globalThis as {
-    __SETZKASTEN_CONFIG__?: { storage?: { contentPath?: string } }
-  }).__SETZKASTEN_CONFIG__
+  const serverConfig = (
+    globalThis as {
+      __SETZKASTEN_CONFIG__?: { storage?: { contentPath?: string } }
+    }
+  ).__SETZKASTEN_CONFIG__
   const contentPath = serverConfig?.storage?.contentPath ?? 'content'
 
   // Read webhooks file directly (no cache — we want the freshly-saved value)

package/src/api-routes/webhooks.ts

@@ -1,15 +1,11 @@
+import { type WebhookConfig, parseWebhooksFile, validateWebhookConfig } from '@setzkasten-cms/core'
 import type { APIRoute } from 'astro'
-import {
-  parseWebhooksFile,
-  validateWebhookConfig,
-  type WebhookConfig,
-} from '@setzkasten-cms/core'
-import { resolveStorageConfigForRequest } from './_storage-config'
-import { resolveGitHubTokenForRequest } from './_github-token'
 import { parseSession, requireAdmin } from './_auth-guard'
-import { cachedFetch, invalidateCache } from './_github-cache'
 import { withTrailers } from './_commit-trailers'
 import { gateFeature } from './_feature-gate'
+import { cachedFetch, invalidateCache } from './_github-cache'
+import { resolveGitHubTokenForRequest } from './_github-token'
+import { resolveStorageConfigForRequest } from './_storage-config'
 
 const WEBHOOKS_FILE = (contentPath: string) => `${contentPath}/_webhooks.json`
 
@@ -89,10 +85,7 @@ export const PUT: APIRoute = async ({ request, cookies }) => {
   for (let i = 0; i < body.webhooks.length; i++) {
     const result = validateWebhookConfig(body.webhooks[i])
     if (!result.ok) {
-      return Response.json(
-        { error: result.error.message, index: i },
-        { status: 400 },
-      )
+      return Response.json({ error: result.error.message, index: i }, { status: 400 })
     }
     if (seenIds.has(result.value.id)) {
       return Response.json(
@@ -141,10 +134,11 @@ export const PUT: APIRoute = async ({ request, cookies }) => {
   }
   if (currentSha) putBody.sha = currentSha
 
-  const putRes = await fetch(
-    `https://api.github.com/repos/${owner}/${repo}/contents/${filePath}`,
-    { method: 'PUT', headers, body: JSON.stringify(putBody) },
-  )
+  const putRes = await fetch(`https://api.github.com/repos/${owner}/${repo}/contents/${filePath}`, {
+    method: 'PUT',
+    headers,
+    body: JSON.stringify(putBody),
+  })
 
   if (!putRes.ok) {
     const text = await putRes.text()
@@ -156,8 +150,10 @@ export const PUT: APIRoute = async ({ request, cookies }) => {
 }
 
 function resolveContentPath(): string {
-  const serverConfig = (globalThis as {
-    __SETZKASTEN_CONFIG__?: { storage?: { contentPath?: string } }
-  }).__SETZKASTEN_CONFIG__
+  const serverConfig = (
+    globalThis as {
+      __SETZKASTEN_CONFIG__?: { storage?: { contentPath?: string } }
+    }
+  ).__SETZKASTEN_CONFIG__
   return serverConfig?.storage?.contentPath ?? 'content'
 }