@robotical/webapp-types 3.7.32 → 3.7.34

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

@@ -11,6 +11,7 @@ import { ConnectedRaftItem } from "../../store/SelectedRaftContext";
 import Toaster from "../../utils/Toaster";
 import AnalyticsFacade from "@robotical/appv2-analytics-gatherer";
 import { CarouselNavigatorManager } from "../../utils/CarouselNavigatorManager";
+import { UserDeviceInfo } from "../../types/userDeviceInfo";
 export default class ApplicationManager {
     AnalyticsFacade: typeof AnalyticsFacade;
     analyticsSessionId: string | undefined;
@@ -22,6 +23,7 @@ export default class ApplicationManager {
     connectedRaftsContext: ConnectedRaftItem[];
     returnToMainApp: () => void;
     carouselNavigatorManager: CarouselNavigatorManager;
+    deviceInfo: UserDeviceInfo | undefined;
     private _router;
     setRouter(router: any): void;
     navigateTo(path: string): void;
@@ -37,6 +39,7 @@ export default class ApplicationManager {
     };
     isPhoneApp: () => boolean;
     constructor();
+    getDeviceInfo(): Promise<void>;
     updateRaftNameInAllStates(raftId: string, name: string): Promise<boolean>;
     pauseWifiConnectionMarty(raftId: string, pause: boolean): Promise<boolean>;
     getCachedWifiStatusMarty(martyId: string): RaftWifiConnStatus | undefined;

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

@@ -70,6 +70,8 @@ var ApplicationManager = /** @class */ (function () {
         this.returnToMainApp = function () { };
         // Carousel navigators
         this.carouselNavigatorManager = new CarouselNavigatorManager();
+        // Device info
+        this.deviceInfo = undefined;
         // Callback to call when a RAFT is selected (Phone App only)
         // We need that to make sure the connection button gets the selected RAFT once the user selects one
         this.ricSelectedCb = null;
@@ -112,6 +114,21 @@ var ApplicationManager = /** @class */ (function () {
             Logger.error(SHOW_LOGS, TAG, "Router is not set");
         }
     };
+    ApplicationManager.prototype.getDeviceInfo = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this;
+                        return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.GET_DEVICE_INFO, {})];
+                    case 1:
+                        _a.deviceInfo = _b.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     ApplicationManager.prototype.updateRaftNameInAllStates = function (raftId, name) {
         return __awaiter(this, void 0, void 0, function () {
             var wasSuccessful;
@@ -380,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*/];
                 }
             });
         });
@@ -643,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();
+                            clearTimeout(notFoundTimeout);
+                        }, 7000);
+                        Logger.phoneAppLog(SHOW_LOGS, TAG, "before raftFoundSubscriptionHelper");
                         raftFoundSubscriptionHelper().subscribe(function (_a) {
                             var discoveredDevice = _a.discoveredDevice;
                             return __awaiter(_this, void 0, void 0, function () {
@@ -666,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;

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*/];
         });
     }); };
@@ -111,6 +115,7 @@ export default function LEDLightsOrQRVerificationModal() {
 }
 function QRContent(_a) {
     var _this = this;
+    var _b;
     var setSerialNo = _a.setSerialNo;
     var onQrCodeFound = function (result) { return __awaiter(_this, void 0, void 0, function () {
         var rawValue, serialNo;
@@ -126,7 +131,8 @@ function QRContent(_a) {
             return [2 /*return*/];
         });
     }); };
-    return (_jsx("div", __assign({ className: styles.QRcontainer }, { children: _jsx("div", __assign({ className: styles.QRscannerContainer }, { children: _jsx(Scanner, { styles: { container: { transform: 'scaleX(-1)' } }, onError: function (err) { return console.error(err); }, formats: [
+    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: [
                     "qr_code",
                     "micro_qr_code",
                     "rm_qr_code",

package/package.json

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