@robotical/webapp-types 3.17.44 → 3.17.45

package/dist-types/src/application/ApplicationManager/ApplicationManager.d.ts

@@ -55,6 +55,8 @@ export default class ApplicationManager {
     updateRaftNameInAllStates(raftId: string, name: string): Promise<boolean>;
     private getConnectedRaftName;
     private addConnectedRaftToContext;
+    private publishLocalVerifiedConnection;
+    private confirmQrVerifiedConnection;
     pauseWifiConnectionMarty(raftId: string, pause: boolean): Promise<boolean>;
     getCachedWifiStatusMarty(martyId: string): RaftWifiConnStatus | undefined;
     wifiConnectMarty(martyId: string, ssid: string, password: string): Promise<boolean>;

package/dist-types/src/application/ApplicationManager/ApplicationManager.js

@@ -45,6 +45,7 @@ import VerificationModal from "../../components/modals/VerificationModal";
 import { raftFoundSubscriptionHelper } from "../RAFTs/raft-subscription-helpers";
 import { AppSentMessage } from "../../types/communication-between-apps/wrapper-communication";
 import VerificationModalPhoneApp from "../../components/modals/VerificationModalPhoneApp";
+import { RaftConnEvent, } from "@robotical/raftjs";
 import Logger from "../../services/logger/Logger";
 import isPhoneApp from "../../utils/phone-app-communication/is-phone-app";
 import DisconnectConfirmationModal from "../../components/modals/DisconnectConfirmation";
@@ -244,6 +245,41 @@ var ApplicationManager = /** @class */ (function () {
             });
         });
     };
+    ApplicationManager.prototype.publishLocalVerifiedConnection = function (raft) {
+        raft.receivedRICEvent("conn", RaftConnEvent.CONN_VERIFIED_CORRECT, "VERIFIED_CORRECT", {});
+    };
+    ApplicationManager.prototype.confirmQrVerifiedConnection = function (raft) {
+        return __awaiter(this, void 0, void 0, function () {
+            var didPublishVerifiedEvent, error_2;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, Promise.resolve()];
+                    case 1:
+                        _a.sent();
+                        if (isPhoneApp()) {
+                            this.publishLocalVerifiedConnection(raft);
+                            return [2 /*return*/];
+                        }
+                        _a.label = 2;
+                    case 2:
+                        _a.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_CONFIRM_VERIFIED, { raftId: raft.id })];
+                    case 3:
+                        didPublishVerifiedEvent = _a.sent();
+                        if (!didPublishVerifiedEvent) {
+                            this.publishLocalVerifiedConnection(raft);
+                        }
+                        return [3 /*break*/, 5];
+                    case 4:
+                        error_2 = _a.sent();
+                        Logger.warn(SHOW_LOGS, TAG, "Failed to publish QR verified event for ".concat(raft.id, ": ").concat(error_2));
+                        this.publishLocalVerifiedConnection(raft);
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
+    };
     //======================//
     /* MARTY WIFI           */
     //======================//
@@ -544,30 +580,34 @@ var ApplicationManager = /** @class */ (function () {
                         e_1 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to start discovery: ".concat(e_1));
                         return [3 /*break*/, 9];
-                    case 9: return [3 /*break*/, 17];
+                    case 9: return [3 /*break*/, 18];
                     case 10:
                         secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), i18n.t("connection.connecting_msg"), false);
                         _a.label = 11;
                     case 11:
-                        _a.trys.push([11, 15, , 16]);
+                        _a.trys.push([11, 16, , 17]);
                         return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuids, isQRVerification)];
                     case 12:
                         newRaft = _a.sent();
-                        if (!newRaft) return [3 /*break*/, 14];
+                        if (!newRaft) return [3 /*break*/, 15];
                         return [4 /*yield*/, this.addConnectedRaftToContext(newRaft)];
                     case 13:
                         _a.sent();
                         afterRaftConnectedCb(newRaft);
-                        _a.label = 14;
-                    case 14: return [3 /*break*/, 16];
-                    case 15:
+                        if (!isQRVerification) return [3 /*break*/, 15];
+                        return [4 /*yield*/, this.confirmQrVerifiedConnection(newRaft)];
+                    case 14:
+                        _a.sent();
+                        _a.label = 15;
+                    case 15: return [3 /*break*/, 17];
+                    case 16:
                         e_2 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to connect to new robot: ".concat(e_2));
