@umituz/react-native-ai-fal-provider 3.2.3 → 3.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-ai-fal-provider",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "description": "FAL AI provider for React Native - implements IAIProvider interface for unified AI generation",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/infrastructure/services/fal-provider-subscription.ts

@@ -112,8 +112,9 @@ export async function handleFalSubscription<T = unknown>(
             Array.isArray(update.logs) ? update.logs : undefined,
           );
 
-          if (jobStatus.status !== lastStatus) {
-            lastStatus = jobStatus.status;
+          const statusWithPosition = `${jobStatus.status}:${jobStatus.queuePosition ?? ""}`;
+          if (statusWithPosition !== lastStatus) {
+            lastStatus = statusWithPosition;
             if (options?.onProgress) {
               if (jobStatus.status === "IN_QUEUE" || jobStatus.status === "IN_PROGRESS") {
                 options.onProgress({ progress: -1, status: jobStatus.status });
@@ -137,7 +138,7 @@ export async function handleFalSubscription<T = unknown>(
     if (signal) {
       const abortPromise = new Promise<never>((_, reject) => {
         abortHandler = () => reject(new Error("Request cancelled by user"));
-        signal.addEventListener("abort", abortHandler);
+        signal.addEventListener("abort", abortHandler, { once: true });
         listenerAdded = true;
         // Re-check after listener to handle race
         if (signal.aborted) {

package/src/infrastructure/services/fal-provider.ts

@@ -13,7 +13,7 @@ import { handleFalSubscription, handleFalRun } from "./fal-provider-subscription
 import { preprocessInput } from "../utils";
 import {
   createRequestKey, getExistingRequest, storeRequest,
-  removeRequest, cancelAllRequests, hasActiveRequests,
+  removeRequest, cancelRequest, cancelAllRequests, hasActiveRequests,
 } from "./request-store";
 import * as queueOps from "./fal-queue-operations";
 import { validateInput } from "../utils/input-validator.util";
@@ -24,6 +24,7 @@ export class FalProvider implements IAIProvider {
 
   private apiKey: string | null = null;
   private initialized = false;
+  private lastRequestKey: string | null = null;
 
   initialize(config: AIProviderConfig): void {
     this.apiKey = config.apiKey;
@@ -110,6 +111,7 @@ export class FalProvider implements IAIProvider {
       rejectPromise = reject;
     });
 
+    this.lastRequestKey = key;
     storeRequest(key, { promise, abortController, createdAt: Date.now() });
 
     handleFalSubscription<T>(model, processedInput, options, abortController.signal)
@@ -143,13 +145,18 @@ export class FalProvider implements IAIProvider {
   }
 
   reset(): void {
-    this.cancelCurrentRequest();
+    cancelAllRequests();
+    this.lastRequestKey = null;
     this.apiKey = null;
     this.initialized = false;
   }
 
   cancelCurrentRequest(): void {
-    cancelAllRequests();
+    // Cancel only this provider instance's last request, not all global requests
+    if (this.lastRequestKey) {
+      cancelRequest(this.lastRequestKey);
+      this.lastRequestKey = null;
+    }
   }
 
   hasRunningRequest(): boolean {

package/src/infrastructure/services/request-store.ts

@@ -37,11 +37,24 @@ export function getRequestStore(): RequestStore {
   return globalObj[STORE_KEY] as RequestStore;
 }
 
+/**
+ * Recursively sort object keys for deterministic JSON output
+ */
+function sortKeys(obj: unknown): unknown {
+  if (obj === null || typeof obj !== "object") return obj;
+  if (Array.isArray(obj)) return obj.map(sortKeys);
+  const sorted: Record<string, unknown> = {};
+  for (const key of Object.keys(obj as Record<string, unknown>).sort()) {
+    sorted[key] = sortKeys((obj as Record<string, unknown>)[key]);
+  }
+  return sorted;
+}
+
 /**
  * Create a deterministic request key using model and input hash
  */
 export function createRequestKey(model: string, input: Record<string, unknown>): string {
-  const inputStr = JSON.stringify(input, Object.keys(input).sort());
+  const inputStr = JSON.stringify(sortKeys(input));
   let hash = 0;
   for (let i = 0; i < inputStr.length; i++) {
     const char = inputStr.charCodeAt(i);
@@ -73,6 +86,19 @@ export function removeRequest(key: string): void {
   // This prevents the race where a new request arrives right after we stop
 }
 
+/**
+ * Cancel a single request by key
+ */
+export function cancelRequest(key: string): void {
+  const store = getRequestStore();
+  const req = store.get(key);
+  if (req) {
+    req.abortController.abort();
+    store.delete(key);
+    if (store.size === 0) stopCleanupTimer();
+  }
+}
+
 export function cancelAllRequests(): void {
   const store = getRequestStore();
   store.forEach((req) => {

package/src/infrastructure/utils/fal-generation-state-manager.util.ts

@@ -79,8 +79,8 @@ export class FalGenerationStateManager<T> {
       queuePosition: status.queuePosition,
     };
 
-    // Only notify if status actually changed (idempotent callbacks)
-    const statusKey = `${normalizedStatus.status}-${normalizedStatus.requestId}`;
+    // Only notify if status or queue position changed (idempotent callbacks)
+    const statusKey = `${normalizedStatus.status}-${normalizedStatus.requestId}-${normalizedStatus.queuePosition ?? ""}`;
     if (this.lastNotifiedStatus !== statusKey) {
       this.lastNotifiedStatus = statusKey;
       this.options?.onQueueUpdate?.(normalizedStatus);