@authme/util 2.4.7 → 2.7.0

package/index.cjs

@@ -302,6 +302,7 @@ function getOsVersion(userAgent) {
 
 class State {
   constructor(initialValue = null) {
+    this._effects = [];
     this._value = initialValue;
   }
   getValue() {
@@ -309,10 +310,22 @@ class State {
   }
   setValue(newValue) {
     this._value = newValue;
+    this._runEffects(newValue);
+  }
+  addEffect(effect) {
+    this._effects.push(effect);
+  }
+  _runEffects(value) {
+    for (const effect of this._effects) {
+      effect(value);
+    }
   }
 }
-function useState(initialValue = null, subscription) {
+function useState(initialValue = null, subscription, effects = []) {
   const state = new State(initialValue);
+  for (const effect of effects) {
+    state.addEffect(effect);
+  }
   function getValue() {
     return state.getValue();
   }
@@ -1081,7 +1094,7 @@ function asyncShowErrorMessage(text, showRetryBtn, options) {
     });
   });
 }
-function asyncOnLineShowErrorMessage(text, showRetryBtn) {
+function asyncOnLineShowErrorMessage(text, buttonText, showRetryBtn) {
   return __awaiter(this, void 0, void 0, function* () {
     return new Promise((res, rej) => {
       showErrorMessage(text, showRetryBtn, (_, tools) => {
@@ -1089,14 +1102,14 @@ function asyncOnLineShowErrorMessage(text, showRetryBtn) {
           res(true);
           tools === null || tools === void 0 ? void 0 : tools.hideErrorMessage();
         }
-      });
+      }, buttonText);
     });
   });
 }
