@morphemecms/cms 0.4.0 → 0.5.0-next-20261104215254

package/worker/store-connection.js

@@ -0,0 +1,106 @@
+// The key the site gets from "Connect to Morpheme": kept in D1 (the binding CONSENT), asked for and removed by the editor.
+// Exposes handleConnection (/api/store/connection), storeKey(env), forgetKey(env) and STORE_URL; used by worker/index.js and worker/store.js.
+// Depends on worker/session.js (sign-in and access), worker/not-found.js (json) and @site/config (the repository). The key never leaves the Worker.
+//   GET    /api/store/connection   { connected, by?, site?, since?, mayChange }; mayChange = the editor may save the site
+//   POST   /api/store/connection   asks the store for a key (POST <store>/store/connect) and keeps it
+//   DELETE /api/store/connection   tells the store to drop the key (DELETE <store>/store/connect) and forgets it
+import { config } from '@site/config';
+import { json } from './not-found.js';
+import { access, sessionToken } from './session.js';
+
+// Lives here, not in store.js, so store.js can import storeKey from this file without a cycle; store.js exports it again.
+export const STORE_URL = 'https://morpheme-appstore.larsadolfsen.workers.dev';
+
+// The table, made the first time an isolate needs it for a database (D1 has no migrations on deploy), as in consent.js.
+const ready = new WeakMap();
+function table(db) {
+  if (!ready.has(db)) {
+    const made = db
+      .prepare('CREATE TABLE IF NOT EXISTS store_connection (site TEXT PRIMARY KEY, key TEXT NOT NULL, connected TEXT NOT NULL)')
+      .run()
+      .catch((e) => {
+        ready.delete(db);
+        throw e;
+      });
+    ready.set(db, made);
+  }
+  return ready.get(db);
+}
+
+/** The key the Worker asks the store with: the one set by hand (MORPHEME_STORE_KEY) first, else the one from the button; null without. */
+export async function storeKey(env) {
+  if (env.MORPHEME_STORE_KEY) return { key: env.MORPHEME_STORE_KEY, by: 'hand' };
+  if (!env.CONSENT) return null;
+  await table(env.CONSENT);
+  const { results } = await env.CONSENT.prepare('SELECT site, key, connected FROM store_connection ORDER BY connected DESC LIMIT 1').all();
+  const row = results[0];
+  return row ? { key: row.key, by: 'button', site: row.site, since: row.connected } : null;
+}
+
+/** Forgets the key from the button (the store no longer knows it, or the owner disconnected). */
+export async function forgetKey(env) {
+  if (!env.CONSENT) return;
+  await table(env.CONSENT);
+  await env.CONSENT.prepare('DELETE FROM store_connection').run();
+}
+
+/** The answer for GET (never the key). @param {Awaited<ReturnType<typeof storeKey>>} found @param {boolean} mayChange */
+const state = (found, mayChange) =>
+  json(
+    !found
+      ? { connected: false, mayChange }
+      : found.by === 'hand'
+        ? { connected: true, by: 'hand', mayChange }
+        : { connected: true, by: 'button', site: found.site, since: found.since, mayChange },
+  );
+
+/** @param {Request} request @param {Record<string, any>} env @param {unknown} _ctx @param {typeof fetch} [ask] fetch, for the store and GitHub */
+export async function handleConnection(request, env, _ctx, ask = fetch) {
+  if (!sessionToken(request)) return json({ error: 'signed out' }, 401);
+  const may = await access(request, ask);
+  if (!may) return json({ error: 'signed out' }, 401);
+  if (!may.read) return json({ error: 'forbidden' }, 403);
+  const method = request.method;
+  if (method !== 'GET' && method !== 'POST' && method !== 'DELETE') return json({ error: 'method' }, 405);
+  if (method === 'GET') return state(await storeKey(env), may.push);
+  if (!may.push) return json({ error: 'forbidden' }, 403);
+
+  const base = env.MORPHEME_STORE_URL ?? STORE_URL;
+  const found = await storeKey(env);
+  if (method === 'POST') {
+    if (found) return json({ error: 'connected' }, 409);
+    if (!env.CONSENT) return json({ error: 'no database' }, 503);
+    let res;
+    try {
+      res = await ask(`${base}/store/connect`, {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ address: new URL(request.url).origin, repo: `${config.repo.owner}/${config.repo.name}` }),
+      });
+    } catch {
+      return json({ error: 'store failed' }, 502);
+    }
+    if (res.status === 429) return json({ error: 'busy' }, 429);
+    if (res.status !== 201) return json({ error: 'store failed' }, 502);
+    const given = await res.json().catch(() => null);
+    if (typeof given?.site !== 'string' || typeof given?.key !== 'string' || !given.key) return json({ error: 'store failed' }, 502);
+    await table(env.CONSENT);
+    await env.CONSENT.prepare('INSERT OR REPLACE INTO store_connection (site, key, connected) VALUES (?, ?, ?)')
+      .bind(given.site, given.key, new Date().toISOString())
+      .run();
+    return state(await storeKey(env), true);
+  }
+
+  // DELETE
+  if (found?.by === 'hand') return json({ error: 'set by hand' }, 409);
+  if (!found) return json({ connected: false, mayChange: true });
+  let res;
+  try {
+    res = await ask(`${base}/store/connect`, { method: 'DELETE', headers: { authorization: `Bearer ${found.key}` } });
+  } catch {
+    return json({ error: 'store failed' }, 502);
+  }
+  if (res.status !== 200 && res.status !== 401) return json({ error: 'store failed' }, 502);
+  await forgetKey(env);
+  return json({ connected: false, mayChange: true });
+}