-                        return [3 /*break*/, 16];
-                    case 16:
+                        return [3 /*break*/, 17];
+                    case 17:
                         secondaryModalState.closeModalWithoutAnimation();
-                        _a.label = 17;
-                    case 17: return [2 /*return*/];
+                        _a.label = 18;
+                    case 18: return [2 /*return*/];
                 }
             });
         });
@@ -671,13 +711,13 @@ var ApplicationManager = /** @class */ (function () {
     ApplicationManager.prototype.connectToRIC = function (method, uuids, withoutVerification) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var wasConnectedObj, raftId, raftType, raft, oldColours;
+            var wasConnectedObj, raftId, raftType, raft;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0: return [4 /*yield*/, RAFT.connect(method, uuids)];
                     case 1:
                         wasConnectedObj = _e.sent();
-                        if (!wasConnectedObj.success) return [3 /*break*/, 7];
+                        if (!wasConnectedObj.success) return [3 /*break*/, 4];
                         raftId = (_a = wasConnectedObj.data) === null || _a === void 0 ? void 0 : _a.raftId;
                         raftType = (_b = wasConnectedObj.data) === null || _b === void 0 ? void 0 : _b.raftType;
                         if (!raftId || !raftType) {
@@ -706,25 +746,17 @@ var ApplicationManager = /** @class */ (function () {
                         _e.sent();
                         _e.label = 3;
                     case 3:
-                        if (!!withoutVerification) return [3 /*break*/, 4];
-                        modalState.setModal(createElement(VerificationModal, { connectedRAFT_: raft }), i18n.t("connection.looking_for_raft", { raftType: raft.type }), false);
-                        return [3 /*break*/, 6];
+                        // start LED verification process
+                        if (!withoutVerification) {
+                            modalState.setModal(createElement(VerificationModal, { connectedRAFT_: raft }), i18n.t("connection.looking_for_raft", { raftType: raft.type }), false);
+                        }
+                        return [2 /*return*/, raft];
                     case 4:
-                        oldColours = raft._ledLcdColours;
-                        raft._ledLcdColours = [];
-                        return [4 /*yield*/, raft.verifyRaft()];
-                    case 5:
-                        _e.sent();
-                        raft._ledLcdColours = oldColours;
-                        raft.stopVerifyingRaft(true);
-                        _e.label = 6;
-                    case 6: return [2 /*return*/, raft];
-                    case 7:
                         if (wasConnectedObj.reason === 'unplugged') {
                             modalState.setModal(createElement(InUnpluggedModalContent), i18n.t("calibration_screen.colour_calibration.unplugged_modal_title"));
                         }
-                        _e.label = 8;
-                    case 8: return [2 /*return*/, null];
+                        _e.label = 5;
+                    case 5: return [2 /*return*/, null];
                 }
             });
         });

package/dist-types/src/types/communication-between-apps/wrapper-communication.d.ts

