@robotical/webapp-types 3.7.33 → 3.7.35

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

@@ -397,55 +397,51 @@ var ApplicationManager = /** @class */ (function () {
                                 uuids = [ConnManager.COGUUID, ConnManager.RICUUID];
                             }
                         }
-                        if (!isPhoneApp()) return [3 /*break*/, 10];
+                        if (!isPhoneApp()) return [3 /*break*/, 9];
                         _a.label = 2;
                     case 2:
-                        _a.trys.push([2, 8, , 9]);
-                        if (!isQRVerification) return [3 /*break*/, 5];
+                        _a.trys.push([2, 7, , 8]);
+                        if (!isQRVerification) return [3 /*break*/, 4];
                         secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), "Connecting...", false);
                         this.ricSelectedCb = null;
                         return [4 /*yield*/, window.applicationManager.startDiscoveryWithoutVerification(uuids, afterRaftConnectedCb)];
                     case 3:
                         _a.sent();
-                        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) {
+                        return [3 /*break*/, 6];
+                    case 4: 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 6:
+                    case 5:
                         _a.sent();
-                        _a.label = 7;
-                    case 7: return [3 /*break*/, 9];
-                    case 8:
+                        _a.label = 6;
+                    case 6: return [3 /*break*/, 8];
+                    case 7:
                         e_1 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to start discovery: ".concat(e_1));
-                        return [3 /*break*/, 9];
-                    case 9: return [3 /*break*/, 15];
-                    case 10:
+                        return [3 /*break*/, 8];
+                    case 8: return [3 /*break*/, 14];
+                    case 9:
                         secondaryModalState.setModal(createElement(ConnectingLoadingSpinnerModal, {}), "Connecting...", false);
-                        _a.label = 11;
-                    case 11:
-                        _a.trys.push([11, 13, , 14]);
+                        _a.label = 10;
+                    case 10:
+                        _a.trys.push([10, 12, , 13]);
                         return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuids, isQRVerification)];
-                    case 12:
+                    case 11:
                         newRaft = _a.sent();
                         if (newRaft) {
                             this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                             afterRaftConnectedCb(newRaft);
                         }
-                        return [3 /*break*/, 14];
-                    case 13:
+                        return [3 /*break*/, 13];
+                    case 12:
                         e_2 = _a.sent();
                         Logger.error(SHOW_LOGS, TAG, "Failed to connect to new robot: ".concat(e_2));
-                        return [3 /*break*/, 14];
-                    case 14:
+                        return [3 /*break*/, 13];
+                    case 13:
                         secondaryModalState.closeModal();
-                        _a.label = 15;
-                    case 15: return [2 /*return*/];
+                        _a.label = 14;
+                    case 14: return [2 /*return*/];
                 }
             });
         });
