@robotical/webapp-types 3.17.51 → 3.18.1

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",
@@ -156,8 +157,7 @@ function QRContent(_a) {
                     "linear_codes",
                     "upc_a",
                     "upc_e",
-                ], allowMultiple: false, scanDelay: 2000, onScan: onQrCodeFound, components: {
-                    audio: true,
+                ], allowMultiple: false, scanDelay: 2000, sound: true, onScan: onQrCodeFound, components: {
                     onOff: false,
                     torch: true,
                     zoom: true,

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

@@ -55,17 +55,13 @@ import RICSignal from "../../oneoffs/RaftSignal";
 import SimpleButton from "../../disposables/buttons/SimpleButton";
 import LEDs from "../../oneoffs/LEDs";
 import { raftConnectingSubscriptionHelper } from "../../../application/RAFTs/raft-subscription-helpers";
-import { useConnectedRafts } from "../../../store/SelectedRaftContext";
 import { useTranslation } from "react-i18next";
-var SHOW_LOGS = true;
-var TAG = "VerificationModal";
 function VerificationModal(_a) {
     var _this = this;
     var connectedRAFT_ = _a.connectedRAFT_;
     var _b = useState([]), randomColours = _b[0], setRandomColours = _b[1];
     // const [connectedRaft, setConnectedRaft] = useState<RAFT | undefined>(connectedRAFT_);
     var _c = useState(-200), RSSI = _c[0], setRSSI = _c[1];
-    var removeConnectedRaft = useConnectedRafts().removeConnectedRaft;
     var t = useTranslation().t;
     useEffect(function () {
         /* Subscribe to the connectedRaft's SIGNAL strength */
@@ -84,12 +80,8 @@ function VerificationModal(_a) {
                     modalState.closeModal();
                     if (!connectedRAFT_)
                         return [2 /*return*/];
-                    removeConnectedRaft(connectedRAFT_.id);
                     return [4 /*yield*/, window.applicationManager.stopVerifyingRaft(connectedRAFT_.id, false)];
                 case 1:
-                    _a.sent();
-                    return [4 /*yield*/, connectedRAFT_.disconnect()];
-                case 2:
                     _a.sent();
                     return [2 /*return*/];
             }

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

@@ -69,11 +69,8 @@ import { raftConnectingSubscriptionHelper, raftDiscoveryFinishedSubscriptionHelp
 import isPhoneApp from "../../../utils/phone-app-communication/is-phone-app";
 import LoadingSpinner from "../../disposables/LoadingSpinner";
 import { RaftConnectionMethod } from "../../../types/raft";
-import { useConnectedRafts } from "../../../store/SelectedRaftContext";
 import { ConnManager } from "@robotical/roboticaljs";
 import { useTranslation } from "react-i18next";
-var SHOW_LOGS = true;
-var TAG = "VerificationModalPhone";
 function VerificationModalPhoneApp(_a) {
     var _this = this;
     var foundRICs = _a.foundRICs;
@@ -84,7 +81,6 @@ function VerificationModalPhoneApp(_a) {
     var _e = useState(false), isLoading = _e[0], setIsLoading = _e[1];
     var _f = useState(isPhoneApp()), isScanning = _f[0], setIsScanning = _f[1];
     var _g = useState(), connectedRaft = _g[0], setConnectedRaft = _g[1];
-    var removeConnectedRaft = useConnectedRafts().removeConnectedRaft;
     useEffect(function () {
         raftDiscoveryFinishedSubscriptionHelper().subscribe(function () { return setIsScanning(false); });
         raftDiscoveryStartedSubscriptionHelper().subscribe(function () { return setIsScanning(true); });
@@ -112,20 +108,16 @@ function VerificationModalPhoneApp(_a) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!connectedRaft) return [3 /*break*/, 3];
+                    if (!connectedRaft) return [3 /*break*/, 2];
                     return [4 /*yield*/, window.applicationManager.stopVerifyingRaft(connectedRaft.id, false)];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, window.applicationManager.disconnectFromRaft(connectedRaft.id)];
-                case 2:
+                    return [3 /*break*/, 4];
+                case 2: return [4 /*yield*/, window.applicationManager.stopDiscovery()];
+                case 3:
                     _a.sent();
-                    removeConnectedRaft(connectedRaft.id);
-                    return [3 /*break*/, 5];
-                case 3: return [4 /*yield*/, window.applicationManager.stopDiscovery()];
+                    _a.label = 4;
                 case 4:
-                    _a.sent();
-                    _a.label = 5;
-                case 5:
                     raftFoundSubscriptionHelper().unsubscribe();
                     modalState.closeModal();
                     return [2 /*return*/];
@@ -137,23 +129,20 @@ function VerificationModalPhoneApp(_a) {
             switch (_a.label) {
                 case 0:
                     modalState.closeModalWithoutAnimation();
-                    if (!connectedRaft) return [3 /*break*/, 3];
+                    if (!connectedRaft) return [3 /*break*/, 2];
                     return [4 /*yield*/, window.applicationManager.stopVerifyingRaft(connectedRaft.id, false)];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, window.applicationManager.disconnectFromRaft(connectedRaft.id)];
+                    _a.label = 2;
                 case 2:
-                    _a.sent();
-                    _a.label = 3;
-                case 3:
                     setSelectedRICIdx(-1);
                     setConnectedRaft(undefined);
-                    if (!window.applicationManager.ricSelectedCb) return [3 /*break*/, 5];
+                    if (!window.applicationManager.ricSelectedCb) return [3 /*break*/, 4];
                     return [4 /*yield*/, window.applicationManager.startDiscovery(window.applicationManager.ricSelectedCb, window.applicationManager.lastUUIDsUsed ? window.applicationManager.lastUUIDsUsed : [ConnManager.COGUUID, ConnManager.RICUUID])];
-                case 4:
+                case 3:
                     _a.sent();
-                    _a.label = 5;
-                case 5: return [2 /*return*/];
+                    _a.label = 4;
+                case 4: return [2 /*return*/];
             }
         });
     }); };
@@ -186,28 +175,24 @@ function VerificationModalPhoneApp(_a) {
             switch (_a.label) {
                 case 0:
                     setIsLoading(true);
-                    if (!connectedRaft) return [3 /*break*/, 3];
+                    if (!connectedRaft) return [3 /*break*/, 2];
                     return [4 /*yield*/, window.applicationManager.stopVerifyingRaft(connectedRaft.id, false)];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, window.applicationManager.disconnectFromRaft(connectedRaft.id)];
+                    _a.label = 2;
                 case 2:
-                    _a.sent();
-                    removeConnectedRaft(connectedRaft.id);
-                    _a.label = 3;
-                case 3:
                     setSelectedRICIdx(raftIdx);
                     raftFoundSubscriptionHelper().unsubscribe();
-                    if (!foundRICsState) return [3 /*break*/, 5];
+                    if (!foundRICsState) return [3 /*break*/, 4];
                     foundRaft = foundRICsState[raftIdx];
                     return [4 /*yield*/, window.applicationManager.selectRaft(foundRaft, RaftConnectionMethod.PHONE_BLE)];
-                case 4:
+                case 3:
                     newRaft = _a.sent();
                     if (!newRaft)
                         return [2 /*return*/];
                     setConnectedRaft(newRaft);
-                    _a.label = 5;
-                case 5:
+                    _a.label = 4;
+                case 4:
                     setIsLoading(false);
                     return [2 /*return*/];
             }

package/dist-types/src/components/oneoffs/LEDs/index.js

@@ -10,7 +10,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { RaftUtils } from "@robotical/raftjs";
+import { RaftUtils } from "@robdobsn/raftjs";
 import "./styles.css";
 import { RaftTypeE } from "../../../types/raft";
 export default function LEDs(_a) {

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/types/raft.d.ts

@@ -1,4 +1,4 @@
-import type { RaftSystemInfo } from "@robotical/raftjs";
+import type { RaftSystemInfo } from "@robdobsn/raftjs";
 export declare enum RaftConnectionMethod {
     WEB_SOCKET = "WebSocket",
     WEB_BLE = "WebBLE",

package/dist-types/src/utils/helpers/wifi-configuration-subtitle-gen.d.ts

@@ -1,4 +1,4 @@
 import RAFT from "../../application/RAFTs/RAFT";
-import { RaftWifiConnStatus } from "@robotical/raftjs";
+import { RaftWifiConnStatus } from "@robdobsn/raftjs";
 export declare const FW_VERSION_RSSI_WIFI = "1.2.0";
 export default function wifiConfigSub(raft: RAFT | undefined, cachedStatus: RaftWifiConnStatus | undefined): string | undefined;

package/dist-types/src/utils/helpers/wifi-configuration-subtitle-gen.js

@@ -1,5 +1,5 @@
 import isVersionGreater from "./compare-version";
-import { RaftWifiConnState } from "@robotical/raftjs";
+import { RaftWifiConnState } from "@robdobsn/raftjs";
 export var FW_VERSION_RSSI_WIFI = "1.2.0"; // greater versions than this (1.1.17) have the wifi rssi logic
 export default function wifiConfigSub(raft, cachedStatus) {
     if (!raft) {

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

@@ -2,12 +2,16 @@ import { RaftInfoEvents } from "../types/events/raft-info";
 import type { RestMessageOptions } from "../types/communication-between-apps/wrapper-communication";
 import { ConnectionAttemptResults, RaftConnectionMethod } from "../types/raft";
 import Connector from "./connectors/Connector";
-import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robdobsn/raftjs";
 import { RICLedLcdColours } from "@robotical/roboticaljs";
 import { CustomBluetoothItem, UserDeviceInfo } from "../types/userDeviceInfo";
 import { ColourSensorCalibrationStage } from "../types/colour-sensor-calibration";
 export declare class WrapperAppManager {
     private connectors;
+    private _connectPromise;
+    private _disconnectOperations;
+    private _pendingConnManagers;
+    private _pageUnloadStarted;
     private _observers;
     constructor();
     /**
@@ -23,6 +27,7 @@ export declare class WrapperAppManager {
     *
     */
     connect(method: RaftConnectionMethod, uuids: string[]): Promise<ConnectionAttemptResults>;
+    private _connect;
     /**
      * Gets user's device info
      */
@@ -66,6 +71,13 @@ export declare class WrapperAppManager {
      * Disconnect from a RAFT
      */
     disconnect(raftId: string): Promise<boolean>;
+    /**
+     * Best-effort terminal cleanup. Page lifecycle events cannot reliably await
+     * async Bluetooth work, so each connector forwards to RaftJS synchronously.
+     */
+    disconnectAllForPageUnload(): void;
+    private _disconnectConnManagerForPageUnload;
+    isConnected(raftId: string): boolean;
     /**
      * Audio streaming
      */
@@ -78,12 +90,9 @@ export declare class WrapperAppManager {
     /**
      * Send a REST message to the RAFT
      */
-    sendRestMessage(msg: string, params: object | undefined, raftId: string, options?: RestMessageOptions): Promise<import("@robotical/raftjs").RaftOKFail>;
-    /**
-     * Removes marty after a certain time
-     * Removes from the martys list after x seconds so that we can still get the last event
-     */
-    _removeRICConnector(connectorId: string, timeout: number): void;
+    sendRestMessage(msg: string, params: object | undefined, raftId: string, options?: RestMessageOptions): Promise<import("@robdobsn/raftjs").RaftOKFail>;
+    private _removeConnectorIfCurrent;
+    private _handleDisconnectedEvent;
     /**
      * Warranty Service bluetooth scan for device
      * It scans for a device and gets the device object