@@ -17,6 +17,7 @@ export declare enum AppSentMessage {
     RAFT_GET_NAME = "RAFT_GET_NAME",
     RAFT_VERIFY = "RAFT_VERIFY",
     RAFT_VERIFY_PHONE = "RAFT_VERIFY_PHONE",
+    RAFT_CONFIRM_VERIFIED = "RAFT_CONFIRM_VERIFIED",
     RAFT_STOP_VERIFY = "RAFT_STOP_VERIFY",
     RAFT_DISCONNECT = "RAFT_DISCONNECT",
     RAFT_START_DISCOVERY = "RAFT_START_DISCOVERY",

package/dist-types/src/types/communication-between-apps/wrapper-communication.js

@@ -5,6 +5,7 @@ export var AppSentMessage;
     AppSentMessage["RAFT_GET_NAME"] = "RAFT_GET_NAME";
     AppSentMessage["RAFT_VERIFY"] = "RAFT_VERIFY";
     AppSentMessage["RAFT_VERIFY_PHONE"] = "RAFT_VERIFY_PHONE";
+    AppSentMessage["RAFT_CONFIRM_VERIFIED"] = "RAFT_CONFIRM_VERIFIED";
     AppSentMessage["RAFT_STOP_VERIFY"] = "RAFT_STOP_VERIFY";
     AppSentMessage["RAFT_DISCONNECT"] = "RAFT_DISCONNECT";
     AppSentMessage["RAFT_START_DISCOVERY"] = "RAFT_START_DISCOVERY";

package/dist-types/src/wrapper-app/WrapperAppManager.d.ts

@@ -44,6 +44,10 @@ export declare class WrapperAppManager {
      * Re-triggers the connect event which was missed due to the connection logic
      */
     getMissedConnEvent(raftId: any): void;
+    /**
+     * Publish successful QR verification without running the LED pattern checker.
+     */
+    confirmVerifiedRaft(raftId: string): Promise<boolean>;
     calibrateColourSensorMarty(raftId: string, stage: ColourSensorCalibrationStage): Promise<boolean>;
     resetColourSensorOffsetsMarty(raftId: string): Promise<boolean>;
     /**

package/dist-types/src/wrapper-app/WrapperAppManager.js

@@ -189,6 +189,27 @@ var WrapperAppManager = /** @class */ (function () {
             this.connectors[raftId].publish("conn", RaftConnEvent.CONN_CONNECTED, "connect", {});
         }
     };
+    /**
+     * Publish successful QR verification without running the LED pattern checker.
+     */
+    WrapperAppManager.prototype.confirmVerifiedRaft = function (raftId) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.connectors[raftId]) {
+                            Logger.warn(SHOW_LOGS, TAG, "confirmVerifiedRaft: No connector found for raftId: ".concat(raftId));
+                            return [2 /*return*/, false];
+                        }
+                        return [4 /*yield*/, this.connectors[raftId].eventHandler("conn", RaftConnEvent.CONN_VERIFIED_CORRECT, "VERIFIED_CORRECT", {})];
+                    case 1:
+                        _a.sent();
+                        this.connectors[raftId].publish("conn", RaftConnEvent.CONN_VERIFIED_CORRECT, "VERIFIED_CORRECT", {});
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
     //=====================//
     /* CALIBRATE MARTY  */
     //=====================//

package/dist-types/src/wrapper-app/communicators/WebAppCommunicator.js

@@ -116,7 +116,7 @@ var WebAppCommunicator = /** @class */ (function () {
 }());
 export default WebAppCommunicator;
 var receivedMessageHandler = function (receivedMessage, data, messagePromiseId) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connectionResults, error_1, ricName, error_2, verifyResults, error_3, stopVerifyResults, error_4, disconnectResults, error_5, restResults, error_6, missedConnEventResults, streamAudioResults, commsStats, calibrateColourSensorResults, error_7, resetColourSensorResults, error_8, deviceInfoResults, wasSaved, wasSaved, fileContents, existingDevices, devices, error_9, wasSent, error_10;
+    var _a, connectionResults, error_1, ricName, error_2, verifyResults, error_3, confirmVerifiedResults, error_4, stopVerifyResults, error_5, disconnectResults, error_6, restResults, error_7, missedConnEventResults, streamAudioResults, commsStats, calibrateColourSensorResults, error_8, resetColourSensorResults, error_9, deviceInfoResults, wasSaved, wasSaved, fileContents, existingDevices, devices, error_10, wasSent, error_11;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -126,23 +126,24 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                     case AppSentMessage.RAFT_CONNECT: return [3 /*break*/, 2];
                     case AppSentMessage.RAFT_GET_NAME: return [3 /*break*/, 6];
                     case AppSentMessage.RAFT_VERIFY: return [3 /*break*/, 10];
-                    case AppSentMessage.RAFT_STOP_VERIFY: return [3 /*break*/, 14];
-                    case AppSentMessage.RAFT_DISCONNECT: return [3 /*break*/, 18];
-                    case AppSentMessage.RAFT_SEND_REST: return [3 /*break*/, 22];
-                    case AppSentMessage.GET_MISSED_CONN_EVENT: return [3 /*break*/, 26];
-                    case AppSentMessage.RAFT_STREAM_AUDIO: return [3 /*break*/, 27];
-                    case AppSentMessage.MARTY_GET_COMMS_STATS: return [3 /*break*/, 28];
-                    case AppSentMessage.MARTY_CALIBRATE_COLOUR_SENSOR: return [3 /*break*/, 29];
-                    case AppSentMessage.MARTY_RESET_COLOUR_SENSOR_OFFSETS: return [3 /*break*/, 33];
-                    case AppSentMessage.GET_DEVICE_INFO: return [3 /*break*/, 37];
-                    case AppSentMessage.GET_TRACKING_PROMPT_DECISION: return [3 /*break*/, 38];
-                    case AppSentMessage.SAVE_FILE_ON_DEVICE: return [3 /*break*/, 39];
-                    case AppSentMessage.SAVE_FILE_ON_DEVICE_LOCAL_STORAGE: return [3 /*break*/, 40];
-                    case AppSentMessage.LOAD_FILE_FROM_DEVICE_LOCAL_STORAGE: return [3 /*break*/, 41];
-                    case AppSentMessage.SCAN_FOR_POTENTIAL_WARRANTY_DEVICE: return [3 /*break*/, 42];
-                    case AppSentMessage.SEND_ATOMIC_READ_OPERATION_TO_MARTY: return [3 /*break*/, 46];
+                    case AppSentMessage.RAFT_CONFIRM_VERIFIED: return [3 /*break*/, 14];
+                    case AppSentMessage.RAFT_STOP_VERIFY: return [3 /*break*/, 18];
+                    case AppSentMessage.RAFT_DISCONNECT: return [3 /*break*/, 22];
+                    case AppSentMessage.RAFT_SEND_REST: return [3 /*break*/, 26];
+                    case AppSentMessage.GET_MISSED_CONN_EVENT: return [3 /*break*/, 30];
+                    case AppSentMessage.RAFT_STREAM_AUDIO: return [3 /*break*/, 31];
+                    case AppSentMessage.MARTY_GET_COMMS_STATS: return [3 /*break*/, 32];
+                    case AppSentMessage.MARTY_CALIBRATE_COLOUR_SENSOR: return [3 /*break*/, 33];
+                    case AppSentMessage.MARTY_RESET_COLOUR_SENSOR_OFFSETS: return [3 /*break*/, 37];
+                    case AppSentMessage.GET_DEVICE_INFO: return [3 /*break*/, 41];
+                    case AppSentMessage.GET_TRACKING_PROMPT_DECISION: return [3 /*break*/, 42];
+                    case AppSentMessage.SAVE_FILE_ON_DEVICE: return [3 /*break*/, 43];
+                    case AppSentMessage.SAVE_FILE_ON_DEVICE_LOCAL_STORAGE: return [3 /*break*/, 44];
+                    case AppSentMessage.LOAD_FILE_FROM_DEVICE_LOCAL_STORAGE: return [3 /*break*/, 45];
+                    case AppSentMessage.SCAN_FOR_POTENTIAL_WARRANTY_DEVICE: return [3 /*break*/, 46];
+                    case AppSentMessage.SEND_ATOMIC_READ_OPERATION_TO_MARTY: return [3 /*break*/, 50];
                 }
