@robotical/webapp-types 3.21.17 → 3.21.19

package/dist-types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marty-web-app",
-    "version": "3.21.17",
+    "version": "3.21.19",
     "private": true,
     "engines": {
         "node": ">=20"
@@ -16,7 +16,7 @@
         "@robotical/cog-shooter-game": "^0.1.27",
         "@robotical/jumping-game": "^0.1.29",
         "@robotical/martyblocks": "^4.0.67",
-        "@robotical/martyblocksjr": "^4.3.2",
+        "@robotical/martyblocksjr": "^4.3.3",
         "@robotical/maze": "^0.1.22",
         "@robotical/rc-sequencer": "^1.1.15",
         "@robotical/ricjs-robotical-addons": "^1.2.8",

package/dist-types/src/components/modals/LEDLightsOrQRVerificationModal/index.d.ts

@@ -1,5 +1,5 @@
 import { RaftTypeE } from "../../../types/raft";
-export type QRScannerErrorDisposition = "permission-denied" | "detector-unavailable" | "unexpected";
+export type QRScannerErrorDisposition = "permission-denied" | "no-camera" | "camera-in-use" | "detector-unavailable" | "unexpected";
 export declare const classifyQRScannerError: (error: unknown) => QRScannerErrorDisposition;
 export declare const reportQRScannerError: (error: unknown) => QRScannerErrorDisposition;
 type Props = {

package/dist-types/src/components/modals/LEDLightsOrQRVerificationModal/index.js

@@ -82,6 +82,16 @@ export var classifyQRScannerError = function (error) {
         causeName === "PermissionDeniedError") {
         return "permission-denied";
     }
+    if (errorKind === "no-camera" ||
+        errorName === "NotFoundError" ||
+        causeName === "NotFoundError") {
+        return "no-camera";
+    }
+    if (errorKind === "in-use" ||
+        errorName === "NotReadableError" ||
+        causeName === "NotReadableError") {
+        return "camera-in-use";
+    }
     if ((errorName === "NotSupportedError" || causeName === "NotSupportedError") &&
         [errorMessage, causeMessage].some(function (message) {
             return typeof message === "string" &&
@@ -97,6 +107,14 @@ export var reportQRScannerError = function (error) {
         Logger.warn(SHOW_LOGS, TAG, "QR camera permission was not granted", error);
         return disposition;
     }
+    if (disposition === "no-camera") {
+        Logger.warn(SHOW_LOGS, TAG, "No QR camera was found", error);
+        return disposition;
+    }
+    if (disposition === "camera-in-use") {
+        Logger.warn(SHOW_LOGS, TAG, "QR camera is already in use", error);
+        return disposition;
+    }
     var cause = getErrorProperty(error, "cause");
     if (cause !== undefined) {
         Logger.error(SHOW_LOGS, TAG, "QR scanner failed", cause, error);
@@ -197,12 +215,20 @@ function QRContent(_a) {
         if (!isActiveRef.current) {
             return;
         }
-        if (reportQRScannerError(error) !== "detector-unavailable") {
-            return;
+        var disposition = reportQRScannerError(error);
+        if (disposition === "detector-unavailable") {
+            resetBarcodeDetectorModule();
+            onScannerUnavailable();
+            window.applicationManager.toaster.error("QR scanning is unavailable. Please use LED verification or select QR Code Verification to try again.", { autoClose: false });
+        }
+        else if (disposition === "no-camera") {
+            onScannerUnavailable();
+            window.applicationManager.toaster.error("No camera was found. Connect a camera and select QR Code Verification to try again, or use LED verification.", { autoClose: false });
+        }
+        else if (disposition === "camera-in-use") {
+            onScannerUnavailable();
+            window.applicationManager.toaster.error("The camera is already in use. Close the other app using it and select QR Code Verification to try again, or use LED verification.", { autoClose: false });
         }
-        resetBarcodeDetectorModule();
-        onScannerUnavailable();
-        window.applicationManager.toaster.error("QR scanning is unavailable. Please use LED verification or select QR Code Verification to try again.", { autoClose: false });
     };
     var isWebapp = ((_b = window.applicationManager.deviceInfo) === null || _b === void 0 ? void 0 : _b.manufacturer) === "Webapp";
     return (_jsx("div", __assign({ className: styles.QRcontainer }, { children: _jsx("div", __assign({ className: styles.QRscannerContainer }, { children: _jsx(SwitchableCameraScanner, { styles: { container: { transform: isWebapp ? 'scaleX(-1)' : 'none' } }, onError: onScannerError, formats: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/webapp-types",
-  "version": "3.21.17",
+  "version": "3.21.19",
   "description": "Type definitions for the Application Manager",
   "main": "dist/application-manager.d.ts",
   "types": "dist/application-manager.d.ts",