@robotical/webapp-types 3.18.13 → 3.19.0

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

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -36,7 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { createElement } from "react";
 import modalState, { secondaryModalState } from "../../state-observables/modal/ModalState";
-import { RaftConnectionMethod, RaftTypeE } from "../../types/raft";
+import { RaftConnectionMethod, RaftTypeE, } from "../../types/raft";
 import WebAppCommunicator from "../../wrapper-app/communicators/WebAppCommunicator";
 import RAFT from "../RAFTs/RAFT";
 import Marty from "../RAFTs/Marty/Marty";
@@ -56,10 +67,13 @@ import ConnectingLoadingSpinnerModal from "../../components/modals/ConnectingLoa
 import draggableModalState from "../../state-observables/modal/DraggableModalState";
 import SensorsDashboardModal from "../../components/modals/ SensorsDashboardModal";
 import LEDLightsOrQRVerificationModal from "../../components/modals/LEDLightsOrQRVerificationModal";
+import WifiConnectionModal from "../../components/modals/WifiConnectionModal";
 import { CarouselNavigatorManager } from "../../utils/CarouselNavigatorManager";
 import i18n from "../../i18n";
 import InUnpluggedModalContent from "../../components/modals/InUnplugged";
 import { cogKeepAwakeManager, } from "../../features/cog-keep-awake";
+import { normalizeWifiLocator } from "../../utils/wifi-connection";
+import { ConnectionMethodPreference, getConnectionMethodPreference, } from "../../store/ConnectionMethodPreference";
 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.";
@@ -95,6 +109,7 @@ var ApplicationManager = /** @class */ (function () {
         this._connectAttemptSequence = 0;
         this._activeConnectAttemptId = null;
         this._disconnectPromises = new Map();
+        this._pendingWifiLocators = new Set();
         this.connectedRaftsContext = [];
         this.returnToMainApp = function () { };
         // Carousel navigators
@@ -254,6 +269,8 @@ var ApplicationManager = /** @class */ (function () {
                             type: raft.type,
                             name: name,
                             isSelected: true,
+                            connectionMethod: raft.connectionMethod,
+                            connectionLocator: raft.connectionLocator,
                         });
                         return [2 /*return*/, true];
                 }
@@ -296,82 +313,118 @@ var ApplicationManager = /** @class */ (function () {
         });
     };
     //======================//
-    /* MARTY WIFI           */
+    /* RAFT WIFI            */
     //======================//
-    ApplicationManager.prototype.pauseWifiConnectionMarty = function (raftId, pause) {
+    ApplicationManager.prototype.getWifiManager = function (raftId) {
+        var raft = this.connectedRafts[raftId];
+        if ((raft === null || raft === void 0 ? void 0 : raft.type) === RaftTypeE.MARTY) {
+            return raft.wifiManager;
+        }
+        if ((raft === null || raft === void 0 ? void 0 : raft.type) === RaftTypeE.COG) {
+            return raft.wifiManager;
+        }
+        Logger.warn(SHOW_LOGS, TAG, "RAFT with id ".concat(raftId, " does not support Wi-Fi provisioning"));
+        return undefined;
+    };
+    ApplicationManager.prototype.pauseWifiConnection = function (raftId, pause) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var raft;
-            return __generator(this, function (_a) {
-                raft = this.connectedRafts[raftId];
-                if (raft && raft.type === RaftTypeE.MARTY) {
-                    return [2 /*return*/, raft.wifiManager.pauseWifiConnection(pause)];
-                }
-                Logger.warn(SHOW_LOGS, TAG, "RAFT with id: ".concat(raftId, " doesn't exist or is not a Marty"));
-                return [2 /*return*/, false];
+            return __generator(this, function (_c) {
+                return [2 /*return*/, (_b = (_a = this.getWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.pauseWifiConnection(pause)) !== null && _b !== void 0 ? _b : false];
+            });
+        });
+    };
+    ApplicationManager.prototype.getCachedWifiStatus = function (raftId) {
+        var _a;
+        return (_a = this.getWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.getCachedWifiStatus();
+    };
+    ApplicationManager.prototype.wifiConnect = function (raftId, ssid, password) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_c) {
+                return [2 /*return*/, (_b = (_a = this.getWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.wifiConnect(ssid, password)) !== null && _b !== void 0 ? _b : false];
+            });
+        });
+    };
+    ApplicationManager.prototype.wifiDisconnect = function (raftId) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_c) {
+                return [2 /*return*/, (_b = (_a = this.getWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.wifiDisconnect()) !== null && _b !== void 0 ? _b : false];
+            });
+        });
+    };
+    ApplicationManager.prototype.getWiFiConnStatus = function (raftId) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_c) {
+                return [2 /*return*/, (_b = (_a = this.getWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.getWiFiConnStatus()) !== null && _b !== void 0 ? _b : null];
+            });
+        });
+    };
+    ApplicationManager.prototype.getWifiScanResults = function (raftId) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_c) {
+                return [2 /*return*/, (_b = (_a = this.getWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.getWifiScanResults()) !== null && _b !== void 0 ? _b : false];
             });
         });
     };
