@privateid/ultrapass-web-sdk 1.6.0 → 1.7.0

package/dist/application/modules/support/camera/services/FirefoxCameraService.js

@@ -11,36 +11,108 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { BaseCameraService } from './BaseCameraService';
 import { CameraFaceMode } from '../camera.types';
 import { printLogs } from '../../../internal/shared/shared.utils';
-import { getFilteredVideoDevices, handleDeviceId, getMediaDeviceInfo, getDeviceMediaStream } from '../camera.utils';
+import { getFilteredVideoDevices, handleDeviceId, getMediaDeviceInfo, getDeviceMediaStream, isBackCameraLabel, } from '../camera.utils';
 export class FirefoxCameraService extends BaseCameraService {
     openCamera(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            printLogs('[FirefoxCameraService] openCamera props', props);
-            try {
-                this.setVideoElementId(props.videoElementId);
-                this.setFaceMode(props.requestFaceMode || CameraFaceMode.front);
-                const { isGranted } = yield this.permissionsService.requestCameraPermissions();
-                const devices = isGranted ? yield getFilteredVideoDevices() : [];
-                devices.forEach((device, index) => {
-                    printLogs(`[FirefoxCameraService] openCamera device ${index}: `, device);
-                });
-                if (devices.length === 0) {
-                    throw new Error('NO_CAMERA');
+            const maxAttempts = 3;
+            let lastError = null;
+            for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+                try {
+                    printLogs(`[FirefoxCameraService] openCamera attempt ${attempt}/${maxAttempts}`, '', 'DEBUG');
+                    printLogs('[FirefoxCameraService] openCamera props', props, 'DEBUG');
+                    localStorage.removeItem('defaultDeviceId');
+                    if (this.isActive()) {
+                        printLogs('[FirefoxCameraService] Camera is active, closing before reopening', '', 'DEBUG');
+                        yield this.closeCamera(props.videoElementId);
+                    }
+                    this.setVideoElementId(props.videoElementId);
+                    this.setFaceMode(props.requestFaceMode || CameraFaceMode.front);
+                    printLogs('[FirefoxCameraService] Requesting camera permission...', '', 'DEBUG');
+                    const { isGranted } = yield this.permissionsService.requestCameraPermissions();
+                    printLogs('[FirefoxCameraService] Getting filtered video devices...', '', 'DEBUG');
+                    let devices = isGranted ? yield getFilteredVideoDevices() : [];
+                    printLogs(`[FirefoxCameraService] Found ${devices.length} devices`, '', 'DEBUG');
+                    // Sort devices based on requestFaceMode to bring appropriate cameras first
+                    // This ensures back cameras appear first for document scan and front cameras for face scan
+                    if (props.requestFaceMode === CameraFaceMode.back) {
+                        devices = devices.sort((a, b) => {
+                            const aIsBack = isBackCameraLabel(a.label) ? 0 : 1;
+                            const bIsBack = isBackCameraLabel(b.label) ? 0 : 1;
+                            return aIsBack - bIsBack;
+                        });
+                    }
+                    else if (props.requestFaceMode === CameraFaceMode.front) {
+                        devices = devices.sort((a, b) => {
+                            const aIsFront = isBackCameraLabel(a.label) ? 1 : 0;
+                            const bIsFront = isBackCameraLabel(b.label) ? 1 : 0;
+                            return aIsFront - bIsFront;
+                        });
+                    }
+                    devices.forEach((device, index) => {
+                        printLogs(`[FirefoxCameraService] Device ${index}: `, device, 'DEBUG');
+                    });
+                    if (devices.length === 0) {
+                        throw new Error('NO_CAMERA');
+                    }
+                    printLogs('[FirefoxCameraService] Waiting for camera availability...', '', 'DEBUG');
+                    const deviceId = handleDeviceId(devices, props.deviceId, false);
+                    yield BaseCameraService.waitForCameraRelease(deviceId, this.faceMode);
+                    // Pass faceMode to handleDeviceId to retrieve the correct scoped device ID
+                    this.setCurrentDeviceId(deviceId);
+                    printLogs(`[FirefoxCameraService] Using deviceId: `, deviceId, 'DEBUG');
+                    printLogs('[FirefoxCameraService] Getting media device info...', '', 'DEBUG');
+                    const mediaDeviceInfo = yield getMediaDeviceInfo(devices, deviceId);
+                    printLogs('[FirefoxCameraService] Requesting media stream...', '', 'DEBUG');
+                    const stream = yield getDeviceMediaStream(mediaDeviceInfo.deviceId, 'firefox', {
+                        canvasResolution: props.canvasResolution,
+                    });
+                    printLogs('[FirefoxCameraService] Media stream obtained successfully', '', 'DEBUG');
+                    printLogs(`[FirefoxCameraService] Stream has ${stream.getVideoTracks().length} video tracks`, '', 'DEBUG');
+                    printLogs('[FirefoxCameraService] Preparing camera result...', '', 'DEBUG');
+                    const result = yield this.prepareCameraResult(stream, devices, this.getFaceMode(), props.videoElementId);
+                    printLogs('[FirefoxCameraService] Camera opened successfully', '', 'DEBUG');
+                    return result;
+                }
+                catch (e) {
+                    lastError = e;
+                    printLogs(`[FirefoxCameraService] Attempt ${attempt}/${maxAttempts} failed`, '', 'ERROR');
+                    printLogs(`[FirefoxCameraService] Error name: `, (e === null || e === void 0 ? void 0 : e.name) || 'unknown', 'DEBUG');
+                    printLogs(`[FirefoxCameraService] Error message: `, (e === null || e === void 0 ? void 0 : e.message) || 'unknown', 'DEBUG');
+                    const permissionState = yield this.permissionsService.checkCameraPermissions();
+                    printLogs(`[FirefoxCameraService] Camera permission state`, permissionState, 'ERROR');
+                    // Enhanced error reporting for common issues
+                    if ((e === null || e === void 0 ? void 0 : e.name) === 'NotAllowedError') {
+                        printLogs(`[FirefoxCameraService] Camera permission denied by user`, '', 'ERROR');
+                    }
+                    else if ((e === null || e === void 0 ? void 0 : e.name) === 'NotFoundError') {
+                        printLogs(`[FirefoxCameraService] No camera device found`, '', 'ERROR');
+                    }
+                    else if ((e === null || e === void 0 ? void 0 : e.name) === 'NotReadableError') {
+                        printLogs(`[FirefoxCameraService] Camera is already in use by another app/tab`, '', 'ERROR');
+                    }
+                    else if ((e === null || e === void 0 ? void 0 : e.name) === 'OverconstrainedError') {
+                        printLogs(`[FirefoxCameraService] Camera constraints cannot be satisfied`, '', 'ERROR');
+                    }
+                    else if ((e === null || e === void 0 ? void 0 : e.message) === 'NO_TRACK_SETTINGS') {
+                        printLogs(`[FirefoxCameraService] Failed to get track settings from camera`, '', 'ERROR');
+                    }
+                    else if ((e === null || e === void 0 ? void 0 : e.message) === 'NO_VIDEO_TRACKS') {
+                        printLogs(`[FirefoxCameraService] Stream has no video tracks`, '', 'ERROR');
+                    }
+                    printLogs(`[FirefoxCameraService] Error stack: `, (e === null || e === void 0 ? void 0 : e.stack) || 'no stack trace', 'DEBUG');
+                    // If this is not the last attempt, wait before retrying
+                    if (attempt < maxAttempts) {
+                        const retryDelay = attempt * 500; // Progressive delay: 500ms, 1000ms
+                        printLogs(`[FirefoxCameraService] Retrying in ${retryDelay}ms...`, '', 'DEBUG');
+                        yield new Promise((resolve) => setTimeout(resolve, retryDelay));
+                    }
                 }
-                const deviceId = handleDeviceId(devices, props.deviceId);
-                this.setCurrentDeviceId(deviceId);
-                printLogs(`[FirefoxCameraService] openCamera deviceId: `, deviceId);
-                const mediaDeviceInfo = yield getMediaDeviceInfo(devices, deviceId);
-                const stream = yield getDeviceMediaStream(mediaDeviceInfo.deviceId, 'firefox', {
-                    canvasResolution: props.canvasResolution,
-                });
-                printLogs(`[FirefoxCameraService] openCamera stream: `, stream);
-                return this.prepareCameraResult(stream, devices, this.getFaceMode(), props.videoElementId);
-            }
-            catch (error) {
-                printLogs(`[FirefoxCameraService] openCamera error: `, error, 'ERROR');
-                return null;
             }
+            // All attempts failed
+            printLogs(`[FirefoxCameraService] All ${maxAttempts} attempts failed`, '', 'ERROR');
+            printLogs(`[FirefoxCameraService] Final error: `, lastError, 'ERROR');
+            return null;
         });
     }
 }

