@rsc-kit/core 0.30.19 → 0.30.21

package/dist/compress.js

@@ -17,6 +17,18 @@ import { deflate } from "./compressRuntime.js";
 const COMPRESSIBLE = /^(?:text\/|application\/(?:json|javascript|xml|manifest\+json|rss\+xml|atom\+xml)|image\/svg\+xml)/i;
 /** Answers too small to be worth a compressor's frame. */
 const MIN_BYTES = 1024;
+/**
+ * How long a body that has begun is given to end, or to reach MIN_BYTES,
+ * before it is taken to be streaming.
+ *
+ * A complete answer built from a string ends in the same turn it starts, so
+ * this is only ever spent on one that is still being written. Waiting for it
+ * to finish was the bug: a client navigation that skips every layout sends a
+ * shell under a kilobyte and then the page's slow data, and the shell sat in
+ * the peek until that data was in. The loading state it carried reached
+ * nobody, and the old page stayed on screen the whole time.
+ */
+const PEEK_MS = 5;
 /** Stored answers, compressed once: the same bytes go to every visitor who accepts gzip. */
 const stored = new Map();
 const STORED_CAP = 1000;
@@ -87,18 +99,31 @@ export async function compressed(request, response, storedKey) {
     // first kilobyte decides. An answer that ends inside it - /api/health, a
     // 15-byte "ok" - goes out as it was; anything longer is compressed from
     // its first byte, the peeked part included, and keeps streaming.
+    //
+    // The first chunk is waited for however long it takes, since it is the
+    // first byte. After it, only PEEK_MS: a body still being written after
+    // that is a stream, and a stream is compressed from its first chunk - its
+    // shell must not wait for the rest of it to decide a question of size.
     const reader = response.body.getReader();
     const peeked = [];
     let size = 0;
     let ended = false;
+    // A read that lost the race is still a read: the next chunk is its, and
+    // asking again would skip one.
+    let pending = null;
     while (size < MIN_BYTES) {
-        const { done, value } = await reader.read();
-        if (done) {
+        const read = pending ?? reader.read();
+        pending = read;
+        const result = size === 0 ? await read : await within(read, PEEK_MS);
+        if (result === null)
+            break;
+        pending = null;
+        if (result.done) {
             ended = true;
             break;
         }
-        peeked.push(value);
-        size += value.byteLength;
+        peeked.push(result.value);
+        size += result.value.byteLength;
     }
     if (ended) {
         return new Response(size === 0 ? null : concat(peeked, size), {
@@ -113,7 +138,9 @@ export async function compressed(request, response, storedKey) {
                 controller.enqueue(chunk);
         },
         async pull(controller) {
-            const { done, value } = await reader.read();
+            const read = pending ?? reader.read();
+            pending = null;
+            const { done, value } = await read;
             if (done)
                 controller.close();
             else
@@ -125,6 +152,21 @@ export async function compressed(request, response, storedKey) {
     });
     return withEncoding(response, gzip.stream(rest));
 }
+/** What the promise settles with, or null if it has not within `ms`. */
+async function within(promise, ms) {
+    let timer;
+    try {
+        return await Promise.race([
+            promise,
+            new Promise((resolve) => {
+                timer = setTimeout(() => resolve(null), ms);
+            }),
+        ]);
+    }
+    finally {
+        clearTimeout(timer);
+    }
+}
 function concat(chunks, size) {
     const out = new Uint8Array(size);
     let at = 0;

package/dist/compress.js.map

@@ -1 +1 @@
-{"version":3,"file":"compress.js","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,EAAE;AACF,4EAA4E;AAC5E,yEAAyE;AACzE,4EAA4E;AAC5E,uEAAuE;AACvE,uEAAuE;AACvE,0EAA0E;AAC1E,oEAAoE;AACpE,EAAE;AACF,2EAA2E;AAC3E,yEAAyE;AACzE,yEAAyE;AACzE,iEAAiE;AAEjE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,oFAAoF;AACpF,MAAM,YAAY,GAAG,qGAAqG,CAAC;AAE3H,0DAA0D;AAC1D,MAAM,SAAS,GAAG,IAAI,CAAC;AAEvB,4FAA4F;AAC5F,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;AAE7C,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,SAAS,WAAW,CAAC,OAAgB;IACnC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;IAE5D,OAAO,8DAA8D,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACrF,CAAC;AAED,qDAAqD;AACrD,MAAM,UAAU,cAAc,CAAC,OAAgB,EAAE,QAAkB;IACjE,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC;IACtE,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG;QAAE,OAAO,KAAK,CAAC;IAC9F,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3D,IAAI,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;QAAE,OAAO,KAAK,CAAC;IACxF,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IAExD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3C,0EAA0E;IAC1E,0EAA0E;IAC1E,0EAA0E;IAC1E,wEAAwE;IACxE,IAAI,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAEtD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAE9D,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,SAAS;QAAE,OAAO,KAAK,CAAC;IAE9E,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,YAAY,CAAC,QAAkB,EAAE,IAAc;IACtD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE9C,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAEjC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEjC,IAAI,CAAC,IAAI;QAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;SAC7C,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG;QAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,mBAAmB,CAAC,CAAC;IAEpH,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;AACnG,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAgB,EAChB,QAAkB,EAClB,SAAkB;IAElB,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IAExD,MAAM,IAAI,GAAG,MAAM,OAAO,EAAE,CAAC;IAE7B,IAAI,CAAC,IAAI;QAAE,OAAO,QAAQ,CAAC;IAE3B,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAElC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;YAEvE,IAAI,MAAM,CAAC,IAAI,IAAI,UAAU;gBAAE,MAAM,CAAC,KAAK,EAAE,CAAC;YAE9C,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,YAAY,CAAC,QAAQ,EAAE,KAA4B,CAAC,CAAC;IAC9D,CAAC;IAED,0EAA0E;IAC1E,sEAAsE;IACtE,yEAAyE;IACzE,wEAAwE;IACxE,iEAAiE;IACjE,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAK,CAAC,SAAS,EAAE,CAAC;IAC1C,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,KAAK,GAAG,KAAK,CAAC;IAElB,OAAO,IAAI,GAAG,SAAS,EAAE,CAAC;QACxB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAE5C,IAAI,IAAI,EAAE,CAAC;YACT,KAAK,GAAG,IAAI,CAAC;YACb,MAAM;QACR,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,IAAI,IAAI,KAAK,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAyB,EAAE;YACrF,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,cAAc,CAAa;QAC1C,KAAK,CAAC,UAAU;YACd,KAAK,MAAM,KAAK,IAAI,MAAM;gBAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,UAAU;YACnB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAE5C,IAAI,IAAI;gBAAE,UAAU,CAAC,KAAK,EAAE,CAAC;;gBACxB,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC;QACD,MAAM,CAAC,MAAM;YACX,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,MAAM,CAAC,MAAoB,EAAE,IAAY;IAChD,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEX,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnB,EAAE,IAAI,KAAK,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,gBAAgB;IAC9B,MAAM,CAAC,KAAK,EAAE,CAAC;AACjB,CAAC","sourcesContent":["// Compression for what the host answers, where nothing in front of it will.\n//\n// Behind Cloudflare, Vercel or nginx the platform compresses and this never\n// runs. A bun or node server answering the internet by itself sent every\n// byte raw - a 90 kB document and 145 kB of stylesheet at their full size -\n// and that alone was the mobile Lighthouse regression a port measured:\n// first paint at 3.8 s where 1.2 s was the baseline. Public assets are\n// precompressed by the build and served by Nitro with their encoding; the\n// pages, payloads, stored answers and api routes come through here.\n//\n// gzip, flushed on every chunk. A streamed page is a shell followed by the\n// holes as they fill, and a compressor left to its own buffer would hold\n// the shell back until enough had accumulated - so each write is flushed\n// out, which costs a little ratio and keeps the stream a stream.\n\nimport { deflate } from \"./compressRuntime.js\";\n\n/** What is worth compressing: text of every kind, and the formats that are text. */\nconst COMPRESSIBLE = /^(?:text\\/|application\\/(?:json|javascript|xml|manifest\\+json|rss\\+xml|atom\\+xml)|image\\/svg\\+xml)/i;\n\n/** Answers too small to be worth a compressor's frame. */\nconst MIN_BYTES = 1024;\n\n/** Stored answers, compressed once: the same bytes go to every visitor who accepts gzip. */\nconst stored = new Map<string, Uint8Array>();\n\nconst STORED_CAP = 1000;\n\nfunction acceptsGzip(request: Request): boolean {\n  const accept = request.headers.get(\"accept-encoding\") ?? \"\";\n\n  return /(?:^|,)\\s*(?:gzip|\\*)\\s*(?:;\\s*q=(?!0(?:\\.0*)?\\s*(?:,|$)))?/i.test(accept);\n}\n\n/** Whether this answer is one to compress at all. */\nexport function shouldCompress(request: Request, response: Response): boolean {\n  if (response.body === null || request.method === \"HEAD\") return false;\n  if (response.status === 204 || response.status === 304 || response.status < 200) return false;\n  if (response.headers.has(\"content-encoding\")) return false;\n  if (/\\bno-transform\\b/i.test(response.headers.get(\"cache-control\") ?? \"\")) return false;\n  const type = response.headers.get(\"content-type\") ?? \"\";\n\n  if (!COMPRESSIBLE.test(type)) return false;\n  // A stream of events is text, and must not be compressed: each message is\n  // a few bytes that has to reach the browser the moment it is written, and\n  // a compressor between them delivered nothing at all - not even headers -\n  // to a browser that sent Accept-Encoding: gzip, which is every browser.\n  if (/^text\\/event-stream\\b/i.test(type)) return false;\n\n  const length = Number(response.headers.get(\"content-length\"));\n\n  if (Number.isFinite(length) && length > 0 && length < MIN_BYTES) return false;\n\n  return acceptsGzip(request);\n}\n\nfunction withEncoding(response: Response, body: BodyInit): Response {\n  const headers = new Headers(response.headers);\n\n  headers.set(\"Content-Encoding\", \"gzip\");\n  headers.delete(\"Content-Length\");\n\n  const vary = headers.get(\"Vary\");\n\n  if (!vary) headers.set(\"Vary\", \"Accept-Encoding\");\n  else if (!/\\baccept-encoding\\b/i.test(vary) && vary.trim() !== \"*\") headers.set(\"Vary\", vary + \", Accept-Encoding\");\n\n  return new Response(body, { status: response.status, statusText: response.statusText, headers });\n}\n\n/**\n * The response, gzipped if the request accepts it and the answer is worth it.\n *\n * `storedKey` names an answer the build wrote - the same bytes for every\n * visitor - so it is compressed once and kept; everything else is streamed\n * through the compressor as it is produced.\n */\nexport async function compressed(\n  request: Request,\n  response: Response,\n  storedKey?: string,\n): Promise<Response> {\n  if (!shouldCompress(request, response)) return response;\n\n  const gzip = await deflate();\n\n  if (!gzip) return response;\n\n  if (storedKey !== undefined) {\n    let bytes = stored.get(storedKey);\n\n    if (!bytes) {\n      bytes = await gzip.whole(new Uint8Array(await response.arrayBuffer()));\n\n      if (stored.size >= STORED_CAP) stored.clear();\n\n      stored.set(storedKey, bytes);\n    }\n\n    return withEncoding(response, bytes as unknown as BodyInit);\n  }\n\n  // A Response made from a string or JSON carries no Content-Length for the\n  // check above to read, so the body is peeked: what arrives before the\n  // first kilobyte decides. An answer that ends inside it - /api/health, a\n  // 15-byte \"ok\" - goes out as it was; anything longer is compressed from\n  // its first byte, the peeked part included, and keeps streaming.\n  const reader = response.body!.getReader();\n  const peeked: Uint8Array[] = [];\n  let size = 0;\n  let ended = false;\n\n  while (size < MIN_BYTES) {\n    const { done, value } = await reader.read();\n\n    if (done) {\n      ended = true;\n      break;\n    }\n\n    peeked.push(value);\n    size += value.byteLength;\n  }\n\n  if (ended) {\n    return new Response(size === 0 ? null : (concat(peeked, size) as unknown as BodyInit), {\n      status: response.status,\n      statusText: response.statusText,\n      headers: response.headers,\n    });\n  }\n\n  const rest = new ReadableStream<Uint8Array>({\n    start(controller) {\n      for (const chunk of peeked) controller.enqueue(chunk);\n    },\n    async pull(controller) {\n      const { done, value } = await reader.read();\n\n      if (done) controller.close();\n      else controller.enqueue(value);\n    },\n    cancel(reason) {\n      return reader.cancel(reason);\n    },\n  });\n\n  return withEncoding(response, gzip.stream(rest));\n}\n\nfunction concat(chunks: Uint8Array[], size: number): Uint8Array {\n  const out = new Uint8Array(size);\n  let at = 0;\n\n  for (const chunk of chunks) {\n    out.set(chunk, at);\n    at += chunk.byteLength;\n  }\n\n  return out;\n}\n\n/** For a test, or a redeploy that reuses the process: forget the stored bytes. */\nexport function forgetCompressed(): void {\n  stored.clear();\n}\n"]}
+{"version":3,"file":"compress.js","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"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","sourcesContent":["// Compression for what the host answers, where nothing in front of it will.\n//\n// Behind Cloudflare, Vercel or nginx the platform compresses and this never\n// runs. A bun or node server answering the internet by itself sent every\n// byte raw - a 90 kB document and 145 kB of stylesheet at their full size -\n// and that alone was the mobile Lighthouse regression a port measured:\n// first paint at 3.8 s where 1.2 s was the baseline. Public assets are\n// precompressed by the build and served by Nitro with their encoding; the\n// pages, payloads, stored answers and api routes come through here.\n//\n// gzip, flushed on every chunk. A streamed page is a shell followed by the\n// holes as they fill, and a compressor left to its own buffer would hold\n// the shell back until enough had accumulated - so each write is flushed\n// out, which costs a little ratio and keeps the stream a stream.\n\nimport { deflate } from \"./compressRuntime.js\";\n\n/** What is worth compressing: text of every kind, and the formats that are text. */\nconst COMPRESSIBLE = /^(?:text\\/|application\\/(?:json|javascript|xml|manifest\\+json|rss\\+xml|atom\\+xml)|image\\/svg\\+xml)/i;\n\n/** Answers too small to be worth a compressor's frame. */\nconst MIN_BYTES = 1024;\n\n/**\n * How long a body that has begun is given to end, or to reach MIN_BYTES,\n * before it is taken to be streaming.\n *\n * A complete answer built from a string ends in the same turn it starts, so\n * this is only ever spent on one that is still being written. Waiting for it\n * to finish was the bug: a client navigation that skips every layout sends a\n * shell under a kilobyte and then the page's slow data, and the shell sat in\n * the peek until that data was in. The loading state it carried reached\n * nobody, and the old page stayed on screen the whole time.\n */\nconst PEEK_MS = 5;\n\n/** Stored answers, compressed once: the same bytes go to every visitor who accepts gzip. */\nconst stored = new Map<string, Uint8Array>();\n\nconst STORED_CAP = 1000;\n\nfunction acceptsGzip(request: Request): boolean {\n  const accept = request.headers.get(\"accept-encoding\") ?? \"\";\n\n  return /(?:^|,)\\s*(?:gzip|\\*)\\s*(?:;\\s*q=(?!0(?:\\.0*)?\\s*(?:,|$)))?/i.test(accept);\n}\n\n/** Whether this answer is one to compress at all. */\nexport function shouldCompress(request: Request, response: Response): boolean {\n  if (response.body === null || request.method === \"HEAD\") return false;\n  if (response.status === 204 || response.status === 304 || response.status < 200) return false;\n  if (response.headers.has(\"content-encoding\")) return false;\n  if (/\\bno-transform\\b/i.test(response.headers.get(\"cache-control\") ?? \"\")) return false;\n  const type = response.headers.get(\"content-type\") ?? \"\";\n\n  if (!COMPRESSIBLE.test(type)) return false;\n  // A stream of events is text, and must not be compressed: each message is\n  // a few bytes that has to reach the browser the moment it is written, and\n  // a compressor between them delivered nothing at all - not even headers -\n  // to a browser that sent Accept-Encoding: gzip, which is every browser.\n  if (/^text\\/event-stream\\b/i.test(type)) return false;\n\n  const length = Number(response.headers.get(\"content-length\"));\n\n  if (Number.isFinite(length) && length > 0 && length < MIN_BYTES) return false;\n\n  return acceptsGzip(request);\n}\n\nfunction withEncoding(response: Response, body: BodyInit): Response {\n  const headers = new Headers(response.headers);\n\n  headers.set(\"Content-Encoding\", \"gzip\");\n  headers.delete(\"Content-Length\");\n\n  const vary = headers.get(\"Vary\");\n\n  if (!vary) headers.set(\"Vary\", \"Accept-Encoding\");\n  else if (!/\\baccept-encoding\\b/i.test(vary) && vary.trim() !== \"*\") headers.set(\"Vary\", vary + \", Accept-Encoding\");\n\n  return new Response(body, { status: response.status, statusText: response.statusText, headers });\n}\n\n/**\n * The response, gzipped if the request accepts it and the answer is worth it.\n *\n * `storedKey` names an answer the build wrote - the same bytes for every\n * visitor - so it is compressed once and kept; everything else is streamed\n * through the compressor as it is produced.\n */\nexport async function compressed(\n  request: Request,\n  response: Response,\n  storedKey?: string,\n): Promise<Response> {\n  if (!shouldCompress(request, response)) return response;\n\n  const gzip = await deflate();\n\n  if (!gzip) return response;\n\n  if (storedKey !== undefined) {\n    let bytes = stored.get(storedKey);\n\n    if (!bytes) {\n      bytes = await gzip.whole(new Uint8Array(await response.arrayBuffer()));\n\n      if (stored.size >= STORED_CAP) stored.clear();\n\n      stored.set(storedKey, bytes);\n    }\n\n    return withEncoding(response, bytes as unknown as BodyInit);\n  }\n\n  // A Response made from a string or JSON carries no Content-Length for the\n  // check above to read, so the body is peeked: what arrives before the\n  // first kilobyte decides. An answer that ends inside it - /api/health, a\n  // 15-byte \"ok\" - goes out as it was; anything longer is compressed from\n  // its first byte, the peeked part included, and keeps streaming.\n  //\n  // The first chunk is waited for however long it takes, since it is the\n  // first byte. After it, only PEEK_MS: a body still being written after\n  // that is a stream, and a stream is compressed from its first chunk - its\n  // shell must not wait for the rest of it to decide a question of size.\n  const reader = response.body!.getReader();\n  const peeked: Uint8Array[] = [];\n  let size = 0;\n  let ended = false;\n  // A read that lost the race is still a read: the next chunk is its, and\n  // asking again would skip one.\n  let pending: ReturnType<typeof reader.read> | null = null;\n\n  while (size < MIN_BYTES) {\n    const read = pending ?? reader.read();\n\n    pending = read;\n\n    const result = size === 0 ? await read : await within(read, PEEK_MS);\n\n    if (result === null) break;\n\n    pending = null;\n\n    if (result.done) {\n      ended = true;\n      break;\n    }\n\n    peeked.push(result.value);\n    size += result.value.byteLength;\n  }\n\n  if (ended) {\n    return new Response(size === 0 ? null : (concat(peeked, size) as unknown as BodyInit), {\n      status: response.status,\n      statusText: response.statusText,\n      headers: response.headers,\n    });\n  }\n\n  const rest = new ReadableStream<Uint8Array>({\n    start(controller) {\n      for (const chunk of peeked) controller.enqueue(chunk);\n    },\n    async pull(controller) {\n      const read = pending ?? reader.read();\n\n      pending = null;\n\n      const { done, value } = await read;\n\n      if (done) controller.close();\n      else controller.enqueue(value);\n    },\n    cancel(reason) {\n      return reader.cancel(reason);\n    },\n  });\n\n  return withEncoding(response, gzip.stream(rest));\n}\n\n/** What the promise settles with, or null if it has not within `ms`. */\nasync function within<T>(promise: Promise<T>, ms: number): Promise<T | null> {\n  let timer: ReturnType<typeof setTimeout> | undefined;\n\n  try {\n    return await Promise.race([\n      promise,\n      new Promise<null>((resolve) => {\n        timer = setTimeout(() => resolve(null), ms);\n      }),\n    ]);\n  } finally {\n    clearTimeout(timer);\n  }\n}\n\nfunction concat(chunks: Uint8Array[], size: number): Uint8Array {\n  const out = new Uint8Array(size);\n  let at = 0;\n\n  for (const chunk of chunks) {\n    out.set(chunk, at);\n    at += chunk.byteLength;\n  }\n\n  return out;\n}\n\n/** For a test, or a redeploy that reuses the process: forget the stored bytes. */\nexport function forgetCompressed(): void {\n  stored.clear();\n}\n"]}

package/dist/js/navigate.js

@@ -500,7 +500,10 @@ notFound = false) {
  * hoists document metadata into <head>. Nothing needs injecting from headers.
  */
 function deserializeResponse(response) {
-    return flightDeserializer(response.body, {
+    return deserializeStream(response.body);
+}
+function deserializeStream(stream) {
+    return flightDeserializer(stream, {
         callServer: callServerFn ??
             (async () => {
                 throw new Error("Server actions not initialized");
@@ -713,7 +716,6 @@ export async function navigate(url, opts) {
         // open over the page behind it.
         const usable = isUsable(cached, chain);
         if (usable) {
-            treePromise = cached.tree;
             // Read after the tree resolves, not now. A prefetch fills these in when
             // its response lands, and a click can land first — hover a modal link
             // and click it quickly and the entry still says depth 0, so the
@@ -722,6 +724,26 @@ export async function navigate(url, opts) {
             // waiting for it is what makes them true.
             reused = cached;
             cache.delete(cacheKey);
+            if (reused.settled) {
+                treePromise = reused.tree;
+            }
+            else {
+                // Still arriving, so read it as it comes - see follow(). The request
+                // is this navigation's from here: leaving the link, or an action
+                // dropping the other prefetches, must not cut short a page the
+                // visitor is waiting on, and being overtaken by another navigation
+                // must stop it as it would a request of its own.
+                const arriving = reused;
+                prefetchControllers.delete(cacheKey);
+                controller.signal.addEventListener("abort", () => arriving.cancel(), { once: true });
+                // A request that dies is asked again, as a prefetch that died before
+                // the click is; the entry says which it was once it has settled.
+                treePromise = arriving.follow().catch((error) => arriving.body.then(() => {
+                    if (arriving.failed)
+                        return null;
+                    throw error;
+                }));
+            }
         }
         else {
             cache.delete(cacheKey);
@@ -1172,6 +1194,11 @@ function warm(entry, cacheKey, followed = new Set()) {
             return;
         // The page about to show: its pictures ahead of every other page's.
         preloadImages(text, "high");
+        // Taken by a click before it had all arrived, which read it as it came:
+        // the page is on its way to the screen, and decoding it again here would
+        // be the same chunks asked for twice.
+        if (cache.get(cacheKey) !== entry)
+            return;
         return entry.tree.then((tree) => {
             if (entry.slot !== null ||
                 entry.segmentDepth === 0 ||
@@ -1200,11 +1227,24 @@ function prefetchUrl(cacheKey, url, ttl, interceptSlot, refererUrl, held = { int
     const controller = new AbortController();
     prefetchControllers.set(cacheKey, controller);
     let decoded = null;
+    // Settled once the response has said whether there is a page to follow: its
+    // bytes as they arrive, or nothing for a redirect or a failure.
+    let arriving;
+    let followed = false;
+    const followable = new Promise((resolve) => {
+        arriving = resolve;
+    });
     const entry = {
         body: Promise.resolve(null),
         get tree() {
             return (decoded ??= this.body.then((text) => (text === null ? null : deserializeResponse(new Response(text)))));
         },
+        settled: false,
+        follow() {
+            followed = true;
+            return followable.then((stream) => (stream ? deserializeStream(stream) : null));
+        },
+        cancel: () => controller.abort(),
         expiresAt: Date.now() + ttl,
         segmentDepth: 0,
         layouts: null,
@@ -1237,6 +1277,7 @@ function prefetchUrl(cacheKey, url, ttl, interceptSlot, refererUrl, held = { int
             entry.redirectTo = redirectTo;
             if (!isExternalUrl(redirectTo) && isSafeRedirect(redirectTo))
                 prefetch(redirectTo, ttl);
+            arriving(null);
             return null;
         }
         entry.slot = response.headers.get("X-RSC-Revalidate");
@@ -1261,7 +1302,16 @@ function prefetchUrl(cacheKey, url, ttl, interceptSlot, refererUrl, held = { int
         // - unless the visitor is already on the way, see prefetch(). The
         // pictures the page shows are asked for now, though: on a phone they
         // take longer than the touch-to-click a hidden render has.
+        //
+        // Read twice: whole, for the cache, and from the first byte by a click
+        // that lands before the last of them - see follow(). The second read is
+        // let go as soon as the first is complete and nobody took it.
+        const copy = response.clone().body;
+        arriving(copy);
         return response.text().then((text) => {
+            entry.settled = true;
+            if (!followed)
+                copy?.cancel();
             preloadImages(text);
             // And the code for its client components, so the first visit to a
             // page does not wait on a chunk after it has arrived.
@@ -1272,6 +1322,7 @@ function prefetchUrl(cacheKey, url, ttl, interceptSlot, refererUrl, held = { int
         .catch(() => {
         entry.failed = true;
         cache.delete(cacheKey);
+        arriving(null);
         return null;
     })
         .finally(() => {