@hangtime/grip-connect 0.6.1 → 0.6.2

package/README.md

@@ -35,9 +35,8 @@ Learn more: [Documentation](https://stevie-ray.github.io/hangtime-grip-connect/)
 
 ## Install
 
-This package is compatible with both Node.js and browser environments. It can be found in the
-[NPM](https://www.npmjs.com/package/@hangtime/grip-connect) and [JSR](https://jsr.io/@hangtime/grip-connect) package
-registries.
+This package works with Node.js, Bun, Deno, and the web, and is available on both
+[NPM](https://www.npmjs.com/package/@hangtime/grip-connect) and [JSR](https://jsr.io/@hangtime/grip-connect).
 
 ```sh [npm]
 $ npm install @hangtime/grip-connect

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export type { IClimbro, IEntralpi, IForceBoard, IKilterBoard, IMotherboard, ImySmartBoard, IProgressor, IWHC06, } from "./interfaces/index.js";
-export { Climbro, Entralpi, ForceBoard, KilterBoard, Motherboard, mySmartBoard, Progressor, WHC06, } from "./models/index.js";
+export type { IClimbro, IEntralpi, IForceBoard, IKilterBoard, IMotherboard, ImySmartBoard, IProgressor, IWHC06, } from "./interfaces/index";
+export { Climbro, Entralpi, ForceBoard, KilterBoard, Motherboard, mySmartBoard, Progressor, WHC06, } from "./models/index";

package/dist/index.js

@@ -1 +1 @@
-export { Climbro, Entralpi, ForceBoard, KilterBoard, Motherboard, mySmartBoard, Progressor, WHC06, } from "./models/index.js";
+export { Climbro, Entralpi, ForceBoard, KilterBoard, Motherboard, mySmartBoard, Progressor, WHC06, } from "./models/index";

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js";
+import type { IDevice } from "../device.interface";
 /**
  * Interface representing the Climbro device, extending the base Device interface.
  */

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js";
+import type { IDevice } from "../device.interface";
 /**
  * Interface representing the Entralpi device, extending the base Device interface.
  */

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js";
+import type { IDevice } from "../device.interface";
 /**
  * Interface representing the PitchSix ForceBoard device, extending the base Device interface.
  */

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js";
+import type { IDevice } from "../device.interface";
 /**
  * Interface representing the KilterBoard device, extending the base Device interface.
  */

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js";
+import type { IDevice } from "../device.interface";
 /**
  * Interface representing the Griptonite Motherboard device, extending the base Device interface.
  */

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js";
+import type { IDevice } from "../device.interface";
 /**
  * Interface representing the Smartboard Climbing mySmartBoard device, extending the base Device interface.
  */

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js";
+import type { IDevice } from "../device.interface";
 /**
  * Interface representing the Tindeq Progressor device, extending the base Device interface.
  */

package/dist/interfaces/device/wh-c06.interface.d.ts

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js";
+import type { IDevice } from "../device.interface";
 /**
  * Interface representing the Weiheng WH-C06 device, extending the base Device interface.
  */

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

@@ -1,6 +1,6 @@
-import type { IBase } from "./base.interface.js";
-import type { massObject } from "./callback.interface.js";
-import type { Commands } from "./command.interface.js";
+import type { IBase } from "./base.interface";
+import type { massObject } from "./callback.interface";
+import type { Commands } from "./command.interface";
 /**
  * Represents a characteristic of a Bluetooth service.
  */

package/dist/interfaces/index.d.ts

@@ -1,8 +1,8 @@
-export type { IClimbro } from "./device/climbro.interface.js";
-export type { IEntralpi } from "./device/entralpi.interface.js";
-export type { IForceBoard } from "./device/forceboard.interface.js";
-export type { IKilterBoard } from "./device/kilterboard.interface.js";
-export type { IMotherboard } from "./device/motherboard.interface.js";
-export type { ImySmartBoard } from "./device/mysmartboard.interface.js";
-export type { IProgressor } from "./device/progressor.interface.js";
-export type { IWHC06 } from "./device/wh-c06.interface.js";
+export type { IClimbro } from "./device/climbro.interface";
+export type { IEntralpi } from "./device/entralpi.interface";
+export type { IForceBoard } from "./device/forceboard.interface";
+export type { IKilterBoard } from "./device/kilterboard.interface";
+export type { IMotherboard } from "./device/motherboard.interface";
+export type { ImySmartBoard } from "./device/mysmartboard.interface";
+export type { IProgressor } from "./device/progressor.interface";
+export type { IWHC06 } from "./device/wh-c06.interface";

package/dist/models/base.model.d.ts

@@ -1,4 +1,4 @@
-import type { IBase } from "../interfaces/base.interface.js";
+import type { IBase } from "../interfaces/base.interface";
 export declare abstract class BaseModel {
     id?: string;
     createdAt?: Date;

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js";
-import type { IClimbro } from "../../interfaces/device/climbro.interface.js";
+import { Device } from "../device.model";
+import type { IClimbro } from "../../interfaces/device/climbro.interface";
 /**
  * Represents a Climbro device.
  * TODO: Add services, do you own a Climbro? Help us!

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

@@ -1,4 +1,4 @@
-import { Device } from "../device.model.js";
+import { Device } from "../device.model";
 /**
  * Represents a Climbro device.
  * TODO: Add services, do you own a Climbro? Help us!

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js";
-import type { IEntralpi } from "../../interfaces/device/entralpi.interface.js";
+import { Device } from "../device.model";
+import type { IEntralpi } from "../../interfaces/device/entralpi.interface";
 /**
  * Represents a Entralpi device.
  * {@link https://entralpi.com}

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

@@ -1,4 +1,4 @@
-import { Device } from "../device.model.js";
+import { Device } from "../device.model";
 /**
  * Represents a Entralpi device.
  * {@link https://entralpi.com}

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js";
-import type { IForceBoard } from "../../interfaces/device/forceboard.interface.js";
+import { Device } from "../device.model";
+import type { IForceBoard } from "../../interfaces/device/forceboard.interface";
 /**
  * Represents a PitchSix Force Board device.
  * {@link https://pitchsix.com}

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

@@ -1,4 +1,4 @@
-import { Device } from "../device.model.js";
+import { Device } from "../device.model";
 /**
  * Represents a PitchSix Force Board device.
  * {@link https://pitchsix.com}

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js";
-import type { IKilterBoard } from "../../interfaces/device/kilterboard.interface.js";
+import { Device } from "../device.model";
+import type { IKilterBoard } from "../../interfaces/device/kilterboard.interface";
 /**
  * For API level 2 and API level 3.
  * The first byte in the data is dependent on where the packet is in the message as a whole.
@@ -113,7 +113,7 @@ export declare class KilterBoard extends Device implements IKilterBoard {
     private prepBytesV3;
     /**
      * Splits a collection into slices of the specified length.
-     * https://github.com/ramda/ramda/blob/master/source/splitEvery.js
+     * https://github.com/ramda/ramda/blob/master/source/splitEvery
      * @param {Number} n
      * @param {Array} list
      * @return {Array<number[]>}

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

@@ -1,4 +1,4 @@
-import { Device } from "../device.model.js";
+import { Device } from "../device.model";
 /**
  * For API level 2 and API level 3.
  * The first byte in the data is dependent on where the packet is in the message as a whole.
@@ -234,7 +234,7 @@ export class KilterBoard extends Device {
     }
     /**
      * Splits a collection into slices of the specified length.
-     * https://github.com/ramda/ramda/blob/master/source/splitEvery.js
+     * https://github.com/ramda/ramda/blob/master/source/splitEvery
      * @param {Number} n
      * @param {Array} list
      * @return {Array<number[]>}

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js";
-import type { IMotherboard } from "../../interfaces/device/motherboard.interface.js";
+import { Device } from "../device.model";
+import type { IMotherboard } from "../../interfaces/device/motherboard.interface";
 /**
  * Represents a Griptonite Motherboard device.
  * {@link https://griptonite.io}

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

@@ -1,4 +1,4 @@
-import { Device } from "../device.model.js";
+import { Device } from "../device.model";
 /**
  * Represents a Griptonite Motherboard device.
  * {@link https://griptonite.io}

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js";
-import type { ImySmartBoard } from "../../interfaces/device/mysmartboard.interface.js";
+import { Device } from "../device.model";
+import type { ImySmartBoard } from "../../interfaces/device/mysmartboard.interface";
 /**
  * Represents a Smartboard Climbing mySmartBoard device.
  * TODO: Add services, do you own a mySmartBoard? Help us!

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

@@ -1,4 +1,4 @@
-import { Device } from "../device.model.js";
+import { Device } from "../device.model";
 /**
  * Represents a Smartboard Climbing mySmartBoard device.
  * TODO: Add services, do you own a mySmartBoard? Help us!

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js";
-import type { IProgressor } from "../../interfaces/device/progressor.interface.js";
+import { Device } from "../device.model";
+import type { IProgressor } from "../../interfaces/device/progressor.interface";
 /**
  * Represents a Tindeq Progressor device.
  * {@link https://tindeq.com}

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

@@ -1,4 +1,4 @@
-import { Device } from "../device.model.js";
+import { Device } from "../device.model";
 /**
  * Progressor responses
  */

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js";
-import type { IWHC06 } from "../../interfaces/device/wh-c06.interface.js";
+import { Device } from "../device.model";
+import type { IWHC06 } from "../../interfaces/device/wh-c06.interface";
 /**
  * Represents a Weiheng - WH-C06 (or MAT Muscle Meter) device.
  * To use this device enable: `chrome://flags/#enable-experimental-web-platform-features`.

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

@@ -1,4 +1,4 @@
-import { Device } from "../device.model.js";
+import { Device } from "../device.model";
 /**
  * Represents a Weiheng - WH-C06 (or MAT Muscle Meter) device.
  * To use this device enable: `chrome://flags/#enable-experimental-web-platform-features`.

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

@@ -1,8 +1,8 @@
-import { BaseModel } from "./../models/base.model.js";
-import type { IDevice, Service } from "../interfaces/device.interface.js";
-import type { ActiveCallback, NotifyCallback, WriteCallback } from "../interfaces/callback.interface.js";
-import type { DownloadPacket } from "../interfaces/download.interface.js";
-import type { Commands } from "../interfaces/command.interface.js";
+import { BaseModel } from "./../models/base.model";
+import type { IDevice, Service } from "../interfaces/device.interface";
+import type { ActiveCallback, NotifyCallback, WriteCallback } from "../interfaces/callback.interface";
+import type { DownloadPacket } from "../interfaces/download.interface";
+import type { Commands } from "../interfaces/command.interface";
 export declare abstract class Device extends BaseModel implements IDevice {
     /**
      * Filters to identify the device during Bluetooth scanning.
@@ -26,7 +26,7 @@ export declare abstract class Device extends BaseModel implements IDevice {
      * @type {BluetoothDevice | undefined}
      * @public
      */
-    bluetooth?: BluetoothDevice | undefined;
+    bluetooth?: BluetoothDevice;
     /**
      * Object representing the set of commands available for this device.
      * These commands allow communication with the device to perform various operations such as starting measurements, retrieving data, or calibrating the device.
@@ -275,25 +275,15 @@ export declare abstract class Device extends BaseModel implements IDevice {
      */
     protected getAllServiceUUIDs: () => string[];
     /**
-     * Attempt to use ES module import rather than require.
-     * This approach uses an async dynamic import for `webbluetooth`,
-     * so we can fallback if `navigator.bluetooth` is unavailable.
-     */
-    protected getBluetooth(): Promise<Bluetooth | import("webbluetooth").Bluetooth>;
-    /**
-     * Retrieves the characteristic from the device's service.
-     * @param {string} serviceId - The UUID of the service.
-     * @param {string} characteristicId - The UUID of the characteristic.
-     * @returns {BluetoothRemoteGATTCharacteristic | undefined} The characteristic, if found.
-     * @protected
+     * Returns the Bluetooth instance available for the current environment.
+     * In browsers, it returns the native Web Bluetooth API (i.e. `navigator.bluetooth`).
+     * In a Node, Bun, or Deno environment, it dynamically imports the `webbluetooth` package.
+     * {@link https://github.com/thegecko/webbluetooth}
      *
-     * @example
-     * const characteristic = device.getCharacteristic('battery', 'level');
-     * if (characteristic) {
-     *   console.log('Characteristic found');
-     * }
+     * @returns {Promise<Bluetooth>} A promise that resolves to the Bluetooth instance.
+     * @throws {Error} If Web Bluetooth is not available in the current environment.
      */
-    protected getCharacteristic: (serviceId: string, characteristicId: string) => BluetoothRemoteGATTCharacteristic | undefined;
+    protected getBluetooth(): Promise<Bluetooth>;
     /**
      * Handles notifications received from a characteristic.
      * @param {BluetoothRemoteGATTCharacteristic} characteristic - The notification event.

package/dist/models/device.model.js

@@ -1,4 +1,4 @@
-import { BaseModel } from "./../models/base.model.js";
+import { BaseModel } from "./../models/base.model";
 export class Device extends BaseModel {
     /**
      * Filters to identify the device during Bluetooth scanning.
@@ -208,22 +208,16 @@ export class Device extends BaseModel {
      * @example
      * await device.activityCheck(5.0);
      */
-    activityCheck = (input) => {
-        return new Promise((resolve) => {
-            const startValue = input;
-            const { threshold, duration } = this.activeConfig;
-            setTimeout(() => {
-                // After waiting for `duration`, check if still active (for a real scenario, you might store a last known input)
-                const activeNow = startValue > threshold;
-                if (this.isActive !== activeNow) {
-                    this.isActive = activeNow;
-                    if (this.activeCallback) {
-                        this.activeCallback(activeNow);
-                    }
-                }
-                resolve();
-            }, duration);
-        });
+    activityCheck = async (input) => {
+        const startValue = input;
+        const { threshold, duration } = this.activeConfig;
+        // After waiting for `duration`, check if still active.
+        await new Promise((resolve) => setTimeout(resolve, duration));
+        const activeNow = startValue > threshold;
+        if (this.isActive !== activeNow) {
+            this.isActive = activeNow;
+            this.activeCallback?.(activeNow);
+        }
     };
     /**
      * Connects to a Bluetooth device.
@@ -277,7 +271,7 @@ export class Device extends BaseModel {
             // Remove all notification listeners
             this.services.forEach((service) => {
                 service.characteristics.forEach((char) => {
-                    // TODO: remove device-specific logic
+                    // Look for the "rx" characteristic that accepts notifications
                     if (char.characteristic && char.id === "rx") {
                         char.characteristic.stopNotifications();
                         const listener = this.notificationListeners.get(char.uuid);
@@ -437,47 +431,28 @@ export class Device extends BaseModel {
         return this.services.filter((service) => service?.uuid).map((service) => service.uuid);
     };
     /**
-     * Attempt to use ES module import rather than require.
-     * This approach uses an async dynamic import for `webbluetooth`,
-     * so we can fallback if `navigator.bluetooth` is unavailable.
+     * Returns the Bluetooth instance available for the current environment.
+     * In browsers, it returns the native Web Bluetooth API (i.e. `navigator.bluetooth`).
+     * In a Node, Bun, or Deno environment, it dynamically imports the `webbluetooth` package.
+     * {@link https://github.com/thegecko/webbluetooth}
+     *
+     * @returns {Promise<Bluetooth>} A promise that resolves to the Bluetooth instance.
+     * @throws {Error} If Web Bluetooth is not available in the current environment.
      */
     async getBluetooth() {
-        // If we're in a browser with real Web Bluetooth available:
-        if (typeof navigator !== "undefined" && "bluetooth" in navigator) {
+        // If running in a browser with native Web Bluetooth support:
+        if (typeof navigator !== "undefined" && navigator.bluetooth) {
             return navigator.bluetooth;
         }
-        // Otherwise, we're likely in Node or an environment without `navigator.bluetooth`.
-        // Use a dynamic import for the ESM version:
-        const { bluetooth } = await import("webbluetooth");
-        return bluetooth;
-    }
-    /**
-     * Retrieves the characteristic from the device's service.
-     * @param {string} serviceId - The UUID of the service.
-     * @param {string} characteristicId - The UUID of the characteristic.
-     * @returns {BluetoothRemoteGATTCharacteristic | undefined} The characteristic, if found.
-     * @protected
-     *
-     * @example
-     * const characteristic = device.getCharacteristic('battery', 'level');
-     * if (characteristic) {
-     *   console.log('Characteristic found');
-     * }
-     */
-    getCharacteristic = (serviceId, characteristicId) => {
-        // Find the service with the specified serviceId
-        const boardService = this.services.find((service) => service.id === serviceId);
-        if (boardService) {
-            // If the service is found, find the characteristic with the specified characteristicId
-            const boardCharacteristic = boardService.characteristics.find((characteristic) => characteristic.id === characteristicId);
-            if (boardCharacteristic) {
-                // If the characteristic is found, return it
-                return boardCharacteristic.characteristic;
-            }
+        const process = await import("node:process");
+        // If running in Node, Bun, or Deno environment
+        if (typeof process !== "undefined" && process.versions?.node) {
+            const { bluetooth } = await import("webbluetooth");
+            return bluetooth;
         }
-        // Return undefined if the service or characteristic is not found
-        return undefined;
-    };
+        // If none of the above conditions are met, throw an error.
+        throw new Error("Bluetooth not available.");
+    }
     /**
      * Handles notifications received from a characteristic.
      * @param {BluetoothRemoteGATTCharacteristic} characteristic - The notification event.
@@ -507,7 +482,7 @@ export class Device extends BaseModel {
      */
     isConnected = () => {
         // Check if the device is defined and available
-        if (!this?.bluetooth) {
+        if (!this.bluetooth) {
             return false;
         }
         // Check if the device is connected
@@ -550,26 +525,34 @@ export class Device extends BaseModel {
         for (const service of services) {
             const matchingService = this.services.find((boardService) => boardService.uuid === service.uuid);
             if (matchingService) {
-                // Android bug: Introduce a delay before getting characteristics
+                // Android bug: Add a small delay before getting characteristics
                 await new Promise((resolve) => setTimeout(resolve, 100));
                 const characteristics = await service.getCharacteristics();
                 for (const characteristic of matchingService.characteristics) {
                     const matchingCharacteristic = characteristics.find((char) => char.uuid === characteristic.uuid);
                     if (matchingCharacteristic) {
-                        const element = matchingService.characteristics.find((char) => char.uuid === matchingCharacteristic.uuid);
-                        if (element) {
-                            element.characteristic = matchingCharacteristic;
-                            // TODO: remove device-specific logic
-                            if (element.id === "rx") {
+                        // Find the corresponding characteristic descriptor in the service's characteristics array
+                        const descriptor = matchingService.characteristics.find((char) => char.uuid === matchingCharacteristic.uuid);
+                        if (descriptor) {
+                            // Assign the actual Bluetooth characteristic object to the descriptor so it can be used later
+                            descriptor.characteristic = matchingCharacteristic;
+                            // Look for the "rx" characteristic id that accepts notifications
+                            if (descriptor.id === "rx") {
+                                // Start receiving notifications for changes on this characteristic
                                 matchingCharacteristic.startNotifications();
+                                // Triggered when the characteristic's value changes
                                 const listener = (event) => {
+                                    // Cast the event's target to a BluetoothRemoteGATTCharacteristic to access its properties
                                     const target = event.target;
                                     if (target && target.value) {
+                                        // Delegate the data to handleNotifications method
                                         this.handleNotifications(target);
                                     }
                                 };
+                                // Attach the event listener to listen for changes in the characteristic's value
                                 matchingCharacteristic.addEventListener("characteristicvaluechanged", listener);
-                                this.notificationListeners.set(element.uuid, listener);
+                                // Store the listener so it can be referenced (for later removal)
+                                this.notificationListeners.set(descriptor.uuid, listener);
                             }
                         }
                     }
@@ -611,7 +594,9 @@ export class Device extends BaseModel {
             return undefined;
         }
         // Get the characteristic from the service
-        const characteristic = this.getCharacteristic(serviceId, characteristicId);
+        const characteristic = this.services
+            .find((service) => service.id === serviceId)
+            ?.characteristics.find((char) => char.id === characteristicId)?.characteristic;
         if (!characteristic) {
             throw new Error(`Characteristic "${characteristicId}" not found in service "${serviceId}"`);
         }
@@ -723,7 +708,9 @@ export class Device extends BaseModel {
             return Promise.resolve();
         }
         // Get the characteristic from the service
-        const characteristic = this.getCharacteristic(serviceId, characteristicId);
+        const characteristic = this.services
+            .find((service) => service.id === serviceId)
+            ?.characteristics.find((char) => char.id === characteristicId)?.characteristic;
         if (!characteristic) {
             throw new Error(`Characteristic "${characteristicId}" not found in service "${serviceId}"`);
         }

package/dist/models/index.d.ts

@@ -1,8 +1,8 @@
-export { Climbro } from "./device/climbro.model.js";
-export { Entralpi } from "./device/entralpi.model.js";
-export { ForceBoard } from "./device/forceboard.model.js";
-export { KilterBoard } from "./device/kilterboard.model.js";
-export { Motherboard } from "./device/motherboard.model.js";
-export { mySmartBoard } from "./device/mysmartboard.model.js";
-export { Progressor } from "./device/progressor.model.js";
-export { WHC06 } from "./device/wh-c06.model.js";
+export { Climbro } from "./device/climbro.model";
+export { Entralpi } from "./device/entralpi.model";
+export { ForceBoard } from "./device/forceboard.model";
+export { KilterBoard } from "./device/kilterboard.model";
+export { Motherboard } from "./device/motherboard.model";
+export { mySmartBoard } from "./device/mysmartboard.model";
+export { Progressor } from "./device/progressor.model";
+export { WHC06 } from "./device/wh-c06.model";

package/dist/models/index.js

@@ -1,8 +1,8 @@
-export { Climbro } from "./device/climbro.model.js";
-export { Entralpi } from "./device/entralpi.model.js";
-export { ForceBoard } from "./device/forceboard.model.js";
-export { KilterBoard } from "./device/kilterboard.model.js";
-export { Motherboard } from "./device/motherboard.model.js";
-export { mySmartBoard } from "./device/mysmartboard.model.js";
-export { Progressor } from "./device/progressor.model.js";
-export { WHC06 } from "./device/wh-c06.model.js";
+export { Climbro } from "./device/climbro.model";
+export { Entralpi } from "./device/entralpi.model";
+export { ForceBoard } from "./device/forceboard.model";
+export { KilterBoard } from "./device/kilterboard.model";
+export { Motherboard } from "./device/motherboard.model";
+export { mySmartBoard } from "./device/mysmartboard.model";
+export { Progressor } from "./device/progressor.model";
+export { WHC06 } from "./device/wh-c06.model";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hangtime/grip-connect",
-  "version": "0.6.1",
-  "description": "Griptonite Motherboard, Tindeq Progressor, PitchSix Force Board, WHC-06, Entralpi, Climbro, mySmartBoard: Web + Node Bluetooth API Force-Sensing strength analysis for climbers",
+  "version": "0.6.2",
+  "description": "Griptonite Motherboard, Tindeq Progressor, PitchSix Force Board, WHC-06, Entralpi, Climbro, mySmartBoard: Bluetooth API Force-Sensing strength analysis for climbers",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,6 +35,6 @@
   },
   "homepage": "https://stevie-ray.github.io/hangtime-grip-connect/",
   "dependencies": {
-    "webbluetooth": "^3.2.1"
+    "webbluetooth": "^3.3.2"
   }
 }

package/src/index.ts

@@ -7,7 +7,7 @@ export type {
   ImySmartBoard,
   IProgressor,
   IWHC06,
-} from "./interfaces/index.js"
+} from "./interfaces/index"
 
 export {
   Climbro,
@@ -18,4 +18,4 @@ export {
   mySmartBoard,
   Progressor,
   WHC06,
-} from "./models/index.js"
+} from "./models/index"

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js"
+import type { IDevice } from "../device.interface"
 /**
  * Interface representing the Climbro device, extending the base Device interface.
  */

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js"
+import type { IDevice } from "../device.interface"
 
 /**
  * Interface representing the Entralpi device, extending the base Device interface.

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js"
+import type { IDevice } from "../device.interface"
 
 /**
  * Interface representing the PitchSix ForceBoard device, extending the base Device interface.

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js"
+import type { IDevice } from "../device.interface"
 /**
  * Interface representing the KilterBoard device, extending the base Device interface.
  */

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js"
+import type { IDevice } from "../device.interface"
 
 /**
  * Interface representing the Griptonite Motherboard device, extending the base Device interface.

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js"
+import type { IDevice } from "../device.interface"
 /**
  * Interface representing the Smartboard Climbing mySmartBoard device, extending the base Device interface.
  */

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

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js"
+import type { IDevice } from "../device.interface"
 
 /**
  * Interface representing the Tindeq Progressor device, extending the base Device interface.

package/src/interfaces/device/wh-c06.interface.ts

@@ -1,4 +1,4 @@
-import type { IDevice } from "../device.interface.js"
+import type { IDevice } from "../device.interface"
 /**
  * Interface representing the Weiheng WH-C06 device, extending the base Device interface.
  */

package/src/interfaces/device.interface.ts

@@ -1,6 +1,6 @@
-import type { IBase } from "./base.interface.js"
-import type { massObject } from "./callback.interface.js"
-import type { Commands } from "./command.interface.js"
+import type { IBase } from "./base.interface"
+import type { massObject } from "./callback.interface"
+import type { Commands } from "./command.interface"
 
 /**
  * Represents a characteristic of a Bluetooth service.

package/src/interfaces/index.ts

@@ -1,15 +1,15 @@
-export type { IClimbro } from "./device/climbro.interface.js"
+export type { IClimbro } from "./device/climbro.interface"
 
-export type { IEntralpi } from "./device/entralpi.interface.js"
+export type { IEntralpi } from "./device/entralpi.interface"
 
-export type { IForceBoard } from "./device/forceboard.interface.js"
+export type { IForceBoard } from "./device/forceboard.interface"
 
-export type { IKilterBoard } from "./device/kilterboard.interface.js"
+export type { IKilterBoard } from "./device/kilterboard.interface"
 
-export type { IMotherboard } from "./device/motherboard.interface.js"
+export type { IMotherboard } from "./device/motherboard.interface"
 
-export type { ImySmartBoard } from "./device/mysmartboard.interface.js"
+export type { ImySmartBoard } from "./device/mysmartboard.interface"
 
-export type { IProgressor } from "./device/progressor.interface.js"
+export type { IProgressor } from "./device/progressor.interface"
 
-export type { IWHC06 } from "./device/wh-c06.interface.js"
+export type { IWHC06 } from "./device/wh-c06.interface"

package/src/models/base.model.ts

@@ -1,4 +1,4 @@
-import type { IBase } from "../interfaces/base.interface.js"
+import type { IBase } from "../interfaces/base.interface"
 
 export abstract class BaseModel {
   id?: string

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js"
-import type { IClimbro } from "../../interfaces/device/climbro.interface.js"
+import { Device } from "../device.model"
+import type { IClimbro } from "../../interfaces/device/climbro.interface"
 
 /**
  * Represents a Climbro device.

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js"
-import type { IEntralpi } from "../../interfaces/device/entralpi.interface.js"
+import { Device } from "../device.model"
+import type { IEntralpi } from "../../interfaces/device/entralpi.interface"
 
 /**
  * Represents a Entralpi device.

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js"
-import type { IForceBoard } from "../../interfaces/device/forceboard.interface.js"
+import { Device } from "../device.model"
+import type { IForceBoard } from "../../interfaces/device/forceboard.interface"
 
 /**
  * Represents a PitchSix Force Board device.

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js"
-import type { IKilterBoard } from "../../interfaces/device/kilterboard.interface.js"
+import { Device } from "../device.model"
+import type { IKilterBoard } from "../../interfaces/device/kilterboard.interface"
 
 /**
  * For API level 2 and API level 3.
@@ -254,7 +254,7 @@ export class KilterBoard extends Device implements IKilterBoard {
 
   /**
    * Splits a collection into slices of the specified length.
-   * https://github.com/ramda/ramda/blob/master/source/splitEvery.js
+   * https://github.com/ramda/ramda/blob/master/source/splitEvery
    * @param {Number} n
    * @param {Array} list
    * @return {Array<number[]>}

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

@@ -1,6 +1,6 @@
-import { Device } from "../device.model.js"
-import type { IMotherboard } from "../../interfaces/device/motherboard.interface.js"
-import type { DownloadPacket } from "../../interfaces/download.interface.js"
+import { Device } from "../device.model"
+import type { IMotherboard } from "../../interfaces/device/motherboard.interface"
+import type { DownloadPacket } from "../../interfaces/download.interface"
 
 /**
  * Represents a Griptonite Motherboard device.

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js"
-import type { ImySmartBoard } from "../../interfaces/device/mysmartboard.interface.js"
+import { Device } from "../device.model"
+import type { ImySmartBoard } from "../../interfaces/device/mysmartboard.interface"
 
 /**
  * Represents a Smartboard Climbing mySmartBoard device.

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js"
-import type { IProgressor } from "../../interfaces/device/progressor.interface.js"
+import { Device } from "../device.model"
+import type { IProgressor } from "../../interfaces/device/progressor.interface"
 
 /**
  * Progressor responses

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

@@ -1,5 +1,5 @@
-import { Device } from "../device.model.js"
-import type { IWHC06 } from "../../interfaces/device/wh-c06.interface.js"
+import { Device } from "../device.model"
+import type { IWHC06 } from "../../interfaces/device/wh-c06.interface"
 
 /**
  * Represents a Weiheng - WH-C06 (or MAT Muscle Meter) device.

package/src/models/device.model.ts

@@ -1,8 +1,8 @@
-import { BaseModel } from "./../models/base.model.js"
-import type { IDevice, Service } from "../interfaces/device.interface.js"
-import type { ActiveCallback, massObject, NotifyCallback, WriteCallback } from "../interfaces/callback.interface.js"
-import type { DownloadPacket } from "../interfaces/download.interface.js"
-import type { Commands } from "../interfaces/command.interface.js"
+import { BaseModel } from "./../models/base.model"
+import type { IDevice, Service } from "../interfaces/device.interface"
+import type { ActiveCallback, massObject, NotifyCallback, WriteCallback } from "../interfaces/callback.interface"
+import type { DownloadPacket } from "../interfaces/download.interface"
+import type { Commands } from "../interfaces/command.interface"
 
 export abstract class Device extends BaseModel implements IDevice {
   /**
@@ -29,7 +29,7 @@ export abstract class Device extends BaseModel implements IDevice {
    * @type {BluetoothDevice | undefined}
    * @public
    */
-  bluetooth?: BluetoothDevice | undefined
+  bluetooth?: BluetoothDevice
 
   /**
    * Object representing the set of commands available for this device.
@@ -240,22 +240,16 @@ export abstract class Device extends BaseModel implements IDevice {
    * @example
    * await device.activityCheck(5.0);
    */
-  protected activityCheck = (input: number): Promise<void> => {
-    return new Promise((resolve) => {
-      const startValue = input
-      const { threshold, duration } = this.activeConfig
-      setTimeout(() => {
-        // After waiting for `duration`, check if still active (for a real scenario, you might store a last known input)
-        const activeNow = startValue > threshold
-        if (this.isActive !== activeNow) {
-          this.isActive = activeNow
-          if (this.activeCallback) {
-            this.activeCallback(activeNow)
-          }
-        }
-        resolve()
-      }, duration)
-    })
+  protected activityCheck = async (input: number): Promise<void> => {
+    const startValue = input
+    const { threshold, duration } = this.activeConfig
+    // After waiting for `duration`, check if still active.
+    await new Promise((resolve) => setTimeout(resolve, duration))
+    const activeNow = startValue > threshold
+    if (this.isActive !== activeNow) {
+      this.isActive = activeNow
+      this.activeCallback?.(activeNow)
+    }
   }
 
   /**
@@ -319,7 +313,7 @@ export abstract class Device extends BaseModel implements IDevice {
       // Remove all notification listeners
       this.services.forEach((service) => {
         service.characteristics.forEach((char) => {
-          // TODO: remove device-specific logic
+          // Look for the "rx" characteristic that accepts notifications
           if (char.characteristic && char.id === "rx") {
             char.characteristic.stopNotifications()
             const listener = this.notificationListeners.get(char.uuid)
@@ -494,53 +488,30 @@ export abstract class Device extends BaseModel implements IDevice {
   }
 
   /**
-   * Attempt to use ES module import rather than require.
-   * This approach uses an async dynamic import for `webbluetooth`,
-   * so we can fallback if `navigator.bluetooth` is unavailable.
+   * Returns the Bluetooth instance available for the current environment.
+   * In browsers, it returns the native Web Bluetooth API (i.e. `navigator.bluetooth`).
+   * In a Node, Bun, or Deno environment, it dynamically imports the `webbluetooth` package.
+   * {@link https://github.com/thegecko/webbluetooth}
+   *
+   * @returns {Promise<Bluetooth>} A promise that resolves to the Bluetooth instance.
+   * @throws {Error} If Web Bluetooth is not available in the current environment.
    */
-  protected async getBluetooth() {
-    // If we're in a browser with real Web Bluetooth available:
-    if (typeof navigator !== "undefined" && "bluetooth" in navigator) {
+  protected async getBluetooth(): Promise<Bluetooth> {
+    // If running in a browser with native Web Bluetooth support:
+    if (typeof navigator !== "undefined" && navigator.bluetooth) {
       return navigator.bluetooth
     }
 
-    // Otherwise, we're likely in Node or an environment without `navigator.bluetooth`.
-    // Use a dynamic import for the ESM version:
-    const { bluetooth } = await import("webbluetooth")
-    return bluetooth
-  }
+    const process = await import("node:process")
 
-  /**
-   * Retrieves the characteristic from the device's service.
-   * @param {string} serviceId - The UUID of the service.
-   * @param {string} characteristicId - The UUID of the characteristic.
-   * @returns {BluetoothRemoteGATTCharacteristic | undefined} The characteristic, if found.
-   * @protected
-   *
-   * @example
-   * const characteristic = device.getCharacteristic('battery', 'level');
-   * if (characteristic) {
-   *   console.log('Characteristic found');
-   * }
-   */
-  protected getCharacteristic = (
-    serviceId: string,
-    characteristicId: string,
-  ): BluetoothRemoteGATTCharacteristic | undefined => {
-    // Find the service with the specified serviceId
-    const boardService = this.services.find((service) => service.id === serviceId)
-    if (boardService) {
-      // If the service is found, find the characteristic with the specified characteristicId
-      const boardCharacteristic = boardService.characteristics.find(
-        (characteristic) => characteristic.id === characteristicId,
-      )
-      if (boardCharacteristic) {
-        // If the characteristic is found, return it
-        return boardCharacteristic.characteristic
-      }
+    // If running in Node, Bun, or Deno environment
+    if (typeof process !== "undefined" && process.versions?.node) {
+      const { bluetooth } = await import("webbluetooth")
+      return bluetooth
     }
-    // Return undefined if the service or characteristic is not found
-    return undefined
+
+    // If none of the above conditions are met, throw an error.
+    throw new Error("Bluetooth not available.")
   }
 
   /**
@@ -573,7 +544,7 @@ export abstract class Device extends BaseModel implements IDevice {
    */
   isConnected = (): boolean => {
     // Check if the device is defined and available
-    if (!this?.bluetooth) {
+    if (!this.bluetooth) {
       return false
     }
     // Check if the device is connected
@@ -612,7 +583,7 @@ export abstract class Device extends BaseModel implements IDevice {
       throw new Error("GATT server is not available")
     }
     // Connect to GATT server and set up characteristics
-    const services: BluetoothRemoteGATTService[] | undefined = await this.server.getPrimaryServices()
+    const services: BluetoothRemoteGATTService[] = await this.server.getPrimaryServices()
 
     if (!services || services.length === 0) {
       throw new Error("No services found")
@@ -622,7 +593,7 @@ export abstract class Device extends BaseModel implements IDevice {
       const matchingService = this.services.find((boardService) => boardService.uuid === service.uuid)
 
       if (matchingService) {
-        // Android bug: Introduce a delay before getting characteristics
+        // Android bug: Add a small delay before getting characteristics
         await new Promise((resolve) => setTimeout(resolve, 100))
 
         const characteristics = await service.getCharacteristics()
@@ -631,21 +602,28 @@ export abstract class Device extends BaseModel implements IDevice {
           const matchingCharacteristic = characteristics.find((char) => char.uuid === characteristic.uuid)
 
           if (matchingCharacteristic) {
-            const element = matchingService.characteristics.find((char) => char.uuid === matchingCharacteristic.uuid)
-            if (element) {
-              element.characteristic = matchingCharacteristic
-
-              // TODO: remove device-specific logic
-              if (element.id === "rx") {
+            // Find the corresponding characteristic descriptor in the service's characteristics array
+            const descriptor = matchingService.characteristics.find((char) => char.uuid === matchingCharacteristic.uuid)
+            if (descriptor) {
+              // Assign the actual Bluetooth characteristic object to the descriptor so it can be used later
+              descriptor.characteristic = matchingCharacteristic
+              // Look for the "rx" characteristic id that accepts notifications
+              if (descriptor.id === "rx") {
+                // Start receiving notifications for changes on this characteristic
                 matchingCharacteristic.startNotifications()
+                // Triggered when the characteristic's value changes
                 const listener = (event: Event) => {
+                  // Cast the event's target to a BluetoothRemoteGATTCharacteristic to access its properties
                   const target = event.target as BluetoothRemoteGATTCharacteristic
                   if (target && target.value) {
+                    // Delegate the data to handleNotifications method
                     this.handleNotifications(target)
                   }
                 }
+                // Attach the event listener to listen for changes in the characteristic's value
                 matchingCharacteristic.addEventListener("characteristicvaluechanged", listener)
-                this.notificationListeners.set(element.uuid, listener)
+                // Store the listener so it can be referenced (for later removal)
+                this.notificationListeners.set(descriptor.uuid, listener)
               }
             }
           } else {
@@ -654,7 +632,6 @@ export abstract class Device extends BaseModel implements IDevice {
         }
       }
     }
-
     // Call the onSuccess callback after successful connection and setup
     onSuccess()
   }
@@ -689,7 +666,10 @@ export abstract class Device extends BaseModel implements IDevice {
       return undefined
     }
     // Get the characteristic from the service
-    const characteristic = this.getCharacteristic(serviceId, characteristicId)
+    const characteristic = this.services
+      .find((service) => service.id === serviceId)
+      ?.characteristics.find((char) => char.id === characteristicId)?.characteristic
+
     if (!characteristic) {
       throw new Error(`Characteristic "${characteristicId}" not found in service "${serviceId}"`)
     }
@@ -815,7 +795,10 @@ export abstract class Device extends BaseModel implements IDevice {
       return Promise.resolve()
     }
     // Get the characteristic from the service
-    const characteristic = this.getCharacteristic(serviceId, characteristicId)
+    const characteristic = this.services
+      .find((service) => service.id === serviceId)
+      ?.characteristics.find((char) => char.id === characteristicId)?.characteristic
+
     if (!characteristic) {
       throw new Error(`Characteristic "${characteristicId}" not found in service "${serviceId}"`)
     }

package/src/models/index.ts

@@ -1,15 +1,15 @@
-export { Climbro } from "./device/climbro.model.js"
+export { Climbro } from "./device/climbro.model"
 
-export { Entralpi } from "./device/entralpi.model.js"
+export { Entralpi } from "./device/entralpi.model"
 
-export { ForceBoard } from "./device/forceboard.model.js"
+export { ForceBoard } from "./device/forceboard.model"
 
-export { KilterBoard } from "./device/kilterboard.model.js"
+export { KilterBoard } from "./device/kilterboard.model"
 
-export { Motherboard } from "./device/motherboard.model.js"
+export { Motherboard } from "./device/motherboard.model"
 
-export { mySmartBoard } from "./device/mysmartboard.model.js"
+export { mySmartBoard } from "./device/mysmartboard.model"
 
-export { Progressor } from "./device/progressor.model.js"
+export { Progressor } from "./device/progressor.model"
 
-export { WHC06 } from "./device/wh-c06.model.js"
+export { WHC06 } from "./device/wh-c06.model"