@robotical/webapp-types 3.7.6 → 3.7.7

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

@@ -155,49 +155,55 @@ var ApplicationManager = /** @class */ (function () {
                                 uuids = [ConnManager.COGUUID, ConnManager.RICUUID];
                             }
                         }
-                        if (!isPhoneApp()) return [3 /*break*/, 9];
+                        if (!isPhoneApp()) return [3 /*break*/, 10];
                         _a.label = 2;
                     case 2:
-                        _a.trys.push([2, 7, , 8]);
-                        if (!isQRVerification) return [3 /*break*/, 4];
+                        _a.trys.push([2, 8, , 9]);
+                        if (!isQRVerification) return [3 /*break*/, 5];
+                        secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), "Connecting...", false);
+                        this.ricSelectedCb = null;
                         return [4 /*yield*/, window.applicationManager.startDiscoveryWithoutVerification(uuids, afterRaftConnectedCb)];
                     case 3:
                         _a.sent();
-                        return [3 /*break*/, 6];
-                    case 4: return [4 /*yield*/, window.applicationManager.startDiscovery(function (newRaft) {
+                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 1000); })];
+                    case 4:
+                        _a.sent(); // make sure the device has shown up in the connection area
+                        secondaryModalState.closeModal();
+                        return [3 /*break*/, 7];
+                    case 5: return [4 /*yield*/, window.applicationManager.startDiscovery(function (newRaft) {
                             _this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                             afterRaftConnectedCb(newRaft);
                         }, uuids)];
-                    case 5:
+                    case 6:
                         _a.sent();
-                        _a.label = 6;
-                    case 6: return [3 /*break*/, 8];
-                    case 7:
+                        _a.label = 7;
+                    case 7: return [3 /*break*/, 9];
+                    case 8:
                         e_1 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to start discovery: ".concat(e_1));
-                        return [3 /*break*/, 8];
-                    case 8: return [3 /*break*/, 14];
-                    case 9:
-                        secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), "Connecting...", false);
-                        _a.label = 10;
+                        return [3 /*break*/, 9];
+                    case 9: return [3 /*break*/, 15];
                     case 10:
-                        _a.trys.push([10, 12, , 13]);
-                        return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuids, isQRVerification)];
+                        secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), "Connecting...", false);
+                        _a.label = 11;
                     case 11:
+                        _a.trys.push([11, 13, , 14]);
+                        return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuids, isQRVerification)];
+                    case 12:
                         newRaft = _a.sent();
                         if (newRaft) {
                             this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                             afterRaftConnectedCb(newRaft);
                         }
-                        return [3 /*break*/, 13];
-                    case 12:
+                        return [3 /*break*/, 14];
+                    case 13:
                         e_2 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to connect to new robot: ".concat(e_2));
-                        return [3 /*break*/, 13];
-                    case 13:
+                        return [3 /*break*/, 14];
+                    case 14:
                         secondaryModalState.closeModal();
-                        _a.label = 14;
-                    case 14: return [2 /*return*/];
+                        _a.label = 15;
+                    case 15: return [2 /*return*/];
                 }
             });
         });
