@sproutboat/toolchain 0.9.0 → 0.10.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @sproutboat/toolchain
 
+## 0.10.1
+
+### Patch Changes
+
+- 6676ead: `env.BUCKET.put(key, request.body)`, `env.KV.put(key, request.body)` and `fetch(url, { body: request.body })` store and send the request body again. Since 0.19.0, `body` is a `ReadableStream`, and these took its string form. Incoming request bodies are also read as the bytes they are, so `arrayBuffer()`, `blob()`, `body` and KV `put` no longer UTF-8 encode a non-ASCII upload twice. R2 `put` accepts bytes as well.
+
+## 0.10.0
+
+### Minor Changes
+
+- 4274bef: `Response.body` and `Request.body` are `ReadableStream`s for every body type, as in the Fetch spec and workerd. Before, they held the value given (a string, bytes or a `Blob`). `res.body.getReader()`, `res.body.pipeThrough(...)` and `new Response(other.body)` now work on any response, including the incoming request. The value as given stays internal, so responses are still written with a fixed length unless the body really is a stream. A body whose stream has been locked can no longer be read with `text()` and the other readers, which throw a `TypeError`.
+
 ## 0.9.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sproutboat/toolchain",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "license": "MIT",
   "type": "module",
   "repository": {

package/src/fetch-classes.ts

@@ -65,7 +65,25 @@ export const REQUEST_CLASS_SOURCE = String.raw`class Request {
   static _consume(message) {
     if (message._bodyUsed === true) throw new TypeError('Body has already been used');
     message._bodyUsed = true;
-    return message.body;
+    // A stream the body getter handed out is what the reader reads: a locked one throws.
+    return message._bodyStream != null ? message._bodyStream : message._bodyInit;
+  }
+
+  // body is a ReadableStream, as in Fetch: a stream body itself, else a stream made once over
+  // the bytes. The value as given stays in _bodyInit, which the native writer, streaming and
+  // the prelude read; assigning body (the native ingress does) sets it.
+  static _bodyAsStream(message) {
+    const init = message._bodyInit;
+    if (init == null) return null;
+    if (Request._isStream(init)) return init;
+    if (message._bodyStream == null) {
+      const bytes = Request._messageBytes(message, init);
+      message._bodyStream = new globalThis.ReadableStream({ start(c) { if (bytes.length) c.enqueue(bytes); c.close(); } });
+      // The value the stream was made from, for the bindings that take a body at once
+      // (R2 and KV put, outbound fetch): put(key, request.body) is the Workers idiom.
+      message._bodyStream._sbBody = message._bodyLatin1 === true ? bytes : init;
+    }
+    return message._bodyStream;
   }
 
   static _bodyText(body) {
@@ -105,7 +123,17 @@ export const REQUEST_CLASS_SOURCE = String.raw`class Request {
   static _read(message, finish) {
     const body = Request._consume(message);
     if (Request._isStream(body)) return Request._streamBytes(body).then(finish);
-    return finish(Request._bodyBytes(body));
+    return finish(Request._messageBytes(message, body));
+  }
+  // A body the native ingress delivered is its raw bytes, one character each
+  // (_bodyLatin1): those bytes, not the string UTF-8 encoded again.
+  static _messageBytes(message, body) {
+    if (message._bodyLatin1 === true && typeof body == 'string') {
+      const out = new Uint8Array(body.length);
+      for (let i = 0; i < body.length; i++) out[i] = body.charCodeAt(i) & 255;
+      return out;
+    }
+    return Request._bodyBytes(body);
   }
 
   constructor(input, init = undefined) {
@@ -119,7 +147,7 @@ export const REQUEST_CLASS_SOURCE = String.raw`class Request {
       url = input.url;
       method = input.method;
       headers = input.headers;
-      body = input.body;
+      body = input._bodyStream != null ? input._bodyStream : input._bodyInit;
       redirect = input.redirect;
     } else if (input != null && Porffor.type(input) == Porffor.TYPES.object && input.href != null) url = input.href;
 
@@ -142,11 +170,13 @@ export const REQUEST_CLASS_SOURCE = String.raw`class Request {
     if (init != null && init.body != null && init.body !== '' && (this.method == 'GET' || this.method == 'HEAD'))
       throw new TypeError('Request with GET/HEAD method cannot have body.');
     this.headers = new Headers(headers);
-    this.body = Request._extractBody(body, this.headers);
+    this._bodyInit = Request._extractBody(body, this.headers);
     if (redirect != null) this._redirect = String(redirect);
   }
 
   get redirect() { return this._redirect ?? 'follow'; }
+  get body() { return Request._bodyAsStream(this); }
+  set body(value) { this._bodyInit = value; this._bodyStream = null; }
   get bodyUsed() { return this._bodyUsed === true; }
 
   arrayBuffer() { return Request._read(this, (bytes) => bytes.buffer); }
@@ -179,7 +209,7 @@ export const RESPONSE_CLASS_SOURCE = String.raw`class Response {
       throw new TypeError('Response with null body status cannot have body');
     if (init?.statusText != null) this._statusText = String(init.statusText);
     this.headers = new Headers(init?.headers);
-    this.body = Request._extractBody(body, this.headers);
+    this._bodyInit = Request._extractBody(body, this.headers);
   }
 
   static error() {
@@ -192,6 +222,8 @@ export const RESPONSE_CLASS_SOURCE = String.raw`class Response {
   get statusText() { return this._statusText ?? ''; }
   get type() { return this._type ?? 'default'; }
   get ok() { return this.status >= 200 && this.status < 300; }
+  get body() { return Request._bodyAsStream(this); }
+  set body(value) { this._bodyInit = value; this._bodyStream = null; }
   get bodyUsed() { return this._bodyUsed === true; }
 
   arrayBuffer() { return Request._read(this, (bytes) => bytes.buffer); }
@@ -199,7 +231,7 @@ export const RESPONSE_CLASS_SOURCE = String.raw`class Response {
   clone() {
     if (this._bodyUsed === true) throw new TypeError('Body has already been used');
     const copy = new Response(null, { status: this.status == 0 ? 200 : this.status, statusText: this._statusText, headers: this.headers });
-    copy.body = this.body;
+    copy._bodyInit = this._bodyInit;
     copy.status = this.status;
     if (this._type != null) copy._type = this._type;
     return copy;
@@ -223,7 +255,7 @@ export const RESPONSE_BYTES_ANCHOR =
 export const RESPONSE_BYTES_INJECT =
   "  // sproutboat: byte bodies go out as their bytes. A Latin-1 string, one character per byte,\n" +
   "  // built in windows (concatenating one long string is quadratic), sent raw by the writer.\n" +
-  "  let body = response.body;\n" +
+  "  let body = response._bodyInit !== undefined ? response._bodyInit : response.body;\n" +
   "  let headersEntries = response.headers._entries;\n" +
   "  if (body instanceof ArrayBuffer || ArrayBuffer.isView(body)) {\n" +
   "    const view = body instanceof ArrayBuffer ? new Uint8Array(body) : new Uint8Array(body.buffer, body.byteOffset, body.byteLength);\n" +

package/src/fingerprint.ts

@@ -21,7 +21,7 @@ export const PATCH_SOURCES = [
  * patch.ts as the module patch.ts is everywhere else. Kept current by fingerprint.test.ts
  * (UPDATE_FINGERPRINT=1 bun test packages/toolchain/src/fingerprint.test.ts).
  */
-export const RELEASED_FINGERPRINT = "5a243546eb20";
+export const RELEASED_FINGERPRINT = "9a717433bb3b";
 
 /** The fingerprint of the sources in dir, or null where they are not on disk. */
 export function sourceFingerprint(dir: string): string | null {