@hangtime/grip-connect 0.13.0 → 0.13.1

package/src/models/device/pb-700bt.model.ts

@@ -1,10 +1,11 @@
 import { Device } from "../device.model.js"
+import type { IPB700BT } from "../../interfaces/device/pb-700bt.interface.js"
 
 /**
  * Represents a NSD PB-700BT device.
  * {@link https://www.nsd.com.tw/}
  */
-export class PB700BT extends Device {
+export class PB700BT extends Device implements IPB700BT {
   constructor() {
     super({
       filters: [{ name: "NSD Workout" }],

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

@@ -456,12 +456,7 @@ export class Progressor extends NordicDfuDevice implements IProgressor {
    */
   stream = async (duration = 0): Promise<void> => {
     // Reset download packets and session stats for fresh measurement
-    this.downloadPackets.length = 0
-    this.peak = Number.NEGATIVE_INFINITY
-    this.mean = 0
-    this.sum = 0
-    this.dataPointCount = 0
-    this.min = Number.POSITIVE_INFINITY
+    this.resetSessionData()
     this.resetPacketTracking()
     this.recentSampleTimestamps = []
     // Start streaming data

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

@@ -41,6 +41,45 @@ export class WHC06 extends Device implements IWHC06 {
    */
   private readonly advertisementTimeoutTime: number = 10
 
+  private readonly onAdvertisementReceived = (event: BluetoothAdvertisingEvent): void => {
+    const data = event.manufacturerData.get(WHC06.manufacturerId)
+    if (data) {
+      this.currentSamplesPerPacket = 1
+      this.recordPacketReceived()
+      const weight = (data.getUint8(WHC06.weightOffset) << 8) | data.getUint8(WHC06.weightOffset + 1)
+      // const stable = (data.getUint8(STABLE_OFFSET) & 0xf0) >> 4
+      // const unit = data.getUint8(STABLE_OFFSET) & 0x0f
+      const receivedTime: number = Date.now()
+      const receivedData = weight / 100
+
+      const numericData = receivedData - this.applyTare(receivedData)
+      const currentMassTotal = Math.max(-1000, numericData)
+
+      // Update session stats before building packet
+      this.peak = Math.max(this.peak, numericData)
+      this.min = Math.min(this.min, Math.max(-1000, numericData))
+      this.sum += currentMassTotal
+      this.dataPointCount++
+      this.mean = this.sum / this.dataPointCount
+
+      // Add data to downloadable Array
+      this.downloadPackets.push(
+        this.buildDownloadPacket(currentMassTotal, [numericData], {
+          timestamp: receivedTime,
+          sampleIndex: this.dataPointCount,
+        }),
+      )
+
+      // Check if device is being used
+      this.activityCheck(numericData)
+
+      // Notify with weight data
+      this.notifyCallback(this.buildForceMeasurement(currentMassTotal))
+    }
+    // Reset "still advertising" counter
+    this.resetAdvertisementTimeout()
+  }
+
   // /**
   //  * Offset for the byte location in the manufacturer data to determine weight stability.
   //  * @type {number}
@@ -93,47 +132,7 @@ export class WHC06 extends Device implements IWHC06 {
       // Update timestamp
       this.updateTimestamp()
 
-      // Device has no services / characteristics, so we directly call onSuccess
-      onSuccess()
-
-      this.bluetooth.addEventListener("advertisementreceived", (event) => {
-        const data = event.manufacturerData.get(WHC06.manufacturerId)
-        if (data) {
-          this.currentSamplesPerPacket = 1
-          this.recordPacketReceived()
-          const weight = (data.getUint8(WHC06.weightOffset) << 8) | data.getUint8(WHC06.weightOffset + 1)
-          // const stable = (data.getUint8(STABLE_OFFSET) & 0xf0) >> 4
-          // const unit = data.getUint8(STABLE_OFFSET) & 0x0f
-          const receivedTime: number = Date.now()
-          const receivedData = weight / 100
-
-          const numericData = receivedData - this.applyTare(receivedData) * -1
-          const currentMassTotal = Math.max(-1000, numericData)
-
-          // Update session stats before building packet
-          this.peak = Math.max(this.peak, numericData)
-          this.min = Math.min(this.min, Math.max(-1000, numericData))
-          this.sum += currentMassTotal
-          this.dataPointCount++
-          this.mean = this.sum / this.dataPointCount
-
-          // Add data to downloadable Array
-          this.downloadPackets.push(
-            this.buildDownloadPacket(currentMassTotal, [numericData], {
-              timestamp: receivedTime,
-              sampleIndex: this.dataPointCount,
-            }),
-          )
-
-          // Check if device is being used
-          this.activityCheck(numericData)
-
-          // Notify with weight data
-          this.notifyCallback(this.buildForceMeasurement(currentMassTotal))
-        }
-        // Reset "still advertising" counter
-        this.resetAdvertisementTimeout()
-      })
+      this.bluetooth.addEventListener("advertisementreceived", this.onAdvertisementReceived)
 
       // When the companyIdentifier is provided we want to get manufacturerData using watchAdvertisements.
       if (optionalManufacturerData.length) {
@@ -148,7 +147,11 @@ export class WHC06 extends Device implements IWHC06 {
           )
         }
       }
+
+      // Device has no services / characteristics, so success means advertisement watching is ready.
+      onSuccess()
     } catch (error) {
+      this.disconnect()
       onError(error as Error)
     }
   }
@@ -167,7 +170,7 @@ export class WHC06 extends Device implements IWHC06 {
    */
   private resetAdvertisementTimeout = (): void => {
     // Clear the previous timeout
-    if (this.advertisementTimeout) {
+    if (this.advertisementTimeout !== null) {
       clearTimeout(this.advertisementTimeout)
     }
 
@@ -184,4 +187,13 @@ export class WHC06 extends Device implements IWHC06 {
       this.onDisconnected(disconnectedEvent)
     }, this.advertisementTimeoutTime * 1000) // 10 seconds
   }
+
+  protected override onDisconnectCleanup(): void {
+    if (this.advertisementTimeout !== null) {
+      clearTimeout(this.advertisementTimeout)
+      this.advertisementTimeout = null
+    }
+    this.bluetooth?.removeEventListener("advertisementreceived", this.onAdvertisementReceived)
+    delete this.bluetooth
+  }
 }

package/src/models/device.model.ts

@@ -284,6 +284,8 @@ export abstract class Device extends BaseModel implements IDevice {
    */
   private notificationListeners = new Map<string, EventListener>()
 
+  private activeCheckPending: { target: boolean; timeout: ReturnType<typeof setTimeout> } | undefined = undefined
+
   constructor(device: Partial<IDevice>) {
     super(device)
 
@@ -312,19 +314,20 @@ export abstract class Device extends BaseModel implements IDevice {
   /**
    * Builds a ForceMeasurement for a single zone (e.g. left/center/right).
    * With one argument, current/peak/mean are all set to that value.
-   * With three arguments, uses the given current, peak, and mean for the zone.
+   * With three or four arguments, uses the given current, peak, mean, and min for the zone.
    * @param valueOrCurrent - Force value, or current force for this zone
    * @param peak - Optional peak for this zone (required if mean is provided)
    * @param mean - Optional mean for this zone
+   * @param min - Optional session minimum for this zone
    * @returns ForceMeasurement (no nested distribution)
    * @protected
    */
-  protected buildZoneMeasurement(valueOrCurrent: number, peak?: number, mean?: number): ForceMeasurement {
+  protected buildZoneMeasurement(valueOrCurrent: number, peak?: number, mean?: number, min?: number): ForceMeasurement {
     const useFullStats = peak !== undefined && mean !== undefined
     const current = valueOrCurrent
     const zonePeak = useFullStats ? (peak === 0 && current < 0 ? current : peak) : valueOrCurrent
     const zoneMean = useFullStats ? mean : valueOrCurrent
-    const zoneMin = useFullStats ? Math.min(zonePeak, current) : current
+    const zoneMin = useFullStats ? (min ?? Math.min(zonePeak, current)) : current
     return {
       unit: this.unit,
       timestamp: Date.now(),
@@ -501,6 +504,21 @@ export abstract class Device extends BaseModel implements IDevice {
     }
   }
 
+  /**
+   * Resets per-session measurement state: the download buffer and force statistics.
+   * Device models call this at the start of a new streaming session so stats from a
+   * previous session do not leak into the next one.
+   * @protected
+   */
+  protected resetSessionData(): void {
+    this.downloadPackets.length = 0
+    this.peak = Number.NEGATIVE_INFINITY
+    this.min = Number.POSITIVE_INFINITY
+    this.mean = 0
+    this.sum = 0
+    this.dataPointCount = 0
+  }
+
   /**
    * Checks if a dynamic value is active based on a threshold and duration.
    *
@@ -509,20 +527,37 @@ export abstract class Device extends BaseModel implements IDevice {
    * the previous state, the callback function is called with the updated activity status.
    *
    * @param {number} input - The dynamic value to check for activity status.
-   * @returns {Promise<void>} A promise that resolves once the activity check is complete.
    *
    * @example
-   * await device.activityCheck(5.0);
+   * device.activityCheck(5.0);
    */
-  protected activityCheck = async (input: number): Promise<void> => {
-    const startValue = input
+  protected activityCheck = (input: number): void => {
     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)
+    const activeNow = input > threshold
+
+    if (activeNow === this.isActive) {
+      if (this.activeCheckPending) {
+        clearTimeout(this.activeCheckPending.timeout)
+        this.activeCheckPending = undefined
+      }
+      return
+    }
+
+    if (this.activeCheckPending?.target === activeNow) {
+      return
+    }
+
+    if (this.activeCheckPending) {
+      clearTimeout(this.activeCheckPending.timeout)
+    }
+
+    this.activeCheckPending = {
+      target: activeNow,
+      timeout: setTimeout(() => {
+        this.isActive = activeNow
+        this.activeCallback(activeNow)
+        this.activeCheckPending = undefined
+      }, duration),
     }
   }
 
@@ -577,6 +612,13 @@ export abstract class Device extends BaseModel implements IDevice {
         })
       }
 
+      if (!this.bluetooth) {
+        throw new Error("Bluetooth device is not available")
+      }
+
+      // Hook for when a device has been selected.
+      this.onBluetoothDeviceSelected(this.bluetooth)
+
       if (!this.bluetooth.gatt) {
         throw new Error("GATT is not available on this device")
       }
@@ -585,10 +627,13 @@ export abstract class Device extends BaseModel implements IDevice {
 
       this.server = this.bluetooth.gatt.connected ? this.bluetooth.gatt : await this.bluetooth.gatt.connect()
 
-      if (this.server.connected) {
-        await this.onConnected(onSuccess)
+      if (!this.server.connected) {
+        throw new Error("GATT server did not connect")
       }
+
+      await this.onConnected(onSuccess)
     } catch (error) {
+      this.disconnect()
       onError(error as Error)
     }
   }
@@ -639,6 +684,15 @@ export abstract class Device extends BaseModel implements IDevice {
     this.server = undefined
     this.writeLast = null
     this.isActive = false
+    if (this.activeCheckPending) {
+      clearTimeout(this.activeCheckPending.timeout)
+      this.activeCheckPending = undefined
+    }
+    this.onDisconnectCleanup()
+  }
+
+  protected onDisconnectCleanup(): void {
+    return
   }
 
   /**
@@ -830,6 +884,14 @@ export abstract class Device extends BaseModel implements IDevice {
     throw new Error("Bluetooth not available.")
   }
 
+  /**
+   * Hook for device-specific setup after a Bluetooth device has been selected.
+   */
+  protected onBluetoothDeviceSelected(device: BluetoothDevice): void {
+    void device
+    return
+  }
+
   /**
    * Handles notifications received from a characteristic.
    * @param {DataView} value - The notification event.
@@ -934,7 +996,7 @@ export abstract class Device extends BaseModel implements IDevice {
               // Look for our default notify characteristic id that accepts notifications
               if (descriptor.id === this.notifyCharacteristicId) {
                 // Start receiving notifications for changes on this characteristic
-                matchingCharacteristic.startNotifications()
+                await 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
@@ -944,6 +1006,10 @@ export abstract class Device extends BaseModel implements IDevice {
                     this.handleNotifications(target.value)
                   }
                 }
+                const existingListener = this.notificationListeners.get(descriptor.uuid)
+                if (existingListener) {
+                  matchingCharacteristic.removeEventListener("characteristicvaluechanged", existingListener)
+                }
                 // Attach the event listener to listen for changes in the characteristic's value
                 matchingCharacteristic.addEventListener("characteristicvaluechanged", listener)
                 // Store the listener so it can be referenced (for later removal)

package/src/models/index.ts

@@ -8,8 +8,6 @@ export { ForceBoard } from "./device/forceboard.model.js"
 
 export { NordicDfuDevice, createNordicDfuService } from "./nordic.model.js"
 
-export { KilterBoard, KilterBoardPlacementRoles } from "./device/kilterboard.model.js"
-
 export { Motherboard } from "./device/motherboard.model.js"
 
 export { mySmartBoard } from "./device/mysmartboard.model.js"
@@ -21,3 +19,5 @@ export { Progressor } from "./device/progressor.model.js"
 export { SmartBoardPro } from "./device/smartboard-pro.model.js"
 
 export { WHC06 } from "./device/wh-c06.model.js"
+
+export { AuroraBoard } from "./device/aurora.model.js"

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

@@ -1,17 +0,0 @@
-import type { IDevice } from "../device.interface.js";
-/**
- * Interface representing the KilterBoard device, extending the base Device interface.
- */
-export interface IKilterBoard extends IDevice {
-    /**
-     * Configures the LEDs based on an array of climb placements.
-     * @param {{ position: number; role_id?: number; color?: string }[]} config - Array of climb placements for the LEDs. Either role_id or color (hex string) must be provided.
-     * @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: {
-        position: number;
-        role_id?: number;
-        color?: string;
-    }[]): Promise<number[] | undefined>;
-}
-//# sourceMappingURL=kilterboard.interface.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"kilterboard.interface.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/device/kilterboard.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,OAAO;IAC3C;;;;OAIG;IACH,GAAG,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAAA;CACrG"}

package/dist/cjs/interfaces/device/kilterboard.interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"kilterboard.interface.js","sourceRoot":"","sources":["../../../../src/interfaces/device/kilterboard.interface.ts"],"names":[],"mappings":""}

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

@@ -1 +0,0 @@
-{"version":3,"file":"kilterboard.model.d.ts","sourceRoot":"","sources":["../../../../src/models/device/kilterboard.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kDAAkD,CAAA;AAEpF;;;;GAIG;AACH,oBAAY,iBAAiB;IAC3B,oEAAoE;IACpE,SAAS,KAAK;IACd,4FAA4F;IAC5F,QAAQ,KAAA;IACR,+EAA+E;IAC/E,OAAO,KAAA;IACP,8IAA8I;IAC9I,OAAO,KAAA;IACP,oEAAoE;IACpE,SAAS,KAAA;IACT,4FAA4F;IAC5F,QAAQ,KAAA;IACR,+EAA+E;IAC/E,OAAO,KAAA;IACP,8IAA8I;IAC9I,OAAO,KAAA;CACR;AACD;;GAEG;AACH,eAAO,MAAM,yBAAyB;;;;;;;;GAqCrC,CAAA;AAED;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,MAAO,YAAW,YAAY;IAC7D;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAyC;IAE3E;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAc;IAE1D;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAa;;IA+B5D;;;;OAIG;IACH,OAAO,CAAC,QAAQ;IAQhB;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAiBjB;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAOtB;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAenB;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IAIvB;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAsEnB;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAYlB;;;;;;OAMG;IACH,OAAO,CAAC,aAAa,CAC2E;IAEhG;;OAEG;YACW,kBAAkB;IAMhC;;;;OAIG;IACH,GAAG,GAAU,QAAQ;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,KAAG,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAW5G;CACF"}