-                return [3 /*break*/, 50];
+                return [3 /*break*/, 54];
             case 1:
                 try {
                     console.log("3");
@@ -154,7 +155,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 51];
+                return [3 /*break*/, 55];
             case 2:
                 _b.trys.push([2, 4, , 5]);
                 return [4 /*yield*/, wrapperAppManager.connect(data.method, data.uuids)];
@@ -166,7 +167,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_1 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_1.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 5];
-            case 5: return [3 /*break*/, 51];
+            case 5: return [3 /*break*/, 55];
             case 6:
                 _b.trys.push([6, 8, , 9]);
                 return [4 /*yield*/, wrapperAppManager.getRaftName(data.raftId)];
@@ -178,7 +179,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_2 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_2.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 9];
-            case 9: return [3 /*break*/, 51];
+            case 9: return [3 /*break*/, 55];
             case 10:
                 _b.trys.push([10, 12, , 13]);
                 return [4 /*yield*/, wrapperAppManager.verifyRaft(data.ledLcdColours, data.raftId)];
@@ -190,44 +191,56 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 error_3 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_3.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 13];
-            case 13: return [3 /*break*/, 51];
+            case 13: return [3 /*break*/, 55];
             case 14:
                 _b.trys.push([14, 16, , 17]);
-                return [4 /*yield*/, wrapperAppManager.stopVerifyingRaft(data.isCorrectRIC, data.raftId)];
+                return [4 /*yield*/, wrapperAppManager.confirmVerifiedRaft(data.raftId)];
             case 15:
