feat: move subscribe to top-level

fal-ai · Oct 4, 2023 · 813e3de · 813e3de
1 parent c2ebc7b
commit 813e3de
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 43 deletions.
diff --git a/libs/client/src/function.ts b/libs/client/src/function.ts
@@ -112,6 +112,50 @@ export async function run<Input, Output>(
   return await responseHandler(response);
 }
 
+/**
+ * Subscribes to updates for a specific request in the queue.
+ *
+ * @param id - The ID or URL of the function web endpoint.
+ * @param options - Options to configure how the request is run and how updates are received.
+ * @returns A promise that resolves to the result of the request once it's completed.
+ */
+export async function subscribe<Input, Output>(
+  id: string,
+  options: RunOptions<Input> & QueueSubscribeOptions = {}
+): Promise<Output> {
+  const { request_id: requestId } = await queue.submit(id, options);
+  if (options.onEnqueue) {
+    options.onEnqueue(requestId);
+  }
+  return new Promise<Output>((resolve, reject) => {
+    let timeoutId: ReturnType<typeof setTimeout>;
+    const pollInterval = options.pollInterval ?? 1000;
+    const poll = async () => {
+      try {
+        const requestStatus = await queue.status(id, requestId);
+        if (options.onQueueUpdate) {
+          options.onQueueUpdate(requestStatus);
+        }
+        if (requestStatus.status === 'COMPLETED') {
+          clearTimeout(timeoutId);
+          try {
+            const result = await queue.result<Output>(id, requestId);
+            resolve(result);
+          } catch (error) {
+            reject(error);
+          }
+          return;
+        }
+        timeoutId = setTimeout(poll, pollInterval);
+      } catch (error) {
+        clearTimeout(timeoutId);
+        reject(error);
+      }
+    };
+    poll().catch(reject);
+  });
+}
+
 /**
  * Options for subscribing to the request queue.
  */
@@ -168,11 +212,7 @@ interface Queue {
   result<Output>(id: string, requestId: string): Promise<Output>;
 
   /**
-   * Subscribes to updates for a specific request in the queue.
-   *
-   * @param id - The ID or URL of the function web endpoint.
-   * @param options - Options to configure how the request is run and how updates are received.
-   * @returns A promise that resolves to the result of the request once it's completed.
+   * @deprecated Use `fal.subscribe` instead.
    */
   subscribe<Input, Output>(
     id: string,
@@ -204,40 +244,5 @@ export const queue: Queue = {
       path: `/fal/queue/requests/${requestId}/response`,
     });
   },
-  async subscribe<Input, Output>(
-    id: string,
-    options: RunOptions<Input> & QueueSubscribeOptions = {}
-  ): Promise<Output> {
-    const { request_id: requestId } = await queue.submit(id, options);
-    if (options.onEnqueue) {
-      options.onEnqueue(requestId);
-    }
-    return new Promise<Output>((resolve, reject) => {
-      let timeoutId: ReturnType<typeof setTimeout>;
-      const pollInterval = options.pollInterval ?? 1000;
-      const poll = async () => {
-        try {
-          const requestStatus = await queue.status(id, requestId);
-          if (options.onQueueUpdate) {
-            options.onQueueUpdate(requestStatus);
-          }
-          if (requestStatus.status === 'COMPLETED') {
-            clearTimeout(timeoutId);
-            try {
-              const result = await queue.result<Output>(id, requestId);
-              resolve(result);
-            } catch (error) {
-              reject(error);
-            }
-            return;
-          }
-          timeoutId = setTimeout(poll, pollInterval);
-        } catch (error) {
-          clearTimeout(timeoutId);
-          reject(error);
-        }
-      };
-      poll().catch(reject);
-    });
-  },
+  subscribe,
 };
diff --git a/libs/client/src/index.ts b/libs/client/src/index.ts
@@ -1,5 +1,5 @@
 export { config, getConfig } from './config';
-export { queue, run } from './function';
+export { queue, run, subscribe } from './function';
 export { withMiddleware } from './middleware';
 export { ApiError, ValidationError } from './response';
 export type { RequestMiddleware } from './middleware';

diff --git a/libs/client/src/response.ts b/libs/client/src/response.ts
@@ -42,7 +42,7 @@ export async function defaultResponseHandler<Output>(
         body,
       });
     }
-    throw new Error(`HTTP ${status}: ${statusText}`);
+    throw new ApiError({ message: `HTTP ${status}: ${statusText}`, status });
   }
   if (contentType?.includes('application/json')) {
     return response.json() as Promise<Output>;