@sproutboat/runtime 0.6.0 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @sproutboat/runtime
 
+## 0.6.1
+
+### Patch Changes
+
+- 806c21e: Fix (baronunread/sproutboat#176): #172's bytestring UTF-8 encoding fix broke
+  the assets binding, which reads a file's bytes off disk into a `bytestring`
+  specifically so they pass through the wire untouched — a `bytestring`
+  carrying real text a handler built and one carrying opaque file bytes are the
+  same type with no way to tell them apart, so #172's blanket encoding also
+  re-encoded already-finished bytes, corrupting any binary asset (and any
+  proxied `fetch()`/service-binding response body).
+  
+  Adds a second, dedicated `porf_native_fetch_read_raw_bytes` (zero-copy,
+  bytestring-only, no encoding, ever) alongside the untouched original —
+  `porf_native_fetch_read_value` is called from ~30 places across sproutboat's
+  own inline C, all genuine text, so its signature and behavior stay exactly as
+  #172 left them. `write_response_value` picks between the two based on a new
+  reserved `x-sb-raw-body` response header (same pattern as #163's
+  `x-sb-remote-addr`), which the assets binding, outbound `fetch()`, and
+  service-binding `fetch()` now set — the three places sproutboat's own
+  prelude constructs a Response from wire bytes rather than a string a handler
+  built. Verified end-to-end: a 256-byte all-values fixture now round-trips
+  byte-for-byte through a real standalone build's assets binding, and #172's
+  original UTF-8 fix still holds for genuine text.
+  
+  Not fixed here: `env.<R2>.get()`'s `.body` is exposed directly to handler
+  code, which then constructs its own `new Response(obj.body)` — no
+  sproutboat-owned call site to attach the marker to, so R2 binary objects
+  served this way carry the same corruption. Needs either a real binary body
+  type upstream in Porffor or a different API shape; tracked as a known gap on
+  #176, not resolved by this fix.
+
 ## 0.6.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sproutboat/runtime",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "MIT",
   "type": "module",
   "main": "./src/index.ts",

package/src/native-fetch-prelude.js

@@ -1140,6 +1140,11 @@ globalThis.__sbInstallBindings = function (target, bindings) {
         const headers = {};
         if (r.type) headers["content-type"] = r.type;
         if (r.found) headers["etag"] = '"' + r.hash + '"';
+        // #176: these bytes came off disk already-finished (UTF-8 text or
+        // binary, doesn't matter which) -- the reserved x-sb-raw-body header
+        // tells the C write path to pass them through untouched instead of
+        // re-encoding as if this were a JS string a handler built.
+        if (r.body != null) headers["x-sb-raw-body"] = "1";
         return new Response(r.body == null ? "" : r.body, { status: r.status || (r.found ? 200 : 404), headers });
       },
     };
@@ -1168,6 +1173,10 @@ globalThis.__sbInstallBindings = function (target, bindings) {
         });
         const respHeaders = new Headers();
         for (let j = 0; j < (r.headers || []).length; j++) respHeaders.set(r.headers[j][0], r.headers[j][1]);
+        // #176: wire bytes from another deployment, not a string this handler
+        // built -- must not be re-encoded if the handler proxies it straight
+        // through (see the assets binding for the same reasoning).
+        if (r.body != null) respHeaders.set("x-sb-raw-body", "1");
         return new Response(r.body == null ? "" : r.body, { status: r.status || 502, headers: respHeaders });
       },
     };
@@ -1190,6 +1199,10 @@ globalThis.__sbInstallBindings = function (target, bindings) {
       });
       const respHeaders = new Headers();
       for (let j = 0; j < (r.headers || []).length; j++) respHeaders.set(r.headers[j][0], r.headers[j][1]);
+      // #176: bytes from an outbound HTTP response, not a string this handler
+      // built -- must not be re-encoded if the handler proxies it straight
+      // through (see the assets binding for the same reasoning).
+      if (r.body != null) respHeaders.set("x-sb-raw-body", "1");
       return new Response(r.body == null ? "" : r.body, { status: r.status || 502, headers: respHeaders });
     };
   }