@volter/world-core 3.0.3 → 3.0.4

package/dist/src/pack-fetch.js

@@ -8,6 +8,7 @@
 import { ORIGINAL_PATH_HEADER } from "./sigv4.js";
 import { TWIN_PREFIX_HEADER } from "./twin-fetch.js";
 import { PREFIX_PARAMS_HEADER } from "./derived.js";
+import { withHeaders } from "./with-headers.js";
 import { authRefusal, bindSemantics, contextFor, LANE_HEADER, SCENARIO_DECISION_HEADER, coreFor, crossCutting, derivedRequestScopes, vendorError } from "./derived-core.js";
 import { compileSurface, createDerivedFetch, matchOperation } from "./derived.js";
 import { isReadOnlyRequest, READ_ONLY_REQUEST_HEADER, runAsVendorMove } from "./request-scope.js";
@@ -195,7 +196,7 @@ export function createPackFetch(parts, options = {}) {
         }
         if (decision.kind === 'fault')
             return Response.json(decision.result.body, { status: decision.result.status, headers: decision.result.headers ?? {} });
-        return api(new Request(request, { headers: new Headers([...request.headers, [SCENARIO_DECISION_HEADER, JSON.stringify(decision)]]) }));
+        return api(withHeaders(request, new Headers([...request.headers, [SCENARIO_DECISION_HEADER, JSON.stringify(decision)]])));
     };
     const doors = (m.doors ?? []).map((d) => {
         const answer = parts.doors?.[d.id];
@@ -257,7 +258,7 @@ export function createPackFetch(parts, options = {}) {
             return vendorError(m, m.encodings?.undecodable ?? { status: 400, message: `the body does not decode as its Content-Encoding (${arrived.headers.get('content-encoding')}) says` });
         const incoming = routed(readable);
         // a twin started read-only marks every request so, so every context it opens knows (isReadOnlyRequest)
-        const request = options.readOnly && !isReadOnlyRequest(incoming) ? new Request(incoming, { headers: new Headers([...incoming.headers, [READ_ONLY_REQUEST_HEADER, '1']]) }) : incoming;
+        const request = options.readOnly && !isReadOnlyRequest(incoming) ? withHeaders(incoming, new Headers([...incoming.headers, [READ_ONLY_REQUEST_HEADER, '1']])) : incoming;
         const url = new URL(request.url);
         const path = url.pathname.replace(/\/+$/, '') || '/';
         const readOnly = (options.readOnly ?? false) || isReadOnlyRequest(request);
@@ -400,7 +401,7 @@ function laneRouter(vendor, decl, lanes, rootServes = () => false) {
         const named = (request) => {
             const headers = new Headers(request.headers);
             headers.set(LANE_HEADER, name);
-            return part.fetch(new Request(request, { headers, ...(request.body ? { duplex: 'half' } : {}) }));
+            return part.fetch(withHeaders(request, headers));
         };
         return decl.cors ? withCors(decl.cors, named) : named;
     };

package/dist/src/serve.js

@@ -12,6 +12,7 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { serveHttp, setServeDecorator, WORLD_BOOT_PATH } from "./serve-http.js";
 import { performAtHead } from "./head.js";
+import { withHeaders } from "./with-headers.js";
 import { createHash } from 'node:crypto';
 import { dirname, join } from 'node:path';
 import { hashFieldValue } from "./hash.js";
@@ -350,7 +351,7 @@ function journalingFetch(config, callSiteVendor) {
             if (caller !== undefined) {
                 const headers = new Headers(request.headers);
                 headers.delete(CALLER_HEADER);
-                request = new Request(request, { headers });
+                request = withHeaders(request, headers);
             }
             // The World's own boot probe (serve-http.ts, WORLD_BOOT_PATH) is not the app's traffic: never journaled.
             if (!twinRequestJournalEnabled() || new URL(request.url).pathname === WORLD_BOOT_PATH)

package/dist/src/with-headers.d.ts

@@ -0,0 +1,5 @@
+/** `request` with `headers` in place of its own, its body passed through as the same stream. Bun's
+ *  `new Request(request, { headers })` drops a streamed body (one a node:http server gives as `Readable.toWeb`, duplex
+ *  half): reading the copy waits forever, and so does the twin that reads it. Measured on Bun 1.3.10; rebuilding from
+ *  the URL with `body: request.body` keeps it readable. */
+export declare function withHeaders(request: Request, headers: Headers): Request;

package/dist/src/with-headers.js

@@ -0,0 +1,8 @@
+/** `request` with `headers` in place of its own, its body passed through as the same stream. Bun's
+ *  `new Request(request, { headers })` drops a streamed body (one a node:http server gives as `Readable.toWeb`, duplex
+ *  half): reading the copy waits forever, and so does the twin that reads it. Measured on Bun 1.3.10; rebuilding from
+ *  the URL with `body: request.body` keeps it readable. */
+export function withHeaders(request, headers) {
+    const body = request.method === 'GET' || request.method === 'HEAD' ? null : request.body;
+    return new Request(request.url, { method: request.method, headers, body, signal: request.signal, redirect: request.redirect, ...(body ? { duplex: 'half' } : {}) });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/world-core",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "The kernel of Volter World: one log per twin, branches as pointers, checkpoints, the fold that keeps a twin current, the head that performs a write against the vendor, references, and the git plane. A twin package builds on it; the runtime serves it.",
   "keywords": [
     "twin",

package/src/pack-fetch.ts

@@ -8,6 +8,7 @@
 import { ORIGINAL_PATH_HEADER } from './sigv4.ts';
 import { TWIN_PREFIX_HEADER } from './twin-fetch.ts';
 import { PREFIX_PARAMS_HEADER } from './derived.ts';
+import { withHeaders } from './with-headers.ts';
 import { authRefusal, bindSemantics, contextFor, LANE_HEADER, SCENARIO_DECISION_HEADER, coreFor, crossCutting, derivedRequestScopes, vendorError, type CoreScope, type DerivedManifest, type ErrorSpec, type Handler, type HandlerContext, type LanesDecl, type VendorManifest } from './derived-core.ts';
 import { compileSurface, createDerivedFetch, matchOperation, type DerivedFetch, type DerivedOperation, type DerivedOwner, type DerivedSurface } from './derived.ts';
 import { isReadOnlyRequest, READ_ONLY_REQUEST_HEADER, runAsVendorMove } from './request-scope.ts';
@@ -230,7 +231,7 @@ export function createPackFetch(parts: PackParts, options: PackFetchOptions = {}
       return vendorError(m, { status: 500, code: 'scenario_error', message: `the World's scenario: ${error.message}` });
     }
     if (decision.kind === 'fault') return Response.json(decision.result.body, { status: decision.result.status, headers: decision.result.headers ?? {} });
-    return api(new Request(request, { headers: new Headers([...request.headers, [SCENARIO_DECISION_HEADER, JSON.stringify(decision)]]) }));
+    return api(withHeaders(request, new Headers([...request.headers, [SCENARIO_DECISION_HEADER, JSON.stringify(decision)]])));
   };
   const doors = (m.doors ?? []).map((d) => {
     const answer = parts.doors?.[d.id];
@@ -287,7 +288,7 @@ export function createPackFetch(parts: PackParts, options: PackFetchOptions = {}
     if (!readable) return vendorError(m, m.encodings?.undecodable ?? { status: 400, message: `the body does not decode as its Content-Encoding (${arrived.headers.get('content-encoding')}) says` });
     const incoming = routed(readable);
     // a twin started read-only marks every request so, so every context it opens knows (isReadOnlyRequest)
-    const request = options.readOnly && !isReadOnlyRequest(incoming) ? new Request(incoming, { headers: new Headers([...incoming.headers, [READ_ONLY_REQUEST_HEADER, '1']]) }) : incoming;
+    const request = options.readOnly && !isReadOnlyRequest(incoming) ? withHeaders(incoming, new Headers([...incoming.headers, [READ_ONLY_REQUEST_HEADER, '1']])) : incoming;
     const url = new URL(request.url);
     const path = url.pathname.replace(/\/+$/, '') || '/';
     const readOnly = (options.readOnly ?? false) || isReadOnlyRequest(request);
@@ -407,7 +408,7 @@ function laneRouter(vendor: string, decl: LanesDecl, lanes: Record<string, LaneP
     const named = (request: Request): Promise<Response> => {
       const headers = new Headers(request.headers);
       headers.set(LANE_HEADER, name);
-      return part.fetch(new Request(request, { headers, ...(request.body ? { duplex: 'half' } : {}) } as RequestInit));
+      return part.fetch(withHeaders(request, headers));
     };
     return decl.cors ? withCors(decl.cors, named) : named;
   };

package/src/serve.ts

@@ -12,6 +12,7 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { serveHttp, setServeDecorator, WORLD_BOOT_PATH, type HttpHandler } from './serve-http.ts';
 import { performAtHead } from './head.ts';
+import { withHeaders } from './with-headers.ts';
 import { createHash } from 'node:crypto';
 import { dirname, join } from 'node:path';
 import type { SubjectFields } from './hash.ts';
@@ -405,7 +406,7 @@ function journalingFetch(config: Record<string | symbol, unknown> & { fetch: (..
     const journaling = async function (this: unknown, request: Request, server: unknown) {
       // who made it is read here and goes no further: no twin's handler (a tunnel's, a proxy's) hands it on
       const sent = request.headers.get(CALLER_HEADER); const caller = sent === null ? undefined : callerFromHeader(sent);
-      if (caller !== undefined) { const headers = new Headers(request.headers); headers.delete(CALLER_HEADER); request = new Request(request, { headers }); }
+      if (caller !== undefined) { const headers = new Headers(request.headers); headers.delete(CALLER_HEADER); request = withHeaders(request, headers); }
       // The World's own boot probe (serve-http.ts, WORLD_BOOT_PATH) is not the app's traffic: never journaled.
       if (!twinRequestJournalEnabled() || new URL(request.url).pathname === WORLD_BOOT_PATH) return inner.call(this, request, server);
       const slot: { identity?: TwinJournalIdentity } = {};

package/src/with-headers.ts

@@ -0,0 +1,8 @@
+/** `request` with `headers` in place of its own, its body passed through as the same stream. Bun's
+ *  `new Request(request, { headers })` drops a streamed body (one a node:http server gives as `Readable.toWeb`, duplex
+ *  half): reading the copy waits forever, and so does the twin that reads it. Measured on Bun 1.3.10; rebuilding from
+ *  the URL with `body: request.body` keeps it readable. */
+export function withHeaders(request: Request, headers: Headers): Request {
+  const body = request.method === 'GET' || request.method === 'HEAD' ? null : request.body;
+  return new Request(request.url, { method: request.method, headers, body, signal: request.signal, redirect: request.redirect, ...(body ? { duplex: 'half' } : {}) } as RequestInit);
+}