@robotical/webapp-types 3.17.52 → 3.18.1

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

@@ -24,6 +24,8 @@ export default class ApplicationManager {
         [key: string]: RAFT;
     };
     private _connectPromise;
+    private _connectAttemptSequence;
+    private _activeConnectAttemptId;
     private _disconnectPromises;
     connectedRaftsContext: ConnectedRaftItem[];
     returnToMainApp: () => void;
@@ -93,6 +95,9 @@ export default class ApplicationManager {
      */
     connectGeneric(afterRaftConnectedCb: (raft: RAFT) => void, uuids?: string[], shouldShowQrModal?: boolean): Promise<void>;
     private _clearConnectPromise;
+    private _dismissConnectAttempt;
+    private _isConnectAttemptActive;
+    private _createConnectingModal;
     private _connectGeneric;
     /**
      * Disconnect from RAFT generic

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

@@ -91,6 +91,8 @@ var ApplicationManager = /** @class */ (function () {
         // Connected RICs
         this.connectedRafts = {};
         this._connectPromise = null;
+        this._connectAttemptSequence = 0;
+        this._activeConnectAttemptId = null;
         this._disconnectPromises = new Map();
         this.connectedRaftsContext = [];
         this.returnToMainApp = function () { };
@@ -519,18 +521,38 @@ var ApplicationManager = /** @class */ (function () {
             }));
             return Promise.resolve();
         }
-        var connectPromise = this._connectGeneric(afterRaftConnectedCb, uuids, shouldShowQrModal);
+        var connectAttemptId = ++this._connectAttemptSequence;
+        this._activeConnectAttemptId = connectAttemptId;
+        var connectPromise = this._connectGeneric(afterRaftConnectedCb, uuids, shouldShowQrModal, connectAttemptId);
         this._connectPromise = connectPromise;
-        void connectPromise.then(function () { return _this._clearConnectPromise(connectPromise); }, function () { return _this._clearConnectPromise(connectPromise); });
+        void connectPromise.then(function () { return _this._clearConnectPromise(connectPromise, connectAttemptId); }, function () { return _this._clearConnectPromise(connectPromise, connectAttemptId); });
         return connectPromise;
     };