package/dist/application/modules/support/camera/services/FirefoxCameraService.js.map

@@ -1 +1 @@
-{"version":3,"file":"FirefoxCameraService.js","sourceRoot":"","sources":["../../../../../../src/application/modules/support/camera/services/FirefoxCameraService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,iDAAiD;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAsC,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEpH,MAAM,OAAO,oBAAqB,SAAQ,iBAAiB;IAC5C,UAAU,CAAC,KAAuB;;YAC7C,SAAS,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;YAE5D,IAAI;gBACF,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBAC7C,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,eAAe,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC;gBAEhE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,EAAE,CAAC;gBAC/E,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,uBAAuB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAEjE,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;oBAChC,SAAS,CAAC,4CAA4C,KAAK,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC3E,CAAC,CAAC,CAAC;gBAEH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;oBACxB,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;iBAC9B;gBAED,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACzD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;gBAClC,SAAS,CAAC,8CAA8C,EAAE,QAAQ,CAAC,CAAC;gBAEpE,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBACpE,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,eAAe,CAAC,QAAQ,EAAE,SAAS,EAAE;oBAC7E,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;iBACzC,CAAC,CAAC;gBACH,SAAS,CAAC,4CAA4C,EAAE,MAAM,CAAC,CAAC;gBAEhE,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;aAC5F;YAAC,OAAO,KAAK,EAAE;gBACd,SAAS,CAAC,2CAA2C,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBACvE,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;CACF"}
+{"version":3,"file":"FirefoxCameraService.js","sourceRoot":"","sources":["../../../../../../src/application/modules/support/camera/services/FirefoxCameraService.ts"],"names":[],"mappings":"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"}

package/dist/application/modules/support/engine/EngineService.d.ts

@@ -1,6 +1,6 @@
 import { WasmOrchestrator } from '../../internal/wasm-orchestrator';
 import { Engine } from './engine.domain';
-import { LoadModuleParams, LoadModuleResult, PackageSupportResult } from './engine.types';
+import { LoadModuleParams, LoadModuleResult, PackageSupportResult, WasmInfo, WasmLoadStatus, WasmVersionManifest } from './engine.types';
 export declare class EngineService implements Engine {
     private wasmOrchestratorService;
     private browserOS;
@@ -12,4 +12,8 @@ export declare class EngineService implements Engine {
     freeMemory(): Promise<boolean>;
     encryptData(payload: unknown): Promise<(string | null)[]>;
     checkPackageSupport(): PackageSupportResult;
+    getWasmInfo(): Promise<WasmInfo>;
+    getLoadStatus(): Promise<WasmLoadStatus | null>;
+    getVersionManifest(): Promise<WasmVersionManifest>;
+    checkVersionMatch(version: string): Promise<boolean>;
 }

package/dist/application/modules/support/engine/EngineService.js

@@ -102,5 +102,53 @@ export class EngineService {
         printLogs('[EngineService] checkPackageSupport result', result);
         return result;
     }
+    getWasmInfo() {
+        return __awaiter(this, void 0, void 0, function* () {
+            printLogs('[EngineService] getWasmInfo', '');
+            try {
+                return yield this.wasmOrchestratorService.getWasmInfo();
+            }
+            catch (error) {
+                printLogs('[EngineService] getWasmInfo error', error, 'ERROR');
+                throw error;
+            }
+        });
+    }
+    getLoadStatus() {
+        return __awaiter(this, void 0, void 0, function* () {
+            printLogs('[EngineService] getLoadStatus', '');
+            try {
+                return yield this.wasmOrchestratorService.getLoadStatus();
+            }
+            catch (error) {
+                printLogs('[EngineService] getLoadStatus error', error, 'ERROR');
+                throw error;
+            }
+        });
+    }
+    getVersionManifest() {
+        return __awaiter(this, void 0, void 0, function* () {
+            printLogs('[EngineService] getVersionManifest', '');
+            try {
+                return yield this.wasmOrchestratorService.getVersionManifest();
+            }
+            catch (error) {
+                printLogs('[EngineService] getVersionManifest error', error, 'ERROR');
+                throw error;
+            }
+        });
+    }
+    checkVersionMatch(version) {
+        return __awaiter(this, void 0, void 0, function* () {
+            printLogs('[EngineService] checkVersionMatch', version);
+            try {
+                return yield this.wasmOrchestratorService.checkVersionMatch(version);
+            }
+            catch (error) {
+                printLogs('[EngineService] checkVersionMatch error', error, 'ERROR');
+                throw error;
+            }
+        });
+    }
 }
 //# sourceMappingURL=EngineService.js.map

package/dist/application/modules/support/engine/EngineService.js.map

@@ -1 +1 @@
-{"version":3,"file":"EngineService.js","sourceRoot":"","sources":["../../../../../src/application/modules/support/engine/EngineService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EngineService.js","sourceRoot":"","sources":["../../../../../src/application/modules/support/engine/EngineService.ts"],"names":[],"mappings":"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"}

package/dist/application/modules/support/engine/engine.domain.d.ts

@@ -1,4 +1,4 @@
-import { LoadModuleParams, LoadModuleResult, PackageSupportResult } from './engine.types';
+import { LoadModuleParams, LoadModuleResult, PackageSupportResult, WasmInfo, WasmLoadStatus, WasmVersionManifest } from './engine.types';
 export interface Engine {
     /**
      * Load the WASM modules with the given options
@@ -20,4 +20,20 @@ export interface Engine {
      * Check if the current browser supports the package
      */
     checkPackageSupport(): PackageSupportResult;
+    /**
+     * Get WASM information (version, intercept path, CDN URL)
+     */
+    getWasmInfo(): Promise<WasmInfo>;
+    /**
+     * Get WASM load status
+     */
+    getLoadStatus(): Promise<WasmLoadStatus | null>;
+    /**
+     * Get WASM version manifest with download URLs and checksums for all platforms
+     */
+    getVersionManifest(): Promise<WasmVersionManifest>;
+    /**
+     * Check if provided version matches current WASM version
+     */
+    checkVersionMatch(version: string): Promise<boolean>;
 }

package/dist/application/modules/support/engine/engine.types.d.ts

@@ -10,6 +10,10 @@ type ApiUrl = {
         };
     };
 };
