[Miniflare 2] Fix body.cancel() throwing undefined (#757)

cloudflare · Jan 29, 2024 · c705758 · c705758
1 parent 04134bb
commit c705758
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/packages/core/src/standards/http.ts b/packages/core/src/standards/http.ts
@@ -265,7 +265,10 @@ export class Body<Inner extends BaseRequest | BaseResponse> {
  controller.byobRequest?.respond(0);
  }
  },
- cancel: (reason) => reader.cancel(reason),
+ cancel: (reason) => {
+ if (reader === undefined) reader = body.getReader();
+ return reader.cancel(reason);
+ },
  };
  // TODO: maybe set { highWaterMark: 0 } as a strategy here?
  bodyStream = new ReadableStream(source);

diff --git a/packages/core/test/standards/http.spec.ts b/packages/core/test/standards/http.spec.ts
@@ -179,6 +179,26 @@ test("Body: can pause, resume and cancel body stream", async (t) => {
  t.true(result.done);
  t.is(result.value, undefined);
 });
+test("Body: can cancel body directly", async (t) => {
+ const chunks = ["123", "456", "789"];
+ const bodyStream = new ReadableStream({
+ pull(controller) {
+ const chunk = chunks.shift();
+ if (chunk) {
+ controller.enqueue(utf8Encode(chunk));
+ } else {
+ controller.close();
+ }
+ },
+ });
+ const { body } = new Response(bodyStream);
+ assert(body);
+
+ await body.cancel();
+ const result = await body.getReader().read();
+ t.true(result.done);
+ t.is(result.value, undefined);
+});
 test("Body: throws on string chunks", async (t) => {
  const inputStream = new ReadableStream({
  start(controller) {