-                stopVerifyResults = _b.sent();
-                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: stopVerifyResults, messagePromiseId: messagePromiseId });
+                confirmVerifiedResults = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: confirmVerifiedResults, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 17];
             case 16:
                 error_4 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_4.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 17];
-            case 17: return [3 /*break*/, 51];
+            case 17: return [3 /*break*/, 55];
             case 18:
                 _b.trys.push([18, 20, , 21]);
-                return [4 /*yield*/, wrapperAppManager.disconnect(data.raftId)];
+                return [4 /*yield*/, wrapperAppManager.stopVerifyingRaft(data.isCorrectRIC, data.raftId)];
             case 19:
-                disconnectResults = _b.sent();
-                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: disconnectResults, messagePromiseId: messagePromiseId });
+                stopVerifyResults = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: stopVerifyResults, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 21];
             case 20:
                 error_5 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_5.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 21];
-            case 21: return [3 /*break*/, 51];
+            case 21: return [3 /*break*/, 55];
             case 22:
                 _b.trys.push([22, 24, , 25]);
-                return [4 /*yield*/, wrapperAppManager.sendRestMessage(data.msg, data.params, data.raftId, data.options)];
+                return [4 /*yield*/, wrapperAppManager.disconnect(data.raftId)];
             case 23:
-                restResults = _b.sent();
-                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: restResults, messagePromiseId: messagePromiseId });
+                disconnectResults = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: disconnectResults, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 25];
             case 24:
                 error_6 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_6.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 25];
-            case 25: return [3 /*break*/, 51];
+            case 25: return [3 /*break*/, 55];
             case 26:
+                _b.trys.push([26, 28, , 29]);
+                return [4 /*yield*/, wrapperAppManager.sendRestMessage(data.msg, data.params, data.raftId, data.options)];
+            case 27:
+                restResults = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: restResults, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 29];
+            case 28:
+                error_7 = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: false, error: error_7.message, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 29];
+            case 29: return [3 /*break*/, 55];
+            case 30:
                 try {
                     missedConnEventResults = wrapperAppManager.getMissedConnEvent(data.raftId);
                     window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: missedConnEventResults, messagePromiseId: messagePromiseId });
@@ -235,8 +248,8 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 51];
-            case 27:
+                return [3 /*break*/, 55];
+            case 31:
                 try {
                     streamAudioResults = wrapperAppManager.streamAudio(data.raftId, data.streamContents, data.clearExisting, data.duration);
                     window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: streamAudioResults, messagePromiseId: messagePromiseId });
@@ -244,8 +257,8 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 51];
-            case 28:
+                return [3 /*break*/, 55];
+            case 32:
                 try {
                     commsStats = wrapperAppManager.getCommsStatsMarty(data.raftId);
                     window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: commsStats, messagePromiseId: messagePromiseId });
@@ -253,32 +266,32 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 51];
-            case 29:
-                _b.trys.push([29, 31, , 32]);
-                return [4 /*yield*/, wrapperAppManager.calibrateColourSensorMarty(data.raftId, data.stage)];
-            case 30:
-                calibrateColourSensorResults = _b.sent();
-                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: calibrateColourSensorResults, messagePromiseId: messagePromiseId });
-                return [3 /*break*/, 32];
-            case 31:
-                error_7 = _b.sent();
-                window.wrapperCommunicator.onMessageResponse({ success: false, error: error_7.message, messagePromiseId: messagePromiseId });
-                return [3 /*break*/, 32];
-            case 32: return [3 /*break*/, 51];
+                return [3 /*break*/, 55];
             case 33:
                 _b.trys.push([33, 35, , 36]);
-                return [4 /*yield*/, wrapperAppManager.resetColourSensorOffsetsMarty(data.raftId)];
+                return [4 /*yield*/, wrapperAppManager.calibrateColourSensorMarty(data.raftId, data.stage)];
             case 34:
-                resetColourSensorResults = _b.sent();
-                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: resetColourSensorResults, messagePromiseId: messagePromiseId });
+                calibrateColourSensorResults = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: calibrateColourSensorResults, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 36];
             case 35:
                 error_8 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_8.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 36];