-function checkOnlineStatus(msg) {
+function checkOnlineStatus(msg, buttonText) {
   return __awaiter(this, void 0, void 0, function* () {
     if (!window.navigator.onLine) {
-      yield asyncOnLineShowErrorMessage(msg, true);
+      yield asyncOnLineShowErrorMessage(msg, buttonText, true);
     }
   });
 }
@@ -1249,22 +1262,27 @@ function switchCamera(deviceId, video) {
       }
       const constraints = {
         video: {
-          // 推測依然需要使用 width & height 的限制條件，
-          // 否則即使是高解析度相機，也有可能拿到低解析度的圖片。(待驗證)
-          width: {
-            min: 1280,
-            ideal: 1920,
-            max: 1920
-          },
-          height: {
-            min: 720,
-            ideal: 1080,
-            max: 1080
-          },
+          width: {},
+          height: {},
           focusMode: 'auto',
           deviceId: deviceId
         }
       };
+      const constraint = localStorage.getItem('camera_constraint');
+      if (!constraint) {
+        // 推測依然需要使用 width & height 的限制條件，
+        // 否則即使是高解析度相機，也有可能拿到低解析度的圖片。(待驗證)
+        constraints.video.width = {
+          min: 1280,
+          ideal: 1920,
+          max: 1920
+        };
+        constraints.video.height = {
+          min: 720,
+          ideal: 1080,
+          max: 1080
+        };
+      }
       stream = yield navigator.mediaDevices.getUserMedia(constraints);
       video.srcObject = stream;
       yield video.play();
@@ -1279,7 +1297,6 @@ function switchCamera(deviceId, video) {
   });
 }
 function _requestCamera(video, facingMode) {
-  var _a;
   return __awaiter(this, void 0, void 0, function* () {
     if (!('mediaDevices' in navigator)) {
       throw BROWSER_CAMERA_ERRORS.NOT_SUPPORT;
@@ -1298,7 +1315,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 _b, _c, _d, _e;
+      var _a, _b, _c, _d;
       const stream = yield navigator.mediaDevices.getUserMedia({
         video: {
           deviceId: {
@@ -1306,10 +1323,10 @@ function _requestCamera(video, facingMode) {
           }
         }
       });
-      const track = (_b = stream.getVideoTracks()) === null || _b === void 0 ? void 0 : _b[0];
-      const capabilities = ((_c = track === null || track === void 0 ? void 0 : track.getCapabilities) !== null && _c !== void 0 ? _c : () => undefined).bind(track)(); // firefox 沒有 getCapabilities 可以用。
-      const widthMax = (_d = capabilities === null || capabilities === void 0 ? void 0 : capabilities.width) === null || _d === void 0 ? void 0 : _d.max;
-      const heightMax = (_e = capabilities === null || capabilities === void 0 ? void 0 : capabilities.height) === null || _e === void 0 ? void 0 : _e.max;
+      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 resolution = widthMax && heightMax ? widthMax * heightMax : 0;
       const facingModeFromLabel = inferFacingModeFromLabel(device === null || device === void 0 ? void 0 : device.label);
       const facingModeFromapabilities = inferFacingModeFromCapabilities(capabilities);
@@ -1328,7 +1345,7 @@ function _requestCamera(video, facingMode) {
         capabilities
       };
     }), videoDevices));
-    const firstDevice = (_a = deviceMetas.sort((a, b) => {
+    const devices = deviceMetas.sort((a, b) => {
       // 若是 Samsung 手機且模式為後鏡頭，則優先使用Label為 camera2 0 的鏡頭
       let samsungCondition = 0;
       if (isSamsung && facingMode === 'back') {
@@ -1347,7 +1364,9 @@ function _requestCamera(video, facingMode) {
       }
       const resolutionCondition = b.meta.resolution - a.meta.resolution;
       return samsungCondition || cameraFacingCondition || resolutionCondition;
-    })) === null || _a === void 0 ? void 0 : _a[0];
+    });
+    const cameraIndex = window.localStorage.getItem('camera') || '0';
+    const firstDevice = devices[parseInt(cameraIndex, 10)];
     const deviceId = firstDevice.device.deviceId;
     if (!deviceId) {
       throw BROWSER_CAMERA_ERRORS.NO_CAMERA;
@@ -1382,19 +1401,19 @@ function requestCamera({
       return yield _requestCamera(video, facingMode);
     } catch (error) {
       if (error === BROWSER_CAMERA_ERRORS.NOT_SUPPORT) {
-        showMessage(translate('camera.error.notFound'));
+        showMessage(translate('sdk.general.error.cameraNotFound.title'));
         throw new AuthmeError(exports.ErrorCode.CAMERA_NOT_SUPPORT, 'Browser not support WebRTC, or https required.');
       }
       if (error === BROWSER_CAMERA_ERRORS.NO_CAMERA) {
-        showMessage(translate('camera.error.notFound'));
+        showMessage(translate('sdk.general.error.cameraNotFound.content'));
         throw new AuthmeError(exports.ErrorCode.CAMERA_NOT_SUPPORT, 'camera not found');
       }
       if ((error === null || error === void 0 ? void 0 : error.name) === BROWSER_CAMERA_ERRORS.NOT_ALLOWED_ERROR || (error === null || error === void 0 ? void 0 : error.name) === BROWSER_CAMERA_ERRORS.NOT_FOUND_ERROR) {
-        showMessage(translate('camera.error.notFound'));
+        showMessage(translate('sdk.general.error.cameraNotFound.content'));
         throw new AuthmeError(exports.ErrorCode.CAMERA_NOT_SUPPORT, error);
       }
       if ((error === null || error === void 0 ? void 0 : error.name) === BROWSER_CAMERA_ERRORS.NOT_READABLE_ERROR || (error === null || error === void 0 ? void 0 : error.name) === BROWSER_CAMERA_ERRORS.ABORT_ERROR) {
-        showMessage(translate('camera.error.notFound'));
+        showMessage(translate('sdk.general.error.cameraNotFound.content'));
         /* NOT_READABLE_ERROR,ABORT_ERROR 這兩個錯誤是用戶授權了，但在呼叫裝置時出現錯誤，
          * 常發生在APP webview ，例如： 手機開啟 web 使用 sdk，儘管在 webview 層級上授權了，但手機在設定層級沒有授權 app 使用相機，會導致此問題。
          * 但每個 android 手機的在這方面的實作不一致，不是每個手機在這種情況下都會拋出錯誤。
@@ -1403,7 +1422,7 @@ function requestCamera({
         throw new AuthmeError(exports.ErrorCode.CAMERA_NOT_SUPPORT, error);
       }
       if (isOverconstrainedError(error)) {
-        showMessage(translate('camera.error.lowResolution'));
+        showMessage(translate('sdk.general.error.cameraLowResolution'));
         throw new AuthmeError(exports.ErrorCode.CAMERA_NOT_SUPPORT, error);
       }
       throw error;
@@ -2425,8 +2444,8 @@ window.ononline = () => {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.4.7";
-var date = "2023-12-14T08:29:41+0000";
+var version$1 = "2.7.0";
+var date = "2024-05-30T14:54:23+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,

package/index.js

@@ -292,6 +292,7 @@ function getOsVersion(userAgent) {
 
 class State {
   constructor(initialValue = null) {
+    this._effects = [];
     this._value = initialValue;
   }
   getValue() {
@@ -299,10 +300,22 @@ class State {
   }
   setValue(newValue) {
     this._value = newValue;
+    this._runEffects(newValue);
+  }
+  addEffect(effect) {
+    this._effects.push(effect);
+  }
+  _runEffects(value) {
+    for (const effect of this._effects) {
+      effect(value);
+    }
   }
 }
-function useState(initialValue = null, subscription) {
+function useState(initialValue = null, subscription, effects = []) {
   const state = new State(initialValue);
+  for (const effect of effects) {
+    state.addEffect(effect);
+  }
   function getValue() {
     return state.getValue();
   }
@@ -1071,7 +1084,7 @@ function asyncShowErrorMessage(text, showRetryBtn, options) {
     });
   });
 }
-function asyncOnLineShowErrorMessage(text, showRetryBtn) {
+function asyncOnLineShowErrorMessage(text, buttonText, showRetryBtn) {
   return __awaiter(this, void 0, void 0, function* () {
     return new Promise((res, rej) => {
       showErrorMessage(text, showRetryBtn, (_, tools) => {
@@ -1079,14 +1092,14 @@ function asyncOnLineShowErrorMessage(text, showRetryBtn) {
           res(true);
           tools === null || tools === void 0 ? void 0 : tools.hideErrorMessage();
         }
-      });
+      }, buttonText);
     });
   });
 }
-function checkOnlineStatus(msg) {
+function checkOnlineStatus(msg, buttonText) {
   return __awaiter(this, void 0, void 0, function* () {
     if (!window.navigator.onLine) {
-      yield asyncOnLineShowErrorMessage(msg, true);
+      yield asyncOnLineShowErrorMessage(msg, buttonText, true);
     }
   });
 }
@@ -1239,22 +1252,27 @@ function switchCamera(deviceId, video) {
       }
       const constraints = {
         video: {
-          // 推測依然需要使用 width & height 的限制條件，
-          // 否則即使是高解析度相機，也有可能拿到低解析度的圖片。(待驗證)
-          width: {
-            min: 1280,
-            ideal: 1920,
-            max: 1920
-          },
-          height: {
-            min: 720,
-            ideal: 1080,
-            max: 1080
-          },
+          width: {},
+          height: {},
           focusMode: 'auto',
           deviceId: deviceId
         }
       };
+      const constraint = localStorage.getItem('camera_constraint');
+      if (!constraint) {
+        // 推測依然需要使用 width & height 的限制條件，
+        // 否則即使是高解析度相機，也有可能拿到低解析度的圖片。(待驗證)
+        constraints.video.width = {
+          min: 1280,
+          ideal: 1920,
+          max: 1920
+        };
+        constraints.video.height = {
+          min: 720,
+          ideal: 1080,
+          max: 1080
+        };
+      }
       stream = yield navigator.mediaDevices.getUserMedia(constraints);
       video.srcObject = stream;
       yield video.play();
@@ -1269,7 +1287,6 @@ function switchCamera(deviceId, video) {
   });
 }
 function _requestCamera(video, facingMode) {
-  var _a;
   return __awaiter(this, void 0, void 0, function* () {
     if (!('mediaDevices' in navigator)) {
       throw BROWSER_CAMERA_ERRORS.NOT_SUPPORT;
@@ -1288,7 +1305,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 _b, _c, _d, _e;
+      var _a, _b, _c, _d;
       const stream = yield navigator.mediaDevices.getUserMedia({
         video: {
           deviceId: {
@@ -1296,10 +1313,10 @@ function _requestCamera(video, facingMode) {
           }
         }
       });
-      const track = (_b = stream.getVideoTracks()) === null || _b === void 0 ? void 0 : _b[0];
-      const capabilities = ((_c = track === null || track === void 0 ? void 0 : track.getCapabilities) !== null && _c !== void 0 ? _c : () => undefined).bind(track)(); // firefox 沒有 getCapabilities 可以用。
-      const widthMax = (_d = capabilities === null || capabilities === void 0 ? void 0 : capabilities.width) === null || _d === void 0 ? void 0 : _d.max;
-      const heightMax = (_e = capabilities === null || capabilities === void 0 ? void 0 : capabilities.height) === null || _e === void 0 ? void 0 : _e.max;
+      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 resolution = widthMax && heightMax ? widthMax * heightMax : 0;
       const facingModeFromLabel = inferFacingModeFromLabel(device === null || device === void 0 ? void 0 : device.label);
       const facingModeFromapabilities = inferFacingModeFromCapabilities(capabilities);
@@ -1318,7 +1335,7 @@ function _requestCamera(video, facingMode) {
         capabilities
       };
     }), videoDevices));
-    const firstDevice = (_a = deviceMetas.sort((a, b) => {
+    const devices = deviceMetas.sort((a, b) => {
       // 若是 Samsung 手機且模式為後鏡頭，則優先使用Label為 camera2 0 的鏡頭
       let samsungCondition = 0;
       if (isSamsung && facingMode === 'back') {
@@ -1337,7 +1354,9 @@ function _requestCamera(video, facingMode) {
       }
       const resolutionCondition = b.meta.resolution - a.meta.resolution;
       return samsungCondition || cameraFacingCondition || resolutionCondition;
-    })) === null || _a === void 0 ? void 0 : _a[0];
+    });
+    const cameraIndex = window.localStorage.getItem('camera') || '0';
+    const firstDevice = devices[parseInt(cameraIndex, 10)];
     const deviceId = firstDevice.device.deviceId;
     if (!deviceId) {
       throw BROWSER_CAMERA_ERRORS.NO_CAMERA;
@@ -1372,19 +1391,19 @@ function requestCamera({
       return yield _requestCamera(video, facingMode);
     } catch (error) {
       if (error === BROWSER_CAMERA_ERRORS.NOT_SUPPORT) {
-        showMessage(translate('camera.error.notFound'));
+        showMessage(translate('sdk.general.error.cameraNotFound.title'));
         throw new AuthmeError(ErrorCode.CAMERA_NOT_SUPPORT, 'Browser not support WebRTC, or https required.');
       }
       if (error === BROWSER_CAMERA_ERRORS.NO_CAMERA) {
-        showMessage(translate('camera.error.notFound'));
+        showMessage(translate('sdk.general.error.cameraNotFound.content'));
         throw new AuthmeError(ErrorCode.CAMERA_NOT_SUPPORT, 'camera not found');
       }
       if ((error === null || error === void 0 ? void 0 : error.name) === BROWSER_CAMERA_ERRORS.NOT_ALLOWED_ERROR || (error === null || error === void 0 ? void 0 : error.name) === BROWSER_CAMERA_ERRORS.NOT_FOUND_ERROR) {
-        showMessage(translate('camera.error.notFound'));
+        showMessage(translate('sdk.general.error.cameraNotFound.content'));
         throw new AuthmeError(ErrorCode.CAMERA_NOT_SUPPORT, error);
       }
       if ((error === null || error === void 0 ? void 0 : error.name) === BROWSER_CAMERA_ERRORS.NOT_READABLE_ERROR || (error === null || error === void 0 ? void 0 : error.name) === BROWSER_CAMERA_ERRORS.ABORT_ERROR) {
-        showMessage(translate('camera.error.notFound'));
+        showMessage(translate('sdk.general.error.cameraNotFound.content'));
         /* NOT_READABLE_ERROR,ABORT_ERROR 這兩個錯誤是用戶授權了，但在呼叫裝置時出現錯誤，
          * 常發生在APP webview ，例如： 手機開啟 web 使用 sdk，儘管在 webview 層級上授權了，但手機在設定層級沒有授權 app 使用相機，會導致此問題。
          * 但每個 android 手機的在這方面的實作不一致，不是每個手機在這種情況下都會拋出錯誤。
@@ -1393,7 +1412,7 @@ function requestCamera({
         throw new AuthmeError(ErrorCode.CAMERA_NOT_SUPPORT, error);
       }
       if (isOverconstrainedError(error)) {
-        showMessage(translate('camera.error.lowResolution'));
+        showMessage(translate('sdk.general.error.cameraLowResolution'));
         throw new AuthmeError(ErrorCode.CAMERA_NOT_SUPPORT, error);
       }
       throw error;
@@ -2415,8 +2434,8 @@ window.ononline = () => {
 };
 
 var name = "authme/sdk";
-var version$1 = "2.4.7";
-var date = "2023-12-14T08:29:41+0000";
+var version$1 = "2.7.0";
+var date = "2024-05-30T14:54:23+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@authme/util",
-  "version": "2.4.7",
+  "version": "2.7.0",
   "peerDependencies": {
     "core-js": "^3.6.0",
     "jwt-decode": "3.1.2",

package/src/lib/common/state.service.d.ts

@@ -1,4 +1,4 @@
 import { BehaviorSubject } from 'rxjs';
 declare type StatePair<T> = [() => T, (value: T) => void];
-export declare function useState<T = any>(initialValue?: T, subscription?: BehaviorSubject<T>): StatePair<T>;
+export declare function useState<T = any>(initialValue?: T, subscription?: BehaviorSubject<T>, effects?: Array<(v: T) => void>): StatePair<T>;
 export {};

package/src/ui/camera.d.ts

@@ -9,7 +9,7 @@ export interface DeviceMeta {
     };
     capabilities: MediaTrackCapabilities;
 }
-declare type FacingMode = 'front' | 'back';
+export declare type FacingMode = 'front' | 'back';
 interface RequestCamersResult {
     facingMode: FacingMode;
     deviceMetas: DeviceMeta[];

package/src/ui/error-message.d.ts

@@ -11,5 +11,5 @@ export declare function asyncShowErrorMessage(text: string, showRetryBtn?: boole
     titleText?: string;
     showErrorMessageHandler?: ShowErrorMessageHandler;
 }): Promise<boolean>;
-export declare function asyncOnLineShowErrorMessage(text: string, showRetryBtn?: boolean): Promise<boolean>;
-export declare function checkOnlineStatus(msg: string): Promise<void>;
+export declare function asyncOnLineShowErrorMessage(text: string, buttonText: string, showRetryBtn?: boolean): Promise<boolean>;
+export declare function checkOnlineStatus(msg: string, buttonText: string): Promise<void>;