fix(fetch): fixed ReferenceError issue when TextEncoder is not available in the environment; (#6410)

DigitalBrainJS · web-flow · commit 733f15fe5bd2 · 2024-05-20T16:15:15.000+03:00
diff --git a/lib/adapters/fetch.js b/lib/adapters/fetch.js
@@ -20,6 +20,12 @@ const fetchProgressDecorator = (total, fn) => {
 const isFetchSupported = typeof fetch !== 'undefined';
 const isReadableStreamSupported = isFetchSupported && typeof ReadableStream !== 'undefined';
 
+// used only inside the fetch adapter
+const encodeText = isFetchSupported && (typeof TextEncoder !== 'undefined' ?
+    ((encoder) => (str) => encoder.encode(str))(new TextEncoder()) :
+    async (str) => new Uint8Array(await new Response(str).arrayBuffer())
+);
+
 const supportsRequestStream = isReadableStreamSupported && (() => {
   let duplexAccessed = false;
 
@@ -80,7 +86,7 @@ const getBodyLength = async (body) => {
   }
 
   if(utils.isString(body)) {
-    return (await new TextEncoder().encode(body)).byteLength;
+    return (await encodeText(body)).byteLength;
   }
 }
 
@@ -144,7 +150,7 @@ export default isFetchSupported && (async (config) => {
         data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, fetchProgressDecorator(
           requestContentLength,
           progressEventReducer(onUploadProgress)
-        ));
+        ), null, encodeText);
       }
     }
 
@@ -179,7 +185,7 @@ export default isFetchSupported && (async (config) => {
         trackStream(response.body, DEFAULT_CHUNK_SIZE, onDownloadProgress && fetchProgressDecorator(
           responseContentLength,
           progressEventReducer(onDownloadProgress, true)
-        ), isStreamResponse && onFinish),
+        ), isStreamResponse && onFinish, encodeText),
         options
       );
     }
diff --git a/lib/helpers/trackStream.js b/lib/helpers/trackStream.js
@@ -1,4 +1,5 @@
 
+
 export const streamChunk = function* (chunk, chunkSize) {
   let len = chunk.byteLength;
 
@@ -17,16 +18,14 @@ export const streamChunk = function* (chunk, chunkSize) {
   }
 }
 
-const encoder = new TextEncoder();
-
-export const readBytes = async function* (iterable, chunkSize) {
+export const readBytes = async function* (iterable, chunkSize, encode) {
   for await (const chunk of iterable) {
-    yield* streamChunk(ArrayBuffer.isView(chunk) ? chunk : (await encoder.encode(String(chunk))), chunkSize);
+    yield* streamChunk(ArrayBuffer.isView(chunk) ? chunk : (await encode(String(chunk))), chunkSize);
   }
 }
 
-export const trackStream = (stream, chunkSize, onProgress, onFinish) => {
-  const iterator = readBytes(stream, chunkSize);
+export const trackStream = (stream, chunkSize, onProgress, onFinish, encode) => {
+  const iterator = readBytes(stream, chunkSize, encode);
 
   let bytes = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,12 @@ const fetchProgressDecorator = (total, fn) => {`
`20`	`20`	`const isFetchSupported = typeof fetch !== 'undefined';`
`21`	`21`	`const isReadableStreamSupported = isFetchSupported && typeof ReadableStream !== 'undefined';`
`22`	`22`
	`23`	`+// used only inside the fetch adapter`
	`24`	`+const encodeText = isFetchSupported && (typeof TextEncoder !== 'undefined' ?`
	`25`	`+ ((encoder) => (str) => encoder.encode(str))(new TextEncoder()) :`
	`26`	`+ async (str) => new Uint8Array(await new Response(str).arrayBuffer())`
	`27`	`+);`
	`28`	`+`
`23`	`29`	`const supportsRequestStream = isReadableStreamSupported && (() => {`
`24`	`30`	`let duplexAccessed = false;`
`25`	`31`
`@@ -80,7 +86,7 @@ const getBodyLength = async (body) => {`
`80`	`86`	`}`
`81`	`87`
`82`	`88`	`if(utils.isString(body)) {`
`83`		`- return (await new TextEncoder().encode(body)).byteLength;`
	`89`	`+ return (await encodeText(body)).byteLength;`
`84`	`90`	`}`
`85`	`91`	`}`
`86`	`92`
`@@ -144,7 +150,7 @@ export default isFetchSupported && (async (config) => {`
`144`	`150`	`data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, fetchProgressDecorator(`
`145`	`151`	`requestContentLength,`
`146`	`152`	`progressEventReducer(onUploadProgress)`
`147`		`- ));`
	`153`	`+ ), null, encodeText);`
`148`	`154`	`}`
`149`	`155`	`}`
`150`	`156`
`@@ -179,7 +185,7 @@ export default isFetchSupported && (async (config) => {`
`179`	`185`	`trackStream(response.body, DEFAULT_CHUNK_SIZE, onDownloadProgress && fetchProgressDecorator(`
`180`	`186`	`responseContentLength,`
`181`	`187`	`progressEventReducer(onDownloadProgress, true)`
`182`		`- ), isStreamResponse && onFinish),`
	`188`	`+ ), isStreamResponse && onFinish, encodeText),`
`183`	`189`	`options`
`184`	`190`	`);`
`185`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`
	`2`	`+`
`2`	`3`	`export const streamChunk = function* (chunk, chunkSize) {`
`3`	`4`	`let len = chunk.byteLength;`
`4`	`5`
`@@ -17,16 +18,14 @@ export const streamChunk = function* (chunk, chunkSize) {`
`17`	`18`	`}`
`18`	`19`	`}`
`19`	`20`
`20`		`-const encoder = new TextEncoder();`
`21`		`-`
`22`		`-export const readBytes = async function* (iterable, chunkSize) {`
	`21`	`+export const readBytes = async function* (iterable, chunkSize, encode) {`
`23`	`22`	`for await (const chunk of iterable) {`
`24`		`- yield* streamChunk(ArrayBuffer.isView(chunk) ? chunk : (await encoder.encode(String(chunk))), chunkSize);`
	`23`	`+ yield* streamChunk(ArrayBuffer.isView(chunk) ? chunk : (await encode(String(chunk))), chunkSize);`
`25`	`24`	`}`
`26`	`25`	`}`
`27`	`26`
`28`		`-export const trackStream = (stream, chunkSize, onProgress, onFinish) => {`
`29`		`- const iterator = readBytes(stream, chunkSize);`
	`27`	`+export const trackStream = (stream, chunkSize, onProgress, onFinish, encode) => {`
	`28`	`+ const iterator = readBytes(stream, chunkSize, encode);`
`30`	`29`
`31`	`30`	`let bytes = 0;`
`32`	`31`