@authme/util 2.8.32 → 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) => {
@@ -1515,8 +1516,8 @@ function upgradeResolution(videoTrack) {
       }
     };
     const minAcceptableWidth = 1280; // 最低可接受的解析度寬度
-    const maxAttempts = 300; // 最多嘗試10次
-    const retryDelay = 100; // 每次重試間隔1秒
+    const maxAttempts = 5; // 最多嘗試10次
+    const retryDelay = 2000; // 每次重試間隔1秒
     console.log('🚀 開始提升解析度...');
     const startTime = Date.now();
     for (let attempt = 1; attempt <= maxAttempts; attempt++) {
@@ -1546,7 +1547,7 @@ function upgradeResolution(videoTrack) {
     console.warn(`⚠️ 達到最大重試次數，使用當前解析度: ${finalSettings.width}x${finalSettings.height}`);
   });
 }
-function switchCamera(deviceId, video) {
+function switchCamera(deviceId, video, translate) {
   var _a, _b;
   return __awaiter(this, void 0, void 0, function* () {
     const startTime = performance.now();
@@ -1578,6 +1579,26 @@ function switchCamera(deviceId, video) {
           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 {
       //   stream = await navigator.mediaDevices.getUserMedia(constraints);
       //   console.log("獲取媒體流成功:", stream);
@@ -1621,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切換失敗', {
@@ -1636,7 +1661,7 @@ function switchCamera(deviceId, video) {
     }
   });
 }
-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();
@@ -1735,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請求流程完成', {
@@ -1783,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({
@@ -1794,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) {
@@ -1820,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);
@@ -3314,8 +3368,8 @@ const themeConfigDefault = {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.8.32";
-var date = "2025-11-07T03:04:15+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) => {
@@ -1505,8 +1506,8 @@ function upgradeResolution(videoTrack) {
       }
     };
     const minAcceptableWidth = 1280; // 最低可接受的解析度寬度
-    const maxAttempts = 300; // 最多嘗試10次
-    const retryDelay = 100; // 每次重試間隔1秒
+    const maxAttempts = 5; // 最多嘗試10次
+    const retryDelay = 2000; // 每次重試間隔1秒
     console.log('🚀 開始提升解析度...');
     const startTime = Date.now();
     for (let attempt = 1; attempt <= maxAttempts; attempt++) {
@@ -1536,7 +1537,7 @@ function upgradeResolution(videoTrack) {
     console.warn(`⚠️ 達到最大重試次數，使用當前解析度: ${finalSettings.width}x${finalSettings.height}`);
   });
 }
-function switchCamera(deviceId, video) {
+function switchCamera(deviceId, video, translate) {
   var _a, _b;
   return __awaiter(this, void 0, void 0, function* () {
     const startTime = performance.now();
@@ -1568,6 +1569,26 @@ function switchCamera(deviceId, video) {
           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 {
       //   stream = await navigator.mediaDevices.getUserMedia(constraints);
       //   console.log("獲取媒體流成功:", stream);
@@ -1611,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切換失敗', {
@@ -1626,7 +1651,7 @@ function switchCamera(deviceId, video) {
     }
   });
 }
-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();
@@ -1725,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請求流程完成', {
@@ -1773,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({
@@ -1784,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) {
@@ -1810,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);
@@ -3304,8 +3358,8 @@ const themeConfigDefault = {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.8.32";
-var date = "2025-11-07T03:04:15+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.32",
+  "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>;