@umituz/react-native-ai-fal-provider 2.0.0 → 2.0.2

package/package.json

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

package/src/exports/domain.ts

@@ -0,0 +1,59 @@
+/**
+ * Domain Layer Exports
+ */
+
+export type {
+  FalConfig,
+  FalModel,
+  FalModelType,
+  FalModelPricing,
+  FalJobInput,
+  FalJobResult,
+  FalLogEntry,
+  FalQueueStatus,
+  FalSubscribeOptions,
+} from "../domain/entities/fal.types";
+
+export type {
+  GenerationCost,
+  CostTrackerConfig,
+  CostSummary,
+  ModelCostInfo,
+} from "../domain/entities/cost-tracking.types";
+
+export { FalErrorType } from "../domain/entities/error.types";
+export type {
+  FalErrorCategory,
+  FalErrorInfo,
+  FalErrorMessages,
+} from "../domain/entities/error.types";
+
+export {
+  DEFAULT_TEXT_TO_IMAGE_MODELS,
+  DEFAULT_TEXT_TO_VOICE_MODELS,
+  DEFAULT_TEXT_TO_VIDEO_MODELS,
+  DEFAULT_IMAGE_TO_VIDEO_MODELS,
+  getAllDefaultModels,
+  getDefaultModelsByType,
+  getDefaultModel,
+  findModelById,
+} from "../domain/constants/default-models.constants";
+export type { FalModelConfig } from "../domain/constants/default-models.constants";
+
+export { FAL_IMAGE_FEATURE_MODELS } from "../domain/constants/feature-models.constants";
+
+export type {
+  UpscaleOptions,
+  PhotoRestoreOptions,
+  FaceSwapOptions,
+  ImageToImagePromptConfig,
+  RemoveBackgroundOptions,
+  RemoveObjectOptions,
+  ReplaceBackgroundOptions,
+  VideoFromImageOptions,
+  ModelType,
+  ModelSelectionConfig,
+  ModelSelectionState,
+  ModelSelectionActions,
+  UseModelsReturn,
+} from "../domain/types";

package/src/exports/infrastructure.ts

@@ -0,0 +1,97 @@
+/**
+ * Infrastructure Layer Exports
+ */
+
+export {
+  FalProvider,
+  falProvider,
+  falModelsService,
+  NSFWContentError,
+  cancelCurrentFalRequest,
+  hasRunningFalRequest,
+} from "../infrastructure/services";
+export type { FalProviderType } from "../infrastructure/services";
+
+export {
+  categorizeFalError,
+  falErrorMapper,
+  mapFalError,
+  isFalErrorRetryable,
+  buildSingleImageInput,
+  buildDualImageInput,
+  buildUpscaleInput,
+  buildPhotoRestoreInput,
+  buildVideoFromImageInput,
+  buildFaceSwapInput,
+  buildImageToImageInput,
+  buildRemoveBackgroundInput,
+  buildRemoveObjectInput,
+  buildReplaceBackgroundInput,
+  buildHDTouchUpInput,
+} from "../infrastructure/utils";
+
+export { CostTracker } from "../infrastructure/utils/cost-tracker";
+
+export {
+  isFalModelType,
+  isModelType,
+  isFalErrorType,
+  isValidBase64Image,
+  isValidApiKey,
+  isValidModelId,
+  isValidPrompt,
+  isValidTimeout,
+  isValidRetryCount,
+} from "../infrastructure/utils";
+
+export {
+  formatImageDataUri,
+  extractBase64,
+  getDataUriExtension,
+  isImageDataUri,
+  uploadToFalStorage,
+  uploadMultipleToFalStorage,
+  calculateTimeoutWithJitter,
+  formatCreditCost,
+  truncatePrompt,
+  sanitizePrompt,
+  buildErrorMessage,
+  isDefined,
+  removeNullish,
+  debounce,
+  throttle,
+} from "../infrastructure/utils";
+
+export {
+  createJobMetadata,
+  updateJobMetadata,
+  isJobCompleted,
+  isJobRunning,
+  isJobStale,
+  getJobDuration,
+  formatJobDuration,
+  calculateJobProgress,
+  serializeJobMetadata,
+  deserializeJobMetadata,
+  filterValidJobs,
+  sortJobsByCreation,
+  getActiveJobs,
+  getCompletedJobs,
+} from "../infrastructure/utils";
+
+export {
+  saveJobMetadata,
+  loadJobMetadata,
+  deleteJobMetadata,
+  loadAllJobs,
+  cleanupOldJobs,
+  getJobsByModel,
+  getJobsByStatus,
+  updateJobStatus,
+} from "../infrastructure/utils";
+
+export type {
+  FalJobMetadata,
+  IJobStorage,
+  InMemoryJobStorage,
+} from "../infrastructure/utils";

