@authme/util 2.8.38 → 2.8.42

package/index.cjs

@@ -469,7 +469,7 @@ function retryPromiseWithCondition(promiseFactory, conditionFactory) {
     }
   });
 }
-function isMobileOrTablet() {
+function isMobileOrTablet$1() {
   return function (a) {
     return !!(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55\/|capi|ccwa|cdm-|cell|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene|gf-5|g-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h-|oo|p-)|sdk\/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-|your|zeto|zte-/i.test(a.substr(0, 4)) || /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) || navigator.maxTouchPoints && navigator.maxTouchPoints > 2);
   }(navigator.userAgent || navigator.vendor || window.opera);
@@ -928,6 +928,10 @@ exports.DEVICE_TYPE = void 0;
 })(exports.DEVICE_TYPE || (exports.DEVICE_TYPE = {}));
 
 function getImageData(canvas, ctx, video, sizeInfo, base64 = false, imageType = 'jpg') {
+  // 防止 canvas 尺寸為 0 導致 getImageData 錯誤
+  if (sizeInfo.canvasWidth <= 0 || sizeInfo.canvasHeight <= 0) {
+    return null;
+  }
   canvas.width = sizeInfo.canvasWidth;
   canvas.height = sizeInfo.canvasHeight;
   ctx.drawImage(video, sizeInfo.startX, sizeInfo.startY, sizeInfo.width, sizeInfo.height, 0, 0, sizeInfo.canvasWidth, sizeInfo.canvasHeight);
@@ -1424,6 +1428,23 @@ var BROWSER_CAMERA_ERRORS;
   BROWSER_CAMERA_ERRORS["LOW_RESOLUTION"] = "LowResolutionError";
 })(BROWSER_CAMERA_ERRORS || (BROWSER_CAMERA_ERRORS = {}));
 let stream;
+/**
+ * 判斷當前裝置是否為行動裝置（手機或平板）
+ * @returns boolean - true 表示是行動裝置，false 表示是桌機或筆電
+ */
+function isMobileOrTablet() {
+  const userAgent = navigator.userAgent.toLowerCase();
+  // 檢查是否為手機或平板
+  const mobilePatterns = [/android/i, /webos/i, /iphone/i, /ipad/i, /ipod/i, /blackberry/i, /windows phone/i, /mobile/i, /tablet/i];
+  // 檢查觸控螢幕支援（額外的行動裝置判斷）
+  const hasTouchScreen = 'ontouchstart' in window || navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
+  // 檢查螢幕寬度（行動裝置通常較小）
+  const isSmallScreen = window.innerWidth <= 1024;
+  // 使用 userAgent 判斷
+  const isMobileUA = mobilePatterns.some(pattern => pattern.test(userAgent));
+  // 組合判斷：userAgent 符合行動裝置 或者 (有觸控螢幕且螢幕較小)
+  return isMobileUA || hasTouchScreen && isSmallScreen;
+}
 const videoConstraintsFactory = (isPC, facingMode) => {
   return isPC ? {
     video: {
@@ -1516,10 +1537,27 @@ function upgradeResolution(videoTrack) {
       }
     };
     const minAcceptableWidth = 1280; // 最低可接受的解析度寬度
-    const maxAttempts = 15; // 最多嘗試10次
-    const retryDelay = 2000; // 每次重試間隔1秒
-    console.log('🚀 開始提升解析度...');
+    const maxAttempts = 15; // 最多嘗試15次
+    const retryDelay = 2000; // 每次重試間隔2秒
+    // 行動裝置跳過最小解析度檢查，只嘗試一次提升解析度
+    const isMobile = isMobileOrTablet();
+    console.log('🚀 開始提升解析度...', {
+      isMobile
+    });
     const startTime = Date.now();
+    // 行動裝置只嘗試一次，不做重試循環
+    if (isMobile) {
+      try {
+        yield videoTrack.applyConstraints(targetConstraints);
+        const settings = videoTrack.getSettings();
+        console.log(`✅ [行動裝置] 解析度設定完成: ${settings.width}x${settings.height}`);
+      } catch (e) {
+        const settings = videoTrack.getSettings();
+        console.log(`⚠️ [行動裝置] 使用當前解析度: ${settings.width}x${settings.height}`);
+      }
+      return;
+    }
+    // 電腦/筆電才執行解析度檢查和重試邏輯
     for (let attempt = 1; attempt <= maxAttempts; attempt++) {
       try {
         yield videoTrack.applyConstraints(targetConstraints);
@@ -1579,9 +1617,9 @@ function switchCamera(deviceId, video, translate) {
           initTime: `${initTime}ms`
         });
       }
-      // 檢查最終解析度是否達到最低要求
+      // 檢查最終解析度是否達到最低要求（僅限電腦/筆電）
       const currentTrack = stream.getVideoTracks()[0];
-      if (currentTrack) {
+      if (currentTrack && !isMobileOrTablet()) {
         const currentSettings = currentTrack.getSettings();
         const minRequiredWidth = 1280;
         if (currentSettings.width && currentSettings.width < minRequiredWidth) {
@@ -1598,6 +1636,12 @@ function switchCamera(deviceId, video, translate) {
           }
           throw BROWSER_CAMERA_ERRORS.LOW_RESOLUTION;
         }
+      } else if (currentTrack && isMobileOrTablet()) {
+        const currentSettings = currentTrack.getSettings();
+        console.log('📱 [行動裝置] 跳過解析度檢查，當前解析度:', {
+          current: `${currentSettings.width}x${currentSettings.height}`,
+          deviceId
+        });
       }
       // try {
       //   stream = await navigator.mediaDevices.getUserMedia(constraints);
@@ -3368,8 +3412,8 @@ const themeConfigDefault = {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.8.38";
-var date = "2026-01-21T02:32:26+0000";
+var version$1 = "2.8.42";
+var date = "2026-02-03T09:36:05+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,
@@ -3413,7 +3457,7 @@ exports.hideErrorMessage = hideErrorMessage;
 exports.hidePopup = hidePopup;
 exports.isIphone14proOrProMax = isIphone14proOrProMax;
 exports.isMobile = isMobile;
-exports.isMobileOrTablet = isMobileOrTablet;
+exports.isMobileOrTablet = isMobileOrTablet$1;
 exports.osVersion = osVersion;
 exports.requestCamera = requestCamera;
 exports.resize = resize;

package/index.js

@@ -459,7 +459,7 @@ function retryPromiseWithCondition(promiseFactory, conditionFactory) {
     }
   });
 }
-function isMobileOrTablet() {
+function isMobileOrTablet$1() {
   return function (a) {
     return !!(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55\/|capi|ccwa|cdm-|cell|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene|gf-5|g-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h-|oo|p-)|sdk\/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-|your|zeto|zte-/i.test(a.substr(0, 4)) || /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) || navigator.maxTouchPoints && navigator.maxTouchPoints > 2);
   }(navigator.userAgent || navigator.vendor || window.opera);
@@ -918,6 +918,10 @@ var DEVICE_TYPE;
 })(DEVICE_TYPE || (DEVICE_TYPE = {}));
 
 function getImageData(canvas, ctx, video, sizeInfo, base64 = false, imageType = 'jpg') {
+  // 防止 canvas 尺寸為 0 導致 getImageData 錯誤
+  if (sizeInfo.canvasWidth <= 0 || sizeInfo.canvasHeight <= 0) {
+    return null;
+  }
   canvas.width = sizeInfo.canvasWidth;
   canvas.height = sizeInfo.canvasHeight;
   ctx.drawImage(video, sizeInfo.startX, sizeInfo.startY, sizeInfo.width, sizeInfo.height, 0, 0, sizeInfo.canvasWidth, sizeInfo.canvasHeight);
@@ -1414,6 +1418,23 @@ var BROWSER_CAMERA_ERRORS;
   BROWSER_CAMERA_ERRORS["LOW_RESOLUTION"] = "LowResolutionError";
 })(BROWSER_CAMERA_ERRORS || (BROWSER_CAMERA_ERRORS = {}));
 let stream;