+export type CustomWasmConfig = {
+    url: string;
+    version: string;
+};
 export type LoadModuleParams = {
     apiUrl: ApiUrl;
     sessionToken: string;
@@ -20,6 +24,7 @@ export type LoadModuleParams = {
     shouldRegenerateSession?: boolean;
     wasmFailureCallback?: (result: any) => void;
     skipSimdCheck?: boolean;
+    customWasm?: CustomWasmConfig;
 };
 export type LoadModuleResult = {
     support: boolean;
@@ -29,4 +34,20 @@ export type PackageSupportResult = {
     isSupported: boolean;
     message?: string;
 };
+export type WasmInfo = {
+    version: string;
+    interceptPath: string;
+    cdnUrl: string;
+};
+export type WasmLoadStatus = {
+    source: 'custom' | 'custom-fallback' | 'cdn' | 'cache';
+    versionMatch: boolean;
+};
+export type WasmVersionManifest = {
+    version: string;
+    releaseDate: string;
+    downloadUrl: string;
+    interceptPath: string;
+    sha256: string;
+};
 export {};

package/dist/application/modules/support/engine/index.d.ts

@@ -1,3 +1,3 @@
 export { EngineService } from './EngineService';
 export { Engine } from './engine.domain';
-export { LoadModuleParams, LoadModuleResult } from './engine.types';
+export { CustomWasmConfig, LoadModuleParams, LoadModuleResult, WasmInfo, WasmLoadStatus, WasmVersionManifest, } from './engine.types';

package/dist/application/workers/wasm/WasmWorkerService.d.ts

@@ -1,5 +1,5 @@
 import { WasmPrividModules, WasmWorker } from './wasm-worker.domain';
-import { LoadParams, EnrollParams, PredictParams, AgeEstimateParams, CompareEmbeddingsParams, PkiEncryptParams, ScanBackDocumentParams, ScanFrontDocumentParams, DocumentOcrParams, ProxiedCallback, RegularCallback } from './wasm-worker.types';
+import { LoadParams, EnrollParams, PredictParams, AgeEstimateParams, CompareEmbeddingsParams, PkiEncryptParams, ScanBackDocumentParams, ScanFrontDocumentParams, DocumentOcrParams, ProxiedCallback, RegularCallback, LoadModulesResult } from './wasm-worker.types';
 declare global {
     function createTFLiteModule(config: {
         wasmBinary: ArrayBuffer;
@@ -26,9 +26,20 @@ export declare class WasmWorkerService implements WasmWorker {
     private isSimd;
     private moduleInitializationLock;
     private isModuleInitializing;
-    loadModules(params: LoadParams, errorCallback: ProxiedCallback, progressCallback?: ProxiedCallback): Promise<string>;
+    private customWasm;
+    private wasmBaseUrl;
+    private lastLoadStatus;
+    private currentWasmVersion;
+    private wasmFolderName;
+    private getWasmFolderName;
+    loadModules(params: LoadParams, errorCallback: ProxiedCallback, progressCallback?: ProxiedCallback): Promise<LoadModulesResult>;
     private loadModulesInternal;
     private loadFromPackage;
+    /**
+     * Constructs a local URL for WASM resources.
+     * Uses wasmBaseUrl if available (passed from main thread), otherwise falls back to relative path.
+     */
+    private getLocalWasmUrl;
     private loadWasmModule;
     private initializeWasmSession;
     ultraEnroll(params: EnrollParams, resultCallback: RegularCallback): Promise<boolean>;

package/dist/application/workers/wasm/WasmWorkerService.js

@@ -12,7 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 /* eslint-disable import/prefer-default-export */
 import { expose } from 'comlink';
 import { printLogs, setDebugType } from '../../modules/internal/shared/shared.utils';
-import { checkCacheAndCurrentAreSameVersion, fetchResource, flatImageDataArraysIntoUint8Array, readCurrentWasmVersion, readFromIndexedDB, removeNullBytesFromDecodedString, writeToIndexedDB, } from './wasm-worker.utils';
+import { checkCacheAndCurrentAreSameVersion, fetchResource, flatImageDataArraysIntoUint8Array, readCurrentWasmVersion, readFromIndexedDB, removeNullBytesFromDecodedString, writeToIndexedDB, validateCustomWasmUrl, } from './wasm-worker.utils';
 import { WASM_ULTRA_FOLDER_NAME } from './wasm-worker.constants';
 const callbackRegistry = {
     result: null,
@@ -93,30 +93,39 @@ export class WasmWorkerService {
         this.isSimd = null;
         this.moduleInitializationLock = null;
         this.isModuleInitializing = false;
+        this.customWasm = null;
+        this.wasmBaseUrl = null;
+        this.lastLoadStatus = null;
+        this.currentWasmVersion = null;
+        this.wasmFolderName = WASM_ULTRA_FOLDER_NAME;
+    }
+    getWasmFolderName() {
+        return this.wasmFolderName;
     }
     loadModules(params, errorCallback, progressCallback) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                printLogs('[WasmWorkerService] loadModules called with params:', params);
+                // If modules are already loaded and session exists, don't re-initialize!
+                // Re-initialization corrupts the WASM state causing _privid_check_models() to return 0
+                if (this.wasmPrividModules && this.wasmSession) {
+                    return { message: 'Already initialized', status: this.lastLoadStatus };
+                }
                 if (this.moduleInitializationLock) {
                     try {
-                        printLogs('[WasmWorkerService] loadModules waiting for existing initialization to complete', '');
                         yield this.moduleInitializationLock;
-                        return 'Already loaded';
+                        return { message: 'Already loaded', status: this.lastLoadStatus };
                     }
                     catch (error) {
-                        printLogs('[WasmWorkerService] Previous initialization failed, retrying...', error, 'WARN');
-                        return 'Retrying initialization';
+                        return { message: 'Retrying initialization', status: null };
                     }
                 }
-                printLogs('[WasmWorkerService] loadModules starting new initialization', '');
                 this.isModuleInitializing = true;
                 this.moduleInitializationLock = this.loadModulesInternal(params, errorCallback, progressCallback);
                 const result = yield this.moduleInitializationLock;
                 return result;
             }
             catch (error) {
-                printLogs('[WasmWorkerService] loadModules error during initialization:', error, 'ERROR');
+                printLogs('[WasmWorkerService] loadModules error', error, 'ERROR');
                 throw error;
             }
             finally {
@@ -137,6 +146,8 @@ export class WasmWorkerService {
             this.useCdnLink = params.useCdn;
             this.setCache = params.cacheConfig;
             this.isSimd = params.simd;
+            this.customWasm = params.customWasm || null;
+            this.wasmBaseUrl = params.wasmBaseUrl || null;
             // Only set debugType if explicitly provided (legacy support)
             // Note: Debug type is already cached globally from WasmOrchestratorService.initialize()
             if (params.debugType) {
@@ -144,11 +155,53 @@ export class WasmWorkerService {
                 // Set debug type onto Web Worker Context
                 setDebugType(params.debugType);
             }
+            // Store WASM folder name from orchestrator (feature flag resolved on main thread)
+            if (params.wasmFolderName) {
+                this.wasmFolderName = params.wasmFolderName;
+            }
             printLogs('[WasmWorkerService] isLoad params: ', params);
             const modulePath = params.simd ? 'simd' : 'nosimd';
             const moduleName = 'privid_fhe_ultra';
             const cachedModule = yield readFromIndexedDB(WASM_ULTRA_FOLDER_NAME);
-            const currentModuleVersionJSON = yield readCurrentWasmVersion(modulePath);
+            const currentModuleVersionJSON = yield readCurrentWasmVersion(modulePath, this.wasmBaseUrl, this.getWasmFolderName());
+            this.currentWasmVersion = currentModuleVersionJSON.version;
+            printLogs('[WasmWorkerService] currentModuleVersionJSON: ', currentModuleVersionJSON.version);
+            // If custom WASM config is provided, validate and load with fallback
+            if (this.customWasm) {
+                printLogs('[WasmWorkerService] Custom WASM detected, validating...', this.customWasm);
+                const isValid = yield validateCustomWasmUrl(this.customWasm.url);
+                if (isValid) {
+                    const expectedVersion = currentModuleVersionJSON.version;
+                    const providedVersion = this.customWasm.version;
+                    // Check version equality
+                    if (providedVersion !== expectedVersion) {
+                        printLogs('[WasmWorkerService] Version mismatch detected, falling back to CDN', { expected: expectedVersion, provided: providedVersion }, 'WARN');
+                        this.customWasm = null;
+                        this.lastLoadStatus = { source: 'custom-fallback', versionMatch: false };
+                        // Continue with normal cache/CDN flow
+                    }
+                    else {
+                        printLogs('[WasmWorkerService] Version match confirmed', { version: providedVersion });
+                        // Proceed with loading
+                        printLogs('[WasmWorkerService] Custom WASM URL is valid, loading...', this.customWasm.url);
+                        yield this.loadFromPackage(currentModuleVersionJSON.version, modulePath, moduleName, params.usageScenario, params.cacheContent);
+                        // Final verification that WASM is fully initialized
+                        if (!this.wasmPrividModules || !this.wasmSession) {
+                            const error = 'WASM modules loaded but session not initialized';
+                            printLogs(`[WasmWorkerService] ERROR: ${error}`, '', 'ERROR');
+                            throw new Error(error);
+                        }
+                        this.lastLoadStatus = { source: 'custom', versionMatch: true };
+                        return { message: 'Loaded from custom URL', status: this.lastLoadStatus };
+                    }
+                }
+                else {
+                    printLogs('[WasmWorkerService] Custom WASM URL validation failed, falling back to CDN', '', 'WARN');
+                    this.customWasm = null;
+                    this.lastLoadStatus = { source: 'custom-fallback', versionMatch: false };
+                    // Continue with normal cache/CDN flow
+                }
+            }
             if (checkCacheAndCurrentAreSameVersion(cachedModule, currentModuleVersionJSON)) {
                 printLogs('[WasmWorkerService] same version confirmed', '');
                 printLogs('[WasmWorkerService] PRIVMODULES LOADED?: ', this.wasmPrividModules);
@@ -164,7 +217,7 @@ export class WasmWorkerService {
                             if (typeof createTFLiteModule === 'undefined') {
                                 printLogs('[WasmWorkerService] createTFLiteModule not defined, falling back to package', '', 'WARN');
                                 yield this.loadFromPackage(currentModuleVersionJSON.version, modulePath, moduleName, params.usageScenario, params.cacheContent);
-                                return 'Loaded from package (cache invalid)';
+                                return { message: 'Loaded from package (cache invalid)', status: this.lastLoadStatus };
                             }
                             this.wasmPrividModules = yield createTFLiteModule({ wasmBinary: cachedWasm });
                             printLogs('[WasmWorkerService] ULTRA MODULES ', this.wasmPrividModules);
@@ -173,12 +226,15 @@ export class WasmWorkerService {
                                 this.checkWasmLoaded = true;
                             }
                             printLogs('[WasmWorkerService] WASM MODULES: ', this.wasmPrividModules);
-                            return 'Loaded from cache (wasm and script)';
+                            if (!this.lastLoadStatus) {
+                                this.lastLoadStatus = { source: 'cache', versionMatch: true };
+                            }
+                            return { message: 'Loaded from cache (wasm and script)', status: this.lastLoadStatus };
                         }
                         catch (error) {
                             printLogs('[WasmWorkerService] Error loading from cache:', error, 'ERROR');
                             yield this.loadFromPackage(currentModuleVersionJSON.version, modulePath, moduleName, params.usageScenario, params.cacheContent);
-                            return 'Loaded from package (cache error)';
+                            return { message: 'Loaded from package (cache error)', status: this.lastLoadStatus };
                         }
                         finally {
                             // Clean up the blob URL
@@ -197,7 +253,7 @@ export class WasmWorkerService {
                 }
                 else {
                     yield this.loadFromPackage(currentModuleVersionJSON.version, modulePath, moduleName, params.usageScenario, params.cacheContent);
-                    return 'Loaded';
+                    return { message: 'Loaded', status: this.lastLoadStatus };
                 }
                 // Final verification that WASM is fully initialized
                 if (!this.wasmPrividModules || !this.wasmSession) {
@@ -205,7 +261,10 @@ export class WasmWorkerService {
                     printLogs(`[WasmWorkerService] ERROR: ${error}`, '', 'ERROR');
                     throw new Error(error);
                 }
-                return 'Cache Loaded';
+                if (!this.lastLoadStatus) {
+                    this.lastLoadStatus = { source: 'cache', versionMatch: true };
+                }
+                return { message: 'Cache Loaded', status: this.lastLoadStatus };
             }
             yield this.loadFromPackage(currentModuleVersionJSON.version, modulePath, moduleName, params.usageScenario, params.cacheContent);
             // Final verification that WASM is fully initialized
@@ -214,7 +273,10 @@ export class WasmWorkerService {
                 printLogs(`[WasmWorkerService] ERROR: ${error}`, '', 'ERROR');
                 throw new Error(error);
             }
-            return 'Loaded';
+            if (!this.lastLoadStatus) {
+                this.lastLoadStatus = { source: 'cdn', versionMatch: true };
+            }
+            return { message: 'Loaded', status: this.lastLoadStatus };
         });
     }
     loadFromPackage(wasmVersion, modulePath, moduleName, usageScenario, cache_content) {
@@ -228,15 +290,62 @@ export class WasmWorkerService {
             return true;
         });
     }
+    /**
+     * Constructs a local URL for WASM resources.
+     * Uses wasmBaseUrl if available (passed from main thread), otherwise falls back to relative path.
+     */
+    getLocalWasmUrl(relativePath) {
+        if (this.wasmBaseUrl) {
+            return `${this.wasmBaseUrl}/wasm/${relativePath}`;
+        }
+        return `../wasm/${relativePath}`;
+    }
     loadWasmModule(modulePath, moduleName, saveCache, version) {
         return __awaiter(this, void 0, void 0, function* () {
+            // If custom WASM config is provided (e.g., from iOS WebView), use it directly
+            if (this.customWasm) {
+                printLogs('[WasmWorkerService] Using custom WASM URL:', this.customWasm.url);
+                // For custom URLs, we still need the JS file from the normal location
+                const scriptUrls = {
+                    cdn: `${this.cdnUrl}/${WASM_ULTRA_FOLDER_NAME}/${modulePath}/${version}/${moduleName}.js`,
+                    local: this.getLocalWasmUrl(`${this.getWasmFolderName()}/${modulePath}/${version}/${moduleName}.js`),
+                };
+                const wasm = yield fetch(this.customWasm.url);
+                if (!wasm.ok) {
+                    throw new Error(`Failed to fetch custom WASM from ${this.customWasm.url}: ${wasm.status}`);
+                }
+                const script = yield fetchResource(scriptUrls, this.useCdnLink);
+                const scriptBuffer = yield script.text();
+                const buffer = yield wasm.arrayBuffer();
+                printLogs(`[WasmWorkerService] loadWasmModule script and buffer from custom URL': `, { scriptBuffer, buffer });
+                const blob = new Blob([scriptBuffer], { type: 'application/javascript' });
+                const blobUrl = URL.createObjectURL(blob);
+                try {
+                    importScripts(blobUrl);
+                    if (typeof createTFLiteModule === 'undefined') {
+                        throw new Error('createTFLiteModule not defined after loading script');
+                    }
+                    const module = yield createTFLiteModule({ wasmBinary: buffer });
+                    printLogs('[WasmWorkerService] loadWasmModule module from custom URL: ', module);
+                    // Note: We don't cache when using custom URLs as they're iOS-specific
+                    return module;
+                }
+                catch (error) {
+                    printLogs('[WasmWorkerService] Error loading WASM module from custom URL:', error, 'ERROR');
+                    throw error;
+                }
+                finally {
+                    URL.revokeObjectURL(blobUrl);
+                }
+            }
+            // Standard loading path (CDN or local)
             const wasmUrls = {
                 cdn: `${this.cdnUrl}/${WASM_ULTRA_FOLDER_NAME}/${modulePath}/${version}/${moduleName}.wasm`,
-                local: `../wasm/${WASM_ULTRA_FOLDER_NAME}/${modulePath}/${version}/${moduleName}.wasm`,
+                local: this.getLocalWasmUrl(`${this.getWasmFolderName()}/${modulePath}/${version}/${moduleName}.wasm`),
             };
             const scriptUrls = {
                 cdn: `${this.cdnUrl}/${WASM_ULTRA_FOLDER_NAME}/${modulePath}/${version}/${moduleName}.js`,
-                local: `../wasm/${WASM_ULTRA_FOLDER_NAME}/${modulePath}/${version}/${moduleName}.js`,
+                local: this.getLocalWasmUrl(`${this.getWasmFolderName()}/${modulePath}/${version}/${moduleName}.js`),
             };
             const wasm = yield fetchResource(wasmUrls, this.useCdnLink);
             const script = yield fetchResource(scriptUrls, this.useCdnLink);
@@ -746,12 +855,10 @@ export class WasmWorkerService {
         return __awaiter(this, void 0, void 0, function* () {
             // Wait if initialization is already in progress
             if (this.isModuleInitializing && this.moduleInitializationLock) {
-                printLogs('[WasmWorkerService] Waiting for ongoing module initialization...', '', 'INFO');
                 try {
                     yield this.moduleInitializationLock;
                 }
                 catch (error) {
-                    printLogs('[WasmWorkerService] Module initialization failed', error, 'ERROR');
                     return false;
                 }
             }
@@ -774,7 +881,6 @@ export class WasmWorkerService {
                     }, this.proxiedErrorCallback);
                 }
                 catch (error) {
-                    printLogs('[WasmWorkerService] ensureModulesInitialized: loadModules failed', error, 'ERROR');
                     return false;
                 }
             }