@hangtime/grip-connect 0.5.4 → 0.5.6

package/dist/interfaces/device/kilterboard.interface.d.ts

@@ -1,76 +1,15 @@
 import type { IDevice } from "../device.interface";
-/**
- * Represents a climbing placement with a position and role identifier.
- */
-export interface ClimbPlacement {
-    /** The position of the hold placement. */
-    position: number;
-    /** The role ID associated with the climb placement. */
-    role_id: number;
-}
 /**
  * Interface representing the KilterBoard device, extending the base Device interface.
  */
 export interface IKilterBoard extends IDevice {
-    /**
-     * Calculates the checksum for a byte array.
-     * @param data - The array of bytes to calculate the checksum for.
-     * @returns The calculated checksum value.
-     */
-    checksum(data: number[]): number;
-    /**
-     * Wraps a byte array with header and footer bytes for transmission.
-     * @param data - The array of bytes to wrap.
-     * @returns The wrapped byte array.
-     */
-    wrapBytes(data: number[]): number[];
-    /**
-     * Encodes a position into a byte array.
-     * @param position - The position to encode.
-     * @returns The encoded byte array representing the position.
-     */
-    encodePosition(position: number): number[];
-    /**
-     * Encodes a color string into a numeric representation.
-     * @param color - The color string in hexadecimal format.
-     * @returns The encoded/compressed color value.
-     */
-    encodeColor(color: string): number;
-    /**
-     * Encodes a placement into a byte array.
-     * @param position - The position to encode.
-     * @param ledColor - The color of the LED in hexadecimal format.
-     * @returns The encoded byte array representing the placement.
-     */
-    encodePlacement(position: number, ledColor: string): number[];
-    /**
-     * Prepares byte arrays for transmission based on a list of climb placements.
-     * @param climbPlacementList - The list of climb placements.
-     * @returns The final byte array ready for transmission.
-     */
-    prepBytesV3(climbPlacementList: ClimbPlacement[]): number[];
-    /**
-     * Splits a collection into slices of the specified length.
-     * @param n - Number of elements per slice.
-     * @param list - Array to be sliced.
-     * @returns The sliced array.
-     */
-    splitEvery(n: number, list: number[]): number[][];
-    /**
-     * Splits a message into 20-byte chunks for Bluetooth transmission.
-     * @param buffer - The message to split.
-     * @returns The array of Uint8Arrays.
-     */
-    splitMessages(buffer: number[]): Uint8Array[];
-    /**
-     * Sends a series of messages to the device.
-     * @param messages - Array of Uint8Arrays to send.
-     */
-    writeMessageSeries(messages: Uint8Array[]): Promise<void>;
     /**
      * Configures the LEDs based on an array of climb placements.
-     * @param config - Optional color or array of climb placements.
-     * @returns The prepared payload or undefined.
+     * @param {{ position: number; role_id: number }[]} config - Array of climb placements for the LEDs.
+     * @returns {Promise<number[] | undefined>} A promise that resolves with the payload array for the Kilter Board if LED settings were applied, or `undefined` if no action was taken or for the Motherboard.
      */
-    led(config?: ClimbPlacement[]): Promise<number[] | undefined>;
+    led(config: {
+        position: number;
+        role_id: number;
+    }[]): Promise<number[] | undefined>;
 }

package/dist/models/device/entralpi.model.js

@@ -1,6 +1,7 @@
 import { Device } from "../device.model";
 import { applyTare } from "../../helpers/tare";
 import { checkActivity } from "../../helpers/is-active";
