@robotical/webapp-types 3.12.4 → 3.13.0

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

@@ -105,6 +105,11 @@ export default class ApplicationManager {
      * Disconnect from RAFT
      */
     disconnectFromRaft(raftId: string): Promise<void>;
+    /**
+     * Removes raft from the connectedRafts list after a timeout without disconnecting as at this point
+     * the device should already be disconnected
+     */
+    removeRaft(raftId: string): Promise<void>;
     /**
      * Removes raft after a certain time
      * Removes from the rics list after x seconds so that we can still get the last event

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

@@ -653,6 +653,30 @@ var ApplicationManager = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Removes raft from the connectedRafts list after a timeout without disconnecting as at this point
+     * the device should already be disconnected
+     */
+    ApplicationManager.prototype.removeRaft = function (raftId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var raft;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.connectedRaftContextMethods.removeConnectedRaft(raftId);
+                        raft = this.connectedRafts[raftId];
+                        if (!raft) {
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, raft.disconnect()];
+                    case 1:
+                        _a.sent();
+                        this._removeRaft(raftId, 10);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * Removes raft after a certain time
      * Removes from the rics list after x seconds so that we can still get the last event

package/dist-types/src/application/RAFTs/RAFT.js

@@ -325,10 +325,20 @@ var RAFT = /** @class */ (function () {
      */
     RAFT.prototype._connectionEventHandler = function (eventEnum, eventName, data) {
         return __awaiter(this, void 0, void 0, function () {
+            var _a;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (eventEnum) {
-                    case RaftConnEvent.CONN_VERIFIED_CORRECT:
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = eventEnum;
+                        switch (_a) {
+                            case RaftConnEvent.CONN_VERIFIED_CORRECT: return [3 /*break*/, 1];
+                            case RaftConnEvent.CONN_DISCONNECTED: return [3 /*break*/, 2];
+                            case RaftConnEvent.CONN_ISSUE_DETECTED: return [3 /*break*/, 4];
+                            case RaftConnEvent.CONN_ISSUE_RESOLVED: return [3 /*break*/, 5];
+                        }
+                        return [3 /*break*/, 6];
+                    case 1:
                         new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
                             var robotId, raftType, raftName, raftSerialNumber, deviceInfo, sessionId, deviceId;
                             var _this = this;
@@ -351,7 +361,6 @@ var RAFT = /** @class */ (function () {
                                         return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.GET_DEVICE_INFO, {})];
                                     case 1:
                                         deviceInfo = _a.sent();
-                                        console.log("deviceInfo", deviceInfo);
                                         sessionId = randomHashGenerator();
                                         deviceId = deviceInfo.deviceId;
                                         window.applicationManager.AnalyticsFacade.startSession(sessionId, deviceId, robotId, raftType);
@@ -362,18 +371,23 @@ var RAFT = /** @class */ (function () {
                                 }
                             });
                         }); });
-                        break;
-                    case RaftConnEvent.CONN_DISCONNECTED: // this runs when the RAFT is disconnected on its own (due to a timeout or other reasons)
-                        window.applicationManager.disconnectGeneric(this, function () { }, true); // disconnects the RAFT and removes it from the connectedRafts list
-                        break;
-                    case RaftConnEvent.CONN_ISSUE_DETECTED:
-                        break;
-                    case RaftConnEvent.CONN_ISSUE_RESOLVED:
-                        break;
-                    default:
-                        break;
+                        return [3 /*break*/, 7];
+                    case 2: 
+                    // this runs when the RAFT is disconnected either on its own (due to a timeout or other reasons), or by the user
+                    // if it's by the user, we don't really need to do anything as the applicationManager will handle the disconnection
+                    // if the RAFT is disconnected on its own, however, we need to remove it from the connectedRafts list
+                    return [4 /*yield*/, window.applicationManager.removeRaft(this.id)];
+                    case 3:
+                        // this runs when the RAFT is disconnected either on its own (due to a timeout or other reasons), or by the user
+                        // if it's by the user, we don't really need to do anything as the applicationManager will handle the disconnection
+                        // if the RAFT is disconnected on its own, however, we need to remove it from the connectedRafts list
+                        _b.sent();
+                        return [3 /*break*/, 7];
+                    case 4: return [3 /*break*/, 7];
+                    case 5: return [3 /*break*/, 7];
+                    case 6: return [3 /*break*/, 7];
+                    case 7: return [2 /*return*/];
                 }
-                return [2 /*return*/];
             });
         });
     };