package/worker/store.js

@@ -1,13 +1,16 @@
 // What the editor asks of the store, through the Worker (the store's key never leaves it): the catalog and the files in it.
 // Exposes handleStore(request, env, ctx, ask) and STORE_URL; used by packages/editor/worker/index.js (/api/store/*).
-// Depends on packages/editor/worker/session.js (sign-in and access) and packages/editor/lib/contracts.mjs (APP_API, THEME_API).
-//   GET /api/store/catalog       the store's catalog for this site's contracts; { connected: false } without MORPHEME_STORE_KEY
+// Depends on packages/editor/worker/session.js (sign-in and access), packages/editor/worker/store-connection.js (the key) and packages/editor/lib/contracts.mjs (APP_API, THEME_API).
+//   GET /api/store/catalog       the store's catalog for this site's contracts; { connected: false } without a key
 //   GET /api/store/files/<oid>   a file of the store by its git id, streamed through with its content-type and cache-control
+// The key is MORPHEME_STORE_KEY or the one from "Connect to Morpheme"; a key from the button that the store refuses is forgotten.
 import { APP_API, THEME_API } from '../lib/contracts.mjs';
 import { access, sessionToken } from './session.js';
 import { json } from './not-found.js';
+import { forgetKey, storeKey } from './store-connection.js';
 
-export const STORE_URL = 'https://morpheme-appstore.larsadolfsen.workers.dev';
+export { STORE_URL } from './store-connection.js';
+import { STORE_URL } from './store-connection.js';
 
 const OID = /^[0-9a-f]{40}$/;
 
@@ -22,17 +25,22 @@ export async function handleStore(request, env, _ctx, ask = fetch) {
   const isCatalog = route === 'catalog';
   const oid = route.startsWith('files/') ? route.slice('files/'.length) : null;
   if (!isCatalog && !(oid !== null && OID.test(oid))) return json({ error: 'not found' }, 404);
-  if (!env.MORPHEME_STORE_KEY) return isCatalog ? json({ connected: false }) : json({ error: 'not found' }, 404);
+  const found = await storeKey(env);
+  if (!found) return isCatalog ? json({ connected: false }) : json({ error: 'not found' }, 404);
 
   const base = env.MORPHEME_STORE_URL ?? STORE_URL;
   const url = isCatalog ? `${base}/store/catalog?app=${APP_API}&theme=${THEME_API}` : `${base}/store/files/${oid}`;
   let res;
   try {
-    res = await ask(url, { headers: { authorization: `Bearer ${env.MORPHEME_STORE_KEY}` } });
+    res = await ask(url, { headers: { authorization: `Bearer ${found.key}` } });
   } catch {
     return json({ error: 'store failed' }, 502);
   }
-  if (res.status === 401 || res.status === 403) return json({ error: 'store refused' }, 502);
+  if (res.status === 401 || res.status === 403) {
+    if (found.by !== 'button') return json({ error: 'store refused' }, 502);
+    await forgetKey(env);
+    return isCatalog ? json({ connected: false }) : json({ error: 'not found' }, 404);
+  }
   if (!isCatalog && res.status === 404) return json({ error: 'not found' }, 404);
   if (res.status !== 200) return json({ error: 'store failed' }, 502);
   if (isCatalog) {

package/lib/apps.test.d.mts

@@ -1 +0,0 @@
-export {};

package/lib/caseCollisions.test.d.mts

@@ -1 +0,0 @@
-export {};

package/lib/changelog.test.d.mts

@@ -1 +0,0 @@
-export {};

package/lib/cms-version.test.d.mts

@@ -1 +0,0 @@
-export {};

package/lib/lockfile.test.d.mts

@@ -1 +0,0 @@
-export {};

package/lib/range.test.d.mts

@@ -1 +0,0 @@
-export {};

package/lib/side-block.test.d.mts

@@ -1 +0,0 @@
-export {};

package/lib/storeEntries.test.d.mts

@@ -1 +0,0 @@
-export {};

package/site/storeTheme.test.d.mts

@@ -1 +0,0 @@
-export {};

package/src/cmsView.test.d.mts

@@ -1 +0,0 @@
-export {};

package/src/frontmatter.test.d.mts

@@ -1 +0,0 @@
-export {};

package/src/standard/leads.test.d.mts

@@ -1 +0,0 @@
-export {};