@authme/util 2.8.31 → 2.8.33

package/index.cjs

@@ -29,6 +29,7 @@ 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/esnext.global-this.js');
 require('core-js/modules/es.string.trim.js');
 require('core-js/modules/es.string.starts-with.js');
 require('core-js/modules/es.symbol.description.js');
@@ -1095,7 +1096,6 @@ const uiThemeDirection = (panel, hintStyle) => {
   panel.style.borderRadius = `${hintStyle.cornerRadius || 20}px`;
   panel.style.backgroundColor = hintStyle.backgroundColor;
   panel.style.opacity = hintStyle.backgroundOpacity;
-  panel.style.display = 'none';
   panel.style.flexDirection = 'row';
   panel.style.alignItems = 'center';
   panel.style.justifyContent = 'center';
@@ -1363,7 +1363,7 @@ function checkOnlineStatus(msg, buttonText) {
   });
 }
 
-function showPopup(title, content, showButton = true, button, callback) {
+function showPopup(title, content, showButton = true, buttonText, callback) {
   return __awaiter(this, void 0, void 0, function* () {
     const target = document.querySelector('.authme-container');
     const popupBackground = document.createElement('div');
@@ -1378,7 +1378,7 @@ function showPopup(title, content, showButton = true, button, callback) {
     popupContent.textContent = content;
     const popupConfirmBtn = document.createElement('button');
     popupConfirmBtn.className = 'popup-btn';
-    popupConfirmBtn.textContent = '確定';
+    popupConfirmBtn.textContent = buttonText || '確定';
     popupPanel.appendChild(popupTitle);
     popupPanel.appendChild(popupContent);
     if (showButton) {
@@ -1401,14 +1401,14 @@ function hidePopup() {
     popupBackground.remove();
   }
 }
-function asyncShowPopup(title, content, showButton = true, button) {
+function asyncShowPopup(title, content, showButton = true, buttonText) {
   return __awaiter(this, void 0, void 0, function* () {
     return new Promise((res, rej) => {
       const callback = () => {
         res(true);
         hidePopup();
       };
-      showPopup(title, content, showButton, button, callback);
+      showPopup(title, content, showButton, buttonText, callback);
     });
   });
 }
@@ -1421,6 +1421,7 @@ var BROWSER_CAMERA_ERRORS;
   BROWSER_CAMERA_ERRORS["NOT_FOUND_ERROR"] = "NotFoundError";
   BROWSER_CAMERA_ERRORS["NOT_READABLE_ERROR"] = "NotReadableError";
   BROWSER_CAMERA_ERRORS["ABORT_ERROR"] = "AbortError";
+  BROWSER_CAMERA_ERRORS["LOW_RESOLUTION"] = "LowResolutionError";
 })(BROWSER_CAMERA_ERRORS || (BROWSER_CAMERA_ERRORS = {}));
 let stream;
 const videoConstraintsFactory = (isPC, facingMode) => {
@@ -1448,50 +1449,6 @@ 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檢查一次
-    const minStableTime = 50; // 最小穩定時間：即使檢測到就緒，也要等待一小段時間
-    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;
-        // ⚠️ 關鍵修正：即使檢測到就緒，也要確保經過最小等待時間
-        // 這對外接相機特別重要，它們需要額外的硬體初始化時間
-        if (elapsedTime < minStableTime) {
-          const remainingTime = minStableTime - elapsedTime;
-          console.log(`⏳ Camera基本就緒，額外等待 ${remainingTime}ms 確保穩定 (當前: ${_settings.width}x${_settings.height})`);
-          yield new Promise(resolve => setTimeout(resolve, remainingTime));
-        }
-        console.log(`✅ Camera就緒 (耗時: ${Date.now() - startTime}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 : '')) {
@@ -1545,8 +1502,53 @@ function arrayFromAsync(asyncIterable) {
     return result;
   });
 }
-function switchCamera(deviceId, video) {
-  var _a, _b, _c, _d;
+function upgradeResolution(videoTrack) {
+  var _a;
+  return __awaiter(this, void 0, void 0, function* () {
+    const targetConstraints = {
+      width: {
+        ideal: 1920,
+        max: 3840
+      },
+      height: {
+        ideal: 1080,
+        max: 2160
+      }
+    };
+    const minAcceptableWidth = 1280; // 最低可接受的解析度寬度
+    const maxAttempts = 5; // 最多嘗試10次
+    const retryDelay = 2000; // 每次重試間隔1秒
+    console.log('🚀 開始提升解析度...');
+    const startTime = Date.now();
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      try {
+        yield videoTrack.applyConstraints(targetConstraints);
+        const settings = videoTrack.getSettings();
+        const currentWidth = (_a = settings.width) !== null && _a !== void 0 ? _a : 0;
+        console.log(`嘗試 ${attempt}/${maxAttempts} - 解析度: ${currentWidth}x${settings.height}`);
+        // 檢查是否達到可接受的解析度
+        if (currentWidth >= minAcceptableWidth) {
+          const elapsedTime = Date.now() - startTime;
+          console.log(`✅ 解析度提升成功！最終: ${currentWidth}x${settings.height} (耗時: ${elapsedTime}ms)`);
+          return; // 成功，退出
+        }
+        // 解析度還不夠，繼續重試
+        console.log(`⚠️ 解析度 ${currentWidth} < ${minAcceptableWidth}，繼續重試...`);
+      } catch (e) {
+        console.warn(`⚠️ 第 ${attempt} 次嘗試失敗:`, e);
+      }
+      // 如果不是最後一次嘗試，等待後重試
+      if (attempt < maxAttempts) {
+        yield new Promise(resolve => setTimeout(resolve, retryDelay));
+      }
+    }
+    // 所有嘗試都失敗
+    const finalSettings = videoTrack.getSettings();
+    console.warn(`⚠️ 達到最大重試次數，使用當前解析度: ${finalSettings.width}x${finalSettings.height}`);
+  });
+}
+function switchCamera(deviceId, video, translate) {
+  var _a, _b;
   return __awaiter(this, void 0, void 0, function* () {
     const startTime = performance.now();
     try {
@@ -1562,103 +1564,39 @@ function switchCamera(deviceId, video) {
       };
       const constraint = localStorage.getItem('camera_constraint');
       stream = yield navigator.mediaDevices.getUserMedia(basicConstraints);
-      // 第二階段：等待就緒策略 + 漸進式重試提升解析度
       if (!constraint && stream) {
         const videoTrack = stream.getVideoTracks()[0];
-        if (videoTrack && videoTrack.applyConstraints) {
-          // 🆕 策略 1: 等待camera完全就緒（特別針對外接camera）
-          const isReady = yield waitForCameraReady(videoTrack, 2000);
-          if (isReady) {
-            // 🆕 策略 2: 漸進式重試邏輯 + 解析度驗證
-            const targetConstraints = {
-              width: {
-                ideal: 1920,
-                max: 3840
-              },
-              height: {
-                ideal: 1080,
-                max: 2160
-              }
-            };
-            const maxRetries = 3;
-            const delays = [0, 100, 300]; // 第一次立即嘗試，後續間隔遞增
-            const minAcceptableWidth = 1280; // 最低可接受的解析度寬度
-            for (let attempt = 0; attempt < maxRetries; attempt++) {
-              try {
-                if (delays[attempt] > 0) {
-                  yield new Promise(resolve => setTimeout(resolve, delays[attempt]));
-                }
-                const beforeSettings = videoTrack.getSettings();
-                yield videoTrack.applyConstraints(targetConstraints);
-                // ⚠️ 關鍵：驗證解析度是否真的改變
-                const afterSettings = videoTrack.getSettings();
-                const afterWidth = (_a = afterSettings.width) !== null && _a !== void 0 ? _a : 0;
-                const beforeWidth = (_b = beforeSettings.width) !== null && _b !== void 0 ? _b : 0;
-                // 成功條件：
-                // 1. 如果初始解析度 < 最低標準 → 必須提升且達到最低標準
-                // 2. 如果初始解析度 >= 最低標準 → 只要有提升就算成功
-                const needsImprovement = beforeWidth < minAcceptableWidth;
-                const resolutionImproved = needsImprovement ? afterWidth > beforeWidth && afterWidth >= minAcceptableWidth : afterWidth > beforeWidth;
-                if (resolutionImproved) {
-                  console.log(`✅ 解析度提升成功 (嘗試 ${attempt + 1}/${maxRetries})`, {
-                    before: `${beforeWidth}x${beforeSettings.height}`,
-                    after: `${afterWidth}x${afterSettings.height}`,
-                    deviceLabel: videoTrack.label
-                  });
-                  break; // 真正成功才跳出
-                } else {
-                  // applyConstraints 沒報錯，但解析度沒變 → 視為失敗，觸發重試
-                  console.warn(`⚠️ 解析度未改善 (嘗試 ${attempt + 1}/${maxRetries})`, {
-                    before: `${beforeWidth}x${beforeSettings.height}`,
-                    after: `${afterWidth}x${afterSettings.height}`,
-                    expected: needsImprovement ? `>= ${minAcceptableWidth}` : '任何提升'
-                  });
-                  if (attempt === maxRetries - 1) {
-                    console.warn(`⚠️ 達到最大重試次數，使用當前解析度 (${afterWidth}x${afterSettings.height})`);
-                  } else {
-                    // 繼續重試
-                    continue;
-                  }
-                }
-              } catch (error) {
-                if (attempt === maxRetries - 1) {
-                  // 最後一次嘗試失敗，記錄警告但不影響功能
-                  const settings = videoTrack.getSettings();
-                  console.warn(`⚠️ 無法提升解析度，使用基本設定 (${settings.width}x${settings.height})`, error);
-                } else {
-                  console.log(`⏳ 解析度提升嘗試 ${attempt + 1} 失敗，準備重試...`, error);
-                }
-              }
-            }
-          } 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`
+        yield upgradeResolution(videoTrack); // ✅ 加上 await 等待解析度提升完成
+        // 🆕 記錄最終解析度資訊
+        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`
+        });
+      }
+      // 檢查最終解析度是否達到最低要求
+      const currentTrack = stream.getVideoTracks()[0];
+      if (currentTrack) {
+        const currentSettings = currentTrack.getSettings();
+        const minRequiredWidth = 1280;
+        if (currentSettings.width && currentSettings.width < minRequiredWidth) {
+          console.error('❌ Camera解析度不足', {
+            current: `${currentSettings.width}x${currentSettings.height}`,
+            required: `${minRequiredWidth}px minimum width`,
+            deviceId
           });
+          // 關閉當前相機流
+          stream.getTracks().forEach(track => track.stop());
+          // 顯示彈窗並等待用戶點擊
+          if (translate) {
+            yield asyncShowPopup('相機解析度不足', '相機解析度不足，請重新嘗試或更換裝置', true, '重新嘗試');
+          }
+          throw BROWSER_CAMERA_ERRORS.LOW_RESOLUTION;
         }
       }
       // try {
@@ -1704,6 +1642,10 @@ function switchCamera(deviceId, video) {
         video.srcObject = stream;
       }, 10);
     } catch (e) {
+      // 如果是低解析度錯誤，直接拋出不包裝，讓外層處理重試
+      if (e === BROWSER_CAMERA_ERRORS.LOW_RESOLUTION) {
+        throw e;
+      }
       // 🆕 增強錯誤日誌
       const initTime = (performance.now() - startTime).toFixed(2);
       console.error('❌ Camera切換失敗', {
@@ -1713,13 +1655,13 @@ function switchCamera(deviceId, video) {
         errorMessage: e === null || e === void 0 ? void 0 : e.message,
         initTime: `${initTime}ms`,
         streamExists: !!stream,
-        trackCount: (_d = (_c = stream === null || stream === void 0 ? void 0 : stream.getTracks()) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0
+        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) {
+function _requestCamera(video, facingMode, translate) {
   var _a, _b, _c, _d, _e, _f;
   return __awaiter(this, void 0, void 0, function* () {
     const requestStartTime = performance.now();
@@ -1818,7 +1760,28 @@ function _requestCamera(video, facingMode) {
     if (stream) {
       stream.getTracks().forEach(track => track.stop());
     }
-    yield switchCamera(deviceId, video);
+    // 嘗試開啟相機，如果解析度不足會持續重試
+    let retryCount = 0;
+    const MAX_RETRIES = 5;
+    while (retryCount < MAX_RETRIES) {
+      try {
+        yield switchCamera(deviceId, video, translate);
+        break; // 成功就跳出循環
+      } catch (error) {
+        if (error === BROWSER_CAMERA_ERRORS.LOW_RESOLUTION) {
+          retryCount++;
+          if (retryCount >= MAX_RETRIES) {
+            console.error(`❌ 達到最大重試次數 (${MAX_RETRIES})，相機解析度持續不足`);
+            throw error;
+          }
+          console.log(`🔄 解析度不足，第 ${retryCount} 次重試...`);
+          // 等待一下再重試
+          yield new Promise(resolve => setTimeout(resolve, 500));
+        } else {
+          throw error; // 其他錯誤直接拋出
+        }
+      }
+    }
     // 🆕 記錄整個請求流程的總結資訊
     const totalTime = (performance.now() - requestStartTime).toFixed(2);
     console.log('🎉 Camera請求流程完成', {
@@ -1866,7 +1829,7 @@ function requestCamera({
           try {
             //for ios 17.4.1 hack, if you call getUserMedia too early will only get not allowed.
             yield sleep(1000);
-            return yield _requestCamera(video, facingMode);
+            return yield _requestCamera(video, facingMode, translate);
           } catch (error) {
             if ((error === null || error === void 0 ? void 0 : error.name) === BROWSER_CAMERA_ERRORS.NOT_ALLOWED_ERROR) {
               perm = yield navigator.permissions.query({
@@ -1877,9 +1840,9 @@ function requestCamera({
             }
           }
         }
-        return yield _requestCamera(video, facingMode);
+        return yield _requestCamera(video, facingMode, translate);
       } else {
-        return yield _requestCamera(video, facingMode);
+        return yield _requestCamera(video, facingMode, translate);
       }
     } catch (error) {
       if (error === BROWSER_CAMERA_ERRORS.NOT_SUPPORT) {
@@ -1903,6 +1866,14 @@ function requestCamera({
          */
         throw new AuthmeError(exports.ErrorCode.CAMERA_NOT_SUPPORT, error);
       }
+      if (error === BROWSER_CAMERA_ERRORS.LOW_RESOLUTION) {
+        // 顯示彈窗並等待用戶點擊後重新載入
+        yield asyncShowPopup(translate('sdk.general.error.cameraLowResolution'), translate('sdk.general.error.cameraLowResolution') + '，請重新嘗試或更換裝置', true);
+        // 用戶點擊確定後，重新載入頁面
+        globalThis.location.reload();
+        // 不會執行到這裡，因為頁面已重新載入
+        throw new AuthmeError(exports.ErrorCode.CAMERA_NOT_SUPPORT, error);
+      }
       if (isOverconstrainedError(error)) {
         showMessage(translate('sdk.general.error.cameraLowResolution'));
         throw new AuthmeError(exports.ErrorCode.CAMERA_NOT_SUPPORT, error);
@@ -3397,8 +3368,8 @@ const themeConfigDefault = {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.8.31";
-var date = "2025-11-05T04:02:33+0000";
+var version$1 = "2.8.33";
+var date = "2025-11-21T09:00:22+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,

package/index.js

@@ -25,6 +25,7 @@ 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/esnext.global-this.js';
 import 'core-js/modules/es.string.trim.js';
 import 'core-js/modules/es.string.starts-with.js';
 import 'core-js/modules/es.symbol.description.js';
@@ -1085,7 +1086,6 @@ const uiThemeDirection = (panel, hintStyle) => {
   panel.style.borderRadius = `${hintStyle.cornerRadius || 20}px`;
   panel.style.backgroundColor = hintStyle.backgroundColor;
   panel.style.opacity = hintStyle.backgroundOpacity;
-  panel.style.display = 'none';
   panel.style.flexDirection = 'row';
   panel.style.alignItems = 'center';
   panel.style.justifyContent = 'center';
@@ -1353,7 +1353,7 @@ function checkOnlineStatus(msg, buttonText) {
   });
 }
 
-function showPopup(title, content, showButton = true, button, callback) {
+function showPopup(title, content, showButton = true, buttonText, callback) {
   return __awaiter(this, void 0, void 0, function* () {
     const target = document.querySelector('.authme-container');
     const popupBackground = document.createElement('div');
@@ -1368,7 +1368,7 @@ function showPopup(title, content, showButton = true, button, callback) {
     popupContent.textContent = content;
     const popupConfirmBtn = document.createElement('button');
     popupConfirmBtn.className = 'popup-btn';
-    popupConfirmBtn.textContent = '確定';
+    popupConfirmBtn.textContent = buttonText || '確定';
     popupPanel.appendChild(popupTitle);
     popupPanel.appendChild(popupContent);
     if (showButton) {
@@ -1391,14 +1391,14 @@ function hidePopup() {
     popupBackground.remove();
   }
 }
-function asyncShowPopup(title, content, showButton = true, button) {
+function asyncShowPopup(title, content, showButton = true, buttonText) {
   return __awaiter(this, void 0, void 0, function* () {
     return new Promise((res, rej) => {
       const callback = () => {
         res(true);
         hidePopup();
       };
-      showPopup(title, content, showButton, button, callback);
+      showPopup(title, content, showButton, buttonText, callback);
     });
   });
 }
@@ -1411,6 +1411,7 @@ var BROWSER_CAMERA_ERRORS;
   BROWSER_CAMERA_ERRORS["NOT_FOUND_ERROR"] = "NotFoundError";
   BROWSER_CAMERA_ERRORS["NOT_READABLE_ERROR"] = "NotReadableError";
   BROWSER_CAMERA_ERRORS["ABORT_ERROR"] = "AbortError";
+  BROWSER_CAMERA_ERRORS["LOW_RESOLUTION"] = "LowResolutionError";
 })(BROWSER_CAMERA_ERRORS || (BROWSER_CAMERA_ERRORS = {}));
 let stream;
 const videoConstraintsFactory = (isPC, facingMode) => {
@@ -1438,50 +1439,6 @@ 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檢查一次
-    const minStableTime = 50; // 最小穩定時間：即使檢測到就緒，也要等待一小段時間
-    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;
-        // ⚠️ 關鍵修正：即使檢測到就緒，也要確保經過最小等待時間
-        // 這對外接相機特別重要，它們需要額外的硬體初始化時間
-        if (elapsedTime < minStableTime) {
-          const remainingTime = minStableTime - elapsedTime;
-          console.log(`⏳ Camera基本就緒，額外等待 ${remainingTime}ms 確保穩定 (當前: ${_settings.width}x${_settings.height})`);
-          yield new Promise(resolve => setTimeout(resolve, remainingTime));
-        }
-        console.log(`✅ Camera就緒 (耗時: ${Date.now() - startTime}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 : '')) {
@@ -1535,8 +1492,53 @@ function arrayFromAsync(asyncIterable) {
     return result;
   });
 }
-function switchCamera(deviceId, video) {
-  var _a, _b, _c, _d;
+function upgradeResolution(videoTrack) {
+  var _a;
+  return __awaiter(this, void 0, void 0, function* () {
+    const targetConstraints = {
+      width: {
+        ideal: 1920,
+        max: 3840
+      },
+      height: {
+        ideal: 1080,
+        max: 2160
+      }
+    };
+    const minAcceptableWidth = 1280; // 最低可接受的解析度寬度
+    const maxAttempts = 5; // 最多嘗試10次
+    const retryDelay = 2000; // 每次重試間隔1秒
+    console.log('🚀 開始提升解析度...');
+    const startTime = Date.now();
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      try {
+        yield videoTrack.applyConstraints(targetConstraints);
+        const settings = videoTrack.getSettings();
+        const currentWidth = (_a = settings.width) !== null && _a !== void 0 ? _a : 0;
+        console.log(`嘗試 ${attempt}/${maxAttempts} - 解析度: ${currentWidth}x${settings.height}`);
+        // 檢查是否達到可接受的解析度
+        if (currentWidth >= minAcceptableWidth) {
+          const elapsedTime = Date.now() - startTime;
+          console.log(`✅ 解析度提升成功！最終: ${currentWidth}x${settings.height} (耗時: ${elapsedTime}ms)`);
+          return; // 成功，退出
+        }
+        // 解析度還不夠，繼續重試
+        console.log(`⚠️ 解析度 ${currentWidth} < ${minAcceptableWidth}，繼續重試...`);
+      } catch (e) {
+        console.warn(`⚠️ 第 ${attempt} 次嘗試失敗:`, e);
+      }
+      // 如果不是最後一次嘗試，等待後重試
+      if (attempt < maxAttempts) {
+        yield new Promise(resolve => setTimeout(resolve, retryDelay));
+      }
+    }
+    // 所有嘗試都失敗
+    const finalSettings = videoTrack.getSettings();
+    console.warn(`⚠️ 達到最大重試次數，使用當前解析度: ${finalSettings.width}x${finalSettings.height}`);
+  });
+}
+function switchCamera(deviceId, video, translate) {
+  var _a, _b;
   return __awaiter(this, void 0, void 0, function* () {
     const startTime = performance.now();
     try {
@@ -1552,103 +1554,39 @@ function switchCamera(deviceId, video) {
       };
       const constraint = localStorage.getItem('camera_constraint');
       stream = yield navigator.mediaDevices.getUserMedia(basicConstraints);
-      // 第二階段：等待就緒策略 + 漸進式重試提升解析度
       if (!constraint && stream) {
         const videoTrack = stream.getVideoTracks()[0];
-        if (videoTrack && videoTrack.applyConstraints) {
-          // 🆕 策略 1: 等待camera完全就緒（特別針對外接camera）
-          const isReady = yield waitForCameraReady(videoTrack, 2000);
-          if (isReady) {
-            // 🆕 策略 2: 漸進式重試邏輯 + 解析度驗證
-            const targetConstraints = {
-              width: {
-                ideal: 1920,
-                max: 3840
-              },
-              height: {
-                ideal: 1080,
-                max: 2160
-              }
-            };
-            const maxRetries = 3;
-            const delays = [0, 100, 300]; // 第一次立即嘗試，後續間隔遞增
-            const minAcceptableWidth = 1280; // 最低可接受的解析度寬度
-            for (let attempt = 0; attempt < maxRetries; attempt++) {
-              try {
-                if (delays[attempt] > 0) {
-                  yield new Promise(resolve => setTimeout(resolve, delays[attempt]));
-                }
-                const beforeSettings = videoTrack.getSettings();
-                yield videoTrack.applyConstraints(targetConstraints);
-                // ⚠️ 關鍵：驗證解析度是否真的改變
-                const afterSettings = videoTrack.getSettings();
-                const afterWidth = (_a = afterSettings.width) !== null && _a !== void 0 ? _a : 0;
-                const beforeWidth = (_b = beforeSettings.width) !== null && _b !== void 0 ? _b : 0;
-                // 成功條件：
-                // 1. 如果初始解析度 < 最低標準 → 必須提升且達到最低標準
-                // 2. 如果初始解析度 >= 最低標準 → 只要有提升就算成功
-                const needsImprovement = beforeWidth < minAcceptableWidth;
-                const resolutionImproved = needsImprovement ? afterWidth > beforeWidth && afterWidth >= minAcceptableWidth : afterWidth > beforeWidth;
-                if (resolutionImproved) {
-                  console.log(`✅ 解析度提升成功 (嘗試 ${attempt + 1}/${maxRetries})`, {
-                    before: `${beforeWidth}x${beforeSettings.height}`,
-                    after: `${afterWidth}x${afterSettings.height}`,
-                    deviceLabel: videoTrack.label
-                  });
-                  break; // 真正成功才跳出
-                } else {
-                  // applyConstraints 沒報錯，但解析度沒變 → 視為失敗，觸發重試
-                  console.warn(`⚠️ 解析度未改善 (嘗試 ${attempt + 1}/${maxRetries})`, {
-                    before: `${beforeWidth}x${beforeSettings.height}`,
-                    after: `${afterWidth}x${afterSettings.height}`,
-                    expected: needsImprovement ? `>= ${minAcceptableWidth}` : '任何提升'
-                  });
-                  if (attempt === maxRetries - 1) {
-                    console.warn(`⚠️ 達到最大重試次數，使用當前解析度 (${afterWidth}x${afterSettings.height})`);
-                  } else {
-                    // 繼續重試
-                    continue;
-                  }
-                }
-              } catch (error) {
-                if (attempt === maxRetries - 1) {
-                  // 最後一次嘗試失敗，記錄警告但不影響功能
-                  const settings = videoTrack.getSettings();
-                  console.warn(`⚠️ 無法提升解析度，使用基本設定 (${settings.width}x${settings.height})`, error);
-                } else {
-                  console.log(`⏳ 解析度提升嘗試 ${attempt + 1} 失敗，準備重試...`, error);
-                }
-              }
-            }
-          } 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`
+        yield upgradeResolution(videoTrack); // ✅ 加上 await 等待解析度提升完成
+        // 🆕 記錄最終解析度資訊
+        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`
+        });
+      }
+      // 檢查最終解析度是否達到最低要求
+      const currentTrack = stream.getVideoTracks()[0];
+      if (currentTrack) {
+        const currentSettings = currentTrack.getSettings();
+        const minRequiredWidth = 1280;
+        if (currentSettings.width && currentSettings.width < minRequiredWidth) {
+          console.error('❌ Camera解析度不足', {
+            current: `${currentSettings.width}x${currentSettings.height}`,
+            required: `${minRequiredWidth}px minimum width`,
+            deviceId
           });
+          // 關閉當前相機流
+          stream.getTracks().forEach(track => track.stop());
+          // 顯示彈窗並等待用戶點擊
+          if (translate) {
+            yield asyncShowPopup('相機解析度不足', '相機解析度不足，請重新嘗試或更換裝置', true, '重新嘗試');
+          }
+          throw BROWSER_CAMERA_ERRORS.LOW_RESOLUTION;
         }
       }
       // try {
@@ -1694,6 +1632,10 @@ function switchCamera(deviceId, video) {
         video.srcObject = stream;
       }, 10);
     } catch (e) {
+      // 如果是低解析度錯誤，直接拋出不包裝，讓外層處理重試
+      if (e === BROWSER_CAMERA_ERRORS.LOW_RESOLUTION) {
+        throw e;
+      }
       // 🆕 增強錯誤日誌
       const initTime = (performance.now() - startTime).toFixed(2);
       console.error('❌ Camera切換失敗', {
@@ -1703,13 +1645,13 @@ function switchCamera(deviceId, video) {
         errorMessage: e === null || e === void 0 ? void 0 : e.message,
         initTime: `${initTime}ms`,
         streamExists: !!stream,
-        trackCount: (_d = (_c = stream === null || stream === void 0 ? void 0 : stream.getTracks()) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0
+        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) {
+function _requestCamera(video, facingMode, translate) {
   var _a, _b, _c, _d, _e, _f;
   return __awaiter(this, void 0, void 0, function* () {
     const requestStartTime = performance.now();
@@ -1808,7 +1750,28 @@ function _requestCamera(video, facingMode) {
     if (stream) {
       stream.getTracks().forEach(track => track.stop());
     }
-    yield switchCamera(deviceId, video);
+    // 嘗試開啟相機，如果解析度不足會持續重試
+    let retryCount = 0;
+    const MAX_RETRIES = 5;
+    while (retryCount < MAX_RETRIES) {
+      try {
+        yield switchCamera(deviceId, video, translate);
+        break; // 成功就跳出循環
+      } catch (error) {
+        if (error === BROWSER_CAMERA_ERRORS.LOW_RESOLUTION) {
+          retryCount++;
+          if (retryCount >= MAX_RETRIES) {
+            console.error(`❌ 達到最大重試次數 (${MAX_RETRIES})，相機解析度持續不足`);
+            throw error;
+          }
+          console.log(`🔄 解析度不足，第 ${retryCount} 次重試...`);
+          // 等待一下再重試
+          yield new Promise(resolve => setTimeout(resolve, 500));
+        } else {
+          throw error; // 其他錯誤直接拋出
+        }
+      }
+    }
     // 🆕 記錄整個請求流程的總結資訊
     const totalTime = (performance.now() - requestStartTime).toFixed(2);
     console.log('🎉 Camera請求流程完成', {
@@ -1856,7 +1819,7 @@ function requestCamera({
           try {
             //for ios 17.4.1 hack, if you call getUserMedia too early will only get not allowed.
             yield sleep(1000);
-            return yield _requestCamera(video, facingMode);
+            return yield _requestCamera(video, facingMode, translate);
           } catch (error) {
             if ((error === null || error === void 0 ? void 0 : error.name) === BROWSER_CAMERA_ERRORS.NOT_ALLOWED_ERROR) {
               perm = yield navigator.permissions.query({
@@ -1867,9 +1830,9 @@ function requestCamera({
             }
           }
         }
-        return yield _requestCamera(video, facingMode);
+        return yield _requestCamera(video, facingMode, translate);
       } else {
-        return yield _requestCamera(video, facingMode);
+        return yield _requestCamera(video, facingMode, translate);
       }
     } catch (error) {
       if (error === BROWSER_CAMERA_ERRORS.NOT_SUPPORT) {
@@ -1893,6 +1856,14 @@ function requestCamera({
          */
         throw new AuthmeError(ErrorCode.CAMERA_NOT_SUPPORT, error);
       }
+      if (error === BROWSER_CAMERA_ERRORS.LOW_RESOLUTION) {
+        // 顯示彈窗並等待用戶點擊後重新載入
+        yield asyncShowPopup(translate('sdk.general.error.cameraLowResolution'), translate('sdk.general.error.cameraLowResolution') + '，請重新嘗試或更換裝置', true);
+        // 用戶點擊確定後，重新載入頁面
+        globalThis.location.reload();
+        // 不會執行到這裡，因為頁面已重新載入
+        throw new AuthmeError(ErrorCode.CAMERA_NOT_SUPPORT, error);
+      }
       if (isOverconstrainedError(error)) {
         showMessage(translate('sdk.general.error.cameraLowResolution'));
         throw new AuthmeError(ErrorCode.CAMERA_NOT_SUPPORT, error);
@@ -3387,8 +3358,8 @@ const themeConfigDefault = {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.8.31";
-var date = "2025-11-05T04:02:33+0000";
+var version$1 = "2.8.33";
+var date = "2025-11-21T09:00:22+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,

package/package.json

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

package/src/ui/camera.d.ts

@@ -39,7 +39,7 @@ export declare const videoConstraintsFactory: (isPC: boolean, facingMode: 'user'
         facingMode: "user" | "environment";
     };
 };
-export declare function switchCamera(deviceId: string, video: HTMLVideoElement): Promise<void>;
+export declare function switchCamera(deviceId: string, video: HTMLVideoElement, translate?: (key: string) => string): Promise<void>;
 export declare function requestCamera({ video, facingMode, translate, showMessage, }: {
     video: HTMLVideoElement;
     facingMode: 'front' | 'back';

package/src/ui/popup.d.ts

@@ -1,3 +1,3 @@
-export declare function showPopup(title: string, content: string, showButton?: boolean, button?: any, callback?: (e: Event) => void): Promise<void>;
+export declare function showPopup(title: string, content: string, showButton?: boolean, buttonText?: string, callback?: (e: Event) => void): Promise<void>;
 export declare function hidePopup(): void;
-export declare function asyncShowPopup(title: string, content: string, showButton?: boolean, button?: any): Promise<boolean>;
+export declare function asyncShowPopup(title: string, content: string, showButton?: boolean, buttonText?: string): Promise<boolean>;