Skip to content

Commit a81e50a

Browse files
committed
fix: use Response.arrayBuffer() in replace of FileReader
1 parent 72271ca commit a81e50a

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

packages/fetch-http-handler/src/fetch-http-handler.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ describe("httpHandler", () => {
4040
["bizz", "bazz"]
4141
])
4242
},
43-
blob: jest.fn().mockResolvedValue("")
43+
body: "FOO" //should be a ReadableStream in real life.
4444
};
4545
const mockFetch = jest.fn().mockResolvedValue(mockResponse);
4646

@@ -50,7 +50,7 @@ describe("httpHandler", () => {
5050
let response = await fetchHttpHandler.handle({} as any, {});
5151

5252
expect(mockFetch.mock.calls.length).toBe(1);
53-
expect(mockResponse.blob.mock.calls.length).toBe(1);
53+
expect(response.response.body).toBe("FOO");
5454
});
5555

5656
it("properly constructs url", async () => {
@@ -61,7 +61,7 @@ describe("httpHandler", () => {
6161
["bizz", "bazz"]
6262
])
6363
},
64-
blob: jest.fn().mockResolvedValue("")
64+
body: ""
6565
};
6666
const mockFetch = jest.fn().mockResolvedValue(mockResponse);
6767

packages/stream-collector-browser/src/index.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@ import { StreamCollector } from "@aws-sdk/types";
33
export const streamCollector: StreamCollector = (
44
stream: ReadableStream
55
): Promise<Uint8Array> => {
6-
const blobToArrayBuffer = (stream: Blob) =>
7-
new Promise<Uint8Array>((resolve, reject) => {
8-
const reader = new FileReader();
9-
reader.onload = () =>
10-
resolve(new Uint8Array(reader.result as ArrayBuffer));
11-
reader.onabort = () => reject(new Error("Read aborted"));
12-
reader.onerror = () => reject(reader.error);
13-
reader.readAsArrayBuffer(stream);
14-
});
15-
return new Response(stream).blob().then(blobToArrayBuffer);
6+
return new Response(stream)
7+
.arrayBuffer()
8+
.then(arrayBuffer => new Uint8Array(arrayBuffer));
169
};

0 commit comments

Comments
 (0)