@robotical/webapp-types 3.17.3 → 3.17.5

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

@@ -61,6 +61,11 @@ import InUnpluggedModalContent from "../../components/modals/InUnplugged";
 var SHOW_LOGS = true;
 var TAG = "ApplicationManager";
 var UNSUPPORTED_WEB_BLUETOOTH_BROWSER_MESSAGE = "This browser can't connect to Marty or Cog over Bluetooth. Please use Chrome or Edge, or use the iPad app.";
+var publishMissedConnectionEvent = function (raftId) {
+    window.wrapperCommunicator
+        .sendMessageAndWait(AppSentMessage.GET_MISSED_CONN_EVENT, { raftId: raftId })
+        .catch(function (error) { return Logger.warn(SHOW_LOGS, TAG, "Failed to get missed connection event for ".concat(raftId, ": ").concat(error)); });
+};
 var canUseWebBluetooth = function () {
     var bluetooth = navigator.bluetooth;
     return window.isSecureContext && !!bluetooth && typeof bluetooth.requestDevice === "function";
@@ -551,15 +556,15 @@ var ApplicationManager = /** @class */ (function () {
      * Selects a RAFT in Phone's verification modal
      */
     ApplicationManager.prototype.selectRaft = function (ricToConnectTo, method) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
             var selectResults, raftId, raftType, raft;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0: return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_SELECT, { discoveredDevice: ricToConnectTo, method: method })];
                     case 1:
-                        selectResults = _c.sent();
-                        if (!selectResults.success) return [3 /*break*/, 3];
+                        selectResults = _e.sent();
+                        if (!selectResults.success) return [3 /*break*/, 4];
                         raftId = (_a = selectResults.data) === null || _a === void 0 ? void 0 : _a.raftId;
                         raftType = (_b = selectResults.data) === null || _b === void 0 ? void 0 : _b.raftType;
                         if (!raftId || !raftType) {
@@ -577,18 +582,22 @@ var ApplicationManager = /** @class */ (function () {
                                 throw new Error("Unknown RAFT type");
                         }
                         this.connectedRafts[raftId] = raft;
+                        if ((_c = selectResults.data) === null || _c === void 0 ? void 0 : _c.systemInfo) {
+                            raft.systemInfo = selectResults.data.systemInfo;
+                        }
                         // get missed Connect event
-                        window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.GET_MISSED_CONN_EVENT, { raftId: raftId });
-                        // Note: we're verifying the RAFT from the place this functions is called
+                        publishMissedConnectionEvent(raftId);
+                        if (!!((_d = selectResults.data) === null || _d === void 0 ? void 0 : _d.systemInfo)) return [3 /*break*/, 3];
                         return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 200); })];
                     case 2:
-                        // Note: we're verifying the RAFT from the place this functions is called
-                        _c.sent();
+                        _e.sent();
+                        _e.label = 3;
+                    case 3:
                         if (this.ricSelectedCb) {
                             this.ricSelectedCb(raft);
                         }
                         return [2 /*return*/, raft];
-                    case 3:
+                    case 4:
                         if (selectResults.reason === 'unplugged') {
                             modalState.closeModalWithoutAnimation();
                             secondaryModalState.closeModalWithoutAnimation();
@@ -597,22 +606,22 @@ var ApplicationManager = /** @class */ (function () {
                         else {
                             Logger.warn(SHOW_LOGS, TAG, "Failed to select RAFT with id: ".concat(ricToConnectTo._id));
                         }
-                        _c.label = 4;
-                    case 4: return [2 /*return*/, null];
+                        _e.label = 5;
+                    case 5: return [2 /*return*/, null];
                 }
             });
         });
     };
     ApplicationManager.prototype.connectToRIC = function (method, uuids, withoutVerification) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
             var wasConnectedObj, raftId, raftType, raft, oldColours;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0: return [4 /*yield*/, RAFT.connect(method, uuids)];
                     case 1:
-                        wasConnectedObj = _c.sent();
-                        if (!wasConnectedObj.success) return [3 /*break*/, 6];
+                        wasConnectedObj = _e.sent();
+                        if (!wasConnectedObj.success) return [3 /*break*/, 7];
                         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) {
@@ -630,30 +639,36 @@ var ApplicationManager = /** @class */ (function () {
                                 throw new Error("Unknown RAFT type");
                         }
                         this.connectedRafts[raftId] = raft;
+                        if ((_c = wasConnectedObj.data) === null || _c === void 0 ? void 0 : _c.systemInfo) {
+                            raft.systemInfo = wasConnectedObj.data.systemInfo;
+                        }
                         // get missed Connect event
-                        window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.GET_MISSED_CONN_EVENT, { raftId: raftId });
+                        publishMissedConnectionEvent(raftId);
+                        if (!!((_d = wasConnectedObj.data) === null || _d === void 0 ? void 0 : _d.systemInfo)) return [3 /*break*/, 3];
                         return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 200); })];
                     case 2:
