@sssxyd/face-liveness-detector 0.2.21 → 0.2.23

package/dist/index.js

@@ -311,6 +311,7 @@
     }
     let webglAvailableCache = null;
     let opencvInitPromise = null;
+    let opencvInitialized = false; // 标记是否已初始化完成
     function _isWebGLAvailable() {
         if (webglAvailableCache !== null) {
             return webglAvailableCache;
@@ -354,8 +355,8 @@
         // 复用 loadOpenCV 的初始化逻辑
         opencvInitPromise = _initializeOpenCV(timeout);
         try {
-            await opencvInitPromise;
-            console.log('[OpenCV] Preload completed successfully');
+            const initTime = await opencvInitPromise;
+            console.log('[OpenCV] Preload completed successfully, cost:', initTime.toFixed(0), 'ms');
         }
         catch (error) {
             console.error('[OpenCV] Preload failed:', error);
@@ -372,16 +373,16 @@
      */
     async function _initializeOpenCV(timeout) {
         const initStartTime = performance.now();
-        console.log('[FaceDetectionEngine] Waiting for OpenCV WASM initialization...');
+        console.log('Waiting for OpenCV WASM initialization...');
         // 快速路径：检查是否已经初始化
         if (cvModule.Mat) {
             const initTime = performance.now() - initStartTime;
-            console.log(`[FaceDetectionEngine] OpenCV.js already initialized, took ${initTime.toFixed(2)}ms`);
+            console.log(`OpenCV.js already initialized, took ${initTime.toFixed(2)}ms`);
             return cvModule;
         }
         if (typeof globalThis !== 'undefined' && globalThis.cv && globalThis.cv.Mat) {
             const initTime = performance.now() - initStartTime;
-            console.log(`[FaceDetectionEngine] OpenCV.js already initialized (from global), took ${initTime.toFixed(2)}ms`);
+            console.log(`OpenCV.js already initialized (from global), took ${initTime.toFixed(2)}ms`);
             cvModule = globalThis.cv;
             return cvModule;
         }
@@ -389,10 +390,10 @@
         if (typeof globalThis !== 'undefined' && !globalThis.cv) {
             if (cvModule && Object.isExtensible(cvModule)) {
                 globalThis.cv = cvModule;
-                console.log('[FaceDetectionEngine] cvModule assigned to globalThis.cv');
+                console.log('cvModule assigned to globalThis.cv');
             }
             else {
-                console.log('[FaceDetectionEngine] cvModule is not extensible or globalThis already has cv');
+                console.log('cvModule is not extensible or globalThis already has cv');
             }
         }
         return new Promise((resolve, reject) => {
@@ -401,7 +402,7 @@
             // 防止多次调用 resolve/reject
             let finished = false;
             const timeoutId = setTimeout(() => {
-                console.error('[FaceDetectionEngine] OpenCV.js initialization timeout after ' + timeout + 'ms');
+                console.error('OpenCV.js initialization timeout after ' + timeout + 'ms');
                 finished = true;
                 if (pollInterval) {
                     clearInterval(pollInterval);
@@ -410,70 +411,65 @@
             }, timeout);
             const resolveOnce = (source) => {
                 if (finished) {
-                    console.log('[FaceDetectionEngine] [resolveOnce] Already finished, ignoring call from:', source);
+                    console.log('[resolveOnce] Already finished, ignoring call from:', source);
                     return;
                 }
                 finished = true;
-                console.log('[FaceDetectionEngine] [resolveOnce] Marking as finished');
+                console.log('[resolveOnce] Marking as finished');
                 // 立即停止所有定时器和轮询
                 clearTimeout(timeoutId);
                 if (pollInterval !== null) {
                     clearInterval(pollInterval);
                     pollInterval = null;
-                    console.log('[FaceDetectionEngine] [resolveOnce] Poll interval cleared:', pollInterval);
-                }
-                // 确保返回有效的 cv 对象
-                let validCv = cvModule;
-                if (typeof globalThis !== 'undefined' && globalThis.cv && globalThis.cv.Mat) {
-                    validCv = globalThis.cv;
+                    console.log('[resolveOnce] Poll interval cleared');
                 }
                 const initTime = performance.now() - initStartTime;
-                console.log(`[FaceDetectionEngine] OpenCV.js initialized (${source}), took ${initTime.toFixed(2)}ms`, {
-                    hasMat: !!(validCv && validCv.Mat),
-                    source: source
-                });
-                console.log('[FaceDetectionEngine] [resolveOnce] About to call resolve');
-                resolve(validCv);
-                console.log('[FaceDetectionEngine] [resolveOnce] resolve called');
+                console.log(`OpenCV.js initialized (${source}), took ${initTime.toFixed(2)}ms`);
+                // 标记初始化完成
+                opencvInitialized = true;
+                // 返回简单的标记，实际的 cv 对象已经在 globalThis.cv 上了
+                // 通过 getCvSync() 获取
+                resolve(initTime);
+                console.log('[resolveOnce] Promise resolved');
             };
             // 尝试设置回调（只有在 cvModule 可扩展时才尝试）
             const canSetCallback = cvModule && Object.isExtensible(cvModule);
             if (canSetCallback) {
                 try {
                     const originalOnRuntimeInitialized = cvModule.onRuntimeInitialized(cvModule).onRuntimeInitialized = () => {
-                        console.log('[FaceDetectionEngine] onRuntimeInitialized callback triggered');
+                        console.log('[onRuntimeInitialized] callback triggered');
                         // 调用原始回调（如果存在）
                         if (originalOnRuntimeInitialized && typeof originalOnRuntimeInitialized === 'function') {
                             try {
                                 originalOnRuntimeInitialized();
                             }
                             catch (e) {
-                                console.warn('[FaceDetectionEngine] Original onRuntimeInitialized callback failed:', e);
+                                console.warn('[onRuntimeInitialized] callback failed:', e);
                             }
                         }
                         resolveOnce('callback');
                     };
-                    console.log('[FaceDetectionEngine] onRuntimeInitialized callback set successfully');
+                    console.log('[onRuntimeInitialized] callback set successfully');
                 }
                 catch (e) {
-                    console.warn('[FaceDetectionEngine] Failed to set onRuntimeInitialized callback, will use polling:', e);
+                    console.warn('[onRuntimeInitialized] Failed to set callback, will use polling:', e);
                 }
             }
             else {
-                console.log('[FaceDetectionEngine] cvModule is not extensible, using polling mode');
+                console.log('[polling] cvModule is not extensible, using polling mode');
             }
             // 启动轮询作为备用方案或主要方案
             pollInterval = setInterval(() => {
-                console.log('[FaceDetectionEngine] [polling] Checking for Mat class...');
+                console.log('[polling] Checking for Mat class...');
                 // 优先检查 cvModule 中是否有 Mat
                 if (cvModule.Mat) {
-                    console.log('[FaceDetectionEngine] [polling] Found Mat in cvModule');
+                    console.log('[polling] Found Mat in cvModule');
                     resolveOnce('cvModule polling');
                     return;
                 }
                 // 其次检查 globalThis.cv 中是否有 Mat
                 if (typeof globalThis !== 'undefined' && globalThis.cv && globalThis.cv.Mat) {
-                    console.log('[FaceDetectionEngine] [polling] Found Mat in globalThis.cv');
+                    console.log('[polling] Found Mat in globalThis.cv');
                     cvModule = globalThis.cv;
                     resolveOnce('globalThis.cv polling');
                     return;
@@ -487,81 +483,40 @@
      * @returns Promise that resolves with cv module
      */
     async function loadOpenCV(timeout = 30000) {
-        let cv;
-        console.log('[FaceDetectionEngine] Loading OpenCV.js...');
         try {
-            console.log('[FaceDetectionEngine] [loadOpenCV] Starting, checking conditions...');
-            // 如果已经在初始化中，复用现有的 Promise
-            if (opencvInitPromise) {
-                console.log('[FaceDetectionEngine] [loadOpenCV] opencvInitPromise exists, awaiting...');
-                console.log('[FaceDetectionEngine] [loadOpenCV] Before await, Promise state:', opencvInitPromise.constructor.name);
-                try {
-                    cv = await opencvInitPromise;
-                    console.log('[FaceDetectionEngine] [loadOpenCV] AFTER AWAIT - OpenCV promise resolved, got cv module:', { hasMat: !!(cv && cv.Mat), type: typeof cv });
-                }
-                catch (awaitError) {
-                    console.error('[FaceDetectionEngine] [loadOpenCV] AWAIT ERROR:', awaitError);
-                    throw awaitError;
+            // 快速检查是否已经初始化完成
+            if (opencvInitialized) {
+                console.log('[loadOpenCV] Already initialized, returning immediately');
+                const cv = getCvSync();
+                if (cv) {
+                    return { cv };
                 }
-                // 完成后清除 Promise 标记
-                console.log('[FaceDetectionEngine] [loadOpenCV] Clearing opencvInitPromise');
-                opencvInitPromise = null;
-                console.log('[FaceDetectionEngine] [loadOpenCV] opencvInitPromise cleared');
-            }
-            else if (cvModule.Mat) {
-                // 检查 cvModule 是否已经初始化
-                console.log('[FaceDetectionEngine] [loadOpenCV] OpenCV.js already initialized in cvModule');
-                cv = cvModule;
-            }
-            else if (typeof globalThis !== 'undefined' && globalThis.cv && globalThis.cv.Mat) {
-                // 检查全局 cv 是否已经初始化
-                console.log('[FaceDetectionEngine] [loadOpenCV] OpenCV.js already initialized in globalThis.cv');
-                cvModule = globalThis.cv;
-                cv = cvModule;
             }
-            else {
-                // 开始新的初始化
-                console.log('[FaceDetectionEngine] [loadOpenCV] Starting new OpenCV initialization...');
+            // 等待初始化
+            console.log('[loadOpenCV] Waiting for initialization...');
+            if (!opencvInitPromise) {
+                console.log('[loadOpenCV] Starting new initialization');
                 opencvInitPromise = _initializeOpenCV(timeout);
-                try {
-                    console.log('[FaceDetectionEngine] [loadOpenCV] Awaiting _initializeOpenCV...');
-                    cv = await opencvInitPromise;
-                    console.log('[FaceDetectionEngine] [loadOpenCV] OpenCV initialization completed, got cv module:', { hasMat: !!(cv && cv.Mat), type: typeof cv });
-                    // 完成后清除 Promise 标记
-                    opencvInitPromise = null;
-                }
-                catch (error) {
-                    // 失败后也要清除 Promise
-                    console.error('[FaceDetectionEngine] [loadOpenCV] _initializeOpenCV threw error:', error);
-                    opencvInitPromise = null;
-                    throw error;
-                }
             }
-            console.log('[FaceDetectionEngine] [loadOpenCV] After await, validating cv module...');
-            // 最终验证 - 如果 cv 无效，尝试从 globalThis 获取
-            if (!cv || !cv.Mat) {
-                console.warn('[FaceDetectionEngine] [loadOpenCV] Returned cv module is invalid, attempting to get from globalThis.cv...');
-                if (typeof globalThis !== 'undefined' && globalThis.cv && globalThis.cv.Mat) {
-                    console.log('[FaceDetectionEngine] [loadOpenCV] Found valid cv in globalThis.cv, using that');
-                    cv = globalThis.cv;
-                }
-                else {
-                    console.error('[FaceDetectionEngine] [loadOpenCV] OpenCV module is invalid:', {
-                        hasMat: cv && cv.Mat,
-                        type: typeof cv,
-                        keys: cv ? Object.keys(cv).slice(0, 10) : 'N/A',
-                        globalCvAvailable: !!(typeof globalThis !== 'undefined' && globalThis.cv)
-                    });
-                    throw new Error('OpenCV.js loaded but module is invalid (no Mat class found)');
-                }
+            console.log('[loadOpenCV] Awaiting opencvInitPromise');
+            const initTime = await opencvInitPromise;
+            // 清除 Promise 缓存
+            opencvInitPromise = null;
+            // 获取初始化后的 cv 对象
+            const cv = getCvSync();
+            if (!cv) {
+                console.error('[loadOpenCV] getCvSync returned null');
+                throw new Error('OpenCV module is invalid');
             }
-            console.log('[FaceDetectionEngine] [loadOpenCV] Validation passed, returning cv module');
-            console.log('[FaceDetectionEngine] OpenCV.js loaded successfully');
-            return { cv };
+            console.log('[loadOpenCV] OpenCV.js load successfully', {
+                initTime: `${initTime.toFixed(2)}ms`,
+                version: getOpenCVVersion()
+            });
+            return cv;
         }
         catch (error) {
-            console.error('[FaceDetectionEngine] [loadOpenCV] Exception caught:', error);
-            console.error('[FaceDetectionEngine] Failed to load OpenCV.js:', error);
+            console.error('[loadOpenCV] OpenCV.js load failed', error);
+            opencvInitPromise = null;
             throw error;
         }
     }
@@ -580,6 +535,35 @@
         }
         return null;
     }
+    /**
+     * Extract OpenCV version from getBuildInformation
+     * @returns version string like "4.12.0"
+     */
+    function getOpenCVVersion() {
+        try {
+            const cv = getCvSync();
+            if (!cv || !cv.getBuildInformation) {
+                return 'unknown';
+            }
+            const buildInfo = cv.getBuildInformation();
+            // 查找 "Version control:" 或 "OpenCV" 开头的行
+            // 格式: "Version control:               4.12.0"
+            const versionMatch = buildInfo.match(/Version\s+control:\s+(\d+\.\d+\.\d+)/i);
+            if (versionMatch && versionMatch[1]) {
+                return versionMatch[1];
+            }
+            // 备用方案：查找 "OpenCV X.X.X" 格式
+            const opencvMatch = buildInfo.match(/OpenCV\s+(\d+\.\d+\.\d+)/i);
+            if (opencvMatch && opencvMatch[1]) {
+                return opencvMatch[1];
+            }
+            return 'unknown';
+        }
+        catch (error) {
+            console.error('[getOpenCVVersion] Failed to get version:', error);
+            return 'unknown';
+        }
+    }
     /**
      * Load Human.js
      * @param modelPath - Path to model files (optional)
@@ -609,24 +593,17 @@
         if (wasmPath) {
             config.wasmPath = wasmPath;
         }
-        console.log('[FaceDetectionEngine] Human.js config:', {
+        console.log('[loadHuman] Config:', {
             backend: config.backend,
             modelBasePath: config.modelBasePath || '(using default)',
             wasmPath: config.wasmPath || '(using default)'
         });
         const initStartTime = performance.now();
-        console.log('[FaceDetectionEngine] Creating Human instance...');
         const human = new Human(config);
-        const instanceCreateTime = performance.now() - initStartTime;
-        console.log(`[FaceDetectionEngine] Human instance created, took ${instanceCreateTime.toFixed(2)}ms`);
-        console.log('[FaceDetectionEngine] Loading Human.js models...');
-        const modelLoadStartTime = performance.now();
         try {
             await human.load();
-            const loadTime = performance.now() - modelLoadStartTime;
             const totalTime = performance.now() - initStartTime;
-            console.log('[FaceDetectionEngine] Human.js loaded successfully', {
-                modelLoadTime: `${loadTime.toFixed(2)}ms`,
+            console.log('[loadHuman] Loaded successfully', {
                 totalInitTime: `${totalTime.toFixed(2)}ms`,
                 version: human.version
             });
@@ -634,7 +611,32 @@
         }
         catch (error) {
             const errorMsg = error instanceof Error ? error.message : 'Unknown error';
-            console.error('[FaceDetectionEngine] Human.js load failed:', errorMsg);
+            console.error('[loadHuman] Load failed:', errorMsg);
+            throw error;
+        }
+    }
+    async function loadLibraries(modelPath, wasmPath, timeout) {
+        console.log('[loadLibraries] Starting parallel load of OpenCV and Human...');
+        const startTime = performance.now();
+        if (timeout == undefined) {
+            timeout = 30000;
+        }
+        try {
+            // 并行加载 OpenCV 和 Human
+            const [cv, human] = await Promise.all([
+                loadOpenCV(timeout),
+                loadHuman(modelPath, wasmPath)
+            ]);
+            const totalTime = performance.now() - startTime;
+            console.log('[loadLibraries] Both libraries loaded successfully in', totalTime.toFixed(2), 'ms');
+            return {
+                cv,
+                human
+            };
+        }
+        catch (error) {
+            const errorMsg = error instanceof Error ? error.message : 'Unknown error';
+            console.error('[loadLibraries] Failed to load libraries:', errorMsg);
             throw error;
         }
     }
@@ -1616,12 +1618,13 @@
             this.isInitializing = true;
             this.emitDebug('initialization', 'Starting to load detection libraries...');
             try {
-                // Load OpenCV
-                this.emitDebug('initialization', 'Loading OpenCV...');
-                const { cv } = await loadOpenCV(300000); // 5 minute timeout
+                // Load Libraries
+                this.emitDebug('initialization', 'Loading Libraries...');
+                const startLoadTime = performance.now();
+                const { cv, human } = await loadLibraries(this.config.human_model_path, this.config.tensorflow_wasm_path, 30000);
                 if (!cv || !cv.Mat) {
                     console.log('[FaceDetectionEngine] Failed to load OpenCV.js: module is null or invalid');
-                    this.emit('detector-error', {
+                    this.emit('detector-loaded', {
                         success: false,
                         error: 'Failed to load OpenCV.js: module is null or invalid'
                     });
@@ -1631,22 +1634,9 @@
                     });
                     return;
                 }
-                this.emitDebug('initialization', 'OpenCV loaded successfully', {
-                    version: cv?.getBuildInformation?.() || 'unknown'
-                });
-                console.log('[FaceDetectionEngine] OpenCV loaded successfully', {
-                    version: cv?.getBuildInformation?.() || 'unknown'
-                });
-                // Load Human.js
-                console.log('[FaceDetectionEngine] Loading Human.js models...');
-                this.emitDebug('initialization', 'Loading Human.js...');
-                const humanStartTime = performance.now();
-                this.human = await loadHuman(this.config.human_model_path, this.config.tensorflow_wasm_path);
-                const humanLoadTime = performance.now() - humanStartTime;
                 if (!this.human) {
                     const errorMsg = 'Failed to load Human.js: instance is null';
                     console.log('[FaceDetectionEngine] ' + errorMsg);
-                    this.emitDebug('initialization', errorMsg, { loadTime: humanLoadTime }, 'error');
                     this.emit('detector-loaded', {
                         success: false,
                         error: errorMsg
@@ -1657,21 +1647,14 @@
                     });
                     return;
                 }
-                this.emitDebug('initialization', 'Human.js loaded successfully', {
-                    loadTime: `${humanLoadTime.toFixed(2)}ms`,
-                    version: this.human.version
-                });
-                console.log('[FaceDetectionEngine] Human.js loaded successfully', {
-                    loadTime: `${humanLoadTime.toFixed(2)}ms`,
-                    version: this.human.version
-                });
                 this.isReady = true;
                 const loadedData = {
                     success: true,
-                    opencv_version: cv?.getBuildInformation?.() || 'unknown',
+                    opencv_version: getOpenCVVersion(),
                     human_version: this.human.version
                 };
                 console.log('[FaceDetectionEngine] Engine initialized and ready', {
+                    initCostTime: (performance.now() - startLoadTime).toFixed(2),
                     opencv_version: loadedData.opencv_version,
                     human_version: loadedData.human_version
                 });
@@ -2444,6 +2427,7 @@
     exports.FaceDetectionEngine = FaceDetectionEngine;
     exports.default = FaceDetectionEngine;
     exports.getCvSync = getCvSync;
+    exports.getOpenCVVersion = getOpenCVVersion;
     exports.loadOpenCV = loadOpenCV;
     exports.preloadOpenCV = preloadOpenCV;