@@ -660,12 +656,21 @@ var ApplicationManager = /** @class */ (function () {
      */
     ApplicationManager.prototype.startDiscoveryWithoutVerification = function (uuids, afterRaftConnectedCb) {
         return __awaiter(this, void 0, void 0, function () {
-            var foundRICs, wasDiscoveryStarted;
+            var foundRICs, notFoundTimeout, wasDiscoveryStarted;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         foundRICs = [];
+                        notFoundTimeout = setTimeout(function () {
+                            if (foundRICs.length === 0) {
+                                _this.toaster.error("Make sure the robot is powered on and in range!");
+                            }
+                            window.applicationManager.stopDiscovery();
+                            secondaryModalState.closeModal();
+                            raftFoundSubscriptionHelper().unsubscribe();
+                            clearTimeout(notFoundTimeout);
+                        }, 7000);
                         raftFoundSubscriptionHelper().subscribe(function (_a) {
                             var discoveredDevice = _a.discoveredDevice;
                             return __awaiter(_this, void 0, void 0, function () {
@@ -683,6 +688,7 @@ var ApplicationManager = /** @class */ (function () {
                                         case 1:
                                             newRaft = _b.sent();
                                             if (!newRaft) return [3 /*break*/, 3];
+                                            secondaryModalState.closeModal();
                                             this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                                             afterRaftConnectedCb(newRaft);
                                             oldColours = newRaft._ledLcdColours;
@@ -708,7 +714,6 @@ var ApplicationManager = /** @class */ (function () {
                         if (!wasDiscoveryStarted) {
                             return [2 /*return*/, raftFoundSubscriptionHelper().unsubscribe()];
                         }
-                        raftFoundSubscriptionHelper().unsubscribe();
                         return [2 /*return*/];
                 }
             });
@@ -726,7 +731,6 @@ var ApplicationManager = /** @class */ (function () {
                     case 0: return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_STOP_DISCOVERY)];
                     case 1:
                         wasDiscoveryStopped = _a.sent();
-                        Logger.phoneAppLog(SHOW_LOGS, TAG, "Was discovery stopped: " + wasDiscoveryStopped);
                         return [2 /*return*/];
                 }
             });

package/dist-types/src/application/RAFTs/Cog/PublishedDataAnalyser.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 { raftPubSubscriptionHelper } from "../raft-subscription-helpers";
+import { createRaftPubSubscriptionHelper } from "../raft-subscription-helpers";
 import { isVersionGreater_errorCatching } from "../../../utils/helpers/compare-version";
 import EventEmitter from "events";
 import Logger from "../../../services/logger/Logger";
@@ -117,7 +117,7 @@ var PublishedDataAnalyser = /** @class */ (function (_super) {
     }
     PublishedDataAnalyser.prototype.subscribeToPublishedData = function () {
         var _this = this;
-        this.pubSub = raftPubSubscriptionHelper(this.cog);
+        this.pubSub = createRaftPubSubscriptionHelper(this.cog);
         this.pubSub.subscribe(function (data) {
             _this.analyse(data.stateInfo);
         });

package/dist-types/src/application/RAFTs/raft-subscription-helpers.d.ts

@@ -1,63 +1,73 @@
 import RAFT from "./RAFT";
-/**
- * Connection Verifying Subscription Helper
- */
 export declare const raftConnectingSubscriptionHelper: (raft: RAFT) => {
     subscribe: (callback: any) => void;
     unsubscribe: () => void;
 };
-/**
- * RAFT Connected Subscription Helper
- */
+export declare const createRaftConnectingHelper: (raft: RAFT) => {
+    subscribe: (callback: any) => void;
+    unsubscribe: () => void;
+};
 export declare const raftConnectedSubscriptionHelper: (raft: RAFT) => {
     subscribe: (callback: any) => void;
     unsubscribe: () => void;
 };
-/**
- * RAFT Disconnected Subscription Helper
- */
+export declare const createRaftConnectedHelper: (raft: RAFT) => {
+    subscribe: (callback: any) => void;
+    unsubscribe: () => void;
+};
 export declare const raftDisconnectedSubscriptionHelper: (raft: RAFT) => {
     subscribe: (callback: any) => void;
     unsubscribe: () => void;
 };
-/**
- * RAFT Verified Subscription Helper
- */
+export declare const createRaftDisconnectedHelper: (raft: RAFT) => {
+    subscribe: (callback: any) => void;
+    unsubscribe: () => void;
+};
 export declare const raftVerifiedSubscriptionHelper: (raft: RAFT) => {
     subscribe: (callback: any) => void;
     unsubscribe: () => void;
 };
-/**
- * Subscription Helper for raftFound event
- * ApplicationManager
- */
+export declare const createRaftVerifiedHelper: (raft: RAFT) => {
+    subscribe: (callback: any) => void;
+    unsubscribe: () => void;
+};
 export declare const raftFoundSubscriptionHelper: () => {
     subscribe: (callback: any) => void;
     unsubscribe: () => void;
 };
-/**
- * Subscription Helper for raftDiscoveryFinished event
- */
+export declare const createRaftFoundHelper: () => {
+    subscribe: (callback: any) => void;
+    unsubscribe: () => void;
+};
 export declare const raftDiscoveryFinishedSubscriptionHelper: () => {
     subscribe: (callback: any) => void;
     unsubscribe: () => void;
 };
-/**
- * Subscription Helper for raftDiscoveryStarted event
- */
+export declare const createRaftDiscoveryFinishedHelper: () => {
+    subscribe: (callback: any) => void;
+    unsubscribe: () => void;
+};
 export declare const raftDiscoveryStartedSubscriptionHelper: () => {
     subscribe: (callback: any) => void;
     unsubscribe: () => void;
 };
-/**
- * Subscription Helper for raftRejected event
- * This event is triggered when the RAFT is rejected during the verification process
- */
+export declare const createRaftDiscoveryStartedHelper: () => {
+    subscribe: (callback: any) => void;
+    unsubscribe: () => void;
+};
 export declare const raftRejectedSubscriptionHelper: (raft: RAFT) => {
     subscribe: (callback: any) => void;
     unsubscribe: () => void;
 };
+export declare const createRaftRejectedHelper: (raft: RAFT) => {
+    subscribe: (callback: any) => void;
+    unsubscribe: () => void;
+};
 export declare const raftPubSubscriptionHelper: (raft: RAFT) => {
     subscribe: (callback: (eventData: any) => void) => void;
     unsubscribe: () => void;
 };
+export declare const createRaftPubSubscriptionHelper: (raft: RAFT) => {
+    subscribe: (callback: (eventData: any) => void) => void;
+    unsubscribe: () => void;
+};

package/dist-types/src/application/RAFTs/raft-subscription-helpers.js

@@ -2,7 +2,14 @@ import { RaftConnEvent } from "@robotical/raftjs";
 /**
  * Connection Verifying Subscription Helper
  */
+var raftConnectingHelperInstance = null;
 export var raftConnectingSubscriptionHelper = function (raft) {
+    if (!raftConnectingHelperInstance) {
+        raftConnectingHelperInstance = createRaftConnectingHelper(raft);
+    }
+    return raftConnectingHelperInstance;
+};
+export var createRaftConnectingHelper = function (raft) {
     var observer = null;
     return {
         subscribe: function (callback) {
@@ -45,7 +52,14 @@ var raftConnectingSubscriptionObserver_ = function (callback) {
 /**
  * RAFT Connected Subscription Helper
  */
+var raftConnectedHelperInstance = null;
 export var raftConnectedSubscriptionHelper = function (raft) {
+    if (!raftConnectedHelperInstance) {
+        raftConnectedHelperInstance = createRaftConnectedHelper(raft);
+    }
+    return raftConnectedHelperInstance;
+};
+export var createRaftConnectedHelper = function (raft) {
     var observer = null;
     return {
         subscribe: function (callback) {
@@ -90,7 +104,14 @@ var raftConnectedSubscriptionObserver_ = function (callback) {
 /**
  * RAFT Disconnected Subscription Helper
  */
+var raftDisconnectedHelperInstance = null;
 export var raftDisconnectedSubscriptionHelper = function (raft) {
+    if (!raftDisconnectedHelperInstance) {
+        raftDisconnectedHelperInstance = createRaftDisconnectedHelper(raft);
+    }
+    return raftDisconnectedHelperInstance;
+};
+export var createRaftDisconnectedHelper = function (raft) {
     var observer = null;
     return {
         subscribe: function (callback) {
@@ -135,7 +156,14 @@ var raftDisconnectedSubscriptionObserver_ = function (callback) {
 /**
  * RAFT Verified Subscription Helper
  */
+var raftVerifiedHelperInstance = null;
 export var raftVerifiedSubscriptionHelper = function (raft) {
+    if (!raftVerifiedHelperInstance) {
+        raftVerifiedHelperInstance = createRaftVerifiedHelper(raft);
+    }
+    return raftVerifiedHelperInstance;
+};
+export var createRaftVerifiedHelper = function (raft) {
     var observer = null;
     return {
         subscribe: function (callback) {
@@ -179,7 +207,14 @@ var raftVerifiedSubscriptionObserver_ = function (callback) {
  * Subscription Helper for raftFound event
  * ApplicationManager
  */
+var raftFoundHelperInstance = null;
 export var raftFoundSubscriptionHelper = function () {
+    if (!raftFoundHelperInstance) {
+        raftFoundHelperInstance = createRaftFoundHelper();
+    }
+    return raftFoundHelperInstance;
+};
+export var createRaftFoundHelper = function () {
     var observer = null;
     return {
         subscribe: function (callback) {
@@ -213,7 +248,14 @@ var raftFoundSubscriptionObserver_ = function (callback) {
 /**
  * Subscription Helper for raftDiscoveryFinished event
  */
+var raftDiscoveryFinishedHelperInstance = null;
 export var raftDiscoveryFinishedSubscriptionHelper = function () {
+    if (!raftDiscoveryFinishedHelperInstance) {
+        raftDiscoveryFinishedHelperInstance = createRaftDiscoveryFinishedHelper();
+    }
+    return raftDiscoveryFinishedHelperInstance;
+};
+export var createRaftDiscoveryFinishedHelper = function () {
     var observer = null;
     return {
         subscribe: function (callback) {
@@ -247,7 +289,14 @@ var raftDiscoveryFinishedSubscriptionObserver_ = function (callback) {
 /**
  * Subscription Helper for raftDiscoveryStarted event
  */
+var raftDiscoveryStartedHelperInstance = null;
 export var raftDiscoveryStartedSubscriptionHelper = function () {
+    if (!raftDiscoveryStartedHelperInstance) {
+        raftDiscoveryStartedHelperInstance = createRaftDiscoveryStartedHelper();
+    }
+    return raftDiscoveryStartedHelperInstance;
+};
+export var createRaftDiscoveryStartedHelper = function () {
     var observer = null;
     return {
         subscribe: function (callback) {
@@ -282,7 +331,14 @@ var raftDiscoveryStartedSubscriptionObserver_ = function (callback) {
  * Subscription Helper for raftRejected event
  * This event is triggered when the RAFT is rejected during the verification process
  */
+var raftRejectedHelperInstance = null;
 export var raftRejectedSubscriptionHelper = function (raft) {
+    if (!raftRejectedHelperInstance) {
+        raftRejectedHelperInstance = createRaftRejectedHelper(raft);
+    }
+    return raftRejectedHelperInstance;
+};
+export var createRaftRejectedHelper = function (raft) {
     var observer = null;
     return {
         subscribe: function (callback) {
@@ -322,7 +378,14 @@ var raftRejectedSubscriptionObserver_ = function (callback) {
         },
     };
 };
+var raftPubSubscriptionHelperInstance = null;
 export var raftPubSubscriptionHelper = function (raft) {
+    if (!raftPubSubscriptionHelperInstance) {
+        raftPubSubscriptionHelperInstance = createRaftPubSubscriptionHelper(raft);
+    }
+    return raftPubSubscriptionHelperInstance;
+};
+export var createRaftPubSubscriptionHelper = function (raft) {
     var observer = null;
     return {
         subscribe: function (callback) {

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

@@ -101,6 +101,10 @@ export default function LEDLightsOrQRVerificationModal() {
             if (serialNoFromQR) {
                 modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID(serialNoFromQR)]);
             }
+            else {
+                // // testing
+                // modalState.closeModalWithoutAnimation([ConnManager.generateServiceFilterUUID('00000000000000000000000000000079')]);
+            }
             return [2 /*return*/];
         });
     }); };

package/package.json

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