-                        _c.sent();
-                        if (!!withoutVerification) return [3 /*break*/, 3];
-                        modalState.setModal(createElement(VerificationModal, { connectedRAFT_: raft }), i18n.t("connection.looking_for_raft", { raftType: raft.type }), false);
-                        return [3 /*break*/, 5];
+                        _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];
+                    case 4:
                         oldColours = raft._ledLcdColours;
                         raft._ledLcdColours = [];
                         return [4 /*yield*/, raft.verifyRaft()];
-                    case 4:
-                        _c.sent();
+                    case 5:
+                        _e.sent();
                         raft._ledLcdColours = oldColours;
                         raft.stopVerifyingRaft(true);
-                        _c.label = 5;
-                    case 5: return [2 /*return*/, raft];
-                    case 6:
+                        _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"));
                         }
-                        _c.label = 7;
-                    case 7: return [2 /*return*/, null];
+                        _e.label = 8;
+                    case 8: return [2 /*return*/, null];
                 }
             });
         });

package/dist-types/src/types/raft.d.ts

@@ -1,3 +1,4 @@
+import type { RaftSystemInfo } from "@robotical/raftjs";
 export declare enum RaftConnectionMethod {
     WEB_SOCKET = "WebSocket",
     WEB_BLE = "WebBLE",
@@ -9,6 +10,7 @@ export type ConnectionAttemptResults = {
     data?: {
         raftId: string;
         raftType: RaftTypeE;
+        systemInfo?: RaftSystemInfo;
     };
 };
 export declare enum RaftTypeE {

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

@@ -75,7 +75,7 @@ var WrapperAppManager = /** @class */ (function () {
     */
     WrapperAppManager.prototype.connect = function (method, uuids) {
         return __awaiter(this, void 0, void 0, function () {
-            var connector, connectionResults;
+            var connector, connectionResults, raftSystemUtils, systemInfo, raftName;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, ConnectorFactory.connectToRaftHelper(method, uuids)];
@@ -90,7 +90,13 @@ var WrapperAppManager = /** @class */ (function () {
                         connectionResults = _a.sent();
                         if (connectionResults.success) {
                             this.connectors[connector.id] = connector;
-                            connectionResults.data = { raftId: connector.id, raftType: connector.type };
+                            raftSystemUtils = connector.connManager.getConnector().getRaftSystemUtils();
+                            systemInfo = raftSystemUtils.getCachedSystemInfo() || undefined;
+                            raftName = raftSystemUtils.getCachedRaftName() || raftSystemUtils.getFriendlyName();
+                            if (systemInfo && (raftName === null || raftName === void 0 ? void 0 : raftName.friendlyName)) {
+                                systemInfo.Friendly = raftName.friendlyName;
+                            }
+                            connectionResults.data = { raftId: connector.id, raftType: connector.type, systemInfo: systemInfo };
                         }
                         else {
                             Logger.warn(SHOW_LOGS, TAG, "Failed to connect to RAFT with id: ".concat(connector.id, " and type: ").concat(connector.type));

package/dist-types/src/wrapper-app/connectors/MartyConnector/MartyConnector.js

@@ -59,6 +59,18 @@ import { RICServoParamUpdater, RICSystemUtils, } from "@robotical/roboticaljs";
 import { WrapperSentMessage } from "../../../types/communication-between-apps/wrapper-communication";
 var SHOW_LOGS = true;
 var TAG = "MartyConnector";
+var UNPLUGGED_MODE_CHECK_TIMEOUT_MS = 750;
+var timeout = function (promise, timeoutMs) {
+    var timeoutId;
+    var timeoutPromise = new Promise(function (resolve) {
+        timeoutId = setTimeout(function () { return resolve(null); }, timeoutMs);
+    });
+    return Promise.race([promise, timeoutPromise]).finally(function () {
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+    });
+};
 var MartyConnector = /** @class */ (function (_super) {
     __extends(MartyConnector, _super);
     function MartyConnector(raftId, connManager) {
@@ -99,9 +111,12 @@ var MartyConnector = /** @class */ (function (_super) {
                             // this.emit(RAFT_REJECTED)
                             return [2 /*return*/, { success: false, reason: 'no_sys_info' }];
                         }
-                        return [4 /*yield*/, this.sendRestMessage("pystatus")];
+                        return [4 /*yield*/, timeout(this.sendRestMessage("pystatus"), UNPLUGGED_MODE_CHECK_TIMEOUT_MS)];
                     case 2:
                         pystatus = _a.sent();
+                        if (!pystatus) {
+                            Logger.warn(SHOW_LOGS, TAG, "Marty unplugged-mode check timed out after ".concat(UNPLUGGED_MODE_CHECK_TIMEOUT_MS, "ms; continuing to verification"));
+                        }
                         if (!(pystatus && pystatus.running === "screenfree.py")) return [3 /*break*/, 4];
                         Logger.warn(SHOW_LOGS, TAG, "Marty is in unplugged mode");
                         return [4 /*yield*/, this.disconnect()];

package/package.json

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