@robotical/webapp-types 1.0.7 → 1.0.9

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

@@ -1,23 +1,76 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 import { raftPubSubscriptionHelper } from "../raft-subscription-helpers";
 import { isVersionGreater_errorCatching } from "../../../utils/helpers/compare-version";
 import PublishedDataGetter from "./PublishedDataGetter";
-var PublishedDataAnalyser = /** @class */ (function () {
+import EventEmitter from "events";
+var PublishedDataAnalyser = /** @class */ (function (_super) {
+    __extends(PublishedDataAnalyser, _super);
     function PublishedDataAnalyser(cog) {
-        this.cog = cog;
-        this.TiltDetection = TiltDetection;
-        this.PublishedDataGetter = PublishedDataGetter;
-        this.cog = cog;
-        this.cogState = {
-            tilt: false,
-            movementType: false,
-            rotation: false,
-            buttonClick: false,
-            objectSense: false,
-            lightSense: false,
-            irMessage: false
+        var _this = _super.call(this) || this;
+        _this.cog = cog;
+        _this.eventsMap = {
+            tilt: {
+                forward: "tiltForward",
+                backward: "tiltBackward",
+                left: "tiltLeft",
+                right: "tiltRight",
+                none: "noTilt"
+            },
+            movementType: {
+                shake: "shake",
+                move: "move",
+                none: "noMovement"
+            },
+            rotation: {
+                clockwise: "rotationClockwise",
+                counterClockwise: "rotationCounterClockwise",
+                none: "noRotation"
+            },
+            buttonClick: {
+                click: "buttonClick",
+                release: "buttonRelease",
+                none: "noButtonClick"
+            },
+            objectSense: {
+                left: "objectSenseLeft",
+                right: "objectSenseRight",
+                none: "noObjectSense"
+            },
+            lightSense: {
+                high: "highLightSense",
+                mid: "midLightSense",
+                low: "lowLightSense",
+                none: "noLightSense"
+            },
+        };
+        _this.TiltDetection = TiltDetection;
+        _this.PublishedDataGetter = PublishedDataGetter;
+        _this.cog = cog;
+        _this.cogState = {
+            tilt: "none",
+            movementType: "none",
+            rotation: "none",
+            buttonClick: "none",
+            objectSense: "none",
+            lightSense: "none",
         };
-        this.pubSub = null;
-        this.subscribeToPublishedData();
+        _this.pubSub = null;
+        _this.subscribeToPublishedData();
+        return _this;
     }
     PublishedDataAnalyser.prototype.subscribeToPublishedData = function () {
         var _this = this;
@@ -31,44 +84,47 @@ var PublishedDataAnalyser = /** @class */ (function () {
         (_a = this.pubSub) === null || _a === void 0 ? void 0 : _a.unsubscribe();
     };
     PublishedDataAnalyser.prototype.analyse = function (data) {
+        //@ts-ignore
         var accelData = PublishedDataGetter.getAccelerometerData(data.deviceManager);
+        //@ts-ignore
         var gyroData = PublishedDataGetter.getGyroscopeData(data.deviceManager);
+        //@ts-ignore
         var lightData = PublishedDataGetter.getLightData(data.deviceManager);
         var isMoving;
         if (accelData)
-            isMoving = this.detectMovement(accelData.ax, accelData.ay, accelData.az);
-        accelData && this.detectTilt(accelData.ax, accelData.ay, accelData.az, !!isMoving);
-        gyroData && this.detectRotation(gyroData.gz, !!isMoving);
-        lightData && this.detectButtonClick(lightData === null || lightData === void 0 ? void 0 : lightData.ir2);
-        lightData && this.detectObjectSense(lightData.ir0, lightData.ir1);
-        lightData && this.detectLightSense(lightData.amb0);
-        //     this.detectIRMessage(data);
+            isMoving = shakeDetector.detectShake(accelData.ax, accelData.ay, accelData.az, Date.now(), this);
+        accelData && tiltDetection.detectTilt(accelData.ax, accelData.ay, accelData.az, isMoving, this, this.cog.getRaftVersion());
+        gyroData && rotationDetection.detectRotation(gyroData.gz, isMoving, this);
+        lightData && buttonClickDetection.detectButtonClick(lightData.ir2, this, this.cog.getRaftVersion());
+        lightData && objectSenseDetection.detectObjectSense([lightData.ir0, lightData.ir1], this);
+        lightData && lightSenseDetection.detectLightSense(lightData.amb0, this);
     };
-    PublishedDataAnalyser.prototype.detectMovement = function (ax, ay, az) {
-        return shakeDetector.detectShake(ax, ay, az, Date.now(), this.cogState);
+    PublishedDataAnalyser.prototype.setTilt = function (tilt) {
+        this.cogState.tilt = tilt;
+        this.emit(this.eventsMap.tilt[tilt]);
     };
-    PublishedDataAnalyser.prototype.detectTilt = function (ax, ay, az, isMoving) {
-        tiltDetection.detectTilt(ax, ay, az, isMoving, this.cogState, this.cog.getRaftVersion());
+    PublishedDataAnalyser.prototype.setMovementType = function (movementType) {
+        this.cogState.movementType = movementType;
+        this.emit(this.eventsMap.movementType[movementType]);
     };
-    PublishedDataAnalyser.prototype.detectRotation = function (gz, isMoving) {
-        rotationDetection.detectRotation(gz, isMoving, this.cogState);
+    PublishedDataAnalyser.prototype.setRotation = function (rotation) {
+        this.cogState.rotation = rotation;
+        this.emit(this.eventsMap.rotation[rotation]);
     };
-    PublishedDataAnalyser.prototype.detectButtonClick = function (buttonLightValue) {
-        buttonClickDetection.detectButtonClick(buttonLightValue, this.cogState, this.cog.getRaftVersion());
+    PublishedDataAnalyser.prototype.setButtonClick = function (buttonClick) {
+        this.cogState.buttonClick = buttonClick;
+        this.emit(this.eventsMap.buttonClick[buttonClick]);
     };
-    PublishedDataAnalyser.prototype.detectObjectSense = function (leftIRValue, rightIRValue) {
-        var objectSenseValueArray = [leftIRValue, rightIRValue];
-        objectSenseDetection.detectObjectSense(objectSenseValueArray, this.cogState);
+    PublishedDataAnalyser.prototype.setObjectSense = function (objectSense) {
+        this.cogState.objectSense = objectSense;
+        this.emit(this.eventsMap.objectSense[objectSense]);
     };
-    PublishedDataAnalyser.prototype.detectLightSense = function (ambientLightValue) {
-        lightSenseDetection.detectLightSense(ambientLightValue, this.cogState);
-    };
-    PublishedDataAnalyser.prototype.detectIRMessage = function (data) {
-        var irMessageData = data;
-        // irMessageDetection.detectIRMessage(data, this.cogState);
+    PublishedDataAnalyser.prototype.setLightSense = function (lightSense) {
+        this.cogState.lightSense = lightSense;
+        this.emit(this.eventsMap.lightSense[lightSense]);
     };
     return PublishedDataAnalyser;
-}());
+}(EventEmitter));
 var TiltDetection = /** @class */ (function () {
     function TiltDetection() {
     }
@@ -90,7 +146,7 @@ var TiltDetection = /** @class */ (function () {
         rotatedZ = rotatedZ; // z remains unchanged as the rotation is around the z-axis
         return { x: rotatedX, y: rotatedY, z: rotatedZ };
     };
-    TiltDetection.prototype.detectTilt = function (ax, ay, az, isMoving, cogState, cogVersion) {
+    TiltDetection.prototype.detectTilt = function (ax, ay, az, isMoving, analyser, cogVersion) {
         if (isMoving === void 0) { isMoving = false; }
         if (isMoving)
             return;
@@ -113,7 +169,7 @@ var TiltDetection = /** @class */ (function () {
         var forwardBackwardThreshold = 20 * (Math.PI / 180); // threshold for forward and backward tilt
         var leftRightThreshold = 20 * (Math.PI / 180); // threshold for left and right tilt
         var upDownThreshold = 0.5; // threshold for up and down tilt
-        var tiltDirection = false;
+        var tiltDirection = "none";
         if (pitch < -forwardBackwardThreshold) { // && Math.abs(yaw) < upDownThreshold) {
             tiltDirection = "forward";
         }
@@ -126,7 +182,7 @@ var TiltDetection = /** @class */ (function () {
         if (roll > leftRightThreshold) { // && Math.abs(yaw) < upDownThreshold) {
             tiltDirection = "right";
         }
-        cogState.tilt = tiltDirection;
+        analyser.setTilt(tiltDirection);
     };
     return TiltDetection;
 }());
@@ -146,11 +202,8 @@ var RotationDetection = /** @class */ (function () {
             this.dataBuffer.shift();
         }
     };
-    RotationDetection.prototype.detectRotation = function (gz, isMoving, cogState) {
+    RotationDetection.prototype.detectRotation = function (gz, isMoving, analyser) {
         if (isMoving === void 0) { isMoving = false; }
-        this.bufferSize = this.bufferSize;
-        this.DELAY_FOR_ROTATION = this.DELAY_FOR_ROTATION;
-        this.ROTATION_THRESHOLD = this.ROTATION_THRESHOLD;
         var currentTime = Date.now();
         this.addToBuffer(gz);
         if (this.dataBuffer.length < this.bufferSize) {
@@ -165,17 +218,18 @@ var RotationDetection = /** @class */ (function () {
         if (metric > this.ROTATION_THRESHOLD || metric < -this.ROTATION_THRESHOLD) {
             this.lastRotationDetectionTime = currentTime;
             this.dataBuffer = [];
+            console.log("Rotation detected. Rotation: ", metric > this.ROTATION_THRESHOLD ? "clockwise" : "counter-clockwise");
             if (metric > this.ROTATION_THRESHOLD) {
                 // console.log("Clockwise rotation detected:", metric);
-                cogState.rotation = "clockwise";
+                analyser.setRotation("clockwise");
             }
             else if (metric < -this.ROTATION_THRESHOLD) {
                 // console.log("Counter-clockwise rotation detected:", metric);
-                cogState.rotation = "counter-clockwise";
+                analyser.setRotation("counterClockwise");
             }
         }
         else {
-            cogState.rotation = false;
+            analyser.setRotation("none");
         }
     };
     RotationDetection.prototype.calculateMetric = function () {
@@ -208,7 +262,7 @@ var ShakeDetector = /** @class */ (function () {
         this.shakeInProgress = false;
         this.moveInProgress = false;
     }
-    ShakeDetector.prototype.detectShake = function (xAcc, yAcc, zAcc, timestamp, cogState) {
+    ShakeDetector.prototype.detectShake = function (xAcc, yAcc, zAcc, timestamp, analyser) {
         this.thresholdAcceleration = this.thresholdAcceleration;
         this.thresholdAccelerationMove = this.thresholdAccelerationMove;
         this.thresholdShakeNumber = this.thresholdShakeNumber;
@@ -221,11 +275,11 @@ var ShakeDetector = /** @class */ (function () {
             this.gravityVector = [xAcc, yAcc, zAcc];
             if (this.moveInProgress) {
                 // console.log("move detected");
-                cogState.movementType = "move";
+                analyser.setMovementType("move");
             }
             else {
                 // console.log("no move detected");
-                cogState.movementType = false;
+                analyser.setMovementType("none");
             }
             this.moveInProgress = false;
             this.shakeInProgress = false;
@@ -256,7 +310,7 @@ var ShakeDetector = /** @class */ (function () {
                             // console.log("Shake detected!");
                             this.sensorBundles = [];
                             this.shakeInProgress = false;
-                            cogState.movementType = "shake";
+                            analyser.setMovementType("shake");
                         }
                     }
                     // this.noMoveCallback();
@@ -267,7 +321,7 @@ var ShakeDetector = /** @class */ (function () {
                         this.sensorBundles = [];
                         // console.log("resetting shake detector. Move detected");
                         // fire move detector
-                        cogState.movementType = "move";
+                        analyser.setMovementType("move");
                     }
                 }
             }
@@ -285,7 +339,7 @@ var ShakeDetector = /** @class */ (function () {
             */
         }
     };
-    ShakeDetector.prototype.performCheck = function (cogState) {
+    ShakeDetector.prototype.performCheck = function (analyser) {
         var _this = this;
         var matrix = [
             [0, 0],
@@ -308,7 +362,7 @@ var ShakeDetector = /** @class */ (function () {
             }
             this.lastTimeShakeDetected = Date.now();
             // console.log("Shake detected!", JSON.stringify(matrix));
-            cogState.movementType = "shake";
+            analyser.setMovementType("shake");
             this.sensorBundles = [];
         }
     };
@@ -337,7 +391,7 @@ var ButtonClickDetection = /** @class */ (function () {
         this.lastTime = 0;
         this.buttonClicked = false;
     }
-    ButtonClickDetection.prototype.detectButtonClick = function (buttonValue, cogState, cogVersion) {
+    ButtonClickDetection.prototype.detectButtonClick = function (buttonValue, analyser, cogVersion) {
         var correctionCutOffVersion = "1.2.0";
         var clickThreshold = 1600;
         if (isVersionGreater_errorCatching(cogVersion, correctionCutOffVersion)) {
@@ -354,12 +408,12 @@ var ButtonClickDetection = /** @class */ (function () {
             // console.log("Button clicked", buttonValue);
             this.buttonClicked = true;
             this.lastTime = currentTime;
-            cogState.buttonClick = true;
+            analyser.setButtonClick("click");
         }
         else if (buttonValue < this.releaseThreshold && this.buttonClicked) {
             // console.log("Button released", buttonValue);
             this.buttonClicked = false;
-            cogState.buttonClick = false;
+            analyser.setButtonClick("release");
         }
         // } else {
         //     this.buttonClicked = false;
@@ -374,51 +428,40 @@ var ObjectSenseDetection = /** @class */ (function () {
         this.objectSensed1Threshold = 2500; // right of the arrow
         this.objectSensed2Threshold = 1500; // button
     }
-    ObjectSenseDetection.prototype.detectObjectSense = function (objectSenseValue, cogState) {
+    ObjectSenseDetection.prototype.detectObjectSense = function (objectSenseValue, analyser) {
         if (objectSenseValue[0] > this.objectSensed0Threshold) {
-            cogState.objectSense = "left";
+            analyser.setObjectSense("left");
         }
         else if (objectSenseValue[1] > this.objectSensed1Threshold) {
-            cogState.objectSense = "right";
+            analyser.setObjectSense("right");
         }
         else {
-            cogState.objectSense = false;
+            analyser.setObjectSense("none");
         }
     };
     return ObjectSenseDetection;
 }());
 var LightSenseDetection = /** @class */ (function () {
     function LightSenseDetection() {
-        this.lightSenseThreshold = 450;
+        this.lowLightThreshold = 5;
+        this.midLightThreshold = 250;
+        this.highLightThreshold = 450;
     }
-    LightSenseDetection.prototype.detectLightSense = function (lightSenseValue, cogState) {
-        if (lightSenseValue > this.lightSenseThreshold) {
-            cogState.lightSense = true;
-        }
-        else {
-            cogState.lightSense = false;
+    LightSenseDetection.prototype.detectLightSense = function (lightSenseValue, analyser) {
+        if (lightSenseValue > this.highLightThreshold) {
+            analyser.setLightSense("high");
         }
-    };
-    return LightSenseDetection;
-}());
-var IRMessageDetection = /** @class */ (function () {
-    function IRMessageDetection() {
-        this.irMessage0Threshold = 0;
-        this.irMessage1Threshold = 0;
-    }
-    IRMessageDetection.prototype.detectIRMessage = function (irMessageValue, cogState) {
-        // placeholder for now
-        if (irMessageValue[0] > this.irMessage0Threshold) {
-            cogState.irMessage = "left";
+        else if (lightSenseValue > this.midLightThreshold) {
+            analyser.setLightSense("mid");
         }
-        else if (irMessageValue[1] > this.irMessage1Threshold) {
-            cogState.irMessage = "right";
+        else if (lightSenseValue > this.lowLightThreshold) {
+            analyser.setLightSense("low");
         }
         else {
-            cogState.irMessage = false;
+            analyser.setLightSense("none");
         }
     };
-    return IRMessageDetection;
+    return LightSenseDetection;
 }());
 var rotationDetection = new RotationDetection();
 var shakeDetector = new ShakeDetector();
@@ -426,5 +469,4 @@ var buttonClickDetection = new ButtonClickDetection();
 var tiltDetection = new TiltDetection();
 var objectSenseDetection = new ObjectSenseDetection();
 var lightSenseDetection = new LightSenseDetection();
-var irMessageDetection = new IRMessageDetection();
 export default PublishedDataAnalyser;

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 {};