cursedbelt-server 3.0.1 → 4.1.0

package/src/server/master-lock/lockPage.ts

@@ -12,13 +12,18 @@
  * keep a wall that strict. Two same-origin files cost one round trip each and let the page
  * ship under `script-src 'self'` with no nonce plumbing.
  *
- * ── 🔴 The derivation in `LOCK_SCRIPT` is a HAND COPY of `deriveMasterLockVerifier` ──────
+ * ── 🔴 The derivation in `MASTER_LOCK_DERIVE_SOURCE` is a HAND COPY of
+ *      `deriveMasterLockVerifier` ────────────────────────────────────────────
  * It cannot import it: this file is served to a browser as plain text, outside every build.
  * A copy that drifts derives a verifier that can never match, and the symptom would be "my
  * correct password is refused" — the same shape of bug that cost `apps/collections` a day.
- * So `lockPage.spec.ts` EVALUATES the script's function out of this source and asserts it
- * agrees with the TypeScript one on a fixed vector. Change one, the spec fails until you
- * change the other.
+ * So `lockPage.spec.ts` EVALUATES the function out of this source and asserts it agrees with
+ * the TypeScript one on a fixed vector. Change one, the spec fails until you change the other.
+ *
+ * 🔴 It is its OWN exported constant, and there is exactly ONE of it. `accountsPage.ts` serves
+ * a second browser script that has to derive the same way — a second hand copy would be a
+ * second thing to keep in step, and the pinning spec would only be watching one of them. Both
+ * scripts interpolate this string, and the spec asserts that they do.
  */
 import { MASTER_LOCK_PATHS } from "cursedbelt-core/master-lock";
 
@@ -159,35 +164,14 @@ button.quiet[disabled]{opacity:.5}
 `;
 
 /**
- * The page's script.
+ * 🔴 The ONE browser copy of `deriveMasterLockVerifier`, shared by every page this feature
+ * serves. Pinned by `lockPage.spec.ts`, which evaluates it and compares against the
+ * TypeScript one. Do not "tidy" it apart, and do not write a second copy — interpolate this.
  *
- * Derives in the browser and sends only the verifier — the password itself never crosses
- * the network, which is what makes "saved nowhere" true rather than aspirational.
- *
- * 600,000 PBKDF2 rounds take a beat on a phone, so the button says so; a page that looks
- * frozen gets clicked again, and every extra click is another 600k rounds.
+ * It ends by publishing the function on `globalThis`, which is the seam the spec pulls it
+ * out through and the seam the accounts page's script calls it back through.
  */
-export const LOCK_SCRIPT = `const paths = ${JSON.stringify(MASTER_LOCK_PATHS)};
-
-const form = document.getElementById("ml-form");
-const input = document.getElementById("ml-input");
-const confirmInput = document.getElementById("ml-confirm");
-const hintInput = document.getElementById("ml-hint");
-const submit = document.getElementById("ml-submit");
-const status = document.getElementById("ml-status");
-const forgot = document.getElementById("ml-forgot");
-const hints = document.getElementById("ml-hints");
-
-function say(message, tone) {
-  status.textContent = message;
-  if (tone) status.setAttribute("data-tone", tone);
-  else status.removeAttribute("data-tone");
-}
-
-// ── derivation ───────────────────────────────────────────────────────────────
-// 🔴 Byte-identical to deriveMasterLockVerifier in cursedbelt-core/master-lock. Pinned by
-// lockPage.spec.ts, which evaluates THIS function and compares. Do not "tidy" it apart.
-function unb64u(text) {
+export const MASTER_LOCK_DERIVE_SOURCE = `function unb64u(text) {
   const padded = text.replace(/-/g, "+").replace(/_/g, "/");
   const binary = atob(padded + "=".repeat((4 - (padded.length % 4)) % 4));
   const out = new Uint8Array(binary.length);
@@ -214,13 +198,38 @@ async function deriveVerifier(password, kdf) {
   joined.set(bytes, kek.length);
   return b64u(await pbkdf2(joined, salt, 1));
 }
-globalThis.__masterLockDerive = deriveVerifier;
+globalThis.__masterLockDerive = deriveVerifier;`;
+
+/**
+ * The page's script.
+ *
+ * Derives in the browser and sends only the verifier — the password itself never crosses
+ * the network, which is what makes "saved nowhere" true rather than aspirational.
+ *
+ * 600,000 PBKDF2 rounds take a beat on a phone, so the button says so; a page that looks
+ * frozen gets clicked again, and every extra click is another 600k rounds.
+ */
+export const LOCK_SCRIPT = `const paths = ${JSON.stringify(MASTER_LOCK_PATHS)};
+
+// ── derivation ───────────────────────────────────────────────────────────────
+${MASTER_LOCK_DERIVE_SOURCE}
+
+const form = document.getElementById("ml-form");
+const input = document.getElementById("ml-input");
+const confirmInput = document.getElementById("ml-confirm");
+const hintInput = document.getElementById("ml-hint");
+const submit = document.getElementById("ml-submit");
+const status = document.getElementById("ml-status");
+const forgot = document.getElementById("ml-forgot");
+const hints = document.getElementById("ml-hints");
+
+function say(message, tone) {
+  status.textContent = message;
+  if (tone) status.setAttribute("data-tone", tone);
+  else status.removeAttribute("data-tone");
+}
 
 // ── the page ─────────────────────────────────────────────────────────────────
-// 🔴 Everything below this line touches \`document\` beyond \`getElementById\`, and
-// lockPage.spec.ts cuts the source at the marker above to evaluate the derivation with a
-// stub. Keep page state here, not in the prelude, or that test throws instead of running.
-//
 // Rendered by the server from THIS principal's own record. The server re-decides it on
 // every POST, so this only chooses which form to submit — it cannot grant anything.
 const enrolling = document.body.dataset.mode === "enroll";

package/src/server/media-bun/streaming.ts

@@ -166,11 +166,6 @@ export const hlsLadderArgs = (
     heights: number[];
     crf: number;
     hasAudio: boolean;
-    // When set, ffmpeg AES-128-encrypts every segment using this key-info file (line 1 = the
-    // key URI written into the playlist's #EXT-X-KEY, line 2 = the raw 16-byte key file, line 3
-    // = IV hex). Yields encrypted-at-rest, edge-cacheable segments the player decrypts. Used by
-    // the private-media pipeline; omit for public (plaintext) media.
-    keyInfoFile?: string;
   },
 ): string[] => {
   const hs = opts.heights.length ? opts.heights : [720];
@@ -218,7 +213,6 @@ export const hlsLadderArgs = (
     'vod',
     '-hls_segment_type',
     'mpegts',
-    ...(opts.keyInfoFile ? ['-hls_key_info_file', opts.keyInfoFile] : []),
     '-master_pl_name',
     'master.m3u8',
     '-hls_segment_filename',