@robotical/webapp-types 1.0.8 → 1.1.0

package/dist-types/src/analytics/AnalyticsManager.d.ts

@@ -0,0 +1,28 @@
+/**
+ * AnalyticsManager
+ *
+ * This class is responsible for managing the analytics services for the testing phase.
+ * Analytics gathered:
+ * - Connections
+ * - Disconnections
+ * - Visited pages
+ * - emoji feedback
+ * - text feedback
+ *
+ * Each of them will be stored as an event. They will stored in the order they were received so we can track the user's journey.
+ * There will be a timestamp for each event.
+ *
+ * We store client's id in a cookie so we can track the user's journey.
+ */
+type EventType = "connection" | "disconnection" | "page" | "emojifeedback" | "textfeedback" | "connection_issue" | "connection_issue_resolved";
+export declare class AnalyticsManager {
+    private static instance;
+    private clientId;
+    private eventsStorer;
+    private constructor();
+    static getInstance(): AnalyticsManager;
+    private getClientId;
+    private generateClientId;
+    logEvent(eventType: EventType, data: any): void;
+}
+export {};

package/dist-types/src/analytics/AnalyticsManager.js

@@ -0,0 +1,171 @@
+/**
+ * AnalyticsManager
+ *
+ * This class is responsible for managing the analytics services for the testing phase.
+ * Analytics gathered:
+ * - Connections
+ * - Disconnections
+ * - Visited pages
+ * - emoji feedback
+ * - text feedback
+ *
+ * Each of them will be stored as an event. They will stored in the order they were received so we can track the user's journey.
+ * There will be a timestamp for each event.
+ *
+ * We store client's id in a cookie so we can track the user's journey.
+ */
+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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var AnalyticsManager = /** @class */ (function () {
+    function AnalyticsManager() {
+        this.clientId = this.getClientId();
+        this.eventsStorer = new EventsStorer(this.clientId);
+    }
+    AnalyticsManager.getInstance = function () {
+        if (!AnalyticsManager.instance) {
+            AnalyticsManager.instance = new AnalyticsManager();
+        }
+        return AnalyticsManager.instance;
+    };
+    AnalyticsManager.prototype.getClientId = function () {
+        var clientId = localStorage.getItem('@robotical/webapp/analytics/clientId');
+        if (!clientId) {
+            clientId = this.generateClientId();
+            localStorage.setItem('@robotical/webapp/analytics/clientId', clientId);
+        }
+        return clientId;
+    };
+    AnalyticsManager.prototype.generateClientId = function () {
+        return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
+    };
+    AnalyticsManager.prototype.logEvent = function (eventType, data) {
+        var event = new AnalyticsEvent(eventType, data);
+        this.eventsStorer.addEvent(event);
+    };
+    return AnalyticsManager;
+}());
+export { AnalyticsManager };
+var AnalyticsEvent = /** @class */ (function () {
+    function AnalyticsEvent(type, data) {
+        this.type = type;
+        this.data = data;
+        this.isProcessed = false;
+        this.timestamp = new Date().toString();
+        this.urlSafeTimestamp = new Date().toISOString().replaceAll("T", "_").replaceAll(":", "-").replaceAll("/", "-").replaceAll(".", "_");
+    }
+    AnalyticsEvent.prototype.process = function () {
+        this.isProcessed = true;
+    };
+    return AnalyticsEvent;
+}());
+var EventsStorer = /** @class */ (function () {
+    function EventsStorer(clientId) {
+        this.clientId = clientId;
+        this.events = [];
+        this.processing = false;
+    }
+    EventsStorer.prototype.addEvent = function (event) {
+        this.events.push(event);
+        this._processEvents();
+    };
+    EventsStorer.prototype._processEvents = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _i, _a, event_1;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (this.processing)
+                            return [2 /*return*/];
+                        this.processing = true;
+                        _i = 0, _a = this.events;
+                        _b.label = 1;
+                    case 1:
+                        if (!(_i < _a.length)) return [3 /*break*/, 4];
+                        event_1 = _a[_i];
+                        if (!!event_1.isProcessed) return [3 /*break*/, 3];
+                        this._processEvent(event_1);
+                        return [4 /*yield*/, this._delay(1000)];
+                    case 2:
+                        _b.sent(); // 1 second debounce time
+                        _b.label = 3;
+                    case 3:
+                        _i++;
+                        return [3 /*break*/, 1];
+                    case 4:
+                        this.processing = false;
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    EventsStorer.prototype._delay = function (ms) {
+        return new Promise(function (resolve) { return setTimeout(resolve, ms); });
+    };
+    EventsStorer.prototype._processEvent = function (event) {
+        event.process();
+        var data = __assign(__assign(__assign({}, event), event.data), { data: undefined, isProcessed: undefined, urlSafeTimestamp: undefined });
+        var path = "".concat(this.clientId, "/").concat(event.urlSafeTimestamp, "-").concat(event.type);
+        FirebaseInteractor.put(path, data);
+    };
+    return EventsStorer;
+}());
+var FirebaseInteractor = /** @class */ (function () {
+    function FirebaseInteractor() {
+    }
+    FirebaseInteractor.put = function (path, data) {
+        fetch("".concat(this.db_href, "/").concat(path, ".json"), {
+            method: 'PUT',
+            body: JSON.stringify(data),
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        });
+    };
+    FirebaseInteractor.db_href = "https://app-v2-analytics-default-rtdb.firebaseio.com";
+    return FirebaseInteractor;
+}());

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

