@robotical/webapp-types 3.23.8 → 3.23.10

package/dist-types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marty-web-app",
-    "version": "3.23.8",
+    "version": "3.23.10",
     "private": true,
     "engines": {
         "node": ">=20"

package/dist-types/src/application/RAFTs/Marty/notifications-manager/RICNotificationsManager.d.ts

@@ -1,11 +1,11 @@
-import { RICHWElem, RICHWElemList } from "@robotical/ricjs";
+import { RICHWElemList } from "@robotical/ricjs";
 import Marty from "../Marty";
 export declare class RICNotificationsManager {
     private marty;
     constructor(marty: Marty);
-    msgBodyDecider(report: any, hwElems: RICHWElem[]): void;
+    msgBodyDecider(report: any): void;
     reportNofication(report: any): Promise<void>;
-    getHwStatus(stringify?: boolean, maxRetries?: number, delayMs?: number): Promise<string | RICHWElemList["hw"]>;
+    getHwStatus(stringify?: boolean, notificationType?: string, maxRetries?: number, delayMs?: number): Promise<string | RICHWElemList["hw"]>;
     getHWNameGivenIdNo(hwStatusArr: RICHWElemList["hw"], IDNo: number): string | number | null;
     getHwRevAndVersion(): Promise<string>;
     martyNameStr(): Promise<string>;

package/dist-types/src/application/RAFTs/Marty/notifications-manager/RICNotificationsManager.js

@@ -41,7 +41,6 @@ import RICServoFaultDetector from "@robotical/ricjs/dist/RICServoFaultDetector";
 import { toast } from "react-toastify";
 import { ReportedWarningsState } from "./ReportedWarningsState";
 import { createTicket, isSerialNumberRegistered } from "../../../../utils/warranty-service/warranty-service-utils";
-import { RICHWElemList_Str } from "@robotical/roboticaljs";
 import Logger from "../../../../services/logger/Logger";
 var SHOW_LOGS = true;
 var TAG = "RICNotificationsManager";
@@ -59,7 +58,6 @@ var CacheManager = /** @class */ (function () {
         return CacheManager.instances.get(key);
     };
     CacheManager.HW_STATUS_KEY = 'HW_STATUS';
-    CacheManager.HW_ELEMS_KEY = 'HW_ELEMS';
     CacheManager.SYSTEM_INFO_KEY = 'SYSTEM_INFO';
     CacheManager.instances = new Map();
     return CacheManager;
@@ -85,29 +83,14 @@ var LastReportedCache = /** @class */ (function () {
     };
     return LastReportedCache;
 }());
-var isCompressedHardwareElementList = function (value) {
-    return value !== null &&
-        typeof value === "object" &&
-        Array.isArray(value.hw);
-};
 var RICNotificationsManager = /** @class */ (function () {
     function RICNotificationsManager(marty) {
         this.marty = marty;
     }
-    RICNotificationsManager.prototype.msgBodyDecider = function (report, hwElems) {
-        Logger.info(SHOW_LOGS, TAG, "msgBodyDecider", report, hwElems);
+    RICNotificationsManager.prototype.msgBodyDecider = function (report) {
+        Logger.info(SHOW_LOGS, TAG, "msgBodyDecider", report);
         switch (report.msgBody) {
             case "overCurrentDet":
-                if (!report.hasOwnProperty("IDNo"))
-                    break;
-                var motor = report.IDNo;
-                var motorElem = hwElems.find(function (_a) {
-                    var IDNo = _a.IDNo;
-                    return IDNo === report.IDNo;
-                });
-                if (motorElem !== undefined) {
-                    motor = motorElem.name;
-                }
                 // TODO: add warnings manager to display warnings to user
                 // adding warning to the manager where the warning message to
                 // be displayed is decided
@@ -127,83 +110,57 @@ var RICNotificationsManager = /** @class */ (function () {
     // REPORT notifications are messages generated by RIC in response to certain events, including raw i2c events and motor safeties
     RICNotificationsManager.prototype.reportNofication = function (report) {
         return __awaiter(this, void 0, void 0, function () {
-            var hwElemsCached_str, hwElems, hwElemsResponse, hwElems_str;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        Logger.info(SHOW_LOGS, TAG, "reportNotification Report callback", report);
-                        hwElemsCached_str = CacheManager.getInstance(CacheManager.HW_ELEMS_KEY, 30000).getLastReported();
-                        if (!hwElemsCached_str) return [3 /*break*/, 1];
-                        Logger.info(SHOW_LOGS, TAG, "got hw elems from cache", hwElemsCached_str);
-                        hwElems = RICHWElemList_Str.expand(hwElemsCached_str);
-                        return [3 /*break*/, 3];
-                    case 1:
-                        Logger.info(SHOW_LOGS, TAG, "getting hw elems from rest");
-                        return [4 /*yield*/, this.marty.sendRestMessage("hwstatus/strstat")];
-                    case 2:
-                        hwElemsResponse = _a.sent();
-                        if (!isCompressedHardwareElementList(hwElemsResponse)) {
-                            Logger.error(SHOW_LOGS, TAG, "Invalid hardware status response", {
-                                responseType: hwElemsResponse === null ? "null" : typeof hwElemsResponse,
-                                hasHardwareElements: hwElemsResponse !== null &&
-                                    typeof hwElemsResponse === "object" &&
-                                    "hw" in hwElemsResponse,
-                            });
-                            return [2 /*return*/];
+                Logger.info(SHOW_LOGS, TAG, "reportNotification Report callback", report);
+                if (report.hasOwnProperty("msgType")) {
+                    if (report.msgType === "raw") {
+                        this.handleServoFaultRawMsg(report);
+                        return [2 /*return*/];
+                    }
+                    if (report.msgType === "warn" && report.hasOwnProperty("msgBody")) {
+                        if (report.msgBody === "servoFaultDet") {
+                            // if there is a servo fault, we want to get the servo fault data using the servo fault detector
+                            Logger.info(SHOW_LOGS, TAG, "servo fault detected, sending atomic read operation");
+                            // this.handleServoFaultRawMsg(report); // DEBUGGING ONLY
+                            this.marty.sendAtomicReadOperation(); // this will trigger reportMsgCallback, and so the above code will be executed
                         }
-                        hwElems_str = hwElemsResponse;
-                        CacheManager.getInstance(CacheManager.HW_ELEMS_KEY, 30000).setLastReported(hwElems_str);
-                        hwElems = RICHWElemList_Str.expand(hwElems_str);
-                        _a.label = 3;
-                    case 3:
-                        Logger.info(SHOW_LOGS, TAG, "hw elems: ", hwElems);
-                        if (report.hasOwnProperty("msgType")) {
-                            if (report.msgType === "raw") {
-                                this.handleServoFaultRawMsg(report);
-                                return [2 /*return*/];
-                            }
-                            if (report.msgType === "warn" && report.hasOwnProperty("msgBody")) {
-                                if (report.msgBody === "servoFaultDet") {
-                                    // if there is a servo fault, we want to get the servo fault data using the servo fault detector
-                                    Logger.info(SHOW_LOGS, TAG, "servo fault detected, sending atomic read operation");
-                                    // this.handleServoFaultRawMsg(report); // DEBUGGING ONLY
-                                    this.marty.sendAtomicReadOperation(); // this will trigger reportMsgCallback, and so the above code will be executed
-                                }
-                                else if (report.msgBody === "elemCommsFailDet") {
-                                    this.handleElemCommsFailDet(report);
-                                }
-                                else if (report.msgBody === "busFailDet") {
-                                    this.handleBusFailDet(report);
-                                }
-                                else {
-                                    Logger.info(SHOW_LOGS, TAG, "Unknown msgBody", report.msgBody);
-                                }
-                                ///////
-                                this.msgBodyDecider(report, hwElems.hw);
-                            }
-                            else {
-                                Logger.debug(SHOW_LOGS, TAG, "Either msgType or msgBody not found in report", report.msgType, report.msgBody);
-                            }
+                        else if (report.msgBody === "elemCommsFailDet") {
+                            this.handleElemCommsFailDet(report);
+                        }
+                        else if (report.msgBody === "busFailDet") {
+                            this.handleBusFailDet(report);
                         }
                         else {
-                            Logger.debug(SHOW_LOGS, TAG, "Didn't find msgType in report", report);
+                            Logger.info(SHOW_LOGS, TAG, "Unknown msgBody", report.msgBody);
                         }
-                        return [2 /*return*/];
+                        ///////
+                        this.msgBodyDecider(report);
+                    }
+                    else {
+                        Logger.debug(SHOW_LOGS, TAG, "Either msgType or msgBody not found in report", report.msgType, report.msgBody);
+                    }
+                }
+                else {
+                    Logger.debug(SHOW_LOGS, TAG, "Didn't find msgType in report", report);
                 }
+                return [2 /*return*/];
             });
         });
     };
-    RICNotificationsManager.prototype.getHwStatus = function (stringify, maxRetries, delayMs) {
+    RICNotificationsManager.prototype.getHwStatus = function (stringify, notificationType, maxRetries, delayMs) {
+        var _a;
         if (stringify === void 0) { stringify = true; }
+        if (notificationType === void 0) { notificationType = "unknown"; }
         if (maxRetries === void 0) { maxRetries = 10; }
         if (delayMs === void 0) { delayMs = 1000; }
         return __awaiter(this, void 0, void 0, function () {
-            var i, cachedHwStatus, hwStatusResponse, err_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var lastResultCode, i, cachedHwStatus, hwStatusResponse, err_1;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        lastResultCode = "unknown";
                         i = 0;
-                        _a.label = 1;
+                        _b.label = 1;
                     case 1:
                         if (!(i < maxRetries)) return [3 /*break*/, 11];
                         cachedHwStatus = CacheManager.getInstance(CacheManager.HW_STATUS_KEY, 30000).getLastReported();
@@ -211,38 +168,43 @@ var RICNotificationsManager = /** @class */ (function () {
                             Logger.info(SHOW_LOGS, TAG, "got hw status from cache");
                             return [2 /*return*/, stringify ? JSON.stringify(cachedHwStatus.hw) : cachedHwStatus.hw];
                         }
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
-                        _a.trys.push([2, 7, , 10]);
+                        _b.trys.push([2, 7, , 10]);
                         return [4 /*yield*/, this.marty.sendRestMessage('hwstatus')];
                     case 3:
-                        hwStatusResponse = _a.sent();
+                        hwStatusResponse = _b.sent();
                         if (!((hwStatusResponse === null || hwStatusResponse === void 0 ? void 0 : hwStatusResponse.rslt) === 'ok' && (hwStatusResponse === null || hwStatusResponse === void 0 ? void 0 : hwStatusResponse.hw))) return [3 /*break*/, 4];
                         CacheManager.getInstance(CacheManager.HW_STATUS_KEY, 30000).setLastReported(hwStatusResponse);
                         Logger.info(SHOW_LOGS, TAG, "got hw status from rest");
                         return [2 /*return*/, stringify ? JSON.stringify(hwStatusResponse.hw) : hwStatusResponse.hw];
                     case 4:
+                        lastResultCode = (_a = hwStatusResponse === null || hwStatusResponse === void 0 ? void 0 : hwStatusResponse.rslt) !== null && _a !== void 0 ? _a : (hwStatusResponse === null ? "null" : typeof hwStatusResponse);
                         Logger.info(SHOW_LOGS, TAG, "Couldn't get hwstatus: retrying...");
                         if (!(i < maxRetries - 1)) return [3 /*break*/, 6];
                         return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, delayMs); })];
                     case 5:
-                        _a.sent();
-                        _a.label = 6;
+                        _b.sent();
+                        _b.label = 6;
                     case 6: return [3 /*break*/, 10];
                     case 7:
-                        err_1 = _a.sent();
-                        Logger.error(SHOW_LOGS, TAG, "Failed to get hardware status; retrying", err_1);
+                        err_1 = _b.sent();
+                        lastResultCode = "exception";
+                        Logger.info(SHOW_LOGS, TAG, "Failed to get hardware status; retrying", err_1);
                         if (!(i < maxRetries - 1)) return [3 /*break*/, 9];
                         return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, delayMs); })];
                     case 8:
-                        _a.sent();
-                        _a.label = 9;
+                        _b.sent();
+                        _b.label = 9;
                     case 9: return [3 /*break*/, 10];
                     case 10:
                         i++;
                         return [3 /*break*/, 1];
                     case 11:
-                        Logger.info(SHOW_LOGS, TAG, "Couldn't get hwstatus: returning empty array");
+                        Logger.warn(SHOW_LOGS, TAG, "Hardware status unavailable; using element ID fallback", {
+                            notificationType: notificationType,
+                            resultCode: lastResultCode,
+                        });
                         return [2 /*return*/, stringify ? "[]" : []];
                 }
             });
@@ -333,7 +295,7 @@ var RICNotificationsManager = /** @class */ (function () {
                             servoHornPositionError: "Servo Horn Position Error",
                         };
                         if (!detectedServoFaults) return [3 /*break*/, 10];
-                        return [4 /*yield*/, this.getHwStatus(false)];
+                        return [4 /*yield*/, this.getHwStatus(false, report.msgType)];
                     case 1:
                         hwStatusArr = _d.sent();
                         hwStatus = JSON.stringify(hwStatusArr);
@@ -419,7 +381,7 @@ var RICNotificationsManager = /** @class */ (function () {
             var hwStatusArr, hwStatus, elemName, martyNameStr, appVersion, versionsInfo, enhancedDescription, userInfo;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getHwStatus(false)];
+                    case 0: return [4 /*yield*/, this.getHwStatus(false, report.msgBody)];
                     case 1:
                         hwStatusArr = _a.sent();
                         hwStatus = JSON.stringify(hwStatusArr);
@@ -470,7 +432,7 @@ var RICNotificationsManager = /** @class */ (function () {
             var hwStatusArr, hwStatus, elemName, martyNameStr, appVersion, versionsInfo, enhancedDescription, userInfo;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getHwStatus(false)];
+                    case 0: return [4 /*yield*/, this.getHwStatus(false, report.msgBody)];
                     case 1:
                         hwStatusArr = _a.sent();
                         hwStatus = JSON.stringify(hwStatusArr);

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

@@ -216,7 +216,11 @@ function QRContent(_a) {
             return;
         }
         var disposition = reportQRScannerError(error);
-        if (disposition === "detector-unavailable") {
+        if (disposition === "permission-denied") {
+            onScannerUnavailable();
+            window.applicationManager.toaster.error("Camera access was not granted. Allow camera access for Robotical in your phone settings, or for this website in your browser settings, then select QR Code Verification to try again. You can also use LED verification.", { autoClose: false });
+        }
+        else 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 });
@@ -229,6 +233,10 @@ function QRContent(_a) {
             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 });
         }
+        else {
+            onScannerUnavailable();
+            window.applicationManager.toaster.error("The QR camera could not start. Select QR Code Verification to try again, or use LED verification.", { 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.23.8",
+  "version": "3.23.10",
   "description": "Type definitions for the Application Manager",
   "main": "dist/application-manager.d.ts",
   "types": "dist/application-manager.d.ts",