package/src/exports/presentation.ts

@@ -0,0 +1,23 @@
+/**
+ * Presentation Layer Exports
+ */
+
+export {
+  useFalGeneration,
+  useModels,
+  useModelCapabilities,
+  useVideoDurations,
+  useVideoResolutions,
+  useAspectRatios,
+} from "../presentation/hooks";
+
+export type {
+  UseFalGenerationOptions,
+  UseFalGenerationResult,
+  UseModelsProps,
+  UseModelCapabilitiesOptions,
+  UseModelCapabilitiesReturn,
+  UseVideoDurationsReturn,
+  UseVideoResolutionsReturn,
+  UseAspectRatiosReturn,
+} from "../presentation/hooks";

package/src/exports/registry.ts

@@ -0,0 +1,39 @@
+/**
+ * Model Registry Exports
+ */
+
+export {
+  VIDEO_ASPECT_RATIOS,
+  IMAGE_ASPECT_RATIOS,
+  GLOBAL_CAPABILITIES,
+  GLOBAL_DEFAULTS,
+  SORA_2_DURATIONS,
+  SORA_2_RESOLUTIONS,
+  SORA_2_CREDITS_BY_DURATION,
+  SORA_2_TEXT_TO_VIDEO,
+  SORA_2_IMAGE_TO_VIDEO,
+  SORA_2_MODELS,
+  MODEL_REGISTRY,
+  getModelConfig,
+  getModelsByType,
+  getEnabledModels,
+  getModelCapabilities,
+  getModelCreditCost,
+  getDefaultModelFromRegistry,
+} from "../registry";
+
+export type {
+  ModelType as RegistryModelType,
+  ModelProvider,
+  DurationOption,
+  ResolutionOption,
+  AspectRatioOption,
+  ModelCapabilities,
+  ModelPricing,
+  ModelDefaults,
+  ModelConfig,
+  ModelRegistry as ModelRegistryType,
+  ResolvedCapabilities,
+  GlobalCapabilities,
+  GlobalDefaults,
+} from "../registry";

package/src/index.ts

@@ -3,213 +3,20 @@
  * FAL AI provider for React Native - implements IAIProvider interface
  */
 
-export type {
-  FalConfig,
-  FalModel,
-  FalModelType,
-  FalModelPricing,
-  FalJobInput,
-  FalJobResult,
-  FalLogEntry,
-  FalQueueStatus,
-  FalSubscribeOptions,
-} from "./domain/entities/fal.types";
+// Domain Layer
+export * from "./exports/domain";
 
-export type {
-  GenerationCost,
-  CostTrackerConfig,
-  CostSummary,
-  ModelCostInfo,
-} from "./domain/entities/cost-tracking.types";
+// Infrastructure Layer
+export * from "./exports/infrastructure";
 
-export { FalErrorType } from "./domain/entities/error.types";
-export type {
-  FalErrorCategory,
-  FalErrorInfo,
-  FalErrorMessages,
-} from "./domain/entities/error.types";
+// Presentation Layer
+export * from "./exports/presentation";
 
