Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .codegen.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "engineHash": "d1cb68d", "specHash": "9919482", "version": "1.3.0" }
{ "engineHash": "ab2fc63", "specHash": "9919482", "version": "1.3.0" }
2 changes: 1 addition & 1 deletion src/internal/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export function decodeBase64ByteStream(data: string): Readable {
: eval('require')('stream').Readable.from(Buffer.from(data, 'base64'));
}

export async function readByteStream(byteStream: Readable) {
export async function readByteStream(byteStream: Readable): Promise<Buffer> {
const buffers: Buffer[] = [];
for await (const data of byteStream) {
buffers.push(data);
Expand Down
19 changes: 16 additions & 3 deletions src/networking/fetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,15 @@ export async function fetch(
options
)
: options;

const requestInit = await createRequestInit(fetchOptions);
const fileStreamBuffer = fetchOptions.fileStream
? await readByteStream(fetchOptions.fileStream)
: void 0;
const requestInit = await createRequestInit({
...fetchOptions,
fileStream: fileStreamBuffer
? generateByteStreamFromBuffer(fileStreamBuffer)
: void 0,
});

const { params = {} } = fetchOptions;
const response = await nodeFetch(
Expand Down Expand Up @@ -287,7 +294,13 @@ export async function fetch(
await fetchOptions.auth.refreshToken(fetchOptions.networkSession);

// retry the request right away
return fetch(resource, { ...fetchOptions, numRetries: numRetries + 1 });
return fetch(resource, {
...fetchOptions,
numRetries: numRetries + 1,
fileStream: fileStreamBuffer
? generateByteStreamFromBuffer(fileStreamBuffer)
: void 0,
});
}

const isRetryable =
Expand Down