package/dist-types/src/store/SelectedRaftContext.js

@@ -38,24 +38,6 @@ export var ConnectedRaftContentProvider = function (_a) {
     var children = _a.children;
     var _b = useState([{ id: NewRobotIdE.NEW, isSelected: true, name: "Connect to new robot", type: RaftTypeE.undefined }]), connectedRafts = _b[0], setConnectedRafts = _b[1];
     var _c = useState(0), nameUpdatedState = _c[0], setNameUpdatedState = _c[1];
-    useEffect(function () {
-        if (window.applicationManager) {
-            window.applicationManager.connectedRaftContextMethods = {
-                addConnectedRaft: function (connectedRaft) {
-                    addConnectedRaft(connectedRaft);
-                },
-                removeConnectedRaft: function (connectedRaftId) {
-                    removeConnectedRaft(connectedRaftId);
-                },
-                setSelectedRaft: function (connectedRaftId) {
-                    setSelectedRaft(connectedRaftId);
-                },
-                nameUpdated: function () {
-                    nameUpdated();
-                },
-            };
-        }
-    }, []);
     useEffect(function () {
         window.applicationManager.connectedRaftsContext = connectedRafts;
     }, [connectedRafts]);
@@ -76,18 +58,35 @@ export var ConnectedRaftContentProvider = function (_a) {
         setConnectedRafts(function (prev) { return __spreadArray(__spreadArray([], prev, true), [connectedRaft], false); });
     };
     var removeConnectedRaft = function (connectedRaftId) {
-        // if the removed raft is selected, select the first raft in the list
+        // if the removed raft is selected, filter it out and then select the first raft in the list
         var selectedRaft = connectedRafts.find(function (connectedRaft) { return connectedRaft.isSelected; });
         if ((selectedRaft === null || selectedRaft === void 0 ? void 0 : selectedRaft.id) === connectedRaftId) {
-            setConnectedRafts(function (prev) { return prev.map(function (connectedRaft, index) { return (__assign(__assign({}, connectedRaft), { isSelected: index === 0 })); }); });
+            setConnectedRafts(function (prev) { return prev
+                .filter(function (connectedRaft) { return connectedRaft.id !== connectedRaftId; })
+                .map(function (connectedRaft, index) { return (__assign(__assign({}, connectedRaft), { isSelected: index === 1 })); }); });
+        }
+        else {
+            // otherwise just filter out the raft
+            setConnectedRafts(function (prev) { return prev.filter(function (connectedRaft) { return connectedRaft.id !== connectedRaftId; }); });
         }
-        setConnectedRafts(function (prev) { return prev.filter(function (connectedRaft) { return connectedRaft.id !== connectedRaftId; }); });
     };
     var setSelectedRaft = function (connectedRaftId) {
         // deselect the previously selected raft
-        setConnectedRafts(function (prev) { return prev.map(function (connectedRaft) { return (__assign(__assign({}, connectedRaft), { isSelected: false })); }); });
         setConnectedRafts(function (prev) { return prev.map(function (connectedRaft) { return (__assign(__assign({}, connectedRaft), { isSelected: connectedRaft.id === connectedRaftId })); }); });
     };
+    useEffect(function () {
+        var handle;
+        function tryAttach() {
+            if (window.applicationManager) {
+                window.applicationManager.connectedRaftContextMethods = { addConnectedRaft: addConnectedRaft, removeConnectedRaft: removeConnectedRaft, setSelectedRaft: setSelectedRaft, nameUpdated: nameUpdated };
+            }
+            else {
+                handle = window.setTimeout(tryAttach, 100);
+            }
+        }
+        tryAttach();
+        return function () { handle && clearTimeout(handle); };
+    }, [addConnectedRaft, removeConnectedRaft, setSelectedRaft, nameUpdated]);
     return (_jsx(ConnectedRaftContext.Provider, __assign({ value: { connectedRafts: connectedRafts, addConnectedRaft: addConnectedRaft, removeConnectedRaft: removeConnectedRaft, setSelectedRaft: setSelectedRaft, nameUpdated: nameUpdated, nameUpdatedState: nameUpdatedState } }, { children: children })));
 };
 export var useConnectedRafts = function () { return useContext(ConnectedRaftContext); };

package/package.json

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