@monkvision/camera-web 5.0.20 → 5.0.22

package/lib/Camera/hooks/useUserMedia.js

@@ -203,16 +203,17 @@ function useUserMedia(constraints, videoRef) {
     var _e = (0, react_1.useState)([]), availableCameraDevices = _e[0], setAvailableCameraDevices = _e[1];
     var _f = (0, react_1.useState)(null), selectedCameraDeviceId = _f[0], setSelectedCameraDeviceId = _f[1];
     var _g = (0, react_1.useState)(null), lastConstraintsApplied = _g[0], setLastConstraintsApplied = _g[1];
+    var lastGetUserMediaTimeRef = (0, react_1.useRef)(null);
     var handleError = (0, monitoring_1.useMonitoring)().handleError;
     var isMounted = (0, common_1.useIsMounted)();
     var handleGetUserMediaError = function (err, permissionState) {
         var type = UserMediaErrorType.OTHER;
         if (err instanceof Error && err.name === 'NotAllowedError') {
             switch (permissionState) {
-                case 'denied':
+                case 'prompt':
                     type = UserMediaErrorType.WEBPAGE_NOT_ALLOWED;
                     break;
-                case 'granted':
+                case 'denied':
                     type = UserMediaErrorType.BROWSER_NOT_ALLOWED;
                     break;
                 default:
@@ -297,27 +298,35 @@ function useUserMedia(constraints, videoRef) {
             }
             setLastConstraintsApplied(constraints);
             var effect = function () { return __awaiter(_this, void 0, void 0, function () {
-                var err_2, permissionState;
-                var _a, _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var err_2, isCameraPermissionDenied, permissionState, _a;
+                var _b, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
-                            _c.trys.push([0, 2, , 4]);
+                            _d.trys.push([0, 2, , 6]);
+                            lastGetUserMediaTimeRef.current = Date.now();
                             return [4 /*yield*/, getUserMedia()];
                         case 1:
-                            _c.sent();
-                            return [3 /*break*/, 4];
+                            _d.sent();
+                            return [3 /*break*/, 6];
                         case 2:
-                            err_2 = _c.sent();
-                            return [4 /*yield*/, getCameraPermissionState()];
-                        case 3:
-                            permissionState = (_b = (_a = (_c.sent())) === null || _a === void 0 ? void 0 : _a.state) !== null && _b !== void 0 ? _b : null;
+                            err_2 = _d.sent();
+                            isCameraPermissionDenied = lastGetUserMediaTimeRef.current && Date.now() - lastGetUserMediaTimeRef.current < 100;
+                            if (!isCameraPermissionDenied) return [3 /*break*/, 3];
+                            _a = 'denied';
+                            return [3 /*break*/, 5];
+                        case 3: return [4 /*yield*/, getCameraPermissionState()];
+                        case 4:
+                            _a = (_c = (_b = (_d.sent())) === null || _b === void 0 ? void 0 : _b.state) !== null && _c !== void 0 ? _c : null;
+                            _d.label = 5;
+                        case 5:
+                            permissionState = _a;
                             if (err_2 && isMounted()) {
                                 handleGetUserMediaError(err_2, permissionState);
                                 throw err_2;
                             }
-                            return [3 /*break*/, 4];
-                        case 4: return [2 /*return*/];
+                            return [3 /*break*/, 6];
+                        case 6: return [2 /*return*/];
                     }
                 });
             }); };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkvision/camera-web",
-  "version": "5.0.20",
+  "version": "5.0.22",
   "license": "BSD-3-Clause-Clear",
   "packageManager": "yarn@3.2.4",
   "description": "MonkJs camera package for React (web) used to display a camera preview and take pictures",
@@ -28,9 +28,9 @@
     "lint:fix": "yarn run prettier:fix && yarn run eslint:fix"
   },
   "dependencies": {
-    "@monkvision/common": "5.0.20",
-    "@monkvision/common-ui-web": "5.0.20",
-    "@monkvision/monitoring": "5.0.20",
+    "@monkvision/common": "5.0.22",
+    "@monkvision/common-ui-web": "5.0.22",
+    "@monkvision/monitoring": "5.0.22",
     "fast-deep-equal": "^3.1.3",
     "i18next": "^23.4.5",
     "react-i18next": "^13.2.0"
@@ -42,13 +42,13 @@
     "react-router-dom": "^6.22.3"
   },
   "devDependencies": {
-    "@monkvision/eslint-config-base": "5.0.20",
-    "@monkvision/eslint-config-typescript": "5.0.20",
-    "@monkvision/eslint-config-typescript-react": "5.0.20",
-    "@monkvision/jest-config": "5.0.20",
-    "@monkvision/prettier-config": "5.0.20",
-    "@monkvision/test-utils": "5.0.20",
-    "@monkvision/typescript-config": "5.0.20",
+    "@monkvision/eslint-config-base": "5.0.22",
+    "@monkvision/eslint-config-typescript": "5.0.22",
+    "@monkvision/eslint-config-typescript-react": "5.0.22",
+    "@monkvision/jest-config": "5.0.22",
+    "@monkvision/prettier-config": "5.0.22",
+    "@monkvision/test-utils": "5.0.22",
+    "@monkvision/typescript-config": "5.0.22",
     "@testing-library/react": "^12.1.5",
     "@testing-library/react-hooks": "^8.0.1",
     "@types/fscreen": "^1.0.1",
@@ -90,5 +90,5 @@
     "url": "https://github.com/monkvision/monkjs/issues"
   },
   "homepage": "https://github.com/monkvision/monkjs",
-  "gitHead": "c767cd051992b0249313d78102c5c222703ef294"
+  "gitHead": "a247bce658ecb086070158973a2e30ca420f0713"
 }