fix(fetch): fix stream handling in Safari by fallback to using a stream reader instead of an async iterator; (#6584)

DigitalBrainJS · web-flow · commit d1980854fee1 · 2024-08-31T22:14:23.000+03:00
diff --git a/lib/adapters/fetch.js b/lib/adapters/fetch.js
@@ -146,7 +146,7 @@ export default isFetchSupported && (async (config) => {
           progressEventReducer(asyncDecorator(onUploadProgress))
         );
 
-        data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, onProgress, flush, encodeText);
+        data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, onProgress, flush);
       }
     }
 
@@ -189,7 +189,7 @@ export default isFetchSupported && (async (config) => {
         trackStream(response.body, DEFAULT_CHUNK_SIZE, onProgress, () => {
           flush && flush();
           unsubscribe && unsubscribe();
-        }, encodeText),
+        }),
         options
       );
     }
diff --git a/lib/helpers/trackStream.js b/lib/helpers/trackStream.js
@@ -17,14 +17,34 @@ export const streamChunk = function* (chunk, chunkSize) {
   }
 }
 
-export const readBytes = async function* (iterable, chunkSize, encode) {
-  for await (const chunk of iterable) {
-    yield* streamChunk(ArrayBuffer.isView(chunk) ? chunk : (await encode(String(chunk))), chunkSize);
+export const readBytes = async function* (iterable, chunkSize) {
+  for await (const chunk of readStream(iterable)) {
+    yield* streamChunk(chunk, chunkSize);
   }
 }
 
-export const trackStream = (stream, chunkSize, onProgress, onFinish, encode) => {
-  const iterator = readBytes(stream, chunkSize, encode);
+const readStream = async function* (stream) {
+  if (stream[Symbol.asyncIterator]) {
+    yield* stream;
+    return;
+  }
+
+  const reader = stream.getReader();
+  try {
+    for (;;) {
+      const {done, value} = await reader.read();
+      if (done) {
+        break;
+      }
+      yield value;
+    }
+  } finally {
+    await reader.cancel();
+  }
+}
+
+export const trackStream = (stream, chunkSize, onProgress, onFinish) => {
+  const iterator = readBytes(stream, chunkSize);
 
   let bytes = 0;
   let done;

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ export default isFetchSupported && (async (config) => {`
`146`	`146`	`progressEventReducer(asyncDecorator(onUploadProgress))`
`147`	`147`	`);`
`148`	`148`
`149`		`- data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, onProgress, flush, encodeText);`
	`149`	`+ data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, onProgress, flush);`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`@@ -189,7 +189,7 @@ export default isFetchSupported && (async (config) => {`
`189`	`189`	`trackStream(response.body, DEFAULT_CHUNK_SIZE, onProgress, () => {`
`190`	`190`	`flush && flush();`
`191`	`191`	`unsubscribe && unsubscribe();`
`192`		`- }, encodeText),`
	`192`	`+ }),`
`193`	`193`	`options`
`194`	`194`	`);`
`195`	`195`	`}`