-            case 36: return [3 /*break*/, 51];
+            case 36: return [3 /*break*/, 55];
             case 37:
+                _b.trys.push([37, 39, , 40]);
+                return [4 /*yield*/, wrapperAppManager.resetColourSensorOffsetsMarty(data.raftId)];
+            case 38:
+                resetColourSensorResults = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: resetColourSensorResults, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 40];
+            case 39:
+                error_9 = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: false, error: error_9.message, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 40];
+            case 40: return [3 /*break*/, 55];
+            case 41:
                 try {
                     deviceInfoResults = wrapperAppManager.getDeviceInfo();
                     window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: deviceInfoResults, messagePromiseId: messagePromiseId });
@@ -286,8 +299,8 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 51];
-            case 38:
+                return [3 /*break*/, 55];
+            case 42:
                 window.wrapperCommunicator.onMessageResponse({
                     success: true,
                     error: "",
@@ -298,8 +311,8 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                     },
                     messagePromiseId: messagePromiseId,
                 });
-                return [3 /*break*/, 51];
-            case 39:
+                return [3 /*break*/, 55];
+            case 43:
                 try {
                     wasSaved = saveItemOnDevice(data.fileName, data.base64);
                     window.wrapperCommunicator.onMessageResponse({ success: wasSaved, error: "", results: wasSaved, messagePromiseId: messagePromiseId });
@@ -307,8 +320,8 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 51];
-            case 40:
+                return [3 /*break*/, 55];
+            case 44:
                 try {
                     wasSaved = saveItemOnDevice(data.fileName, data.base64);
                     window.wrapperCommunicator.onMessageResponse({ success: wasSaved, error: "", results: wasSaved, messagePromiseId: messagePromiseId });
@@ -316,8 +329,8 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 51];
-            case 41:
+                return [3 /*break*/, 55];
+            case 45:
                 try {
                     fileContents = loadItem(data.fileName);
                     if (fileContents) {
@@ -330,36 +343,36 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 catch (error) {
                     window.wrapperCommunicator.onMessageResponse({ success: false, error: error.message, messagePromiseId: messagePromiseId });
                 }
-                return [3 /*break*/, 51];
-            case 42:
-                _b.trys.push([42, 44, , 45]);
+                return [3 /*break*/, 55];
+            case 46:
+                _b.trys.push([46, 48, , 49]);
                 existingDevices = data.existingDevices;
                 return [4 /*yield*/, wrapperAppManager.scanForPotentialWarrantyDevice(existingDevices)];
-            case 43:
+            case 47:
                 devices = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: devices, messagePromiseId: messagePromiseId });
-                return [3 /*break*/, 45];
-            case 44:
-                error_9 = _b.sent();
-                window.wrapperCommunicator.onMessageResponse({ success: false, error: error_9.message, messagePromiseId: messagePromiseId });
-                return [3 /*break*/, 45];
-            case 45: return [3 /*break*/, 51];
-            case 46:
-                _b.trys.push([46, 48, , 49]);
-                return [4 /*yield*/, wrapperAppManager.sendAtomicReadOperationToMarty(data.raftId)];
-            case 47:
-                wasSent = _b.sent();
-                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: wasSent, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 49];
             case 48:
                 error_10 = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: false, error: error_10.message, messagePromiseId: messagePromiseId });
                 return [3 /*break*/, 49];
-            case 49: return [3 /*break*/, 51];
+            case 49: return [3 /*break*/, 55];
             case 50:
+                _b.trys.push([50, 52, , 53]);
+                return [4 /*yield*/, wrapperAppManager.sendAtomicReadOperationToMarty(data.raftId)];
+            case 51:
+                wasSent = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: wasSent, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 53];
+            case 52:
+                error_11 = _b.sent();
+                window.wrapperCommunicator.onMessageResponse({ success: false, error: error_11.message, messagePromiseId: messagePromiseId });
+                return [3 /*break*/, 53];
+            case 53: return [3 /*break*/, 55];
+            case 54:
                 Logger.warn(SHOW_LOGS, TAG, "Unhandled message: ".concat(receivedMessage));
-                _b.label = 51;
-            case 51: return [2 /*return*/];
+                _b.label = 55;
+            case 55: return [2 /*return*/];
         }
     });
 }); };

package/package.json

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