Bases fetcher response type on header content-type

OnedocLabs · May 27, 2024 · 2c6305e · 2c6305e
1 parent 4551db3
commit 2c6305e
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 30 deletions.
diff --git a/output.pdf b/output.pdf
diff --git a/output_helper.pdf b/output_helper.pdf
diff --git a/output_merged.pdf b/output_merged.pdf
diff --git a/src/Client.ts b/src/Client.ts
@@ -40,7 +40,7 @@ export class FileForgeClient {
         files: File[] | fs.ReadStream[],
         request: FileForge.GenerateRequest,
         requestOptions?: FileForgeClient.RequestOptions
-    ): Promise<any>{
+    ): Promise<stream.Readable | any>{
         const _request = core.newFormData();
         const options = await serializers.GenerateRequestOptions.jsonOrThrow(request.options, {
             unrecognizedObjectKeys: "passthrough",

diff --git a/src/core/fetcher/Fetcher.ts b/src/core/fetcher/Fetcher.ts
@@ -55,15 +55,6 @@ async function* readableStreamAsyncIterator(stream: ReadableStream<Uint8Array>)
     }
   }
 
-function isStringifiedJSON(str: string): boolean {
-    try {
-      JSON.parse(str);
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
 
 const INITIAL_RETRY_DELAY = 1;
 const MAX_RETRY_DELAY = 60;
@@ -154,23 +145,23 @@ async function fetcherImpl<R = unknown>(args: Fetcher.Args): Promise<APIResponse
             body = await response.blob();
         } else if (response.body != null && args.responseType === "streaming") {
 
-            const chunks: any[] = [];
-
-            for await (let chunk of readableStreamAsyncIterator(response.body)) {
-                chunks.push(chunk);
-            }
-
-            const buffer: Buffer = Buffer.concat(chunks);
-            const bufferString = buffer.toString();
 
-            if (bufferString.includes("%%EOF")){
-                body = {"file":buffer};
+            if (response.headers.get('content-type')!.includes("application/json")){
+
+                const chunks: any[] = [];
+
+                for await (let chunk of readableStreamAsyncIterator(response.body)) {
+                    chunks.push(chunk);
+                }
+
+                const buffer: Buffer = Buffer.concat(chunks);
+                const bufferString = buffer.toString();
 
-            }else if (isStringifiedJSON(bufferString)){
                 body = JSON.parse(bufferString)
 
             }else{
-                body = bufferString
+
+                body = response.body
 
             }
 

diff --git a/tests/custom.test.ts b/tests/custom.test.ts
@@ -53,9 +53,17 @@ describe("test", () => {
                 options: {}
             }
         );       
-
 
-        await writeFile("output.pdf", pdf.file);
+        const chunks: any[] = [];
+
+        for await (let chunk of pdf) {
+            chunks.push(chunk);
+        }
+
+        const buffer: Buffer = Buffer.concat(chunks);
+        const bufferString = buffer.toString()
+
+        await writeFile("output.pdf", bufferString);
     }, 10_000_000);
 
 
@@ -82,7 +90,6 @@ describe("test", () => {
             }
         );
 
-
         expect(pdf.url).not.toBeNull();
 
     }, 10_000_000);
@@ -143,9 +150,18 @@ describe("test", () => {
                 test:false
             }
 
-        );       
+        );   
+        const chunks: any[] = [];
+
+        for await (let chunk of pdf) {
+            chunks.push(chunk);
+        }
+
+        const buffer: Buffer = Buffer.concat(chunks);
+        const bufferString = buffer.toString()
+
 
-        await writeFile("output_helper.pdf", pdf.file!);
+        await writeFile("output_helper.pdf", bufferString);
     }, 10_000_000);
 
     it("should generate a PDF url from helper", async () => {
@@ -197,10 +213,18 @@ describe("test", () => {
             {   
                 options: {},
             }            
-        );       
+        );   
+
+        const chunks: any[] = [];
+
+        for await (let chunk of pdf) {
+            chunks.push(chunk);
+        }
+
+        const buffer: Buffer = Buffer.concat(chunks);
+        const bufferString = buffer.toString()
 
-        await writeFile("output_merged.pdf", pdf.file);
-        expect(pdf.file).not.toBeNull();
+        await writeFile("output_merged.pdf", bufferString);
 }, 10_000_000);
 
 });