-export {
-  DEFAULT_TEXT_TO_IMAGE_MODELS,
-  DEFAULT_TEXT_TO_VOICE_MODELS,
-  DEFAULT_TEXT_TO_VIDEO_MODELS,
-  DEFAULT_IMAGE_TO_VIDEO_MODELS,
-  getAllDefaultModels,
-  getDefaultModelsByType,
-  getDefaultModel,
-  findModelById,
-} from "./domain/constants/default-models.constants";
-export type { FalModelConfig } from "./domain/constants/default-models.constants";
-
-export { FAL_IMAGE_FEATURE_MODELS } from "./domain/constants/feature-models.constants";
-
-export {
-  FalProvider,
-  falProvider,
-  falModelsService,
-  NSFWContentError,
-  cancelCurrentFalRequest,
-  hasRunningFalRequest,
-} from "./infrastructure/services";
-export type { FalProviderType } from "./infrastructure/services";
-
-export {
-  categorizeFalError,
-  falErrorMapper,
-  mapFalError,
-  isFalErrorRetryable,
-  buildSingleImageInput,
-  buildDualImageInput,
-  buildUpscaleInput,
-  buildPhotoRestoreInput,
-  buildVideoFromImageInput,
-  buildFaceSwapInput,
-  buildImageToImageInput,
-  buildRemoveBackgroundInput,
-  buildRemoveObjectInput,
-  buildReplaceBackgroundInput,
-  buildHDTouchUpInput,
-} from "./infrastructure/utils";
-
-export { CostTracker } from "./infrastructure/utils/cost-tracker";
-
-export {
-  isFalModelType,
-  isModelType,
-  isFalErrorType,
-  isValidBase64Image,
-  isValidApiKey,
-  isValidModelId,
-  isValidPrompt,
-  isValidTimeout,
-  isValidRetryCount,
-} from "./infrastructure/utils";
-
-export {
-  formatImageDataUri,
-  extractBase64,
-  getDataUriExtension,
-  isImageDataUri,
-  uploadToFalStorage,
-  uploadMultipleToFalStorage,
-  calculateTimeoutWithJitter,
-  formatCreditCost,
-  truncatePrompt,
-  sanitizePrompt,
-  buildErrorMessage,
-  isDefined,
-  removeNullish,
-  debounce,
-  throttle,
-} from "./infrastructure/utils";
-
-export {
-  createJobMetadata,
-  updateJobMetadata,
-  isJobCompleted,
-  isJobRunning,
-  isJobStale,
-  getJobDuration,
-  formatJobDuration,
-  calculateJobProgress,
-  serializeJobMetadata,
-  deserializeJobMetadata,
-  filterValidJobs,
-  sortJobsByCreation,
-  getActiveJobs,
-  getCompletedJobs,
-} from "./infrastructure/utils";
-
-export {
-  saveJobMetadata,
-  loadJobMetadata,
-  deleteJobMetadata,
-  loadAllJobs,
-  cleanupOldJobs,
-  getJobsByModel,
-  getJobsByStatus,
-  updateJobStatus,
-} from "./infrastructure/utils";
-
-export type {
-  FalJobMetadata,
-  IJobStorage,
-  InMemoryJobStorage,
-} from "./infrastructure/utils";
-
-export type {
-  UpscaleOptions,
-  PhotoRestoreOptions,
-  FaceSwapOptions,
-  ImageToImagePromptConfig,
-  RemoveBackgroundOptions,
-  RemoveObjectOptions,
-  ReplaceBackgroundOptions,
-  VideoFromImageOptions,
-  ModelType,
-  ModelSelectionConfig,
-  ModelSelectionState,
-  ModelSelectionActions,
-  UseModelsReturn,
-} from "./domain/types";
-
-export {
-  useFalGeneration,
-  useModels,
-  useModelCapabilities,
-  useVideoDurations,
-  useVideoResolutions,
-  useAspectRatios,
-} from "./presentation/hooks";
-export type {
-  UseFalGenerationOptions,
-  UseFalGenerationResult,
-  UseModelsProps,
-  UseModelCapabilitiesOptions,
-  UseModelCapabilitiesReturn,
-  UseVideoDurationsReturn,
-  UseVideoResolutionsReturn,
-  UseAspectRatiosReturn,
-} from "./presentation/hooks";
+// Model Registry
+export * from "./exports/registry";
 
 // Init Module Factory
 export {
   createAiProviderInitModule,
   type AiProviderInitModuleConfig,
 } from './init';
-
-// Model Registry
-export {
-  VIDEO_ASPECT_RATIOS,
-  IMAGE_ASPECT_RATIOS,
-  GLOBAL_CAPABILITIES,
-  GLOBAL_DEFAULTS,
-  SORA_2_DURATIONS,
-  SORA_2_RESOLUTIONS,
-  SORA_2_CREDITS_BY_DURATION,
-  SORA_2_TEXT_TO_VIDEO,
-  SORA_2_IMAGE_TO_VIDEO,
-  SORA_2_MODELS,
-  MODEL_REGISTRY,
-  getModelConfig,
-  getModelsByType,
-  getEnabledModels,
-  getModelCapabilities,
-  getModelCreditCost,
-  getDefaultModelFromRegistry,
-} from "./registry";
-export type {
-  ModelType as RegistryModelType,
-  ModelProvider,
-  DurationOption,
-  ResolutionOption,
-  AspectRatioOption,
-  ModelCapabilities,
-  ModelPricing,
-  ModelDefaults,
-  ModelConfig,
-  ModelRegistry as ModelRegistryType,
-  ResolvedCapabilities,
-  GlobalCapabilities,
-  GlobalDefaults,
-} from "./registry";

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

