fix: Moved to factory

Author: asafgardin

src/APIClient.ts

@@ -12,7 +12,7 @@ import {
   FilePathOrFileObject,
 } from './types';
 import { AI21EnvConfig } from './EnvConfig';
-import { createFetchInstance, createFilesHandlerInstance } from './runtime';
+import { createFetchInstance, createFilesHandlerInstance } from './factory';
 import { Fetch } from 'fetch';
 import { BaseFilesHandler } from 'files/BaseFilesHandler';
 import { FormDataRequest } from 'types/API';

src/factory.ts

@@ -0,0 +1,21 @@
+import { BrowserFilesHandler } from './files/BrowserFilesHandler';
+import { BrowserFetch, Fetch, NodeFetch } from './fetch';
+import { NodeFilesHandler } from './files/NodeFilesHandler';
+import { BaseFilesHandler } from './files/BaseFilesHandler';
+import { isBrowser, isWebWorker } from 'runtime';
+
+export function createFetchInstance(): Fetch {
+  if (isBrowser || isWebWorker) {
+    return new BrowserFetch();
+  }
+
+  return new NodeFetch();
+}
+
+export function createFilesHandlerInstance(): BaseFilesHandler {
+  if (isBrowser || isWebWorker) {
+    return new BrowserFilesHandler();
+  }
+
+  return new NodeFilesHandler();
+}

src/files/NodeFilesHandler.ts

@@ -1,77 +1,86 @@
 import { FilePathOrFileObject } from 'types';
 import { BaseFilesHandler } from './BaseFilesHandler';
 import { FormDataRequest } from 'types/API';
+import { isNode } from 'runtime';
 
 export class NodeFilesHandler extends BaseFilesHandler {
   private async convertReadableStream(readableStream: ReadableStream): Promise<NodeJS.ReadableStream> {
-    try {
-      if (typeof window === 'undefined') {
-        const { Readable } = await import('stream');
-        const reader = readableStream.getReader();
+    if (!isNode) {
+      throw new Error('Stream conversion is not supported in browser environment');
+    }
 
-        return new Readable({
-          async read() {
-            const { done, value } = await reader.read();
-            if (done) {
-              this.push(null);
-            } else {
-              this.push(value);
-            }
-          },
-        });
-      } else {
-        throw new Error('Stream conversion is not supported in browser environment');
-      }
-    } catch (error) {
-      console.error('Error in convertReadableStream:', error);
-      throw error;
+    const { Readable } = await import('stream');
+    const reader = readableStream.getReader();
+
+    return new Readable({
+      async read() {
+        const { done, value } = await reader.read();
+        done ? this.push(null) : this.push(value);
+      },
+    });
+  }
+
+  private async handleStringFile(filePath: string, formData: any): Promise<void> {
+    // eslint-disable-line @typescript-eslint/no-explicit-any
+    if (!isNode) {
+      throw new Error('File system operations are not supported in browser environment');
+    }
+
+    const fs = await import('fs').then((m) => m.default || m);
+    if (!fs.existsSync(filePath)) {
+      throw new Error(`File not found: ${filePath}`);
     }
+
+    formData.append('file', fs.createReadStream(filePath), {
+      filename: filePath.split('/').pop(),
+    });
   }
 
   async prepareFormDataRequest(file: FilePathOrFileObject): Promise<FormDataRequest> {
-    console.log('Preparing form data request for Node.js');
     try {
-      const FormData = await import('form-data').then(m => m.default || m);
-      console.log('Successfully imported form-data module');
-      
+      const FormData = await import('form-data').then((m) => m.default || m);
       const formData = new FormData();
-      console.log('Created new FormData instance');
 
       if (typeof file === 'string') {
-        if (typeof window === 'undefined') {
-          const fs = await import('fs').then(m => m.default || m);
-          if (!fs.existsSync(file)) {
-            throw new Error(`File not found: ${file}`);
-          }
-          console.log(`Appending file from path: ${file}`);
-          formData.append('file', fs.createReadStream(file), { filename: file.split('/').pop() });
-        } else {
-          throw new Error('File system operations are not supported in browser environment');
-        }
-      } else if (file && typeof file === 'object') {
-        console.log('Processing file object:', file);
-        if ('buffer' in file) {
-          console.log('Appending file from buffer');
-          formData.append('file', file.buffer, { filename: file.name, contentType: file.type });
-        } else if ('stream' in file && typeof file.stream === 'function') {
-          console.log('Converting and appending file from stream');
-          const nodeStream = await this.convertReadableStream(file.stream());
-          formData.append('file', nodeStream, { filename: file.name, contentType: file.type });
-        } else {
-          throw new Error(`Invalid file object structure: ${JSON.stringify(file)}`);
-        }
-      } else {
+        await this.handleStringFile(file, formData);
+        return this.createFormDataResponse(formData);
+      }
+
+      if (!file || typeof file !== 'object') {
         throw new Error(`Unsupported file type for Node.js file upload flow: ${file}`);
       }
 
-      const formDataHeaders = { 'Content-Type': `multipart/form-data; boundary=${formData.getBoundary()}` };
-      console.log('FormData preparation completed successfully');
+      if ('buffer' in file) {
+        formData.append('file', file.buffer, {
+          filename: file.name,
+          contentType: file.type,
+        });
+        return this.createFormDataResponse(formData);
+      }
+
+      if ('stream' in file && typeof file.stream === 'function') {
+        const nodeStream = await this.convertReadableStream(file.stream());
+        formData.append('file', nodeStream, {
+          filename: file.name,
+          contentType: file.type,
+        });
+        return this.createFormDataResponse(formData);
+      }
 
-      return { formData, headers: formDataHeaders };
+      throw new Error(`Unsupported file type for Node.js file upload flow: ${file}`);
     } catch (error) {
       console.error('Error in prepareFormDataRequest:', error);
-      console.error('Error details:', error instanceof Error ? error.message : String(error));
       throw error;
     }
   }
+
+  private createFormDataResponse(formData: any): FormDataRequest {
+    // eslint-disable-line @typescript-eslint/no-explicit-any
+    return {
+      formData,
+      headers: {
+        'Content-Type': `multipart/form-data; boundary=${formData.getBoundary()}`,
+      },
+    };
+  }
 }

src/runtime.ts

@@ -1,8 +1,3 @@
-import { BrowserFilesHandler } from './files/BrowserFilesHandler';
-import { BrowserFetch, Fetch, NodeFetch } from './fetch';
-import { NodeFilesHandler } from './files/NodeFilesHandler';
-import { BaseFilesHandler } from './files/BaseFilesHandler';
-
 export const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
 
 /**
@@ -21,22 +16,3 @@ export const isWebWorker =
 
 export const isNode =
   typeof process !== 'undefined' && Boolean(process.version) && Boolean(process.versions?.node);
-
-export function createFetchInstance(): Fetch {
-  if (isBrowser || isWebWorker) {
-    console.log('Creating BrowserFetch instance');
-    return new BrowserFetch();
-  }
-
-  console.log('Creating NodeFetch instance');
-  return new NodeFetch();
-}
-
-export function createFilesHandlerInstance(): BaseFilesHandler {
-  if (isBrowser || isWebWorker) {
-    console.log('Creating BrowserFilesHandler instance');
-    return new BrowserFilesHandler();
-  }
-  console.log('Creating NodeFilesHandler instance');
-  return new NodeFilesHandler();
-}