@authme/util 2.8.30 → 2.8.32

package/index.cjs

@@ -1448,42 +1448,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檢查一次
-    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 : '')) {
@@ -1537,6 +1501,51 @@ function arrayFromAsync(asyncIterable) {
     return result;
   });
 }
+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 = 300; // 最多嘗試10次
+    const retryDelay = 100; // 每次重試間隔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) {
   var _a, _b;
   return __awaiter(this, void 0, void 0, function* () {
@@ -1554,78 +1563,20 @@ 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]; // 第一次立即嘗試，後續間隔遞增
-            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`
-          });
-        }
+        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`
+        });
       }
       // try {
       //   stream = await navigator.mediaDevices.getUserMedia(constraints);
@@ -3363,8 +3314,8 @@ const themeConfigDefault = {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.8.30";
-var date = "2025-10-30T10:27:17+0000";
+var version$1 = "2.8.32";
+var date = "2025-11-07T03:04:15+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,

package/index.js

@@ -1438,42 +1438,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檢查一次
-    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 : '')) {
@@ -1527,6 +1491,51 @@ function arrayFromAsync(asyncIterable) {
     return result;
   });
 }
+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 = 300; // 最多嘗試10次
+    const retryDelay = 100; // 每次重試間隔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) {
   var _a, _b;
   return __awaiter(this, void 0, void 0, function* () {
@@ -1544,78 +1553,20 @@ 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]; // 第一次立即嘗試，後續間隔遞增
-            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`
-          });
-        }
+        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`
+        });
       }
       // try {
       //   stream = await navigator.mediaDevices.getUserMedia(constraints);
@@ -3353,8 +3304,8 @@ const themeConfigDefault = {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.8.30";
-var date = "2025-10-30T10:27:17+0000";
+var version$1 = "2.8.32";
+var date = "2025-11-07T03:04:15+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,

package/package.json

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