@@ -12,23 +12,13 @@ import type {
 import type { CostTrackerConfig } from "../../domain/entities/cost-tracking.types";
 import { DEFAULT_FAL_CONFIG, FAL_CAPABILITIES } from "./fal-provider.constants";
 import { handleFalSubscription, handleFalRun } from "./fal-provider-subscription";
-import { CostTracker } from "../utils/cost-tracker";
+import { CostTracker, executeWithCostTracking, preprocessInput } from "../utils";
 import {
   createRequestKey, getExistingRequest, storeRequest,
   removeRequest, cancelAllRequests, hasActiveRequests,
 } from "./request-store";
-import {
-  submitJob as submitJobImpl,
-  getJobStatus as getJobStatusImpl,
-  getJobResult as getJobResultImpl,
-} from "./fal-queue-operations";
-import {
-  getImageFeatureModel as getImageFeatureModelImpl,
-  getVideoFeatureModel as getVideoFeatureModelImpl,
-  buildImageFeatureInput as buildImageFeatureInputImpl,
-  buildVideoFeatureInput as buildVideoFeatureInputImpl,
-} from "./fal-feature-models";
-import { preprocessInput } from "../utils/input-preprocessor.util";
+import * as queueOps from "./fal-queue-operations";
+import * as featureModels from "./fal-feature-models";
 
 declare const __DEV__: boolean | undefined;
 
@@ -96,17 +86,17 @@ export class FalProvider implements IAIProvider {
 
   async submitJob(model: string, input: Record<string, unknown>): Promise<JobSubmission> {
     this.validateInit();
-    return submitJobImpl(model, input);
+    return queueOps.submitJob(model, input);
   }
 
   async getJobStatus(model: string, requestId: string): Promise<JobStatus> {
     this.validateInit();
-    return getJobStatusImpl(model, requestId);
+    return queueOps.getJobStatus(model, requestId);
   }
 
   async getJobResult<T = unknown>(model: string, requestId: string): Promise<T> {
     this.validateInit();
-    return getJobResultImpl<T>(model, requestId);
+    return queueOps.getJobResult<T>(model, requestId);
   }
 
   async subscribe<T = unknown>(
@@ -128,35 +118,15 @@ export class FalProvider implements IAIProvider {
     }
 
     const abortController = new AbortController();
-    const operationId = this.costTracker?.startOperation(model, "subscribe");
-    // Capture costTracker reference to avoid race condition during reset
     const tracker = this.costTracker;
 
-    const promise = handleFalSubscription<T>(model, processedInput, options, abortController.signal)
-      .then(({ result, requestId }) => {
-        if (operationId && tracker) {
-          try {
-            tracker.completeOperation(operationId, model, "subscribe", requestId ?? undefined);
-          } catch (costError) {
-            if (typeof __DEV__ !== "undefined" && __DEV__) {
-              console.warn("[FalProvider] Cost tracking failed:", costError);
-            }
-          }
-        }
-        return result;
-      })
-      .catch((error) => {
-        // Mark operation as failed in cost tracker
-        if (operationId && tracker) {
-          try {
-            tracker.failOperation(operationId);
-          } catch {
-            // Silently ignore cost tracking errors on failure path
-          }
-        }
-        throw error;
-      })
-      .finally(() => removeRequest(key));
+    const promise = executeWithCostTracking({
+      tracker,
+      model,
+      operation: "subscribe",
+      execute: () => handleFalSubscription<T>(model, processedInput, options, abortController.signal),
+      getRequestId: (res) => res.requestId ?? undefined,
+    }).then((res) => res.result).finally(() => removeRequest(key));
 
     storeRequest(key, { promise, abortController });
     return promise;
@@ -165,33 +135,13 @@ export class FalProvider implements IAIProvider {
   async run<T = unknown>(model: string, input: Record<string, unknown>, options?: RunOptions): Promise<T> {
     this.validateInit();
     const processedInput = await preprocessInput(input);
-    const operationId = this.costTracker?.startOperation(model, "run");
-    // Capture costTracker reference to avoid race condition during reset
-    const tracker = this.costTracker;
 
-    try {
-      const result = await handleFalRun<T>(model, processedInput, options);
-      if (operationId && tracker) {
-        try {
-          tracker.completeOperation(operationId, model, "run");
-        } catch (costError) {
-          if (typeof __DEV__ !== "undefined" && __DEV__) {
-            console.warn("[FalProvider] Cost tracking failed:", costError);
-          }
-        }
-      }
-      return result;
-    } catch (error) {
-      // Mark operation as failed in cost tracker
-      if (operationId && tracker) {
-        try {
-          tracker.failOperation(operationId);
-        } catch {
-          // Silently ignore cost tracking errors on failure path
-        }
-      }
-      throw error;
-    }
+    return executeWithCostTracking({
+      tracker: this.costTracker,
+      model,
+      operation: "run",
+      execute: () => handleFalRun<T>(model, processedInput, options),
+    });
   }
 
   reset(): void {
@@ -209,19 +159,19 @@ export class FalProvider implements IAIProvider {
   }
 
   getImageFeatureModel(feature: ImageFeatureType): string {
-    return getImageFeatureModelImpl(this.imageFeatureModels, feature);
+    return featureModels.getImageFeatureModel(this.imageFeatureModels, feature);
   }
 
   buildImageFeatureInput(feature: ImageFeatureType, data: ImageFeatureInputData): Record<string, unknown> {
-    return buildImageFeatureInputImpl(feature, data);
+    return featureModels.buildImageFeatureInput(feature, data);
   }
 
   getVideoFeatureModel(feature: VideoFeatureType): string {
-    return getVideoFeatureModelImpl(this.videoFeatureModels, feature);
+    return featureModels.getVideoFeatureModel(this.videoFeatureModels, feature);
   }
 
   buildVideoFeatureInput(feature: VideoFeatureType, data: VideoFeatureInputData): Record<string, unknown> {
-    return buildVideoFeatureInputImpl(feature, data);
+    return featureModels.buildVideoFeatureInput(feature, data);
   }
 }
 

package/src/infrastructure/utils/cost-tracking-executor.util.ts

@@ -0,0 +1,54 @@
+/**
+ * Cost Tracking Executor
+ * Wraps operations with cost tracking logic
+ */
+
+import type { CostTracker } from "./cost-tracker";
+
+declare const __DEV__: boolean | undefined;
+
+interface ExecuteWithCostTrackingOptions<T> {
+  tracker: CostTracker | null;
+  model: string;
+  operation: string;
+  execute: () => Promise<T>;
+  getRequestId?: (result: T) => string | undefined;
+}
+
+/**
+ * Execute an operation with cost tracking
+ * Handles start, complete, and fail operations automatically
+ */
+export async function executeWithCostTracking<T>(
+  options: ExecuteWithCostTrackingOptions<T>
+): Promise<T> {
+  const { tracker, model, operation, execute, getRequestId } = options;
+
+  if (!tracker) {
+    return execute();
+  }
+
+  const operationId = tracker.startOperation(model, operation);
+
+  try {
+    const result = await execute();
+
+    try {
+      const requestId = getRequestId?.(result);
+      tracker.completeOperation(operationId, model, operation, requestId);
+    } catch (costError) {
+      if (typeof __DEV__ !== "undefined" && __DEV__) {
+        console.warn("[CostTracking] Failed:", costError);
+      }
+    }
+
+    return result;
+  } catch (error) {
+    try {
+      tracker.failOperation(operationId);
+    } catch {
+      // Silently ignore cost tracking errors on failure path
+    }
+    throw error;
+  }
+}

package/src/infrastructure/utils/index.ts

@@ -87,4 +87,6 @@ export type { IJobStorage, InMemoryJobStorage } from "./job-storage";
 
 export { CostTracker } from "./cost-tracker";
 
+export { executeWithCostTracking } from "./cost-tracking-executor.util";
+
 export { preprocessInput } from "./input-preprocessor.util";