@@ -6,9 +6,10 @@ import Cog from "../RAFTs/Cog/Cog";
 import { FOUND_RAFT_ON_DISCOVERY_RESPONSE } from "../../types/phone-app-communicator";
 import { RaftObserver } from "../RAFTs/RaftObserver";
 import { RaftInfoEvents } from "../../types/events/raft-info";
-import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robotical/raftjs";
 import { ConnectedRaftItem } from "../../store/SelectedRaftContext";
 import Toaster from "../../utils/Toaster";
+import { AnalyticsManager } from "../../analytics/AnalyticsManager";
 export default class ApplicationManager {
     private _observers;
     static wrapperAppCommunicator: WebAppCommunicator;
@@ -16,8 +17,13 @@ export default class ApplicationManager {
         [key: string]: RAFT;
     };
     connectedRaftsContext: ConnectedRaftItem[];
+    returnToMainApp: () => void;
+    private _router;
+    setRouter(router: any): void;
+    navigateTo(path: string): void;
     ricSelectedCb: ((raft: RAFT) => void) | null;
     toaster: typeof Toaster;
+    analyticsManager: AnalyticsManager;
     showBackHomeButton: () => void;
     hideBackHomeButton: () => void;
     connectedRaftContextMethods: {
@@ -41,7 +47,7 @@ export default class ApplicationManager {
      * Disconnect from RAFT generic
      * This method is called from various environments (connection button, blocksjr, blocks etc.)
      */
-    disconnectGeneric(raft: RAFT): Promise<void>;
+    disconnectGeneric(raft: RAFT, afterRaftDisconnectedCb?: () => void): Promise<void>;
     /**
      * Selects a RAFT in Phone's verification modal
      */
@@ -55,7 +61,7 @@ export default class ApplicationManager {
      * Removes raft after a certain time
      * Removes from the rics list after x seconds so that we can still get the last event
      */
-    _removeRIC(raftId: string, timeout: number): void;
+    _removeRaft(raftId: string, timeout: number): void;
     /**
      * Start looking for rics to connect to
      * This is used from the Phone App only

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

@@ -45,11 +45,12 @@ import VerificationModal from "../../components/modals/VerificationModal";
 import { raftFoundSubscriptionHelper } from "../RAFTs/raft-subscription-helpers";
 import { AppSentMessage } from "../../types/communication-between-apps/wrapper-communication";
 import VerificationModalPhoneApp from "../../components/modals/VerificationModalPhoneApp";
-import { RaftChannelBLE, } from "@robdobsn/raftjs";
+import { RaftChannelBLE, } from "@robotical/raftjs";
 import Logger from "../../services/logger/Logger";
 import isPhoneApp from "../../utils/phone-app-communication/is-phone-app";
 import DisconnectConfirmationModal from "../../components/modals/DisconnectConfirmation";
 import Toaster from "../../utils/Toaster";
+import { AnalyticsManager } from "../../analytics/AnalyticsManager";
 var SHOW_LOGS = true;
 var TAG = "ApplicationManager";
 var ApplicationManager = /** @class */ (function () {
@@ -59,10 +60,11 @@ var ApplicationManager = /** @class */ (function () {
         // Connected RICs
         this.connectedRafts = {};
         this.connectedRaftsContext = [];
+        this.returnToMainApp = function () { };
         // 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;
-        // // RICNotificationsManager
+        // RICNotificationsManager
         // private _ricNotificationsManager: RICNotificationsManager = new RICNotificationsManager(
         //     this
         // );
@@ -75,6 +77,8 @@ var ApplicationManager = /** @class */ (function () {
         // public sessionDbs = new SessionsDBManager();
         // toaster
         this.toaster = Toaster;
+        // Analytics Manager
+        this.analyticsManager = AnalyticsManager.getInstance();
         this.showBackHomeButton = function () { };
         this.hideBackHomeButton = function () { };
         // connected raft context methods
@@ -85,10 +89,21 @@ var ApplicationManager = /** @class */ (function () {
         };
         this.isPhoneApp = isPhoneApp;
         // super();
-        // AnalyticsManager.appStartSession();
+        // DatabaseManager.appStartSession();
         this.connectGenericMarty = this.connectGenericMarty.bind(this);
         this.connectGenericCog = this.connectGenericCog.bind(this);
     }
+    ApplicationManager.prototype.setRouter = function (router) {
+        this._router = router;
+    };
+    ApplicationManager.prototype.navigateTo = function (path) {
+        if (this._router) {
+            this._router.navigate(path);
+        }
+        else {
+            Logger.error(SHOW_LOGS, TAG, "Router is not set");
+        }
+    };
     ApplicationManager.prototype.createNewCog = function (id) {
         return new Cog(id);
     };
@@ -126,7 +141,7 @@ var ApplicationManager = /** @class */ (function () {
                     case 1:
                         _a.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, window.applicationManager.startDiscovery(function (newRaft) {
-                                _this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, name: newRaft.getFriendlyName() || "", isSelected: true });
+                                _this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                                 afterRaftConnectedCb(newRaft);
                             })];
                     case 2:
@@ -143,7 +158,7 @@ var ApplicationManager = /** @class */ (function () {
                     case 6:
                         newRaft = _a.sent();
                         if (newRaft) {
-                            this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, name: newRaft.getFriendlyName() || "", isSelected: true });
+                            this.connectedRaftContextMethods.addConnectedRaft({ id: newRaft.id, type: newRaft.type, name: newRaft.getFriendlyName() || "", isSelected: true });
                             afterRaftConnectedCb(newRaft);
                         }
                         return [3 /*break*/, 8];
@@ -160,7 +175,7 @@ var ApplicationManager = /** @class */ (function () {
      * Disconnect from RAFT generic
      * This method is called from various environments (connection button, blocksjr, blocks etc.)
      */
-    ApplicationManager.prototype.disconnectGeneric = function (raft) {
+    ApplicationManager.prototype.disconnectGeneric = function (raft, afterRaftDisconnectedCb) {
         return __awaiter(this, void 0, void 0, function () {
             var confirmDisconnect, e_3;
             return __generator(this, function (_a) {
@@ -176,6 +191,9 @@ var ApplicationManager = /** @class */ (function () {
                         return [4 /*yield*/, window.applicationManager.disconnectFromRaft(raft.id)];
                     case 2:
                         _a.sent();
+                        if (afterRaftDisconnectedCb) {
+                            afterRaftDisconnectedCb();
+                        }
                         return [3 /*break*/, 4];
                     case 3:
                         e_3 = _a.sent();
@@ -292,7 +310,7 @@ var ApplicationManager = /** @class */ (function () {
                         return [4 /*yield*/, raft.disconnect()];
                     case 1:
                         _a.sent();
-                        this._removeRIC(raftId, 11000);
+                        this._removeRaft(raftId, 3000);
                         return [2 /*return*/];
                 }
             });
@@ -302,7 +320,7 @@ var ApplicationManager = /** @class */ (function () {
      * Removes raft after a certain time
      * Removes from the rics list after x seconds so that we can still get the last event
      */
-    ApplicationManager.prototype._removeRIC = function (raftId, timeout) {
+    ApplicationManager.prototype._removeRaft = function (raftId, timeout) {
         var _this = this;
         var ricRemovalTimeout = setTimeout(function () {
             delete _this.connectedRafts[raftId];
@@ -360,7 +378,7 @@ var ApplicationManager = /** @class */ (function () {
                     case 0: return [4 /*yield*/, ((_a = this.connectedRafts[raftId]) === null || _a === void 0 ? void 0 : _a.stopVerifyingRaft(isCorrectRIC))];
                     case 1:
                         _b.sent();
-                        this._removeRIC(raftId, 11000);
+                        this._removeRaft(raftId, 3000);
                         return [2 /*return*/];
                 }
             });

package/dist-types/src/application/RAFTs/Cog/Cog.d.ts

@@ -2,7 +2,7 @@ import RAFT from "../RAFT";
 import RICInterface from "../RAFTInterface";
 import { RaftTypeE } from "../../../types/raft";
 import { CogStateInfo, RICLedLcdColours } from "@robotical/roboticaljs";
-import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
 import { RaftInfoEvents } from "../../../types/events/raft-info";
 import PublishedDataAnalyser from "./PublishedDataAnalyser";
 export declare class Cog extends RAFT implements RICInterface {

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

@@ -51,7 +51,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import RAFT from "../RAFT";
 import { RaftTypeE } from "../../../types/raft";
-import { deviceAttrGetLatestFormatted, RaftConnEvent, RaftPublishEvent } from "@robdobsn/raftjs";
+import { deviceAttrGetLatestFormatted, RaftConnEvent, RaftPublishEvent } from "@robotical/raftjs";
 import { RaftInfoEvents } from "../../../types/events/raft-info";
 import PublishedDataAnalyser from "./PublishedDataAnalyser";
 var Cog = /** @class */ (function (_super) {

package/dist-types/src/application/RAFTs/Cog/PublishedDataGetter.d.ts

@@ -1,4 +1,4 @@
-import { DeviceManager } from "@robdobsn/raftjs/dist/web/RaftDeviceManager";
+import { DeviceManager } from "@robotical/raftjs/dist/web/RaftDeviceManager";
 export default class PublishedDataGetter {
     static getPowerData(deviceManager: DeviceManager): {
         battV: number;

package/dist-types/src/application/RAFTs/Cog/PublishedDataGetter.js

@@ -1,4 +1,4 @@
-import { deviceAttrGetLatestFormatted } from "@robdobsn/raftjs";
+import { deviceAttrGetLatestFormatted } from "@robotical/raftjs";
 /* LIGHT ATTRIBUTES */
 var COG_LIGHT_ATTR_KEY = 'RoboCogLightV1_0';
 var AMB0_KEY = 'amb0';

package/dist-types/src/application/RAFTs/Marty/Marty.d.ts

@@ -1,7 +1,7 @@
 import RICInterface from "../RAFTInterface";
 import { RaftTypeE } from "../../../types/raft";
 import RAFT from "../RAFT";
-import { RaftConnEvent, RaftPublishEvent, RaftSystemInfo, RaftUpdateEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftSystemInfo, RaftUpdateEvent } from "@robotical/raftjs";
 import { RaftInfoEvents } from "../../../types/events/raft-info";
 import { RICLedLcdColours, RICStateInfo } from "@robotical/roboticaljs";
 export declare class Marty extends RAFT implements RICInterface {
@@ -10,6 +10,8 @@ export declare class Marty extends RAFT implements RICInterface {
     raftStateInfo: RICStateInfo | null;
     systemInfo: RaftSystemInfo | null;
     _ledLcdColours: RICLedLcdColours;
+    private rssiValues;
+    private MAX_RSSI_VALUES_N;
     constructor(id: string);
     get ledLcdColours(): RICLedLcdColours;
     /**
@@ -25,8 +27,8 @@ export declare class Marty extends RAFT implements RICInterface {
      */
     highlight(): Promise<void>;
     /**
-   * This methods handles RAFT events coming from the RICConnector of the wrapper
-   */
+    * This methods handles RAFT events coming from the RICConnector of the wrapper
+    */
     handleRaftEvent(eventType: string, eventEnum: RaftConnEvent | RaftUpdateEvent | RaftPublishEvent | RaftInfoEvents, eventName: string, eventData: any): void;
     /**
      * Pub Event Handler

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

@@ -51,21 +51,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { RaftTypeE } from "../../../types/raft";
 import RAFT from "../RAFT";
-import { RaftPublishEvent } from "@robdobsn/raftjs";
+import { RaftPublishEvent } from "@robotical/raftjs";
 var Marty = /** @class */ (function (_super) {
     __extends(Marty, _super);
-    // // Joint names
-    // private _jointNames = {
-    //     LeftHip: "LeftHip",
-    //     LeftTwist: "LeftTwist",
-    //     LeftKnee: "LeftKnee",
-    //     RightHip: "RightHip",
-    //     RightTwist: "RightTwist",
-    //     RightKnee: "RightKnee",
-    //     LeftArm: "LeftArm",
-    //     RightArm: "RightArm",
-    //     Eyes: "Eyes",
-    // };
     function Marty(id) {
         var _this = _super.call(this, id) || this;
         _this.id = id;
@@ -80,6 +68,20 @@ var Marty = /** @class */ (function (_super) {
             { led: "#880000", lcd: "#FF0000" },
             { led: "#000040", lcd: "#0080FF" },
         ];
+        // // Joint names
+        // private _jointNames = {
+        //     LeftHip: "LeftHip",
+        //     LeftTwist: "LeftTwist",
+        //     LeftKnee: "LeftKnee",
+        //     RightHip: "RightHip",
+        //     RightTwist: "RightTwist",
+        //     RightKnee: "RightKnee",
+        //     LeftArm: "LeftArm",
+        //     RightArm: "RightArm",
+        //     Eyes: "Eyes",
+        // };
+        _this.rssiValues = []; // Array to store recent RSSI values
+        _this.MAX_RSSI_VALUES_N = 8; // Number of values to consider for averaging
         return _this;
     }
     Object.defineProperty(Marty.prototype, "ledLcdColours", {
@@ -94,7 +96,13 @@ var Marty = /** @class */ (function (_super) {
     */
     Marty.prototype.getRSSI = function () {
         var _a;
-        return ((_a = this.raftStateInfo) === null || _a === void 0 ? void 0 : _a.robotStatus.robotStatus.bleRSSI) || -200;
+        var newRssi = ((_a = this.raftStateInfo) === null || _a === void 0 ? void 0 : _a.robotStatus.robotStatus.bleRSSI) || -200;
+        if (this.rssiValues.length >= this.MAX_RSSI_VALUES_N) {
+            this.rssiValues.shift();
+        }
+        this.rssiValues.push(newRssi);
+        var rssiAverage = this.rssiValues.reduce(function (sum, val) { return sum + val; }, 0) / this.rssiValues.length;
+        return this.rssiValues.reduce(function (sum, val) { return sum + val; }, 0) / this.rssiValues.length;
     };
     /**
      * Gets the battery strength of the RAFT
@@ -128,8 +136,8 @@ var Marty = /** @class */ (function (_super) {
         });
     };
     /**
-   * This methods handles RAFT events coming from the RICConnector of the wrapper
-   */
+    * This methods handles RAFT events coming from the RICConnector of the wrapper
+    */
     Marty.prototype.handleRaftEvent = function (eventType, eventEnum, eventName, eventData) {
         _super.prototype.handleRaftEvent.call(this, eventType, eventEnum, eventName, eventData);
         switch (eventType) {

package/dist-types/src/application/RAFTs/RAFT.d.ts

@@ -3,7 +3,7 @@ import { RaftInfoEvents } from "../../types/events/raft-info";
 import { FOUND_RAFT_ON_DISCOVERY_RESPONSE } from "../../types/phone-app-communicator";
 import RICInterface from "./RAFTInterface";
 import { RaftObserver } from "./RaftObserver";
-import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, RaftOKFail, RaftSystemInfo } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, RaftOKFail, RaftSystemInfo } from "@robotical/raftjs";
 import { CogStateInfo, RICLedLcdColours, RICStateInfo } from "@robotical/roboticaljs";
 export default class RAFT implements RICInterface {
     id: string;
@@ -98,6 +98,10 @@ export default class RAFT implements RICInterface {
      * (to be implemented in child classes)
      */
     handleRaftEvent(eventType: string, eventEnum: RaftConnEvent | RaftUpdateEvent | RaftPublishEvent | RaftInfoEvents, eventName: string, eventData: any): void;
+    /**
+     * Connection Event Handler
+     */
+    _connectionEventHandler(eventEnum: RaftConnEvent, eventName: string, data: any): Promise<void>;
     /**
     * Pub Event Handler
     */

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

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { AppSentMessage } from "../../types/communication-between-apps/wrapper-communication";
 import { RaftTypeE } from "../../types/raft";
 import { RaftInfoEvents } from "../../types/events/raft-info";
-import { RaftPublishEvent, } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftPublishEvent, } from "@robotical/raftjs";
 var RAFT = /** @class */ (function () {
     function RAFT(id) {
         this.id = id;
@@ -261,6 +261,9 @@ var RAFT = /** @class */ (function () {
      */
     RAFT.prototype.handleRaftEvent = function (eventType, eventEnum, eventName, eventData) {
         switch (eventType) {
+            case "conn":
+                this._connectionEventHandler(eventEnum, eventName, eventData);
+                break;
             case "pub":
                 this._pubEventHandler(eventEnum, eventName, eventData);
                 break;
@@ -271,6 +274,32 @@ var RAFT = /** @class */ (function () {
                 break;
         }
     };
+    /**
+     * Connection Event Handler
+     */
+    RAFT.prototype._connectionEventHandler = function (eventEnum, eventName, data) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (eventEnum) {
+                    case RaftConnEvent.CONN_VERIFIED_CORRECT:
+                        window.applicationManager.analyticsManager.logEvent("connection", { raftType: this.type, systemInfo: this.systemInfo });
+                        break;
+                    case RaftConnEvent.CONN_DISCONNECTED:
+                        window.applicationManager.analyticsManager.logEvent("disconnection", { raftType: this.type });
+                        break;
+                    case RaftConnEvent.CONN_ISSUE_DETECTED:
+                        window.applicationManager.analyticsManager.logEvent("connection_issue", { data: data });
+                        break;
+                    case RaftConnEvent.CONN_ISSUE_RESOLVED:
+                        window.applicationManager.analyticsManager.logEvent("connection_issue_resolved", { data: data });
+                        break;
+                    default:
+                        break;
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
     /**
     * Pub Event Handler
     */

package/dist-types/src/application/RAFTs/RAFTInterface.d.ts

@@ -1,5 +1,5 @@
 import { RaftTypeE } from "../../types/raft";
-import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
 import { RaftInfoEvents } from "../../types/events/raft-info";
 import { RICLedLcdColours } from "@robotical/roboticaljs";
 export default abstract class RICInterface {

package/dist-types/src/application/RAFTs/RaftObserver.d.ts

@@ -1,5 +1,5 @@
 import { RaftInfoEvents } from "../../types/events/raft-info";
-import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robotical/raftjs";
 export interface MartyObservable {
     subscribe(observer: RaftObserver, topics: Array<string>): void;
     unsubscribe(observer: RaftObserver): void;

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

@@ -1,4 +1,4 @@
-import { RaftConnEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent } from "@robotical/raftjs";
 /**
  * Connection Verifying Subscription Helper
  */

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

@@ -48,8 +48,10 @@ export default function DisconnectConfirmationModal(_a) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!connectedRaft)
+                    if (!connectedRaft) {
+                        console.warn("No connected raft found", connectedRaft);
                         return [2 /*return*/];
+                    }
                     return [4 /*yield*/, window.applicationManager.disconnectFromRaft(connectedRaft.id)];
                 case 1:
                     _a.sent();

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

@@ -51,7 +51,7 @@ import "./styles.css";
 import { ReactComponent as BluetoothSVG } from "../../../assets/configuration/bluetooth.svg";
 import { MAIN_BLUE } from "../../../styles/colors";
 import modalState from "../../../state-observables/modal/ModalState";
-import RICSignal from "../../oneoffs/RICSignal";
+import RICSignal from "../../oneoffs/RaftSignal";
 import SimpleButton from "../../disposables/buttons/SimpleButton";
 import LEDs from "../../oneoffs/LEDs";
 import { raftConnectingSubscriptionHelper } from "../../../application/RAFTs/raft-subscription-helpers";

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

@@ -52,7 +52,7 @@ import { ReactComponent as BluetoothSVG } from "../../../assets/configuration/bl
 import { ReactComponent as RefreshSVG } from "../../../assets/refresh.svg";
 import { MAIN_BLUE, WHITE } from "../../../styles/colors";
 import modalState from "../../../state-observables/modal/ModalState";
-import RICSignal from "../../oneoffs/RICSignal";
+import RICSignal from "../../oneoffs/RaftSignal";
 import SimpleButton from "../../disposables/buttons/SimpleButton";
 import LEDs from "../../oneoffs/LEDs";
 import SVGImageButton from "../../disposables/buttons/SVGImageButton";

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 "@robdobsn/raftjs";
+import { RaftUtils } from "@robotical/raftjs";
 import "./styles.css";
 import { RaftTypeE } from "../../../types/raft";
 export default function LEDs(_a) {

package/dist-types/src/components/oneoffs/RaftSignal/index.d.ts

@@ -0,0 +1,7 @@
+import RAFT from "../../../application/RAFTs/RAFT";
+type RaftSignalProps = {
+    signalStrength: number;
+    connectedRaft?: RAFT;
+};
+export default function RaftSignal({ signalStrength, connectedRaft }: RaftSignalProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist-types/src/components/oneoffs/{RICSignal → RaftSignal}/index.js

@@ -5,7 +5,7 @@ import rescale from "../../../utils/helpers/rescale-range";
 import { SCREENFREE_GREEN, SCREENFREE_YELLOW } from "../../../styles/colors";
 import isVersionGreater from "../../../utils/helpers/compare-version";
 import { FW_VERSION_RSSI_WIFI } from "../../../utils/helpers/wifi-configuration-subtitle-gen";
-export default function RICSignal(_a) {
+export default function RaftSignal(_a) {
     var signalStrength = _a.signalStrength, connectedRaft = _a.connectedRaft;
     var signalRef = useRef(null);
     useEffect(function () {
@@ -25,5 +25,5 @@ export default function RICSignal(_a) {
             }
         }
     }, [signalStrength]);
-    return _jsx(EmptySignalSVG, { ref: signalRef, width: "80%", opacity: !isVersionGreater((connectedRaft === null || connectedRaft === void 0 ? void 0 : connectedRaft.getRaftVersion()) || "100.0.0", FW_VERSION_RSSI_WIFI) ? 0.5 : 1 });
+    return _jsx(EmptySignalSVG, { ref: signalRef, width: "100%", opacity: !isVersionGreater((connectedRaft === null || connectedRaft === void 0 ? void 0 : connectedRaft.getRaftVersion()) || "100.0.0", FW_VERSION_RSSI_WIFI) ? 0.5 : 1 });
 }

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

@@ -22,3 +22,4 @@ declare class ModalState implements ModalObservable {
 declare const modalState: ModalState;
 export default modalState;
 export declare const secondaryModalState: ModalState;
+export declare const emojiFeedbackModalState: ModalState;

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

@@ -67,3 +67,4 @@ var ModalState = /** @class */ (function () {
 var modalState = new ModalState();
 export default modalState;
 export var secondaryModalState = new ModalState();
+export var emojiFeedbackModalState = new ModalState();

package/dist-types/src/store/SelectedRaftContext.d.ts

@@ -1,9 +1,11 @@
+import { RaftTypeE } from '../types/raft';
 export declare enum NewRobotIdE {
     NEW = "=+__new__+="
 }
 export type ConnectedRaftItem = {
     id: string;
     name: string;
+    type: RaftTypeE;
     isSelected: boolean;
 };
 export declare const ConnectedRaftContentProvider: ({ children }: {

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

@@ -20,6 +20,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useContext, useEffect, useState } from 'react';
+import { RaftTypeE } from '../types/raft';
 export var NewRobotIdE;
 (function (NewRobotIdE) {
     NewRobotIdE["NEW"] = "=+__new__+=";
@@ -33,7 +34,7 @@ var ConnectedRaftContext = createContext({
 // Provider component
 export var ConnectedRaftContentProvider = function (_a) {
     var children = _a.children;
-    var _b = useState([{ id: NewRobotIdE.NEW, isSelected: true, name: "Connect to new robot" }]), connectedRafts = _b[0], setConnectedRafts = _b[1];
+    var _b = useState([{ id: NewRobotIdE.NEW, isSelected: true, name: "Connect to new robot", type: RaftTypeE.undefined }]), connectedRafts = _b[0], setConnectedRafts = _b[1];
     useEffect(function () {
         if (window.applicationManager) {
             window.applicationManager.connectedRaftContextMethods = {

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

@@ -1,6 +1,6 @@
 import { RaftInfoEvents } from "../types/events/raft-info";
 import { ConnectionAttemptResults, RaftConnectionMethod } from "../types/raft";
-import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
 import { RICLedLcdColours } from "@robotical/roboticaljs";
 export declare class WrapperAppManager {
     private connectors;
@@ -47,7 +47,7 @@ export declare class WrapperAppManager {
     /**
      * Send a REST message to the RAFT
      */
-    sendRestMessage(msg: string, params: object | undefined, raftId: string): Promise<import("@robdobsn/raftjs").RaftOKFail>;
+    sendRestMessage(msg: string, params: object | undefined, raftId: string): 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

package/dist-types/src/wrapper-app/WrapperAppManager.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { WrapperSentMessage } from "../types/communication-between-apps/wrapper-communication";
 import Logger from "../services/logger/Logger";
-import { RaftConnEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent } from "@robotical/raftjs";
 import ConnectorFactory from "./connectors/ConnectorFactory";
 var SHOW_LOGS = true;
 var TAG = "WrapperAppManager";
@@ -116,7 +116,7 @@ var WrapperAppManager = /** @class */ (function () {
      */
     WrapperAppManager.prototype.stopVerifyingRaft = function (isCorrectRIC, raftId) {
         if (!isCorrectRIC) {
-            this._removeRICConnector(raftId, 11000);
+            this._removeRICConnector(raftId, 3000);
         }
         return this.connectors[raftId].stopVerifyingRaft(isCorrectRIC);
     };
@@ -124,7 +124,7 @@ var WrapperAppManager = /** @class */ (function () {
      * Disconnect from a RAFT
      */
     WrapperAppManager.prototype.disconnect = function (raftId) {
-        this._removeRICConnector(raftId, 11000);
+        this._removeRICConnector(raftId, 3000);
         return this.connectors[raftId].disconnect();
     };
     /**

package/dist-types/src/wrapper-app/connectors/CogConnector/CogConnector.d.ts

@@ -2,7 +2,7 @@ import { RaftInfoEvents } from "../../../types/events/raft-info";
 import { ConnectionAttemptResults, RaftTypeE } from "../../../types/raft";
 import Connector from "../Connector";
 import ConnectorInterface from "../ConnectorInterface";
-import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
 import { ConnManager } from "@robotical/roboticaljs";
 declare class CogConnector extends Connector implements ConnectorInterface {
     type: RaftTypeE;

package/dist-types/src/wrapper-app/connectors/CogConnector/CogConnector.js

@@ -52,7 +52,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import Logger from "../../../services/logger/Logger";
 import { RaftTypeE } from "../../../types/raft";
 import Connector from "../Connector";
-import { RaftConnEvent, RaftUpdateEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftUpdateEvent } from "@robotical/raftjs";
 var SHOW_LOGS = true;
 var TAG = "CogConnector";
 var CogConnector = /** @class */ (function (_super) {

package/dist-types/src/wrapper-app/connectors/Connector.d.ts

@@ -2,7 +2,7 @@ import { RaftInfoEvents } from "../../types/events/raft-info";
 import { ConnectionAttemptResults, RaftTypeE } from "../../types/raft";
 import ConnectorInterface from "./ConnectorInterface";
 import { ConnManager, RICLedLcdColours } from "@robotical/roboticaljs";
-import { RaftOKFail, RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robdobsn/raftjs";
+import { RaftOKFail, RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robotical/raftjs";
 declare class Connector implements ConnectorInterface {
     id: string;
     type: RaftTypeE;
@@ -16,7 +16,7 @@ declare class Connector implements ConnectorInterface {
     /**
      * Get connected raft info
      */
-    getSystemInfo(): Promise<import("@robdobsn/raftjs").RaftSystemInfo>;
+    getSystemInfo(): Promise<import("@robotical/raftjs").RaftSystemInfo>;
     /**
      * Gets the RAFT name
      */

package/dist-types/src/wrapper-app/connectors/Connector.js

@@ -38,7 +38,7 @@ import { RaftInfoEvents } from "../../types/events/raft-info";
 import { WrapperSentMessage } from "../../types/communication-between-apps/wrapper-communication";
 import Logger from "../../services/logger/Logger";
 import { RaftTypeE } from "../../types/raft";
-import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robotical/raftjs";
 var SHOW_LOGS = true;
 var TAG = "Connector";
 var Connector = /** @class */ (function () {

package/dist-types/src/wrapper-app/connectors/ConnectorInterface.d.ts

@@ -1,4 +1,4 @@
-import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
 import { ConnectionAttemptResults, RaftTypeE } from "../../types/raft";
 import { RaftInfoEvents } from "../../types/events/raft-info";
 import { RICLedLcdColours } from "@robotical/roboticaljs";

package/dist-types/src/wrapper-app/connectors/MartyConnector/MartyConnector.d.ts

@@ -2,7 +2,7 @@ import { RaftInfoEvents } from "../../../types/events/raft-info";
 import { ConnectionAttemptResults, RaftTypeE } from "../../../types/raft";
 import Connector from "../Connector";
 import ConnectorInterface from "../ConnectorInterface";
-import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robotical/raftjs";
 import { ConnManager } from "@robotical/roboticaljs";
 declare class MartyConnector extends Connector implements ConnectorInterface {
     type: RaftTypeE;

package/dist-types/src/wrapper-app/connectors/MartyConnector/MartyConnector.js

@@ -53,7 +53,7 @@ import { RICRoboticalAddOns } from "@robotical/ricjs-robotical-addons";
 import Logger from "../../../services/logger/Logger";
 import { RaftTypeE } from "../../../types/raft";
 import Connector from "../Connector";
-import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, } from "@robdobsn/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, } from "@robotical/raftjs";
 import { RICServoParamUpdater, RICSystemUtils, } from "@robotical/roboticaljs";
 var SHOW_LOGS = true;
 var TAG = "MartyConnector";

package/package.json

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

package/dist-types/src/components/oneoffs/RICSignal/index.d.ts

@@ -1,7 +0,0 @@
-import RAFT from "../../../application/RAFTs/RAFT";
-type RICSignlaProps = {
-    signalStrength: number;
-    connectedRaft?: RAFT;
-};
-export default function RICSignal({ signalStrength, connectedRaft }: RICSignlaProps): import("react/jsx-runtime").JSX.Element;
-export {};