@authme/util 2.8.28 → 2.8.30

package/index.cjs

@@ -27,6 +27,7 @@ var fileSaver = require('file-saver');
 var JSZip = require('jszip');
 require('core-js/modules/es.parse-int.js');
 var Lottie = require('lottie-web');
+require('core-js/modules/es.number.to-fixed.js');
 require('core-js/modules/es.array.sort.js');
 require('core-js/modules/es.string.trim.js');
 require('core-js/modules/es.string.starts-with.js');
@@ -1447,6 +1448,42 @@ const videoConstraintsFactory = (isPC, facingMode) => {
     }
   };
 };
+/**
+ * 等待camera完全就緒
+ * 用於解決外接camera初始化延遲問題
+ * @param videoTrack - MediaStreamTrack 實例
+ * @param maxWaitMs - 最大等待時間（毫秒）
+ * @returns Promise<boolean> - true表示camera已就緒，false表示超時
+ */
+function waitForCameraReady(videoTrack, maxWaitMs = 100) {
+  var _a, _b, _c, _d;
+  return __awaiter(this, void 0, void 0, function* () {
+    const startTime = Date.now();
+    const checkInterval = 50; // 每50ms檢查一次
+    while (Date.now() - startTime < maxWaitMs) {
+      const _settings = videoTrack.getSettings();
+      const capabilities = (_a = videoTrack.getCapabilities) === null || _a === void 0 ? void 0 : _a.call(videoTrack);
+      // 檢查camera是否已提供完整資訊
+      // 1. 必須有基本的寬高設定
+      // 2. 如果支援 getCapabilities，確認有最大解析度資訊
+      const hasBasicSettings = _settings.width && _settings.height;
+      const hasCapabilities = !capabilities || ((_b = capabilities === null || capabilities === void 0 ? void 0 : capabilities.width) === null || _b === void 0 ? void 0 : _b.max) && ((_c = capabilities === null || capabilities === void 0 ? void 0 : capabilities.height) === null || _c === void 0 ? void 0 : _c.max);
+      if (hasBasicSettings && hasCapabilities) {
+        const elapsedTime = Date.now() - startTime;
+        console.log(`✅ Camera就緒 (耗時: ${elapsedTime}ms, 解析度: ${_settings.width}x${_settings.height})`);
+        return true;
+      }
+      yield new Promise(resolve => setTimeout(resolve, checkInterval));
+    }
+    const settings = videoTrack.getSettings();
+    console.warn(`⚠️ Camera未在時限內完全就緒 (${maxWaitMs}ms), 當前狀態:`, {
+      width: settings.width,
+      height: settings.height,
+      hasCapabilities: !!((_d = videoTrack.getCapabilities) === null || _d === void 0 ? void 0 : _d.call(videoTrack))
+    });
+    return false;
+  });
+}
 function inferFacingModeFromLabel(label) {
   const pattern = /rear|back|rück|arrière|trasera|trás|traseira|posteriore|后|後|背|задней|الخلفية|후|arka|achterzijde|หลัง|baksidan|bagside|sau|bak|tylny|takakamera|belakang|אחורית|πίσω|spate|hátsó|zadní|darrere|zadná|задня|stražnja|belakang|बैक/i;
   if (pattern.test(label !== null && label !== void 0 ? label : '')) {
@@ -1501,7 +1538,9 @@ function arrayFromAsync(asyncIterable) {
   });
 }
 function switchCamera(deviceId, video) {
+  var _a, _b;
   return __awaiter(this, void 0, void 0, function* () {
+    const startTime = performance.now();
     try {
       if (stream) {
         stream.getTracks().forEach(track => track.stop());
@@ -1515,13 +1554,15 @@ function switchCamera(deviceId, video) {
       };
       const constraint = localStorage.getItem('camera_constraint');
       stream = yield navigator.mediaDevices.getUserMedia(basicConstraints);
-      // 第二階段：如果沒有設定跳過約束，嘗試使用 applyConstraints 提升解析度
+      // 第二階段：等待就緒策略 + 漸進式重試提升解析度
       if (!constraint && stream) {
         const videoTrack = stream.getVideoTracks()[0];
         if (videoTrack && videoTrack.applyConstraints) {
-          try {
-            // 嘗試應用更高解析度（使用 ideal 而非 min/max）
-            yield videoTrack.applyConstraints({
+          // 🆕 策略 1: 等待camera完全就緒（特別針對外接camera）
+          const isReady = yield waitForCameraReady(videoTrack, 2000);
+          if (isReady) {
+            // 🆕 策略 2: 漸進式重試邏輯
+            const targetConstraints = {
               width: {
                 ideal: 1920,
                 max: 3840
@@ -1530,10 +1571,60 @@ function switchCamera(deviceId, video) {
                 ideal: 1080,
                 max: 2160
               }
-            });
-          } catch (error) {
-            // 失敗時保持原有流，不會中斷相機
+            };
+            const maxRetries = 3;
+            const delays = [0, 100, 300]; // 第一次立即嘗試，後續間隔遞增
+            for (let attempt = 0; attempt < maxRetries; attempt++) {
+              try {
+                if (delays[attempt] > 0) {
+                  yield new Promise(resolve => setTimeout(resolve, delays[attempt]));
+                }
+                yield videoTrack.applyConstraints(targetConstraints);
+                const settings = videoTrack.getSettings();
+                console.log(`✅ 解析度提升成功 (嘗試 ${attempt + 1}/${maxRetries})`, {
+                  resolution: `${settings.width}x${settings.height}`,
+                  deviceLabel: videoTrack.label
+                });
+                break; // 成功後跳出
+              } catch (error) {
+                if (attempt === maxRetries - 1) {
+                  // 最後一次嘗試失敗，記錄警告但不影響功能
+                  const settings = videoTrack.getSettings();
+                  console.warn(`⚠️ 無法提升解析度，使用基本設定 (${settings.width}x${settings.height})`, error);
+                } else {
+                  console.log(`⏳ 解析度提升嘗試 ${attempt + 1} 失敗，準備重試...`);
+                }
+              }
+            }
+          } else {
+            // Camera未完全就緒，但仍嘗試套用約束
+            console.warn('⚠️ Camera未完全就緒，嘗試套用解析度約束...');
+            try {
+              yield videoTrack.applyConstraints({
+                width: {
+                  ideal: 1920,
+                  max: 3840
+                },
+                height: {
+                  ideal: 1080,
+                  max: 2160
+                }
+              });
+            } catch (error) {
+              console.warn('⚠️ 解析度提升失敗，使用預設解析度', error);
+            }
           }
+          // 🆕 記錄最終解析度資訊
+          const finalSettings = videoTrack.getSettings();
+          const initTime = (performance.now() - startTime).toFixed(2);
+          console.log('📹 Camera初始化完成', {
+            deviceId,
+            deviceLabel: videoTrack.label,
+            resolution: `${finalSettings.width}x${finalSettings.height}`,
+            frameRate: finalSettings.frameRate,
+            facingMode: finalSettings.facingMode,
+            initTime: `${initTime}ms`
+          });
         }
       }
       // try {
@@ -1579,12 +1670,28 @@ function switchCamera(deviceId, video) {
         video.srcObject = stream;
       }, 10);
     } catch (e) {
+      // 🆕 增強錯誤日誌
+      const initTime = (performance.now() - startTime).toFixed(2);
+      console.error('❌ Camera切換失敗', {
+        deviceId,
+        error: e,
+        errorName: e === null || e === void 0 ? void 0 : e.name,
+        errorMessage: e === null || e === void 0 ? void 0 : e.message,
+        initTime: `${initTime}ms`,
+        streamExists: !!stream,
+        trackCount: (_b = (_a = stream === null || stream === void 0 ? void 0 : stream.getTracks()) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0
+      });
       throw new AuthmeError(exports.ErrorCode.CAMERA_NOT_SUPPORT, e);
     }
   });
 }
 function _requestCamera(video, facingMode) {
+  var _a, _b, _c, _d, _e, _f;
   return __awaiter(this, void 0, void 0, function* () {
+    const requestStartTime = performance.now();
+    console.log('🎬 開始camera請求流程', {
+      facingMode
+    });
     if (!('mediaDevices' in navigator)) {
       throw BROWSER_CAMERA_ERRORS.NOT_SUPPORT;
     }
@@ -1607,7 +1714,7 @@ function _requestCamera(video, facingMode) {
     // 輪詢取得攝影機 解析度等資訊
     const videoDevices = (yield navigator.mediaDevices.enumerateDevices()).filter(device => device.kind === 'videoinput');
     const deviceMetas = yield arrayFromAsync(asyncMap(device => __awaiter(this, void 0, void 0, function* () {
-      var _a, _b, _c, _d;
+      var _g, _h, _j, _k;
       const stream = yield navigator.mediaDevices.getUserMedia({
         video: {
           deviceId: {
@@ -1615,10 +1722,10 @@ function _requestCamera(video, facingMode) {
           }
         }
       });
-      const track = (_a = stream.getVideoTracks()) === null || _a === void 0 ? void 0 : _a[0];
-      const capabilities = ((_b = track === null || track === void 0 ? void 0 : track.getCapabilities) !== null && _b !== void 0 ? _b : () => undefined).bind(track)(); // firefox 沒有 getCapabilities 可以用。
-      const widthMax = (_c = capabilities === null || capabilities === void 0 ? void 0 : capabilities.width) === null || _c === void 0 ? void 0 : _c.max;
-      const heightMax = (_d = capabilities === null || capabilities === void 0 ? void 0 : capabilities.height) === null || _d === void 0 ? void 0 : _d.max;
+      const track = (_g = stream.getVideoTracks()) === null || _g === void 0 ? void 0 : _g[0];
+      const capabilities = ((_h = track === null || track === void 0 ? void 0 : track.getCapabilities) !== null && _h !== void 0 ? _h : () => undefined).bind(track)(); // firefox 沒有 getCapabilities 可以用。
+      const widthMax = (_j = capabilities === null || capabilities === void 0 ? void 0 : capabilities.width) === null || _j === void 0 ? void 0 : _j.max;
+      const heightMax = (_k = capabilities === null || capabilities === void 0 ? void 0 : capabilities.height) === null || _k === void 0 ? void 0 : _k.max;
       const resolution = widthMax && heightMax ? widthMax * heightMax : 0;
       const facingModeFromLabel = inferFacingModeFromLabel(device === null || device === void 0 ? void 0 : device.label);
       const facingModeFromapabilities = inferFacingModeFromCapabilities(capabilities);
@@ -1678,6 +1785,19 @@ function _requestCamera(video, facingMode) {
       stream.getTracks().forEach(track => track.stop());
     }
     yield switchCamera(deviceId, video);
+    // 🆕 記錄整個請求流程的總結資訊
+    const totalTime = (performance.now() - requestStartTime).toFixed(2);
+    console.log('🎉 Camera請求流程完成', {
+      totalTime: `${totalTime}ms`,
+      selectedDevice: {
+        deviceId,
+        label: firstDevice.device.label,
+        facingMode: firstDevice.meta.facingMode,
+        resolution: `${(_c = (_b = (_a = firstDevice.meta.capabilities) === null || _a === void 0 ? void 0 : _a.width) === null || _b === void 0 ? void 0 : _b.max) !== null && _c !== void 0 ? _c : 0}x${(_f = (_e = (_d = firstDevice.meta.capabilities) === null || _d === void 0 ? void 0 : _d.height) === null || _e === void 0 ? void 0 : _e.max) !== null && _f !== void 0 ? _f : 0}`
+      },
+      availableDevices: deviceMetas.length,
+      isSamsung
+    });
     return {
       facingMode: firstDevice.meta.facingMode,
       deviceMetas: deviceMetas
@@ -3243,8 +3363,8 @@ const themeConfigDefault = {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.8.28";
-var date = "2025-10-08T04:07:48+0000";
+var version$1 = "2.8.30";
+var date = "2025-10-30T10:27:17+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,

package/index.js

@@ -23,6 +23,7 @@ import { saveAs } from 'file-saver';
 import JSZip from 'jszip';
 import 'core-js/modules/es.parse-int.js';
 import Lottie from 'lottie-web';
+import 'core-js/modules/es.number.to-fixed.js';
 import 'core-js/modules/es.array.sort.js';
 import 'core-js/modules/es.string.trim.js';
 import 'core-js/modules/es.string.starts-with.js';
@@ -1437,6 +1438,42 @@ const videoConstraintsFactory = (isPC, facingMode) => {
     }
   };
 };
+/**
+ * 等待camera完全就緒
+ * 用於解決外接camera初始化延遲問題
+ * @param videoTrack - MediaStreamTrack 實例
+ * @param maxWaitMs - 最大等待時間（毫秒）
+ * @returns Promise<boolean> - true表示camera已就緒，false表示超時
+ */
+function waitForCameraReady(videoTrack, maxWaitMs = 100) {
+  var _a, _b, _c, _d;
+  return __awaiter(this, void 0, void 0, function* () {
+    const startTime = Date.now();
+    const checkInterval = 50; // 每50ms檢查一次
+    while (Date.now() - startTime < maxWaitMs) {
+      const _settings = videoTrack.getSettings();
+      const capabilities = (_a = videoTrack.getCapabilities) === null || _a === void 0 ? void 0 : _a.call(videoTrack);
+      // 檢查camera是否已提供完整資訊
+      // 1. 必須有基本的寬高設定
+      // 2. 如果支援 getCapabilities，確認有最大解析度資訊
+      const hasBasicSettings = _settings.width && _settings.height;
+      const hasCapabilities = !capabilities || ((_b = capabilities === null || capabilities === void 0 ? void 0 : capabilities.width) === null || _b === void 0 ? void 0 : _b.max) && ((_c = capabilities === null || capabilities === void 0 ? void 0 : capabilities.height) === null || _c === void 0 ? void 0 : _c.max);
+      if (hasBasicSettings && hasCapabilities) {
+        const elapsedTime = Date.now() - startTime;
+        console.log(`✅ Camera就緒 (耗時: ${elapsedTime}ms, 解析度: ${_settings.width}x${_settings.height})`);
+        return true;
+      }
+      yield new Promise(resolve => setTimeout(resolve, checkInterval));
+    }
+    const settings = videoTrack.getSettings();
+    console.warn(`⚠️ Camera未在時限內完全就緒 (${maxWaitMs}ms), 當前狀態:`, {
+      width: settings.width,
+      height: settings.height,
+      hasCapabilities: !!((_d = videoTrack.getCapabilities) === null || _d === void 0 ? void 0 : _d.call(videoTrack))
+    });
+    return false;
+  });
+}
 function inferFacingModeFromLabel(label) {
   const pattern = /rear|back|rück|arrière|trasera|trás|traseira|posteriore|后|後|背|задней|الخلفية|후|arka|achterzijde|หลัง|baksidan|bagside|sau|bak|tylny|takakamera|belakang|אחורית|πίσω|spate|hátsó|zadní|darrere|zadná|задня|stražnja|belakang|बैक/i;
   if (pattern.test(label !== null && label !== void 0 ? label : '')) {
@@ -1491,7 +1528,9 @@ function arrayFromAsync(asyncIterable) {
   });
 }
 function switchCamera(deviceId, video) {
+  var _a, _b;
   return __awaiter(this, void 0, void 0, function* () {
+    const startTime = performance.now();
     try {
       if (stream) {
         stream.getTracks().forEach(track => track.stop());
@@ -1505,13 +1544,15 @@ function switchCamera(deviceId, video) {
       };
       const constraint = localStorage.getItem('camera_constraint');
       stream = yield navigator.mediaDevices.getUserMedia(basicConstraints);
-      // 第二階段：如果沒有設定跳過約束，嘗試使用 applyConstraints 提升解析度
+      // 第二階段：等待就緒策略 + 漸進式重試提升解析度
       if (!constraint && stream) {
         const videoTrack = stream.getVideoTracks()[0];
         if (videoTrack && videoTrack.applyConstraints) {
-          try {
-            // 嘗試應用更高解析度（使用 ideal 而非 min/max）
-            yield videoTrack.applyConstraints({
+          // 🆕 策略 1: 等待camera完全就緒（特別針對外接camera）
+          const isReady = yield waitForCameraReady(videoTrack, 2000);
+          if (isReady) {
+            // 🆕 策略 2: 漸進式重試邏輯
+            const targetConstraints = {
               width: {
                 ideal: 1920,
                 max: 3840
@@ -1520,10 +1561,60 @@ function switchCamera(deviceId, video) {
                 ideal: 1080,
                 max: 2160
               }
-            });
-          } catch (error) {
-            // 失敗時保持原有流，不會中斷相機
+            };
+            const maxRetries = 3;
+            const delays = [0, 100, 300]; // 第一次立即嘗試，後續間隔遞增
+            for (let attempt = 0; attempt < maxRetries; attempt++) {
+              try {
+                if (delays[attempt] > 0) {
+                  yield new Promise(resolve => setTimeout(resolve, delays[attempt]));
+                }
+                yield videoTrack.applyConstraints(targetConstraints);
+                const settings = videoTrack.getSettings();
+                console.log(`✅ 解析度提升成功 (嘗試 ${attempt + 1}/${maxRetries})`, {
+                  resolution: `${settings.width}x${settings.height}`,
+                  deviceLabel: videoTrack.label
+                });
+                break; // 成功後跳出
+              } catch (error) {
+                if (attempt === maxRetries - 1) {
+                  // 最後一次嘗試失敗，記錄警告但不影響功能
+                  const settings = videoTrack.getSettings();
+                  console.warn(`⚠️ 無法提升解析度，使用基本設定 (${settings.width}x${settings.height})`, error);
+                } else {
+                  console.log(`⏳ 解析度提升嘗試 ${attempt + 1} 失敗，準備重試...`);
+                }
+              }
+            }
+          } else {
+            // Camera未完全就緒，但仍嘗試套用約束
+            console.warn('⚠️ Camera未完全就緒，嘗試套用解析度約束...');
+            try {
+              yield videoTrack.applyConstraints({
+                width: {
+                  ideal: 1920,
+                  max: 3840
+                },
+                height: {
+                  ideal: 1080,
+                  max: 2160
+                }
+              });
+            } catch (error) {
+              console.warn('⚠️ 解析度提升失敗，使用預設解析度', error);
+            }
           }
+          // 🆕 記錄最終解析度資訊
+          const finalSettings = videoTrack.getSettings();
+          const initTime = (performance.now() - startTime).toFixed(2);
+          console.log('📹 Camera初始化完成', {
+            deviceId,
+            deviceLabel: videoTrack.label,
+            resolution: `${finalSettings.width}x${finalSettings.height}`,
+            frameRate: finalSettings.frameRate,
+            facingMode: finalSettings.facingMode,
+            initTime: `${initTime}ms`
+          });
         }
       }
       // try {
@@ -1569,12 +1660,28 @@ function switchCamera(deviceId, video) {
         video.srcObject = stream;
       }, 10);
     } catch (e) {
+      // 🆕 增強錯誤日誌
+      const initTime = (performance.now() - startTime).toFixed(2);
+      console.error('❌ Camera切換失敗', {
+        deviceId,
+        error: e,
+        errorName: e === null || e === void 0 ? void 0 : e.name,
+        errorMessage: e === null || e === void 0 ? void 0 : e.message,
+        initTime: `${initTime}ms`,
+        streamExists: !!stream,
+        trackCount: (_b = (_a = stream === null || stream === void 0 ? void 0 : stream.getTracks()) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0
+      });
       throw new AuthmeError(ErrorCode.CAMERA_NOT_SUPPORT, e);
     }
   });
 }
 function _requestCamera(video, facingMode) {
+  var _a, _b, _c, _d, _e, _f;
   return __awaiter(this, void 0, void 0, function* () {
+    const requestStartTime = performance.now();
+    console.log('🎬 開始camera請求流程', {
+      facingMode
+    });
     if (!('mediaDevices' in navigator)) {
       throw BROWSER_CAMERA_ERRORS.NOT_SUPPORT;
     }
@@ -1597,7 +1704,7 @@ function _requestCamera(video, facingMode) {
     // 輪詢取得攝影機 解析度等資訊
     const videoDevices = (yield navigator.mediaDevices.enumerateDevices()).filter(device => device.kind === 'videoinput');
     const deviceMetas = yield arrayFromAsync(asyncMap(device => __awaiter(this, void 0, void 0, function* () {
-      var _a, _b, _c, _d;
+      var _g, _h, _j, _k;
       const stream = yield navigator.mediaDevices.getUserMedia({
         video: {
           deviceId: {
@@ -1605,10 +1712,10 @@ function _requestCamera(video, facingMode) {
           }
         }
       });
-      const track = (_a = stream.getVideoTracks()) === null || _a === void 0 ? void 0 : _a[0];
-      const capabilities = ((_b = track === null || track === void 0 ? void 0 : track.getCapabilities) !== null && _b !== void 0 ? _b : () => undefined).bind(track)(); // firefox 沒有 getCapabilities 可以用。
-      const widthMax = (_c = capabilities === null || capabilities === void 0 ? void 0 : capabilities.width) === null || _c === void 0 ? void 0 : _c.max;
-      const heightMax = (_d = capabilities === null || capabilities === void 0 ? void 0 : capabilities.height) === null || _d === void 0 ? void 0 : _d.max;
+      const track = (_g = stream.getVideoTracks()) === null || _g === void 0 ? void 0 : _g[0];
+      const capabilities = ((_h = track === null || track === void 0 ? void 0 : track.getCapabilities) !== null && _h !== void 0 ? _h : () => undefined).bind(track)(); // firefox 沒有 getCapabilities 可以用。
+      const widthMax = (_j = capabilities === null || capabilities === void 0 ? void 0 : capabilities.width) === null || _j === void 0 ? void 0 : _j.max;
+      const heightMax = (_k = capabilities === null || capabilities === void 0 ? void 0 : capabilities.height) === null || _k === void 0 ? void 0 : _k.max;
       const resolution = widthMax && heightMax ? widthMax * heightMax : 0;
       const facingModeFromLabel = inferFacingModeFromLabel(device === null || device === void 0 ? void 0 : device.label);
       const facingModeFromapabilities = inferFacingModeFromCapabilities(capabilities);
@@ -1668,6 +1775,19 @@ function _requestCamera(video, facingMode) {
       stream.getTracks().forEach(track => track.stop());
     }
     yield switchCamera(deviceId, video);
+    // 🆕 記錄整個請求流程的總結資訊
+    const totalTime = (performance.now() - requestStartTime).toFixed(2);
+    console.log('🎉 Camera請求流程完成', {
+      totalTime: `${totalTime}ms`,
+      selectedDevice: {
+        deviceId,
+        label: firstDevice.device.label,
+        facingMode: firstDevice.meta.facingMode,
+        resolution: `${(_c = (_b = (_a = firstDevice.meta.capabilities) === null || _a === void 0 ? void 0 : _a.width) === null || _b === void 0 ? void 0 : _b.max) !== null && _c !== void 0 ? _c : 0}x${(_f = (_e = (_d = firstDevice.meta.capabilities) === null || _d === void 0 ? void 0 : _d.height) === null || _e === void 0 ? void 0 : _e.max) !== null && _f !== void 0 ? _f : 0}`
+      },
+      availableDevices: deviceMetas.length,
+      isSamsung
+    });
     return {
       facingMode: firstDevice.meta.facingMode,
       deviceMetas: deviceMetas
@@ -3233,8 +3353,8 @@ const themeConfigDefault = {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.8.28";
-var date = "2025-10-08T04:07:48+0000";
+var version$1 = "2.8.30";
+var date = "2025-10-30T10:27:17+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@authme/util",
-  "version": "2.8.28",
+  "version": "2.8.30",
   "peerDependencies": {
     "core-js": "^3.6.0",
     "file-saver": "2.0.5",