-    ApplicationManager.prototype.getCachedWifiStatusMarty = function (martyId) {
-        var raft = this.connectedRafts[martyId];
-        if (raft && raft.type === RaftTypeE.MARTY) {
-            return raft.wifiManager.getCachedWifiStatus();
+    // Marty-specific aliases remain part of the embedded-platform contract.
+    ApplicationManager.prototype.getMartyWifiManager = function (raftId) {
+        var raft = this.connectedRafts[raftId];
+        if ((raft === null || raft === void 0 ? void 0 : raft.type) === RaftTypeE.MARTY) {
+            return raft.wifiManager;
         }
-        Logger.warn(SHOW_LOGS, TAG, "RAFT with id: ".concat(martyId, " doesn't exist or is not a Marty"));
+        Logger.warn(SHOW_LOGS, TAG, "RAFT with id ".concat(raftId, " is not a Marty"));
         return undefined;
     };
-    ApplicationManager.prototype.wifiConnectMarty = function (martyId, ssid, password) {
+    ApplicationManager.prototype.pauseWifiConnectionMarty = function (raftId, pause) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var raft;
-            return __generator(this, function (_a) {
-                raft = this.connectedRafts[martyId];
-                if (raft && raft.type === RaftTypeE.MARTY) {
-                    return [2 /*return*/, raft.wifiManager.wifiConnect(ssid, password)];
-                }
-                Logger.warn(SHOW_LOGS, TAG, "RAFT with id: ".concat(martyId, " doesn't exist or is not a Marty"));
-                return [2 /*return*/, false];
+            return __generator(this, function (_c) {
+                return [2 /*return*/, (_b = (_a = this.getMartyWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.pauseWifiConnection(pause)) !== null && _b !== void 0 ? _b : false];
             });
         });
     };
-    ApplicationManager.prototype.wifiDisconnectMarty = function (martyId) {
+    ApplicationManager.prototype.getCachedWifiStatusMarty = function (raftId) {
+        var _a;
+        return (_a = this.getMartyWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.getCachedWifiStatus();
+    };
+    ApplicationManager.prototype.wifiConnectMarty = function (raftId, ssid, password) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var raft;
-            return __generator(this, function (_a) {
-                raft = this.connectedRafts[martyId];
-                if (raft && raft.type === RaftTypeE.MARTY) {
-                    return [2 /*return*/, raft.wifiManager.wifiDisconnect()];
-                }
-                Logger.warn(SHOW_LOGS, TAG, "RAFT with id: ".concat(martyId, " doesn't exist or is not a Marty"));
-                return [2 /*return*/, false];
+            return __generator(this, function (_c) {
+                return [2 /*return*/, (_b = (_a = this.getMartyWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.wifiConnect(ssid, password)) !== null && _b !== void 0 ? _b : false];
             });
         });
     };
-    ApplicationManager.prototype.getWiFiConnStatusMarty = function (martyId) {
+    ApplicationManager.prototype.wifiDisconnectMarty = function (raftId) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var raft;
-            return __generator(this, function (_a) {
-                raft = this.connectedRafts[martyId];
-                if (raft && raft.type === RaftTypeE.MARTY) {
-                    return [2 /*return*/, raft.wifiManager.getWiFiConnStatus()];
-                }
-                return [2 /*return*/, null];
+            return __generator(this, function (_c) {
+                return [2 /*return*/, (_b = (_a = this.getMartyWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.wifiDisconnect()) !== null && _b !== void 0 ? _b : false];
             });
         });
     };
-    ApplicationManager.prototype.getWifiScanResultsMarty = function (martyId) {
+    ApplicationManager.prototype.getWiFiConnStatusMarty = function (raftId) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var raft;
-            return __generator(this, function (_a) {
-                raft = this.connectedRafts[martyId];
-                if (raft && raft.type === RaftTypeE.MARTY) {
-                    return [2 /*return*/, raft.wifiManager.getWifiScanResults()];
-                }
-                Logger.warn(SHOW_LOGS, TAG, "RAFT with id: ".concat(martyId, " doesn't exist or is not a Marty"));
-                return [2 /*return*/, false];
+            return __generator(this, function (_c) {
+                return [2 /*return*/, (_b = (_a = this.getMartyWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.getWiFiConnStatus()) !== null && _b !== void 0 ? _b : null];
+            });
+        });
+    };
+    ApplicationManager.prototype.getWifiScanResultsMarty = function (raftId) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_c) {
+                return [2 /*return*/, (_b = (_a = this.getMartyWifiManager(raftId)) === null || _a === void 0 ? void 0 : _a.getWifiScanResults()) !== null && _b !== void 0 ? _b : false];
             });
         });
     };
     //======================//
-    /* END MARTY WIFI       */
+    /* END RAFT WIFI        */
     //======================//
     //======================//
     /* CALIBRATION MARTY    */
@@ -503,32 +556,42 @@ var ApplicationManager = /** @class */ (function () {
     ApplicationManager.prototype.createNewMarty = function (id) {
         return new Marty(id);
     };
-    ApplicationManager.prototype.connectGenericMarty = function (afterRaftConnectedCb) {
-        return this.connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID], false);
+    ApplicationManager.prototype.connectGenericMarty = function (afterRaftConnectedCb, options) {
+        if (options === void 0) { options = {}; }
+        return this.connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID], false, __assign(__assign({}, options), { expectedRaftType: RaftTypeE.MARTY }));
     };
-    ApplicationManager.prototype.connectGenericCog = function (afterRaftConnectedCb) {
-        return this.connectGeneric(afterRaftConnectedCb, [ConnManager.COGUUID]);
+    ApplicationManager.prototype.connectGenericCog = function (afterRaftConnectedCb, options) {
+        if (options === void 0) { options = {}; }
+        return this.connectGeneric(afterRaftConnectedCb, [ConnManager.COGUUID], true, __assign(__assign({}, options), { expectedRaftType: RaftTypeE.COG }));
     };
     /**
      * Generic Connect method
      * This method is called from various environments (connection button, blocksjr, blocks etc.)
      * Known issue: connecting to a raft from within a platform won't add the newly connected raft to the connectedRafts hook
      */
-    ApplicationManager.prototype.connectGeneric = function (afterRaftConnectedCb, uuids, shouldShowQrModal) {
+    ApplicationManager.prototype.connectGeneric = function (afterRaftConnectedCb, uuids, shouldShowQrModal, options) {
         var _this = this;
         if (shouldShowQrModal === void 0) { shouldShowQrModal = true; }
+        if (options === void 0) { options = {}; }
         if (this._connectPromise) {
             return this._connectPromise;
         }
         if (this._disconnectPromises.size > 0) {
-            this.toaster.info(i18n.t("connection.wait_for_bluetooth_disconnect", {
-                defaultValue: "Please wait for the current Bluetooth disconnect to finish.",
+            this.toaster.info(i18n.t("connection.wait_for_disconnect", {
+                defaultValue: "Please wait for the current device disconnect to finish.",
             }));
             return Promise.resolve();
         }
         var connectAttemptId = ++this._connectAttemptSequence;
         this._activeConnectAttemptId = connectAttemptId;
-        var connectPromise = this._connectGeneric(afterRaftConnectedCb, uuids, shouldShowQrModal, connectAttemptId);
+        var inferredRaftType = !options.expectedRaftType && (uuids === null || uuids === void 0 ? void 0 : uuids.length) === 1
+            ? uuids[0] === ConnManager.RICUUID
+                ? RaftTypeE.MARTY
+                : uuids[0] === ConnManager.COGUUID
+                    ? RaftTypeE.COG
+                    : undefined
+            : undefined;
+        var connectPromise = this._connectGeneric(afterRaftConnectedCb, uuids, shouldShowQrModal, connectAttemptId, __assign(__assign({}, options), { expectedRaftType: options.expectedRaftType || inferredRaftType }));
         this._connectPromise = connectPromise;
         void connectPromise.then(function () { return _this._clearConnectPromise(connectPromise, connectAttemptId); }, function () { return _this._clearConnectPromise(connectPromise, connectAttemptId); });
         return connectPromise;
@@ -555,7 +618,7 @@ var ApplicationManager = /** @class */ (function () {
         if (this._isConnectAttemptActive(connectAttemptId)) {
             return "commit";
         }
-        // A newer app attempt shares WrapperAppManager's in-flight Bluetooth
+        // A newer app attempt shares WrapperAppManager's in-flight connection
         // result. Let that current consumer commit it instead of tearing down the
         // transport underneath it. With no replacement consumer, Dismiss means
         // the late success must be fully released.
@@ -567,21 +630,138 @@ var ApplicationManager = /** @class */ (function () {
             onDismiss: function () { return _this._dismissConnectAttempt(connectAttemptId); },
         });
     };
-    ApplicationManager.prototype._connectGeneric = function (afterRaftConnectedCb, uuids, shouldShowQrModal, connectAttemptId) {
+    ApplicationManager.prototype._resolveConnectOptions = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var verificationMethod, cancelVerificationResult, isQRVerification, e_1, newRaft, wasAdopted, e_2;
+            var method, expectedRaftType, bluetoothMethod, locator, modalLocator;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        method = options.method;
+                        expectedRaftType = options.expectedRaftType;
+                        bluetoothMethod = isPhoneApp()
+                            ? RaftConnectionMethod.PHONE_BLE
+                            : RaftConnectionMethod.WEB_BLE;
+                        if (!method) {
+                            method = expectedRaftType === RaftTypeE.MARTY &&
+                                getConnectionMethodPreference() === ConnectionMethodPreference.WIFI
+                                ? RaftConnectionMethod.WEB_SOCKET
+                                : bluetoothMethod;
+                        }
+                        if (expectedRaftType === RaftTypeE.COG &&
+                            method === RaftConnectionMethod.WEB_SOCKET) {
+                            this.toaster.error(i18n.t("connection.cog_wifi_unsupported", {
+                                defaultValue: "Cog does not support Wi-Fi. Connect using Bluetooth instead.",
+                            }));
+                            return [2 /*return*/, null];
+                        }
+                        if (method !== RaftConnectionMethod.WEB_SOCKET) {
+                            // The caller chooses the transport family; the runtime owns the
+                            // concrete Bluetooth implementation.
+                            method = bluetoothMethod;
+                            return [2 /*return*/, {
+                                    method: method,
+                                    locator: "",
+                                    expectedRaftType: expectedRaftType,
+                                }];
+                        }
+                        if (!expectedRaftType) {
+                            this.toaster.error(i18n.t("connection.wifi_robot_type_required", {
+                                defaultValue: "Choose Marty or Cog before connecting over Wi-Fi.",
+                            }));
+                            return [2 /*return*/, null];
+                        }
+                        locator = options.locator;
+                        if (!!locator) return [3 /*break*/, 2];
+                        return [4 /*yield*/, modalState.setModal(createElement(WifiConnectionModal, { raftType: expectedRaftType }), i18n.t("connection.wifi_connection_title", {
+                                defaultValue: "Connect over Wi-Fi",
+                            }), getModalLogoForRaftType(expectedRaftType), true, false)];
+                    case 1:
+                        modalLocator = _a.sent();
+                        if (!modalLocator) {
+                            return [2 /*return*/, null];
+                        }
+                        locator = modalLocator;
+                        _a.label = 2;
+                    case 2:
+                        if (!locator) {
+                            return [2 /*return*/, null];
+                        }
+                        try {
+                            return [2 /*return*/, {
+                                    method: method,
+                                    locator: normalizeWifiLocator(locator, expectedRaftType),
+                                    expectedRaftType: expectedRaftType,
+                                }];
+                        }
+                        catch (error) {
+                            this.toaster.error(error instanceof Error ? error.message : String(error));
+                            return [2 /*return*/, null];
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    ApplicationManager.prototype._connectGeneric = function (afterRaftConnectedCb, uuids, shouldShowQrModal, connectAttemptId, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var resolvedOptions, method, locator, isWifiConnection, tracksWifiLocator, alreadyConnected;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this._resolveConnectOptions(options)];
+                    case 1:
+                        resolvedOptions = _a.sent();
+                        if (!resolvedOptions || !this._isConnectAttemptActive(connectAttemptId)) {
+                            return [2 /*return*/];
+                        }
+                        method = resolvedOptions.method, locator = resolvedOptions.locator;
+                        isWifiConnection = method === RaftConnectionMethod.WEB_SOCKET;
+                        tracksWifiLocator = isWifiConnection && !!locator;
+                        if (tracksWifiLocator) {
+                            alreadyConnected = Object.values(this.connectedRafts).some(function (raft) {
+                                return raft.connectionMethod === RaftConnectionMethod.WEB_SOCKET &&
+                                    raft.connectionLocator === locator;
+                            });
+                            if (alreadyConnected || this._pendingWifiLocators.has(locator)) {
+                                this.toaster.info(i18n.t("connection.wifi_already_connected", {
+                                    defaultValue: "This Wi-Fi device is already connected or connecting.",
+                                }));
+                                return [2 /*return*/];
+                            }
+                            this._pendingWifiLocators.add(locator);
+                        }
+                        _a.label = 2;
+                    case 2:
+                        _a.trys.push([2, , 4, 5]);
+                        return [4 /*yield*/, this._connectWithResolvedOptions(afterRaftConnectedCb, uuids, shouldShowQrModal, connectAttemptId, resolvedOptions)];
+                    case 3: return [2 /*return*/, _a.sent()];
+                    case 4:
+                        if (tracksWifiLocator) {
+                            this._pendingWifiLocators.delete(locator);
+                        }
+                        return [7 /*endfinally*/];
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    ApplicationManager.prototype._connectWithResolvedOptions = function (afterRaftConnectedCb, uuids, shouldShowQrModal, connectAttemptId, resolvedOptions) {
+        return __awaiter(this, void 0, void 0, function () {
+            var method, locator, expectedRaftType, isWifiConnection, isPhoneBluetoothConnection, verificationMethod, cancelVerificationResult, isQRVerification, e_1, newRaft, wasAdopted, e_2;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!isPhoneApp() && !canUseWebBluetooth()) {
+                        method = resolvedOptions.method, locator = resolvedOptions.locator, expectedRaftType = resolvedOptions.expectedRaftType;
+                        isWifiConnection = method === RaftConnectionMethod.WEB_SOCKET;
+                        isPhoneBluetoothConnection = method === RaftConnectionMethod.PHONE_BLE && isPhoneApp();
+                        if (method === RaftConnectionMethod.WEB_BLE && !canUseWebBluetooth()) {
                             this.toaster.error(i18n.t("connection.unsupported_web_bluetooth_browser", {
                                 defaultValue: UNSUPPORTED_WEB_BLUETOOTH_BROWSER_MESSAGE,
                             }), { autoClose: false });
                             return [2 /*return*/];
                         }
                         verificationMethod = { action: "led" };
-                        if (!shouldShowQrModal) return [3 /*break*/, 2];
+                        if (!(shouldShowQrModal && !isWifiConnection)) return [3 /*break*/, 2];
                         cancelVerificationResult = { action: "cancel" };
                         return [4 /*yield*/, modalState.setModal(createElement(LEDLightsOrQRVerificationModal, {
                                 targetRaftType: RaftTypeE.COG,
@@ -596,7 +776,10 @@ var ApplicationManager = /** @class */ (function () {
                             return [2 /*return*/];
                         }
                         if (verificationMethod.action === "switch-to-marty") {
-                            return [2 /*return*/, this._connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID], false, connectAttemptId)];
+                            return [2 /*return*/, this._connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID], false, connectAttemptId, {
+                                    method: method,
+                                    expectedRaftType: RaftTypeE.MARTY,
+                                })];
                         }
                         isQRVerification = false;
                         if (verificationMethod.action === "qr") {
@@ -608,7 +791,7 @@ var ApplicationManager = /** @class */ (function () {
                                 uuids = [ConnManager.COGUUID, ConnManager.RICUUID];
                             }
                         }
-                        if (!isPhoneApp()) return [3 /*break*/, 10];
+                        if (!isPhoneBluetoothConnection) return [3 /*break*/, 10];
                         this.lastUUIDsUsed = uuids; // Store the last used UUIDs so when the user presses "Scan Again" in the phone app connection modal, we can use them to start discovery again
                         _a.label = 3;
                     case 3:
@@ -648,7 +831,7 @@ var ApplicationManager = /** @class */ (function () {
                         _a.label = 11;
                     case 11:
                         _a.trys.push([11, 16, , 17]);
-                        return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuids, isQRVerification, function () { return _this._getConnectResultDisposition(connectAttemptId); })];
+                        return [4 /*yield*/, window.applicationManager.connectToRIC(method, uuids, isQRVerification, function () { return _this._getConnectResultDisposition(connectAttemptId); }, locator, expectedRaftType)];
                     case 12:
                         newRaft = _a.sent();
                         if (!this._isConnectAttemptActive(connectAttemptId)) {
@@ -670,6 +853,11 @@ var ApplicationManager = /** @class */ (function () {
                     case 16:
                         e_2 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to connect to new robot: ".concat(e_2));
+                        if (isWifiConnection) {
+                            this.toaster.error(i18n.t("connection.wifi_connect_failed", {
+                                defaultValue: "Couldn't connect over Wi-Fi. Check the address, local-network permission, and that the device is online.",
+                            }));
+                        }
                         return [3 /*break*/, 17];
                     case 17:
                         if (this._isConnectAttemptActive(connectAttemptId)) {
@@ -751,6 +939,8 @@ var ApplicationManager = /** @class */ (function () {
                             default:
                                 throw new Error("Unknown RAFT type");
                         }
+                        raft.connectionMethod = method;
+                        raft.connectionLocator = "";
                         this.connectedRafts[raftId] = raft;
                         if ((_c = selectResults.data) === null || _c === void 0 ? void 0 : _c.systemInfo) {
                             raft.systemInfo = selectResults.data.systemInfo;
@@ -782,31 +972,43 @@ var ApplicationManager = /** @class */ (function () {
             });
         });
     };
-    ApplicationManager.prototype.connectToRIC = function (method, uuids, withoutVerification, getResultDisposition) {
+    ApplicationManager.prototype.connectToRIC = function (method, uuids, withoutVerification, getResultDisposition, locator, expectedRaftType) {
         var _a, _b, _c, _d;
         if (getResultDisposition === void 0) { getResultDisposition = function () { return "commit"; }; }
+        if (locator === void 0) { locator = ""; }
         return __awaiter(this, void 0, void 0, function () {
             var wasConnectedObj, raftId, raftType, resultDisposition, raft;
             return __generator(this, function (_e) {
                 switch (_e.label) {
-                    case 0: return [4 /*yield*/, RAFT.connect(method, uuids)];
+                    case 0: return [4 /*yield*/, RAFT.connect(method, uuids, locator, expectedRaftType)];
                     case 1:
                         wasConnectedObj = _e.sent();
-                        if (!wasConnectedObj.success) return [3 /*break*/, 7];
+                        if (!wasConnectedObj.success) return [3 /*break*/, 9];
                         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) {
                             throw new Error("RAFT ID or RAFT Type is missing: ".concat(raftId, " ").concat(raftType));
                         }
-                        resultDisposition = getResultDisposition();
-                        if (!(resultDisposition !== "commit")) return [3 /*break*/, 4];
-                        if (!(resultDisposition === "release")) return [3 /*break*/, 3];
+                        if (!(expectedRaftType && raftType !== expectedRaftType)) return [3 /*break*/, 3];
                         return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_DISCONNECT, { raftId: raftId })];
                     case 2:
                         _e.sent();
-                        _e.label = 3;
-                    case 3: return [2 /*return*/, null];
+                        this.toaster.error(i18n.t("connection.wifi_wrong_robot_type", {
+                            defaultValue: "The address belongs to a {{actualType}}, not a {{expectedType}}.",
+                            actualType: raftType,
+                            expectedType: expectedRaftType,
+                        }));
+                        return [2 /*return*/, null];
+                    case 3:
+                        resultDisposition = getResultDisposition();
+                        if (!(resultDisposition !== "commit")) return [3 /*break*/, 6];
+                        if (!(resultDisposition === "release")) return [3 /*break*/, 5];
+                        return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_DISCONNECT, { raftId: raftId })];
                     case 4:
+                        _e.sent();
+                        _e.label = 5;
+                    case 5: return [2 /*return*/, null];
+                    case 6:
                         raft = void 0;
                         switch (raftType) {
                             case RaftTypeE.MARTY:
@@ -818,29 +1020,41 @@ var ApplicationManager = /** @class */ (function () {
                             default:
                                 throw new Error("Unknown RAFT type");
                         }
+                        raft.connectionMethod = method;
+                        raft.connectionLocator = locator;
                         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
                         publishMissedConnectionEvent(raftId);
-                        if (!!((_d = wasConnectedObj.data) === null || _d === void 0 ? void 0 : _d.systemInfo)) return [3 /*break*/, 6];
+                        if (!!((_d = wasConnectedObj.data) === null || _d === void 0 ? void 0 : _d.systemInfo)) return [3 /*break*/, 8];
                         return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 200); })];
-                    case 5:
+                    case 7:
                         _e.sent();
-                        _e.label = 6;
-                    case 6:
+                        _e.label = 8;
+                    case 8:
                         // 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 7:
+                    case 9:
                         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];
+                        else if (wasConnectedObj.reason === "invalid_raft_type") {
+                            this.toaster.error(i18n.t("connection.wifi_wrong_robot_type_generic", {
+                                defaultValue: "The address belongs to a different kind of device.",
+                            }));
+                        }
+                        else if (method === RaftConnectionMethod.WEB_SOCKET) {
+                            this.toaster.error(i18n.t("connection.wifi_connect_failed", {
+                                defaultValue: "Couldn't connect over Wi-Fi. Check the address, local-network permission, and that the device is online.",
+                            }));
+                        }
+                        _e.label = 10;
+                    case 10: return [2 /*return*/, null];
                 }
             });
         });

package/dist-types/src/application/RAFTs/Cog/Cog.d.ts

@@ -6,9 +6,11 @@ import { SimplifiedCogStateInfo } from "@robotical/roboticaljs/dist/SystemTypeCo
 import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robdobsn/raftjs";
 import { RaftInfoEvents } from "../../../types/events/raft-info";
 import PublishedDataAnalyser from "./PublishedDataAnalyser";
+import { RaftWifiManager } from "../RaftWifiManager";
 export declare class Cog extends RAFT implements RICInterface {
     id: string;
     type: RaftTypeE;
+    wifiManager: RaftWifiManager;
     _ledLcdColours: RICLedLcdColours;
     raftStateInfo: SimplifiedCogStateInfo | null;
     publishedDataAnalyser: PublishedDataAnalyser;

package/dist-types/src/application/RAFTs/Cog/Cog.js

@@ -54,12 +54,15 @@ import { RaftTypeE } from "../../../types/raft";
 import { RaftConnEvent, RaftPublishEvent } from "@robdobsn/raftjs";
 import { RaftInfoEvents } from "../../../types/events/raft-info";
 import PublishedDataAnalyser, { setButtonThresholdsUtil } from "./PublishedDataAnalyser";
+import { RaftWifiManager } from "../RaftWifiManager";
 var Cog = /** @class */ (function (_super) {
     __extends(Cog, _super);
     function Cog(id) {
         var _this = _super.call(this, id) || this;
         _this.id = id;
         _this.type = RaftTypeE.COG;
+        // Wi-Fi provisioning uses the common NetMan API when supported by firmware.
+        _this.wifiManager = new RaftWifiManager(_this, "Cog");
         // Colours to use for LED patterns
         _this._ledLcdColours = [
             { led: "#202000", lcd: "#FFFF00" },

package/dist-types/src/application/RAFTs/Marty/Marty.js

@@ -49,7 +49,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { RaftTypeE } from "../../../types/raft";
+import { RaftConnectionMethod, RaftTypeE } from "../../../types/raft";
 import RAFT from "../RAFT";
 import { RaftConnEvent, RaftPublishEvent } from "@robdobsn/raftjs";
 import { RaftInfoEvents } from "../../../types/events/raft-info";
@@ -74,7 +74,7 @@ var Marty = /** @class */ (function (_super) {
         // Marty System info
         _this.systemInfo = null;
         // Marty wifi manager
-        _this.wifiManager = new MartyWifiManager(_this);
+        _this.wifiManager = new MartyWifiManager(_this, "Raft");
         // Addons Manager
         _this.addonsManager = new MartyAddonsManager(_this);
         // Calibration Manager
@@ -120,7 +120,11 @@ var Marty = /** @class */ (function (_super) {
     */
     Marty.prototype.getRSSI = function () {
         var _a;
-        var newRssi = ((_a = this.raftStateInfo) === null || _a === void 0 ? void 0 : _a.robotStatus.robotStatus.bleRSSI) || -200;
+        var robotStatus = (_a = this.raftStateInfo) === null || _a === void 0 ? void 0 : _a.robotStatus.robotStatus;
+        var transportRssi = this.connectionMethod === RaftConnectionMethod.WEB_SOCKET
+            ? robotStatus === null || robotStatus === void 0 ? void 0 : robotStatus.wifiRSSI
+            : robotStatus === null || robotStatus === void 0 ? void 0 : robotStatus.bleRSSI;
+        var newRssi = transportRssi || -200;
         if (this.rssiValues.length >= this.MAX_RSSI_VALUES_N) {
             this.rssiValues.shift();
         }