+import { DownloadPackets } from "../../helpers/download";
 export class Entralpi extends Device {
     constructor() {
         super({
@@ -158,10 +159,19 @@ export class Entralpi extends Device {
             if (value.buffer) {
                 const buffer = value.buffer;
                 const rawData = new DataView(buffer);
+                const receivedTime = Date.now();
                 const receivedData = (rawData.getUint16(0) / 100).toFixed(1);
-                let numericData = Number(receivedData);
+                const convertedData = Number(receivedData);
                 // Tare correction
-                numericData -= applyTare(numericData);
+                const numericData = convertedData - applyTare(convertedData);
+                // Add data to downloadable Array
+                DownloadPackets.push({
+                    received: receivedTime,
+                    sampleNum: this.dataPointCount,
+                    battRaw: 0,
+                    samples: [convertedData],
+                    masses: [numericData],
+                });
                 // Update massMax
                 this.massMax = Math.max(Number(this.massMax), numericData).toFixed(1);
                 // Update running sum and count

package/dist/models/device/forceboard.model.js

@@ -1,5 +1,5 @@
 import { Device } from "../device.model";
-import { emptyDownloadPackets } from "../../helpers/download";
+import { DownloadPackets, emptyDownloadPackets } from "../../helpers/download";
 import { checkActivity } from "../../helpers/is-active";
 import { applyTare } from "../../helpers/tare";
 /**
@@ -188,11 +188,20 @@ export class ForceBoard extends Device {
             if (value.buffer) {
                 const buffer = value.buffer;
                 const rawData = new DataView(buffer);
+                const receivedTime = Date.now();
                 const receivedData = rawData.getUint8(4); // Read the value at index 4
                 // Convert from LBS to KG
-                let numericData = receivedData * 0.453592;
+                const convertedReceivedData = receivedData * 0.453592;
                 // Tare correction
-                numericData -= applyTare(numericData);
+                const numericData = convertedReceivedData - applyTare(convertedReceivedData);
+                // Add data to downloadable Array
+                DownloadPackets.push({
+                    received: receivedTime,
+                    sampleNum: this.dataPointCount,
+                    battRaw: 0,
+                    samples: [convertedReceivedData],
+                    masses: [numericData],
+                });
                 // Update massMax
                 this.massMax = Math.max(Number(this.massMax), numericData).toFixed(1);
                 // Update running sum and count

package/dist/models/device/kilterboard.model.d.ts

@@ -35,14 +35,6 @@ export declare const KilterBoardPlacementRoles: {
     led_color: string;
     screen_color: string;
 }[];
-/**
- * Represents climbs_placements from the Kilter Board application
- */
-declare class ClimbPlacement {
-    position: number;
-    role_id: number;
-    constructor(position: number, role_id: number);
-}
 /**
  * Represents a Aurora Climbing device
  * Kilter Board, Tension Board, Decoy Board, Touchstone Board, Grasshopper Board, Aurora Board, So iLL Board
@@ -79,13 +71,13 @@ export declare class KilterBoard extends Device implements IKilterBoard {
      * @param data - The array of bytes to calculate the checksum for.
      * @returns The calculated checksum value.
      */
-    checksum(data: number[]): number;
+    private checksum;
     /**
      * Wraps a byte array with header and footer bytes for transmission.
      * @param data - The array of bytes to wrap.
      * @returns The wrapped byte array.
      */
-    wrapBytes(data: number[]): number[];
+    private wrapBytes;
     /**
      * Encodes a position into a byte array.
      * The lowest 8 bits of the position get put in the first byte of the group.
@@ -93,27 +85,27 @@ export declare class KilterBoard extends Device implements IKilterBoard {
      * @param position - The position to encode.
      * @returns The encoded byte array representing the position.
      */
-    encodePosition(position: number): number[];
+    private encodePosition;
     /**
      * Encodes a color string into a numeric representation.
      * The rgb color, 3 bits for the R and G components, 2 bits for the B component, with the 3 R bits occupying the high end of the byte and the 2 B bits in the low end (hence 3 G bits in the middle).
      * @param color - The color string in hexadecimal format (e.g., 'FFFFFF').
      * @returns The encoded /compressed color value.
      */
-    encodeColor(color: string): number;
+    private encodeColor;
     /**
      * Encodes a placement (requires a 16-bit position and a 24-bit rgb color. ) into a byte array.
      * @param position - The position to encode.
      * @param ledColor - The color of the LED in hexadecimal format (e.g., 'FFFFFF').
      * @returns The encoded byte array representing the placement.
      */
-    encodePlacement(position: number, ledColor: string): number[];
+    private encodePlacement;
     /**
      * Prepares byte arrays for transmission based on a list of climb placements.
-     * @param climbPlacementList - The list of climb placements containing position and role ID.
-     * @returns The final byte array ready for transmission.
+     * @param {{ position: number; role_id: number }[]} climbPlacementList - The list of climb placements containing position and role ID.
+     * @returns {number[]} The final byte array ready for transmission.
      */
-    prepBytesV3(climbPlacementList: ClimbPlacement[]): number[];
+    private prepBytesV3;
     /**
      * Splits a collection into slices of the specified length.
      * https://github.com/ramda/ramda/blob/master/source/splitEvery.js
@@ -121,7 +113,7 @@ export declare class KilterBoard extends Device implements IKilterBoard {
      * @param {Array} list
      * @return {Array}
      */
-    splitEvery(n: number, list: number[]): number[][];
+    private splitEvery;
     /**
      * The kilter board only supports messages of 20 bytes
      * at a time. This method splits a full message into parts
@@ -129,16 +121,18 @@ export declare class KilterBoard extends Device implements IKilterBoard {
      *
      * @param buffer
      */
-    splitMessages: (buffer: number[]) => Uint8Array[];
+    private splitMessages;
     /**
      * Sends a series of messages to a device.
      */
-    writeMessageSeries(messages: Uint8Array[]): Promise<void>;
+    private writeMessageSeries;
     /**
-     * Configures the LEDs based on an array of climb placements. If a configuration is provided, it prepares and sends a payload to the device.
-     * @param {ClimbPlacement[]} [config] - Optional color or array of climb placements for the LEDs. Ignored if placements are provided.
+     * Configures the LEDs based on an array of climb placements.
+     * @param {{ position: number; role_id: number }[]} config - Array of climb placements for the LEDs.
      * @returns {Promise<number[] | undefined>} A promise that resolves with the payload array for the Kilter Board if LED settings were applied, or `undefined` if no action was taken or for the Motherboard.
      */
-    led: (config?: ClimbPlacement[]) => Promise<number[] | undefined>;
+    led: (config: {
+        position: number;
+        role_id: number;
+    }[]) => Promise<number[] | undefined>;
 }
-export {};

package/dist/models/device/kilterboard.model.js

@@ -64,17 +64,6 @@ export const KilterBoardPlacementRoles = [
         screen_color: "FFA500",
     },
 ];
-/**
- * Represents climbs_placements from the Kilter Board application
- */
-class ClimbPlacement {
-    position;
-    role_id;
-    constructor(position, role_id) {
-        this.position = position;
-        this.role_id = role_id;
-    }
-}
 /**
  * Represents a Aurora Climbing device
  * Kilter Board, Tension Board, Decoy Board, Touchstone Board, Grasshopper Board, Aurora Board, So iLL Board
@@ -206,8 +195,8 @@ export class KilterBoard extends Device {
     }
     /**
      * Prepares byte arrays for transmission based on a list of climb placements.
-     * @param climbPlacementList - The list of climb placements containing position and role ID.
-     * @returns The final byte array ready for transmission.
+     * @param {{ position: number; role_id: number }[]} climbPlacementList - The list of climb placements containing position and role ID.
+     * @returns {number[]} The final byte array ready for transmission.
      */
     prepBytesV3(climbPlacementList) {
         const resultArray = [];
@@ -273,8 +262,8 @@ export class KilterBoard extends Device {
         }
     }
     /**
-     * Configures the LEDs based on an array of climb placements. If a configuration is provided, it prepares and sends a payload to the device.
-     * @param {ClimbPlacement[]} [config] - Optional color or array of climb placements for the LEDs. Ignored if placements are provided.
+     * Configures the LEDs based on an array of climb placements.
+     * @param {{ position: number; role_id: number }[]} config - Array of climb placements for the LEDs.
      * @returns {Promise<number[] | undefined>} A promise that resolves with the payload array for the Kilter Board if LED settings were applied, or `undefined` if no action was taken or for the Motherboard.
      */
     led = async (config) => {

package/dist/models/device/progressor.model.js

@@ -123,38 +123,38 @@ export class Progressor extends Device {
         if (value) {
             if (value.buffer) {
                 const buffer = value.buffer;
-                const data = new DataView(buffer);
+                const rawData = new DataView(buffer);
                 const receivedTime = Date.now();
-                const [kind] = struct("<bb").unpack(data.buffer.slice(0, 2));
+                const [kind] = struct("<bb").unpack(rawData.buffer.slice(0, 2));
                 if (kind === ProgressorResponses.WEIGHT_MEASURE) {
-                    const iterable = struct("<fi").iter_unpack(data.buffer.slice(2));
+                    const iterable = struct("<fi").iter_unpack(rawData.buffer.slice(2));
                     // eslint-disable-next-line prefer-const
                     for (let [weight, seconds] of iterable) {
                         if (typeof weight === "number" && !isNaN(weight) && typeof seconds === "number" && !isNaN(seconds)) {
-                            // Add data to downloadable Array: sample and mass are the same
+                            // Tare correction
+                            const numericData = weight - applyTare(weight);
+                            // Add data to downloadable Array
                             DownloadPackets.push({
                                 received: receivedTime,
                                 sampleNum: seconds,
                                 battRaw: 0,
                                 samples: [weight],
-                                masses: [weight],
+                                masses: [numericData],
                             });
-                            // Tare correction
-                            weight -= applyTare(weight);
                             // Check for max weight
-                            this.massMax = Math.max(Number(this.massMax), Number(weight)).toFixed(1);
+                            this.massMax = Math.max(Number(this.massMax), Number(numericData)).toFixed(1);
                             // Update running sum and count
-                            const currentMassTotal = Math.max(-1000, Number(weight));
+                            const currentMassTotal = Math.max(-1000, Number(numericData));
                             this.massTotalSum += currentMassTotal;
                             this.dataPointCount++;
                             // Calculate the average dynamically
                             this.massAverage = (this.massTotalSum / this.dataPointCount).toFixed(1);
                             // Check if device is being used
-                            checkActivity(weight);
+                            checkActivity(numericData);
                             this.notifyCallback({
                                 massMax: this.massMax,
                                 massAverage: this.massAverage,
-                                massTotal: Math.max(-1000, weight).toFixed(1),
+                                massTotal: Math.max(-1000, numericData).toFixed(1),
                             });
                         }
                     }
@@ -164,13 +164,13 @@ export class Progressor extends Device {
                         return;
                     let value = "";
                     if (this.writeLast === this.commands.GET_BATT_VLTG) {
-                        value = new DataView(data.buffer, 2).getUint32(0, true).toString();
+                        value = new DataView(rawData.buffer, 2).getUint32(0, true).toString();
                     }
                     else if (this.writeLast === this.commands.GET_FW_VERSION) {
-                        value = new TextDecoder().decode(data.buffer.slice(2));
+                        value = new TextDecoder().decode(rawData.buffer.slice(2));
                     }
                     else if (this.writeLast === this.commands.GET_ERR_INFO) {
-                        value = new TextDecoder().decode(data.buffer.slice(2));
+                        value = new TextDecoder().decode(rawData.buffer.slice(2));
                     }
                     this.writeCallback(value);
                 }

package/dist/models/device/wh-c06.model.d.ts

@@ -7,11 +7,28 @@ import type { IWHC06 } from "../../interfaces/device/wh-c06.interface";
 export declare class WHC06 extends Device implements IWHC06 {
     /**
      * Offset for the byte location in the manufacturer data to extract the weight.
-     * This value is constant across all instances of the class.
      * @type {number}
      * @constant
      */
     private static readonly WEIGHT_OFFSET;
+    /**
+     * Company identifier for WH-C06, also used by 'TomTom International BV': https://www.bluetooth.com/specifications/assigned-numbers/
+     * @type {number}
+     * @constant
+     */
+    private static readonly MANUFACTURER_ID;
+    /**
+     * To track disconnection timeout.
+     * @type {number|null}
+     * @constant
+     */
+    private advertisementTimeout;
+    /**
+     * The limit in seconds when timeout is triggered
+     * @type {number|null}
+     * @constant
+     */
+    private advertisementTimeoutTime;
     constructor();
     /**
      * Connects to a Bluetooth device.
@@ -19,4 +36,14 @@ export declare class WHC06 extends Device implements IWHC06 {
      * @param {Function} [onError] - Optional callback function to execute on error. Default logs the error.
      */
     connect: (onSuccess?: () => void, onError?: (error: Error) => void) => Promise<void>;
+    /**
+     * Custom check if a Bluetooth device is connected.
+     * For the WH-C06 device, the `gatt.connected` property remains `false` even after the device is connected.
+     * @returns {boolean} A boolean indicating whether the device is connected.
+     */
+    isConnected: () => boolean;
+    /**
+     * Resets the timeout that checks if the device is still advertising.
+     */
+    private resetAdvertisementTimeout;
 }

package/dist/models/device/wh-c06.model.js

@@ -1,6 +1,7 @@
 import { Device } from "../device.model";
 import { applyTare } from "../../helpers/tare";
 import { checkActivity } from "../../helpers/is-active";
+import { DownloadPackets } from "../../helpers/download";
 /**
  * Represents a  Weiheng - WH-C06 (or MAT Muscle Meter) device
  * Enable 'Experimental Web Platform features' Chrome Flags.
@@ -8,11 +9,28 @@ import { checkActivity } from "../../helpers/is-active";
 export class WHC06 extends Device {
     /**
      * Offset for the byte location in the manufacturer data to extract the weight.
-     * This value is constant across all instances of the class.
      * @type {number}
      * @constant
      */
     static WEIGHT_OFFSET = 10;
+    /**
+     * Company identifier for WH-C06, also used by 'TomTom International BV': https://www.bluetooth.com/specifications/assigned-numbers/
+     * @type {number}
+     * @constant
+     */
+    static MANUFACTURER_ID = 256;
+    /**
+     * To track disconnection timeout.
+     * @type {number|null}
+     * @constant
+     */
+    advertisementTimeout = null;
+    /**
+     * The limit in seconds when timeout is triggered
+     * @type {number|null}
+     * @constant
+     */
+    advertisementTimeoutTime = 10;
     // private static readonly  STABLE_OFFSET = 14
     constructor() {
         super({
@@ -45,20 +63,27 @@ export class WHC06 extends Device {
             if (!this.bluetooth.gatt) {
                 throw new Error("GATT is not available on this device");
             }
-            // Device has no services / characteristics
+            // Device has no services / characteristics, so we directly call onSuccess
             onSuccess();
-            // WH-C06
-            const MANUFACTURER_ID = 256; // 0x0100
             this.bluetooth.addEventListener("advertisementreceived", (event) => {
-                const data = event.manufacturerData.get(MANUFACTURER_ID);
+                const data = event.manufacturerData.get(WHC06.MANUFACTURER_ID);
                 if (data) {
                     // Handle recieved data
                     const weight = (data.getUint8(WHC06.WEIGHT_OFFSET) << 8) | data.getUint8(WHC06.WEIGHT_OFFSET + 1);
                     // const stable = (data.getUint8(STABLE_OFFSET) & 0xf0) >> 4
                     // const unit = data.getUint8(STABLE_OFFSET) & 0x0f
-                    let numericData = weight / 100;
+                    const receivedTime = Date.now();
+                    const receivedData = weight / 100;
                     // Tare correction
-                    numericData -= applyTare(numericData);
+                    const numericData = receivedData - applyTare(receivedData);
+                    // Add data to downloadable Array
+                    DownloadPackets.push({
+                        received: receivedTime,
+                        sampleNum: this.dataPointCount,
+                        battRaw: 0,
+                        samples: [numericData],
+                        masses: [numericData],
+                    });
                     // Update massMax
                     this.massMax = Math.max(Number(this.massMax), numericData).toFixed(1);
                     // Update running sum and count
@@ -76,6 +101,8 @@ export class WHC06 extends Device {
                         massTotal: Math.max(-1000, numericData).toFixed(1),
                     });
                 }
+                // Reset "still advertising" counter
+                this.resetAdvertisementTimeout();
             });
             // When the companyIdentifier is provided we want to get manufacturerData using watchAdvertisements.
             if (optionalManufacturerData.length) {
@@ -94,4 +121,30 @@ export class WHC06 extends Device {
             onError(error);
         }
     };
+    /**
+     * Custom check if a Bluetooth device is connected.
+     * For the WH-C06 device, the `gatt.connected` property remains `false` even after the device is connected.
+     * @returns {boolean} A boolean indicating whether the device is connected.
+     */
+    isConnected = () => {
+        return !!this.bluetooth;
+    };
+    /**
+     * Resets the timeout that checks if the device is still advertising.
+     */
+    resetAdvertisementTimeout = () => {
+        // Clear the previous timeout
+        if (this.advertisementTimeout) {
+            clearTimeout(this.advertisementTimeout);
+        }
+        // Set a new timeout to stop tracking if no advertisement is received
+        this.advertisementTimeout = window.setTimeout(() => {
+            // Mimic a disconnect
+            const disconnectedEvent = new Event("gattserverdisconnected");
+            Object.defineProperty(disconnectedEvent, "target", { value: this.bluetooth, writable: false });
+            // Also display a e
+            throw new Error(`No advertisement received for ${this.advertisementTimeoutTime} seconds, stopping tracking..`);
+            this.onDisconnected(disconnectedEvent);
+        }, this.advertisementTimeoutTime * 1000); // 10 seconds
+    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hangtime/grip-connect",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Griptonite Motherboard, Tindeq Progressor, PitchSix Force Board, WHC-06, Entralpi, Climbro, mySmartBoard: Web Bluetooth API Force-Sensing strength analysis for climbers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/interfaces/device/kilterboard.interface.ts

@@ -1,85 +1,12 @@
 import type { IDevice } from "../device.interface"
-/**
- * Represents a climbing placement with a position and role identifier.
- */
-export interface ClimbPlacement {
-  /** The position of the hold placement. */
-  position: number
-  /** The role ID associated with the climb placement. */
-  role_id: number
-}
 /**
  * Interface representing the KilterBoard device, extending the base Device interface.
  */
 export interface IKilterBoard extends IDevice {
-  /**
-   * Calculates the checksum for a byte array.
-   * @param data - The array of bytes to calculate the checksum for.
-   * @returns The calculated checksum value.
-   */
-  checksum(data: number[]): number
-
-  /**
-   * Wraps a byte array with header and footer bytes for transmission.
-   * @param data - The array of bytes to wrap.
-   * @returns The wrapped byte array.
-   */
-  wrapBytes(data: number[]): number[]
-
-  /**
-   * Encodes a position into a byte array.
-   * @param position - The position to encode.
-   * @returns The encoded byte array representing the position.
-   */
-  encodePosition(position: number): number[]
-
-  /**
-   * Encodes a color string into a numeric representation.
-   * @param color - The color string in hexadecimal format.
-   * @returns The encoded/compressed color value.
-   */
-  encodeColor(color: string): number
-
-  /**
-   * Encodes a placement into a byte array.
-   * @param position - The position to encode.
-   * @param ledColor - The color of the LED in hexadecimal format.
-   * @returns The encoded byte array representing the placement.
-   */
-  encodePlacement(position: number, ledColor: string): number[]
-
-  /**
-   * Prepares byte arrays for transmission based on a list of climb placements.
-   * @param climbPlacementList - The list of climb placements.
-   * @returns The final byte array ready for transmission.
-   */
-  prepBytesV3(climbPlacementList: ClimbPlacement[]): number[]
-
-  /**
-   * Splits a collection into slices of the specified length.
-   * @param n - Number of elements per slice.
-   * @param list - Array to be sliced.
-   * @returns The sliced array.
-   */
-  splitEvery(n: number, list: number[]): number[][]
-
-  /**
-   * Splits a message into 20-byte chunks for Bluetooth transmission.
-   * @param buffer - The message to split.
-   * @returns The array of Uint8Arrays.
-   */
-  splitMessages(buffer: number[]): Uint8Array[]
-
-  /**
-   * Sends a series of messages to the device.
-   * @param messages - Array of Uint8Arrays to send.
-   */
-  writeMessageSeries(messages: Uint8Array[]): Promise<void>
-
   /**
    * Configures the LEDs based on an array of climb placements.
-   * @param config - Optional color or array of climb placements.
-   * @returns The prepared payload or undefined.
+   * @param {{ position: number; role_id: number }[]} config - Array of climb placements for the LEDs.
+   * @returns {Promise<number[] | undefined>} A promise that resolves with the payload array for the Kilter Board if LED settings were applied, or `undefined` if no action was taken or for the Motherboard.
    */
-  led(config?: ClimbPlacement[]): Promise<number[] | undefined>
+  led(config: { position: number; role_id: number }[]): Promise<number[] | undefined>
 }

package/src/models/device/entralpi.model.ts

@@ -2,6 +2,7 @@ import { Device } from "../device.model"
 import type { IEntralpi } from "../../interfaces/device/entralpi.interface"
 import { applyTare } from "../../helpers/tare"
 import { checkActivity } from "../../helpers/is-active"
+import { DownloadPackets } from "../../helpers/download"
 
 export class Entralpi extends Device implements IEntralpi {
   constructor() {
@@ -165,12 +166,20 @@ export class Entralpi extends Device implements IEntralpi {
       if (value.buffer) {
         const buffer: ArrayBuffer = value.buffer
         const rawData: DataView = new DataView(buffer)
+        const receivedTime: number = Date.now()
         const receivedData: string = (rawData.getUint16(0) / 100).toFixed(1)
 
-        let numericData = Number(receivedData)
-
+        const convertedData = Number(receivedData)
         // Tare correction
-        numericData -= applyTare(numericData)
+        const numericData = convertedData - applyTare(convertedData)
+        // Add data to downloadable Array
+        DownloadPackets.push({
+          received: receivedTime,
+          sampleNum: this.dataPointCount,
+          battRaw: 0,
+          samples: [convertedData],
+          masses: [numericData],
+        })
 
         // Update massMax
         this.massMax = Math.max(Number(this.massMax), numericData).toFixed(1)

package/src/models/device/forceboard.model.ts

@@ -1,6 +1,6 @@
 import { Device } from "../device.model"
 import type { IForceBoard } from "../../interfaces/device/forceboard.interface"
-import { emptyDownloadPackets } from "../../helpers/download"
+import { DownloadPackets, emptyDownloadPackets } from "../../helpers/download"
 import { checkActivity } from "../../helpers/is-active"
 import { applyTare } from "../../helpers/tare"
 
@@ -192,14 +192,21 @@ export class ForceBoard extends Device implements IForceBoard {
       if (value.buffer) {
         const buffer: ArrayBuffer = value.buffer
         const rawData: DataView = new DataView(buffer)
+        const receivedTime: number = Date.now()
 
         const receivedData = rawData.getUint8(4) // Read the value at index 4
-
         // Convert from LBS to KG
-        let numericData = receivedData * 0.453592
-
+        const convertedReceivedData = receivedData * 0.453592
         // Tare correction
-        numericData -= applyTare(numericData)
+        const numericData = convertedReceivedData - applyTare(convertedReceivedData)
+        // Add data to downloadable Array
+        DownloadPackets.push({
+          received: receivedTime,
+          sampleNum: this.dataPointCount,
+          battRaw: 0,
+          samples: [convertedReceivedData],
+          masses: [numericData],
+        })
 
         // Update massMax
         this.massMax = Math.max(Number(this.massMax), numericData).toFixed(1)

package/src/models/device/kilterboard.model.ts

@@ -66,19 +66,6 @@ export const KilterBoardPlacementRoles = [
   },
 ]
 
-/**
- * Represents climbs_placements from the Kilter Board application
- */
-class ClimbPlacement {
-  position: number
-  role_id: number
-
-  constructor(position: number, role_id: number) {
-    this.position = position
-    this.role_id = role_id
-  }
-}
-
 /**
  * Represents a Aurora Climbing device
  * Kilter Board, Tension Board, Decoy Board, Touchstone Board, Grasshopper Board, Aurora Board, So iLL Board
@@ -145,7 +132,7 @@ export class KilterBoard extends Device implements IKilterBoard {
    * @param data - The array of bytes to calculate the checksum for.
    * @returns The calculated checksum value.
    */
-  checksum(data: number[]) {
+  private checksum(data: number[]) {
     let i = 0
     for (const value of data) {
       i = (i + value) & 255
@@ -157,7 +144,7 @@ export class KilterBoard extends Device implements IKilterBoard {
    * @param data - The array of bytes to wrap.
    * @returns The wrapped byte array.
    */
-  wrapBytes(data: number[]) {
+  private wrapBytes(data: number[]) {
     if (data.length > this.MESSAGE_BODY_MAX_LENGTH) {
       return []
     }
@@ -180,7 +167,7 @@ export class KilterBoard extends Device implements IKilterBoard {
    * @param position - The position to encode.
    * @returns The encoded byte array representing the position.
    */
-  encodePosition(position: number) {
+  private encodePosition(position: number) {
     const position1 = position & 255
     const position2 = (position & 65280) >> 8
 
@@ -192,7 +179,7 @@ export class KilterBoard extends Device implements IKilterBoard {
    * @param color - The color string in hexadecimal format (e.g., 'FFFFFF').
    * @returns The encoded /compressed color value.
    */
-  encodeColor(color: string) {
+  private encodeColor(color: string) {
     const substring = color.substring(0, 2)
     const substring2 = color.substring(2, 4)
 
@@ -212,15 +199,15 @@ export class KilterBoard extends Device implements IKilterBoard {
    * @param ledColor - The color of the LED in hexadecimal format (e.g., 'FFFFFF').
    * @returns The encoded byte array representing the placement.
    */
-  encodePlacement(position: number, ledColor: string) {
+  private encodePlacement(position: number, ledColor: string) {
     return [...this.encodePosition(position), this.encodeColor(ledColor)]
   }
   /**
    * Prepares byte arrays for transmission based on a list of climb placements.
-   * @param climbPlacementList - The list of climb placements containing position and role ID.
-   * @returns The final byte array ready for transmission.
+   * @param {{ position: number; role_id: number }[]} climbPlacementList - The list of climb placements containing position and role ID.
+   * @returns {number[]} The final byte array ready for transmission.
    */
-  prepBytesV3(climbPlacementList: ClimbPlacement[]) {
+  private prepBytesV3(climbPlacementList: { position: number; role_id: number }[]) {
     const resultArray: number[][] = []
     let tempArray: number[] = [KilterBoardPacket.V3_MIDDLE]
 
@@ -260,7 +247,7 @@ export class KilterBoard extends Device implements IKilterBoard {
    * @param {Array} list
    * @return {Array}
    */
-  splitEvery(n: number, list: number[]) {
+  private splitEvery(n: number, list: number[]) {
     if (n <= 0) {
       throw new Error("First argument to splitEvery must be a positive integer")
     }
@@ -278,22 +265,22 @@ export class KilterBoard extends Device implements IKilterBoard {
    *
    * @param buffer
    */
-  splitMessages = (buffer: number[]) =>
+  private splitMessages = (buffer: number[]) =>
     this.splitEvery(this.MAX_BLUETOOTH_MESSAGE_SIZE, buffer).map((arr) => new Uint8Array(arr))
   /**
    * Sends a series of messages to a device.
    */
-  async writeMessageSeries(messages: Uint8Array[]) {
+  private async writeMessageSeries(messages: Uint8Array[]) {
     for (const message of messages) {
       await this.write("uart", "tx", message)
     }
   }
   /**
-   * Configures the LEDs based on an array of climb placements. If a configuration is provided, it prepares and sends a payload to the device.
-   * @param {ClimbPlacement[]} [config] - Optional color or array of climb placements for the LEDs. Ignored if placements are provided.
+   * Configures the LEDs based on an array of climb placements.
+   * @param {{ position: number; role_id: number }[]} config - Array of climb placements for the LEDs.
    * @returns {Promise<number[] | undefined>} A promise that resolves with the payload array for the Kilter Board if LED settings were applied, or `undefined` if no action was taken or for the Motherboard.
    */
-  led = async (config?: ClimbPlacement[]): Promise<number[] | undefined> => {
+  led = async (config: { position: number; role_id: number }[]): Promise<number[] | undefined> => {
     // Handle Kilterboard logic: process placements and send payload if connected
     if (Array.isArray(config)) {
       // Prepares byte arrays for transmission based on a list of climb placements.

package/src/models/device/progressor.model.ts

@@ -133,28 +133,28 @@ export class Progressor extends Device implements IProgressor {
     if (value) {
       if (value.buffer) {
         const buffer: ArrayBuffer = value.buffer
-        const data: DataView = new DataView(buffer)
+        const rawData: DataView = new DataView(buffer)
         const receivedTime: number = Date.now()
-        const [kind] = struct("<bb").unpack(data.buffer.slice(0, 2))
+        const [kind] = struct("<bb").unpack(rawData.buffer.slice(0, 2))
         if (kind === ProgressorResponses.WEIGHT_MEASURE) {
-          const iterable: IterableIterator<unknown[]> = struct("<fi").iter_unpack(data.buffer.slice(2))
+          const iterable: IterableIterator<unknown[]> = struct("<fi").iter_unpack(rawData.buffer.slice(2))
           // eslint-disable-next-line prefer-const
           for (let [weight, seconds] of iterable) {
             if (typeof weight === "number" && !isNaN(weight) && typeof seconds === "number" && !isNaN(seconds)) {
-              // Add data to downloadable Array: sample and mass are the same
+              // Tare correction
+              const numericData = weight - applyTare(weight)
+              // Add data to downloadable Array
               DownloadPackets.push({
                 received: receivedTime,
                 sampleNum: seconds,
                 battRaw: 0,
                 samples: [weight],
-                masses: [weight],
+                masses: [numericData],
               })
-              // Tare correction
-              weight -= applyTare(weight)
               // Check for max weight
-              this.massMax = Math.max(Number(this.massMax), Number(weight)).toFixed(1)
+              this.massMax = Math.max(Number(this.massMax), Number(numericData)).toFixed(1)
               // Update running sum and count
-              const currentMassTotal = Math.max(-1000, Number(weight))
+              const currentMassTotal = Math.max(-1000, Number(numericData))
               this.massTotalSum += currentMassTotal
               this.dataPointCount++
 
@@ -162,12 +162,12 @@ export class Progressor extends Device implements IProgressor {
               this.massAverage = (this.massTotalSum / this.dataPointCount).toFixed(1)
 
               // Check if device is being used
-              checkActivity(weight)
+              checkActivity(numericData)
 
               this.notifyCallback({
                 massMax: this.massMax,
                 massAverage: this.massAverage,
-                massTotal: Math.max(-1000, weight).toFixed(1),
+                massTotal: Math.max(-1000, numericData).toFixed(1),
               })
             }
           }
@@ -177,11 +177,11 @@ export class Progressor extends Device implements IProgressor {
           let value = ""
 
           if (this.writeLast === this.commands.GET_BATT_VLTG) {
-            value = new DataView(data.buffer, 2).getUint32(0, true).toString()
+            value = new DataView(rawData.buffer, 2).getUint32(0, true).toString()
           } else if (this.writeLast === this.commands.GET_FW_VERSION) {
-            value = new TextDecoder().decode(data.buffer.slice(2))
+            value = new TextDecoder().decode(rawData.buffer.slice(2))
           } else if (this.writeLast === this.commands.GET_ERR_INFO) {
-            value = new TextDecoder().decode(data.buffer.slice(2))
+            value = new TextDecoder().decode(rawData.buffer.slice(2))
           }
           this.writeCallback(value)
         } else if (kind === ProgressorResponses.LOW_BATTERY_WARNING) {

package/src/models/device/wh-c06.model.ts

@@ -2,6 +2,7 @@ import { Device } from "../device.model"
 import { applyTare } from "../../helpers/tare"
 import { checkActivity } from "../../helpers/is-active"
 import type { IWHC06 } from "../../interfaces/device/wh-c06.interface"
+import { DownloadPackets } from "../../helpers/download"
 
 /**
  * Represents a  Weiheng - WH-C06 (or MAT Muscle Meter) device
@@ -10,14 +11,30 @@ import type { IWHC06 } from "../../interfaces/device/wh-c06.interface"
 export class WHC06 extends Device implements IWHC06 {
   /**
    * Offset for the byte location in the manufacturer data to extract the weight.
-   * This value is constant across all instances of the class.
    * @type {number}
    * @constant
    */
   private static readonly WEIGHT_OFFSET = 10
+  /**
+   * Company identifier for WH-C06, also used by 'TomTom International BV': https://www.bluetooth.com/specifications/assigned-numbers/
+   * @type {number}
+   * @constant
+   */
+  private static readonly MANUFACTURER_ID: number = 256
+  /**
+   * To track disconnection timeout.
+   * @type {number|null}
+   * @constant
+   */
+  private advertisementTimeout: number | null = null
+  /**
+   * The limit in seconds when timeout is triggered
+   * @type {number|null}
+   * @constant
+   */
+  private advertisementTimeoutTime = 10
 
   // private static readonly  STABLE_OFFSET = 14
-
   constructor() {
     super({
       filters: [
@@ -33,7 +50,6 @@ export class WHC06 extends Device implements IWHC06 {
       services: [],
     })
   }
-
   /**
    * Connects to a Bluetooth device.
    * @param {Function} [onSuccess] - Optional callback function to execute on successful connection. Default logs success.
@@ -58,24 +74,30 @@ export class WHC06 extends Device implements IWHC06 {
         throw new Error("GATT is not available on this device")
       }
 
-      // Device has no services / characteristics
+      // Device has no services / characteristics, so we directly call onSuccess
       onSuccess()
 
-      // WH-C06
-      const MANUFACTURER_ID = 256 // 0x0100
-
       this.bluetooth.addEventListener("advertisementreceived", (event) => {
-        const data = event.manufacturerData.get(MANUFACTURER_ID)
+        const data = event.manufacturerData.get(WHC06.MANUFACTURER_ID)
         if (data) {
           // Handle recieved data
           const weight = (data.getUint8(WHC06.WEIGHT_OFFSET) << 8) | data.getUint8(WHC06.WEIGHT_OFFSET + 1)
           // const stable = (data.getUint8(STABLE_OFFSET) & 0xf0) >> 4
           // const unit = data.getUint8(STABLE_OFFSET) & 0x0f
-
-          let numericData = weight / 100
+          const receivedTime: number = Date.now()
+          const receivedData = weight / 100
 
           // Tare correction
-          numericData -= applyTare(numericData)
+          const numericData = receivedData - applyTare(receivedData)
+
+          // Add data to downloadable Array
+          DownloadPackets.push({
+            received: receivedTime,
+            sampleNum: this.dataPointCount,
+            battRaw: 0,
+            samples: [numericData],
+            masses: [numericData],
+          })
 
           // Update massMax
           this.massMax = Math.max(Number(this.massMax), numericData).toFixed(1)
@@ -98,6 +120,8 @@ export class WHC06 extends Device implements IWHC06 {
             massTotal: Math.max(-1000, numericData).toFixed(1),
           })
         }
+        // Reset "still advertising" counter
+        this.resetAdvertisementTimeout()
       })
 
       // When the companyIdentifier is provided we want to get manufacturerData using watchAdvertisements.
@@ -117,4 +141,31 @@ export class WHC06 extends Device implements IWHC06 {
       onError(error as Error)
     }
   }
+  /**
+   * Custom check if a Bluetooth device is connected.
+   * For the WH-C06 device, the `gatt.connected` property remains `false` even after the device is connected.
+   * @returns {boolean} A boolean indicating whether the device is connected.
+   */
+  isConnected = (): boolean => {
+    return !!this.bluetooth
+  }
+  /**
+   * Resets the timeout that checks if the device is still advertising.
+   */
+  private resetAdvertisementTimeout = (): void => {
+    // Clear the previous timeout
+    if (this.advertisementTimeout) {
+      clearTimeout(this.advertisementTimeout)
+    }
+
+    // Set a new timeout to stop tracking if no advertisement is received
+    this.advertisementTimeout = window.setTimeout(() => {
+      // Mimic a disconnect
+      const disconnectedEvent = new Event("gattserverdisconnected")
+      Object.defineProperty(disconnectedEvent, "target", { value: this.bluetooth, writable: false })
+      // Also display a e
+      throw new Error(`No advertisement received for ${this.advertisementTimeoutTime} seconds, stopping tracking..`)
+      this.onDisconnected(disconnectedEvent)
+    }, this.advertisementTimeoutTime * 1000) // 10 seconds
+  }
 }