@@ -381,26 +387,11 @@ var ApplicationManager = /** @class */ (function () {
      */
     ApplicationManager.prototype.startDiscovery = function (ricSelectedCb, uuids) {
         return __awaiter(this, void 0, void 0, function () {
-            var foundRICs, wasDiscoveryStarted;
+            var wasDiscoveryStarted;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.ricSelectedCb = ricSelectedCb;
-                        foundRICs = [];
-                        raftFoundSubscriptionHelper().subscribe(function (_a) {
-                            var discoveredDevice = _a.discoveredDevice;
-                            // if the discovered RAFT is already in the list, don't add it, just update the rssi
-                            var foundRICIdx = foundRICs.findIndex(function (ric_) { return ric_._id === discoveredDevice._id; });
-                            if (foundRICIdx !== -1) {
-                                foundRICs[foundRICIdx] = discoveredDevice;
-                            }
-                            else {
-                                foundRICs.push(discoveredDevice);
-                            }
-                            // foundRICs.sort((a, b) => b._rssi - a._rssi);
-                            modalState.setModal(createElement(VerificationModalPhoneApp, { foundRICs: foundRICs }), "Looking for RAFT");
-                        });
-                        modalState.setModal(createElement(VerificationModalPhoneApp, { foundRICs: [] }), "Looking for RAFT");
                         return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_START_DISCOVERY, { uuids: uuids })];
                     case 1:
                         wasDiscoveryStarted = _a.sent();
@@ -435,10 +426,11 @@ var ApplicationManager = /** @class */ (function () {
                                 return __generator(this, function (_b) {
                                     switch (_b.label) {
                                         case 0:
-                                            // connect to the first device found, block the rest
+                                            // connect to the first device found if it has the correct service UUID
                                             if (foundRICs.length > 0) {
                                                 return [2 /*return*/];
                                             }
+                                            if (!discoveredDevice._serviceUUIDs.includes(uuids[0])) return [3 /*break*/, 2];
                                             foundRICs.push(discoveredDevice);
                                             return [4 /*yield*/, this.selectRaft(discoveredDevice, RaftConnectionMethod.PHONE_BLE)];
                                         case 1:
@@ -446,11 +438,13 @@ var ApplicationManager = /** @class */ (function () {
                                             if (newRaft) {
                                                 this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                                                 afterRaftConnectedCb(newRaft);
+                                                raftFoundSubscriptionHelper().unsubscribe();
                                             }
                                             else {
                                                 foundRICs = [];
                                             }
-                                            return [2 /*return*/];
+                                            _b.label = 2;
+                                        case 2: return [2 /*return*/];
                                     }
                                 });
                             });

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

@@ -70,7 +70,7 @@ var options = [
 ];
 export default function LEDLightsOrQRVerificationModal() {
     var _this = this;
-    var _a = useState(true), qrSelected = _a[0], setQRSelected = _a[1];
+    var _a = useState(false), qrSelected = _a[0], setQRSelected = _a[1];
     var _b = useState(undefined), serialNoFromQR = _b[0], setSerialNoFromQR = _b[1];
     var _c = useState(false), isButtonToConnectVisible = _c[0], setIsButtonToConnectVisible = _c[1];
     useEffect(function () {
@@ -78,8 +78,8 @@ export default function LEDLightsOrQRVerificationModal() {
             // 00000000202502200000000000000239
             console.log("serialNoFromQR", serialNoFromQR);
             console.log("ConnManager.generateServiceFilterUUID(serialNoFromQR)", ConnManager.generateServiceFilterUUID(serialNoFromQR));
-            // modalState.closeModal([ConnManager.generateServiceFilterUUID(serialNoFromQR)]);
-            // modalState.closeModal([ConnManager.generateServiceFilterUUID('00000000202302111d28b4dc5f0d46d5')]);
+            // modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID(serialNoFromQR)]);
+            // modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID('00000000202302111d28b4dc5f0d46d5')]);
             setIsButtonToConnectVisible(true);
             setQRSelected(false);
         }
@@ -88,15 +88,17 @@ export default function LEDLightsOrQRVerificationModal() {
         if (id === 'qr') {
             setSerialNoFromQR(undefined);
             setQRSelected(function (prev) { return !prev; });
+            // modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID('00000000202502200000000000000239')]);
         }
         else {
-            modalState.closeModal([]);
+            console.log("LED Lights Verification");
+            modalState.closeModalWithoutAnimation([]);
         }
     };
     var handleConnect = function () { return __awaiter(_this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             if (serialNoFromQR) {
-                modalState.closeModal([ConnManager.generateServiceFilterUUID(serialNoFromQR)]);
+                modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID(serialNoFromQR)]);
             }
             return [2 /*return*/];
         });
@@ -124,7 +126,7 @@ function QRContent(_a) {
             return [2 /*return*/];
         });
     }); };
-    return (_jsx("div", __assign({ className: styles.QRcontainer }, { children: _jsx("div", __assign({ className: styles.QRscannerContainer }, { children: _jsx(Scanner, { formats: [
+    return (_jsx("div", __assign({ className: styles.QRcontainer }, { children: _jsx("div", __assign({ className: styles.QRscannerContainer }, { children: _jsx(Scanner, { onError: function (err) { return console.error(err); }, formats: [
                     "qr_code",
                     "micro_qr_code",
                     "rm_qr_code",

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

@@ -45,6 +45,15 @@ 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 };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment, useEffect, useState } from "react";
 import "./styles.css";
@@ -56,7 +65,7 @@ import RICSignal from "../../oneoffs/RaftSignal";
 import SimpleButton from "../../disposables/buttons/SimpleButton";
 import LEDs from "../../oneoffs/LEDs";
 import SVGImageButton from "../../disposables/buttons/SVGImageButton";
-import { raftConnectingSubscriptionHelper, raftDiscoveryFinishedSubscriptionHelper, raftDiscoveryStartedSubscriptionHelper } from "../../../application/RAFTs/raft-subscription-helpers";
+import { raftConnectingSubscriptionHelper, raftDiscoveryFinishedSubscriptionHelper, raftDiscoveryStartedSubscriptionHelper, raftFoundSubscriptionHelper } from "../../../application/RAFTs/raft-subscription-helpers";
 import isPhoneApp from "../../../utils/phone-app-communication/is-phone-app";
 import LoadingSpinner from "../../disposables/LoadingSpinner";
 import { RaftConnectionMethod } from "../../../types/raft";
@@ -68,10 +77,11 @@ function VerificationModalPhoneApp(_a) {
     var _this = this;
     var foundRICs = _a.foundRICs;
     var _b = useState([]), randomColours = _b[0], setRandomColours = _b[1];
-    var _c = useState(-1), selectedRICIdx = _c[0], setSelectedRICIdx = _c[1];
-    var _d = useState(false), isLoading = _d[0], setIsLoading = _d[1];
-    var _e = useState(isPhoneApp()), isScanning = _e[0], setIsScanning = _e[1];
-    var _f = useState(), connectedRaft = _f[0], setConnectedRaft = _f[1];
+    var _c = useState(foundRICs), foundRICsState = _c[0], setFoundRICsState = _c[1];
+    var _d = useState(-1), selectedRICIdx = _d[0], setSelectedRICIdx = _d[1];
+    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); });
@@ -81,6 +91,21 @@ function VerificationModalPhoneApp(_a) {
             raftDiscoveryStartedSubscriptionHelper().unsubscribe();
         };
     }, []);
+    useEffect(function () {
+        raftFoundSubscriptionHelper().subscribe(function (_a) {
+            var discoveredDevice = _a.discoveredDevice;
+            setFoundRICsState(function (prevState) {
+                var foundRICIdx = prevState.findIndex(function (ric_) { return ric_._id === discoveredDevice._id; });
+                if (foundRICIdx !== -1) {
+                    prevState[foundRICIdx] = discoveredDevice;
+                    return __spreadArray([], prevState, true);
+                }
+                else {
+                    return __spreadArray(__spreadArray([], prevState, true), [discoveredDevice], false);
+                }
+            });
+        });
+    }, []);
     var onCancel = function () { return __awaiter(_this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -99,6 +124,7 @@ function VerificationModalPhoneApp(_a) {
                     _a.sent();
                     _a.label = 5;
                 case 5:
+                    raftFoundSubscriptionHelper().unsubscribe();
                     modalState.closeModal();
                     return [2 /*return*/];
             }
@@ -108,6 +134,7 @@ function VerificationModalPhoneApp(_a) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    modalState.closeModalWithoutAnimation();
                     if (!connectedRaft) return [3 /*break*/, 3];
                     return [4 /*yield*/, window.applicationManager.stopVerifyingRaft(connectedRaft.id, false)];
                 case 1:
@@ -144,7 +171,7 @@ function VerificationModalPhoneApp(_a) {
         if (!connectedRaft)
             return;
         raftConnectingSubscriptionHelper(connectedRaft).subscribe(setRandomColours);
-        connectedRaft === null || connectedRaft === void 0 ? void 0 : connectedRaft.verifyRaftPhoneApp(foundRICs[selectedRICIdx]);
+        connectedRaft === null || connectedRaft === void 0 ? void 0 : connectedRaft.verifyRaftPhoneApp(foundRICsState[selectedRICIdx]);
         return function () {
             raftConnectingSubscriptionHelper(connectedRaft).unsubscribe();
         };
@@ -166,8 +193,9 @@ function VerificationModalPhoneApp(_a) {
                     _a.label = 3;
                 case 3:
                     setSelectedRICIdx(raftIdx);
-                    if (!foundRICs) return [3 /*break*/, 5];
-                    foundRaft = foundRICs[raftIdx];
+                    raftFoundSubscriptionHelper().unsubscribe();
+                    if (!foundRICsState) return [3 /*break*/, 5];
+                    foundRaft = foundRICsState[raftIdx];
                     return [4 /*yield*/, window.applicationManager.selectRaft(foundRaft, RaftConnectionMethod.PHONE_BLE)];
                 case 4:
                     newRaft = _a.sent();
@@ -182,11 +210,11 @@ function VerificationModalPhoneApp(_a) {
         });
     }); };
     var contentJSX = null;
-    if (foundRICs.length === 0) {
+    if (foundRICsState.length === 0) {
         contentJSX = _jsxs("div", __assign({ className: "verification-modal-container" }, { children: [!isScanning && _jsx("p", __assign({ style: { alignSelf: 'center' } }, { children: "No Robots Found" })), _jsx("div", __assign({ className: "verification-modal-martys-container" }, { children: isScanning && _jsxs("div", __assign({ style: { margin: "auto", width: "50px", height: "50px" } }, { children: [" ", _jsx(LoadingSpinner, {}), " "] })) })), _jsxs("div", __assign({ className: "verification-modal-bottom-btns-container" }, { children: [_jsx(SVGImageButton, { onClick: onScanAgain, title: "SCAN AGAIN", SVGImage: RefreshSVG, backgroundColour: MAIN_BLUE, titleColour: WHITE, SVGColour: WHITE }), _jsx("div", { className: "dummy-gap" }), _jsx(SimpleButton, { onClick: onCancel, title: "CANCEL" })] }))] }));
     }
     else {
-        contentJSX = _jsxs("div", __assign({ className: "verification-modal-container" }, { children: [_jsxs("div", __assign({ className: "verification-modal-martys-container" }, { children: [isScanning && _jsxs("div", __assign({ style: { margin: "auto", width: "50px", height: "50px" } }, { children: [" ", _jsx(LoadingSpinner, {}), " "] })), foundRICs.map(function (raftObj, raftIdx) {
+        contentJSX = _jsxs("div", __assign({ className: "verification-modal-container" }, { children: [_jsxs("div", __assign({ className: "verification-modal-martys-container" }, { children: [isScanning && _jsxs("div", __assign({ style: { margin: "auto", width: "50px", height: "50px" } }, { children: [" ", _jsx(LoadingSpinner, {}), " "] })), foundRICsState.map(function (raftObj, raftIdx) {
                             return _jsxs(Fragment, { children: [_jsxs("div", __assign({ className: "verification-modal-marty-name-row-container", onClick: function () { return onSelectRaft(raftIdx); } }, { children: [_jsx("p", __assign({ className: "verification-modal-marty-name" }, { children: raftObj._localName })), _jsx("div", __assign({ className: "verification-modal-marty-signal-container" }, { children: _jsx(RICSignal, { signalStrength: raftObj._rssi }) })), _jsx(BluetoothSVG, { fill: MAIN_BLUE })] })), selectedRICIdx === raftIdx && _jsxs("div", { children: [_jsx("p", __assign({ className: "verification-modal-martys-back-hint" }, { children: isLoading ? "Loading..." : "Look on ".concat(connectedRaft === null || connectedRaft === void 0 ? void 0 : connectedRaft.type, "'s back, is it displaying these lights?") })), _jsxs("div", __assign({ className: "verification-modal-led-row-container" }, { children: [_jsx(LEDs, { coloursArr: randomColours, connectedRaft: connectedRaft }), !isLoading && _jsx(SimpleButton, { onClick: onCancel, title: "No", borderColour: "red", colour: "white", textColour: "red" }), !isLoading && _jsx(SimpleButton, { onClick: onYes, title: "YES" })] }))] })] }, raftIdx);
                         })] })), _jsxs("div", __assign({ className: "verification-modal-bottom-btns-container" }, { children: [_jsx(SVGImageButton, { onClick: onScanAgain, title: "SCAN AGAIN", SVGImage: RefreshSVG, backgroundColour: MAIN_BLUE, titleColour: WHITE, SVGColour: WHITE, disabled: isScanning }), _jsx("div", { className: "dummy-gap" }), _jsx(SimpleButton, { onClick: onCancel, title: "CANCEL" })] }))] }));
     }

package/dist-types/src/state-observables/modal/ModalObserver.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from "react";
 export type ModalContentType = ReactNode;
-export type ModalEventTopics = "SetModal" | "CloseModal" | "UpdateModalProps";
+export type ModalEventTopics = "SetModal" | "CloseModal" | "CloseModalWithoutAnimation" | "UpdateModalProps";
 export type ModalStateData = {
     modalContent?: ModalContentType;
     modalTitle?: string;

package/dist-types/src/state-observables/modal/ModalState.d.ts

@@ -10,6 +10,7 @@ declare class ModalState implements ModalObservable {
     constructor();
     setModal(modalContent: ModalContentType, modalTitle: string, withLogo?: boolean): Promise<ModalReturnValue>;
     closeModal(modalReturnValue?: ModalReturnValue, onCloseCb?: () => void): void;
+    closeModalWithoutAnimation(modalReturnValue?: ModalReturnValue, onCloseCb?: () => void): void;
     updateModalProps(updatedProps: {
         modalTitle?: string;
         withCloseButton?: boolean;

package/dist-types/src/state-observables/modal/ModalState.js

@@ -25,6 +25,14 @@ var ModalState = /** @class */ (function () {
         this.clearPromise();
         onCloseCb && onCloseCb();
     };
+    ModalState.prototype.closeModalWithoutAnimation = function (modalReturnValue, onCloseCb) {
+        this.modalContent = null;
+        this.modalTitle = "";
+        this.publish("CloseModalWithoutAnimation");
+        this._modalResolve(modalReturnValue);
+        this.clearPromise();
+        onCloseCb && onCloseCb();
+    };
     ModalState.prototype.updateModalProps = function (updatedProps) {
         this.modalTitle = updatedProps.modalTitle || this.modalTitle;
         this.publish("UpdateModalProps", updatedProps);

package/package.json

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