-    ApplicationManager.prototype._clearConnectPromise = function (connectPromise) {
+    ApplicationManager.prototype._clearConnectPromise = function (connectPromise, connectAttemptId) {
         if (this._connectPromise === connectPromise) {
             this._connectPromise = null;
         }
+        if (this._activeConnectAttemptId === connectAttemptId) {
+            this._activeConnectAttemptId = null;
+        }
     };
-    ApplicationManager.prototype._connectGeneric = function (afterRaftConnectedCb, uuids, shouldShowQrModal) {
-        if (shouldShowQrModal === void 0) { shouldShowQrModal = true; }
+    ApplicationManager.prototype._dismissConnectAttempt = function (connectAttemptId) {
+        if (this._activeConnectAttemptId !== connectAttemptId) {
+            return;
+        }
+        this._activeConnectAttemptId = null;
+        this._connectPromise = null;
+    };
+    ApplicationManager.prototype._isConnectAttemptActive = function (connectAttemptId) {
+        return this._activeConnectAttemptId === connectAttemptId;
+    };
+    ApplicationManager.prototype._createConnectingModal = function (connectAttemptId) {
+        var _this = this;
+        return createElement(ConnectingLoadingSpinnerModal, {
+            onDismiss: function () { return _this._dismissConnectAttempt(connectAttemptId); },
+        });
+    };
+    ApplicationManager.prototype._connectGeneric = function (afterRaftConnectedCb, uuids, shouldShowQrModal, connectAttemptId) {
         return __awaiter(this, void 0, void 0, function () {
             var verificationMethod, cancelVerificationResult, isQRVerification, e_1, newRaft, wasAdopted, e_2;
             var _this = this;
@@ -559,7 +581,7 @@ var ApplicationManager = /** @class */ (function () {
                             return [2 /*return*/];
                         }
                         if (verificationMethod.action === "switch-to-marty") {
-                            return [2 /*return*/, this._connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID], false)];
+                            return [2 /*return*/, this._connectGeneric(afterRaftConnectedCb, [ConnManager.RICUUID], false, connectAttemptId)];
                         }
                         isQRVerification = false;
                         if (verificationMethod.action === "qr") {
@@ -577,7 +599,7 @@ var ApplicationManager = /** @class */ (function () {
                     case 3:
                         _a.trys.push([3, 8, , 9]);
                         if (!isQRVerification) return [3 /*break*/, 5];
-                        secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), i18n.t("connection.connecting_msg"), false);
+                        secondaryModalState.setModal(this._createConnectingModal(connectAttemptId), i18n.t("connection.connecting_msg"), false);
                         this.ricSelectedCb = null;
                         return [4 /*yield*/, window.applicationManager.startDiscoveryWithoutVerification(uuids, afterRaftConnectedCb)];
                     case 4:
@@ -607,13 +629,16 @@ var ApplicationManager = /** @class */ (function () {
                         return [3 /*break*/, 9];
                     case 9: return [3 /*break*/, 18];
                     case 10:
-                        secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), i18n.t("connection.connecting_msg"), false);
+                        secondaryModalState.setModal(this._createConnectingModal(connectAttemptId), i18n.t("connection.connecting_msg"), false);
                         _a.label = 11;
                     case 11:
                         _a.trys.push([11, 16, , 17]);
                         return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuids, isQRVerification)];
                     case 12:
                         newRaft = _a.sent();
+                        if (!this._isConnectAttemptActive(connectAttemptId)) {
+                            return [2 /*return*/];
+                        }
                         if (!newRaft) return [3 /*break*/, 15];
                         return [4 /*yield*/, this.addConnectedRaftToContext(newRaft)];
                     case 13:
@@ -632,7 +657,9 @@ var ApplicationManager = /** @class */ (function () {
                         Logger.error(SHOW_LOGS, TAG, "Failed to connect to new robot: ".concat(e_2));
                         return [3 /*break*/, 17];
                     case 17:
-                        secondaryModalState.closeModalWithoutAnimation();
+                        if (this._isConnectAttemptActive(connectAttemptId)) {
+                            secondaryModalState.closeModalWithoutAnimation();
+                        }
                         _a.label = 18;
                     case 18: return [2 /*return*/];
                 }

package/dist-types/src/components/disposables/SwitchableCameraScanner/index.d.ts

@@ -0,0 +1,4 @@
+import { type IScannerProps } from "@yudiel/react-qr-scanner";
+type Props = IScannerProps;
+export default function SwitchableCameraScanner({ constraints, ...scannerProps }: Props): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist-types/src/components/disposables/SwitchableCameraScanner/index.js

@@ -0,0 +1,47 @@
+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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { MdCameraswitch } from "react-icons/md";
+import { Scanner } from "@yudiel/react-qr-scanner";
+import isPhoneApp from "../../../utils/phone-app-communication/is-phone-app";
+import styles from "./styles.module.css";
+export default function SwitchableCameraScanner(_a) {
+    var constraints = _a.constraints, scannerProps = __rest(_a, ["constraints"]);
+    var t = useTranslation().t;
+    var _b = useState("environment"), facingMode = _b[0], setFacingMode = _b[1];
+    var cameraConstraints = useMemo(function () { return (__assign(__assign({}, constraints), { 
+        // A plain facingMode is an ideal constraint. Older browsers and devices
+        // with one camera can therefore fall back instead of failing outright.
+        facingMode: facingMode })); }, [constraints, facingMode]);
+    var switchToFrontCamera = facingMode === "environment";
+    var cameraSwitchLabel = switchToFrontCamera
+        ? t("connection.switch_to_front_camera")
+        : t("connection.switch_to_rear_camera");
+    return (_jsxs("div", __assign({ className: styles.container }, { children: [_jsx(Scanner, __assign({}, scannerProps, { constraints: cameraConstraints })), isPhoneApp() && (_jsx("button", __assign({ type: "button", className: styles.cameraSwitchButton, "aria-label": cameraSwitchLabel, title: cameraSwitchLabel, onClick: function () {
+                    return setFacingMode(function (currentFacingMode) {
+                        return currentFacingMode === "environment" ? "user" : "environment";
+                    });
+                } }, { children: _jsx(MdCameraswitch, { className: styles.cameraSwitchIcon, "aria-hidden": "true", focusable: "false" }) })))] })));
+}

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

@@ -1,3 +1,5 @@
-type Props = {};
-export default function ConnectingLoadingSpinnerModal({}: Props): import("react/jsx-runtime").JSX.Element;
+type Props = {
+    onDismiss?: () => void;
+};
+export default function ConnectingLoadingSpinnerModal({ onDismiss }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -9,18 +9,25 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useTranslation } from "react-i18next";
-import { useEffect } from "react";
+import { useCallback, useEffect } from "react";
 import { secondaryModalState } from "../../../state-observables/modal/ModalState";
+import SimpleButton from "../../disposables/buttons/SimpleButton";
 import styles from "./styles.module.css";
 export default function ConnectingLoadingSpinnerModal(_a) {
+    var onDismiss = _a.onDismiss;
     var t = useTranslation().t;
+    var dismissLabel = String(t("connection.dismiss", "Dismiss"));
+    var dismissAriaLabel = String(t("connection.dismiss_connecting_modal", "Dismiss connecting dialog"));
+    var dismiss = useCallback(function () {
+        onDismiss === null || onDismiss === void 0 ? void 0 : onDismiss();
+        secondaryModalState.closeModalWithoutAnimation();
+    }, [onDismiss]);
     useEffect(function () {
         // close modal after 3 minutes assuming no connection will take that long
-        setTimeout(function () {
-            secondaryModalState.closeModalWithoutAnimation();
-        }, 180000);
-    }, []);
-    return (_jsx("div", __assign({ className: styles.container }, { children: t("connection.connecting_loading") })));
+        var timeout = setTimeout(dismiss, 180000);
+        return function () { return clearTimeout(timeout); };
+    }, [dismiss]);
+    return (_jsxs("div", __assign({ className: styles.container }, { children: [_jsx("span", { children: t("connection.connecting_loading") }), _jsx("div", __assign({ className: styles.dismissButton, "data-testid": "connecting-modal-dismiss" }, { children: _jsx(SimpleButton, { ariaLabel: dismissAriaLabel, onClick: dismiss, title: dismissLabel }) }))] })));
 }

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

@@ -54,9 +54,10 @@ import { MdQrCode } from "react-icons/md";
 import { ReactComponent as BluetoothSVG } from "../../../assets/configuration/bluetooth.svg";
 import { MAIN_BLUE } from "../../../styles/colors";
 //@ts-ignore
-import { Scanner, centerText } from '@yudiel/react-qr-scanner';
+import { centerText } from '@yudiel/react-qr-scanner';
 import { ConnManager } from "@robotical/roboticaljs";
 import { useTranslation } from "react-i18next";
+import SwitchableCameraScanner from "../../disposables/SwitchableCameraScanner";
 export default function LEDLightsOrQRVerificationModal(_a) {
     var _this = this;
     var targetRaftType = _a.targetRaftType, _b = _a.allowSwitchToMarty, allowSwitchToMarty = _b === void 0 ? false : _b;
@@ -134,7 +135,7 @@ function QRContent(_a) {
         });
     }); };
     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(Scanner, { styles: { container: { transform: isWebapp ? 'scaleX(-1)' : 'none' } }, onError: function (err) { return console.error(err); }, formats: [
+    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: function (err) { return console.error(err); }, formats: [
                     "qr_code",
                     "micro_qr_code",
                     "rm_qr_code",

package/dist-types/src/i18n.js

@@ -249,6 +249,8 @@ var resources = {
                 "qr_subtitle": "Scan a QR code to verify.",
                 "qr_title": "QR Code Verification",
                 "scan_again": "SCAN AGAIN",
+                "switch_to_front_camera": "Switch to front camera",
+                "switch_to_rear_camera": "Switch to rear camera",
                 "verification_method": "Verification Method",
                 "yes": "Yes"
             },

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

@@ -54,22 +54,24 @@ var ConnectorFactory = /** @class */ (function () {
      */
     ConnectorFactory.connectToRaftHelper = function (method, uuids, onConnManagerCreated) {
         return __awaiter(this, void 0, void 0, function () {
-            var connManager, connectorWasCreated, wasConnected, systemInfo, raftType, connector, error_1;
+            var connManager, connectorWasCreated, lowLevelConnectionSucceeded, connectionResult, systemInfo, raftType, connector, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         connManager = new ConnManager();
                         connectorWasCreated = false;
+                        lowLevelConnectionSucceeded = false;
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, , 3, 8]);
                         onConnManagerCreated === null || onConnManagerCreated === void 0 ? void 0 : onConnManagerCreated(connManager);
                         Logger.info(SHOW_LOGS, TAG, "Connecting to RAFT with method: ".concat(method));
-                        return [4 /*yield*/, connManager.connect(method, "", uuids)];
+                        return [4 /*yield*/, connManager.connectDetailed(method, "", uuids)];
                     case 2:
-                        wasConnected = _a.sent();
-                        Logger.info(SHOW_LOGS, TAG, "Was connected to RAFT: ".concat(wasConnected));
-                        if (!wasConnected) {
+                        connectionResult = _a.sent();
+                        lowLevelConnectionSucceeded = connectionResult.status === "success";
+                        Logger.info(SHOW_LOGS, TAG, "Connection result: ".concat(connectionResult.status));
+                        if (!lowLevelConnectionSucceeded) {
                             return [2 /*return*/, null];
                         }
                         systemInfo = connManager.getConnector().getRaftSystemUtils().getCachedSystemInfo();
@@ -79,7 +81,15 @@ var ConnectorFactory = /** @class */ (function () {
                         return [2 /*return*/, connector];
                     case 3:
                         if (!!connectorWasCreated) return [3 /*break*/, 7];
-                        _a.label = 4;
+                        if (!!lowLevelConnectionSucceeded) return [3 /*break*/, 4];
+                        // Before connectDetailed reports success there is no established
+                        // RAFT session to notify. Use immediate transport teardown for
+                        // chooser cancellation, generic failure, and thrown cancellation.
+                        // The graceful path sends `bledisconnect` retries and can otherwise
+                        // keep the UI pending for several seconds for a connection that
+                        // never existed.
+                        connManager.disconnectForPageUnload();
+                        return [3 /*break*/, 7];
                     case 4:
                         _a.trys.push([4, 6, , 7]);
                         return [4 /*yield*/, connManager.disconnect()];

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

@@ -133,12 +133,16 @@ var MartyConnector = /** @class */ (function (_super) {
      */
     MartyConnector.prototype.disconnect = function () {
         return __awaiter(this, void 0, void 0, function () {
+            var raftChannel;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, _super.prototype.disconnect.call(this)];
-                    case 1: 
-                    // this.sendRestMessage('blerestart');
-                    return [2 /*return*/, _a.sent()];
+                    case 0:
+                        raftChannel = this.connManager.getConnector().getRaftChannel();
+                        if (raftChannel) {
+                            raftChannel.ricRestCmdBeforeDisconnect = function () { return null; };
+                        }
+                        return [4 /*yield*/, _super.prototype.disconnect.call(this)];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });

package/package.json

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