@tokenoftrust/storefront-runner 6.0.0 → 6.0.2

package/agency-kit/tools/lib/public-binaries.mjs

@@ -1,8 +1,9 @@
 /**
  * Tenant binaries never live in the tenant repo. The platform's content-addressed `/_a/<sha256>`
  * pool owns them and the store's repo holds references only. Publication captures source images;
- * go-live requires zero uncaptured images in every type and sampled live owned-image responses
- * before the source store is shut down. This decides,
+ * go-live requires zero uncaptured images in every type, or an owner acknowledgement of the exact
+ * remaining count, and sampled live owned-image responses. Acknowledged images still load from the
+ * source store, so it is never shut down while any remain. This decides,
  * from a listing of the store's `public/` tree, whether the repo is carrying binaries it must not.
  *
  * Findings, each naming its remedy:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",

package/packages/public-runtime/src/capture-rewrites.ts

@@ -553,6 +553,9 @@ export function applyCaptureRewrites(
   return artifacts.map(createCaptureArtifactRewriter(rewrites));
 }
 
+/** Characters of a key's file name used to find which rewrites an artifact can need. */
+const REWRITE_ANCHOR_LENGTH = 12;
+
 /** Prepare locator matching once while allowing callers to persist one rewritten artifact at a time. */
 export function createCaptureArtifactRewriter(rewrites: readonly CaptureRewrite[]): (artifact: ImageDependencyArtifact) => ImageDependencyArtifact {
   if (rewrites.length === 0) return (artifact) => ({ ...artifact });
@@ -570,9 +573,43 @@ export function createCaptureArtifactRewriter(rewrites: readonly CaptureRewrite[
     const exact = new Set((rewrite.exactAliases ?? []).flatMap((n) => [n, ...htmlAmpVariants(n)]));
     return { rewrite, needles, key, exact };
   });
+  // Trying every rewrite against every artifact is rewrites × artifacts searches: a 10k-image
+  // catalog over 3.5k files is ~37M searches, about a minute of CPU, past a Worker's limit. Instead
+  // each needle is indexed by the ANCHOR characters that follow its last `/`, and an artifact is read
+  // once, at each `/`, to find the only rewrites with a needle that can occur in it: wherever a needle
+  // occurs, a `/` is followed by its anchor. A rewrite with a needle lacking an anchor (no slash, or
+  // fewer characters after it) is always tried.
+  const anchored = new Map<string, number[]>();
+  const always: number[] = [];
+  prepared.forEach(({ needles }, index) => {
+    const anchors = new Set<string>();
+    for (const needle of needles) {
+      const slash = needle.lastIndexOf("/");
+      if (slash < 0 || needle.length - slash - 1 < REWRITE_ANCHOR_LENGTH) {
+        always.push(index);
+        return;
+      }
+      anchors.add(needle.substr(slash + 1, REWRITE_ANCHOR_LENGTH));
+    }
+    for (const anchor of anchors) {
+      const list = anchored.get(anchor);
+      if (list) list.push(index);
+      else anchored.set(anchor, [index]);
+    }
+  });
+  const candidatesIn = (content: string): number[] => {
+    if (anchored.size === 0) return always;
+    const found = new Set<number>(always);
+    for (let at = content.indexOf("/"); at !== -1; at = content.indexOf("/", at + 1)) {
+      const list = anchored.get(content.substr(at + 1, REWRITE_ANCHOR_LENGTH));
+      if (list) for (const index of list) found.add(index);
+    }
+    return [...found].sort((a, b) => a - b);
+  };
   return (artifact) => {
     let content = artifact.content;
-    for (const { rewrite, needles, key, exact } of prepared) {
+    for (const index of candidatesIn(content)) {
+      const { rewrite, needles, key, exact } = prepared[index]!;
       if (key !== null && !content.includes(key)) continue;
       for (const needle of needles) {
         content = replaceAllLocatorTokens(content, needle, rewrite.platformUrl, exact.has(needle));