+/**
+ * 判斷當前裝置是否為行動裝置（手機或平板）
+ * @returns boolean - true 表示是行動裝置，false 表示是桌機或筆電
+ */
+function isMobileOrTablet() {
+  const userAgent = navigator.userAgent.toLowerCase();
+  // 檢查是否為手機或平板
+  const mobilePatterns = [/android/i, /webos/i, /iphone/i, /ipad/i, /ipod/i, /blackberry/i, /windows phone/i, /mobile/i, /tablet/i];
+  // 檢查觸控螢幕支援（額外的行動裝置判斷）
+  const hasTouchScreen = 'ontouchstart' in window || navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
+  // 檢查螢幕寬度（行動裝置通常較小）
+  const isSmallScreen = window.innerWidth <= 1024;
+  // 使用 userAgent 判斷
+  const isMobileUA = mobilePatterns.some(pattern => pattern.test(userAgent));
+  // 組合判斷：userAgent 符合行動裝置 或者 (有觸控螢幕且螢幕較小)
+  return isMobileUA || hasTouchScreen && isSmallScreen;
+}
 const videoConstraintsFactory = (isPC, facingMode) => {
   return isPC ? {
     video: {
@@ -1506,10 +1527,27 @@ function upgradeResolution(videoTrack) {
       }
     };
     const minAcceptableWidth = 1280; // 最低可接受的解析度寬度
-    const maxAttempts = 15; // 最多嘗試10次
-    const retryDelay = 2000; // 每次重試間隔1秒
-    console.log('🚀 開始提升解析度...');
+    const maxAttempts = 15; // 最多嘗試15次
+    const retryDelay = 2000; // 每次重試間隔2秒
+    // 行動裝置跳過最小解析度檢查，只嘗試一次提升解析度
+    const isMobile = isMobileOrTablet();
+    console.log('🚀 開始提升解析度...', {
+      isMobile
+    });
     const startTime = Date.now();
+    // 行動裝置只嘗試一次，不做重試循環
+    if (isMobile) {
+      try {
+        yield videoTrack.applyConstraints(targetConstraints);
+        const settings = videoTrack.getSettings();
+        console.log(`✅ [行動裝置] 解析度設定完成: ${settings.width}x${settings.height}`);
+      } catch (e) {
+        const settings = videoTrack.getSettings();
+        console.log(`⚠️ [行動裝置] 使用當前解析度: ${settings.width}x${settings.height}`);
+      }
+      return;
+    }
+    // 電腦/筆電才執行解析度檢查和重試邏輯
     for (let attempt = 1; attempt <= maxAttempts; attempt++) {
       try {
         yield videoTrack.applyConstraints(targetConstraints);
@@ -1569,9 +1607,9 @@ function switchCamera(deviceId, video, translate) {
           initTime: `${initTime}ms`
         });
       }
-      // 檢查最終解析度是否達到最低要求
+      // 檢查最終解析度是否達到最低要求（僅限電腦/筆電）
       const currentTrack = stream.getVideoTracks()[0];
-      if (currentTrack) {
+      if (currentTrack && !isMobileOrTablet()) {
         const currentSettings = currentTrack.getSettings();
         const minRequiredWidth = 1280;
         if (currentSettings.width && currentSettings.width < minRequiredWidth) {
@@ -1588,6 +1626,12 @@ function switchCamera(deviceId, video, translate) {
           }
           throw BROWSER_CAMERA_ERRORS.LOW_RESOLUTION;
         }
+      } else if (currentTrack && isMobileOrTablet()) {
+        const currentSettings = currentTrack.getSettings();
+        console.log('📱 [行動裝置] 跳過解析度檢查，當前解析度:', {
+          current: `${currentSettings.width}x${currentSettings.height}`,
+          deviceId
+        });
       }
       // try {
       //   stream = await navigator.mediaDevices.getUserMedia(constraints);
@@ -3358,8 +3402,8 @@ const themeConfigDefault = {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.8.38";
-var date = "2026-01-21T02:32:26+0000";
+var version$1 = "2.8.42";
+var date = "2026-02-03T09:36:05+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,
@@ -3372,4 +3416,4 @@ const version = packageInfo.version;
 (_a = (_b = window)[_c = Symbol.for('authme-sdk')]) !== null && _a !== void 0 ? _a : _b[_c] = {};
 window[Symbol.for('authme-sdk')][packageInfo.name] = version;
 
-export { AuthmeError, DEVICE_TYPE, ErrorCode, Icon, RGBToLottieColor, RUN_FUNCTION_NAME, STORAGE_KEY, Storage, TIME_UNIT, UintArrayToBlob, asyncOnLineShowErrorMessage, asyncShowErrorMessage, asyncShowPopup, backgroundRequest, checkOnlineStatus, clearCanvas, colorStringToRGB, colorToRGB, combineResult, cropByRatio, dataURItoBlob, debugLog, debugTools, decodeToken, dropMenu, fontWeight, getCanvasSize, getCssVariable, getDeviceInfo, getImageData, getSystemInfo, hexToRGB, hideElement, hideErrorMessage, hidePopup, isIphone14proOrProMax, isMobile, isMobileOrTablet, osVersion, requestCamera, resize, retryPromiseWithCondition, showElement, showErrorMessage, showErrorMessageEventName, showPopup, splitResult, startLoadingSDK, startSpinner, stopLoadingSDK, stopSpinner, switchCamera, themeConfigDefault, uiThemeButton, uiThemeDirection, uiThemeHint, uiThemeSmallButton, uiThemeText, uploadModal, useState, verificationErrorMessages, version, videoConstraintsFactory, waitTime };
+export { AuthmeError, DEVICE_TYPE, ErrorCode, Icon, RGBToLottieColor, RUN_FUNCTION_NAME, STORAGE_KEY, Storage, TIME_UNIT, UintArrayToBlob, asyncOnLineShowErrorMessage, asyncShowErrorMessage, asyncShowPopup, backgroundRequest, checkOnlineStatus, clearCanvas, colorStringToRGB, colorToRGB, combineResult, cropByRatio, dataURItoBlob, debugLog, debugTools, decodeToken, dropMenu, fontWeight, getCanvasSize, getCssVariable, getDeviceInfo, getImageData, getSystemInfo, hexToRGB, hideElement, hideErrorMessage, hidePopup, isIphone14proOrProMax, isMobile, isMobileOrTablet$1 as isMobileOrTablet, osVersion, requestCamera, resize, retryPromiseWithCondition, showElement, showErrorMessage, showErrorMessageEventName, showPopup, splitResult, startLoadingSDK, startSpinner, stopLoadingSDK, stopSpinner, switchCamera, themeConfigDefault, uiThemeButton, uiThemeDirection, uiThemeHint, uiThemeSmallButton, uiThemeText, uploadModal, useState, verificationErrorMessages, version, videoConstraintsFactory, waitTime };

package/package.json

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