@hangtime/grip-connect 0.5.9 → 0.5.10

package/dist/models/base.model.js

@@ -3,7 +3,7 @@ export class BaseModel {
     createdAt;
     updatedAt;
     constructor(base) {
-        this.id = base.id ? base.id : self.crypto.randomUUID();
+        this.id = base.id ?? globalThis.crypto?.randomUUID();
         this.createdAt = base.createdAt;
         this.updatedAt = base.updatedAt;
     }

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

@@ -152,6 +152,8 @@ export class Entralpi extends Device {
     handleNotifications = (characteristic) => {
         const value = characteristic.value;
         if (value) {
+            // Update timestamp
+            this.updateTimestamp();
             if (value.buffer) {
                 const receivedTime = Date.now();
                 const receivedData = (value.getUint16(0) / 100).toFixed(1);

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

@@ -181,6 +181,8 @@ export class ForceBoard extends Device {
     handleNotifications = (characteristic) => {
         const value = characteristic.value;
         if (value) {
+            // Update timestamp
+            this.updateTimestamp();
             if (value.buffer) {
                 const receivedTime = Date.now();
                 const dataArray = new Uint8Array(value.buffer);

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

@@ -191,6 +191,8 @@ export class Motherboard extends Device {
     handleNotifications = (characteristic) => {
         const value = characteristic.value;
         if (value) {
+            // Update timestamp
+            this.updateTimestamp();
             if (value.buffer) {
                 for (let i = 0; i < value.byteLength; i++) {
                     this.receiveBuffer.push(value.getUint8(i));

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

@@ -116,6 +116,8 @@ export class Progressor extends Device {
     handleNotifications = (characteristic) => {
         const value = characteristic.value;
         if (value) {
+            // Update timestamp
+            this.updateTimestamp();
             if (value.buffer) {
                 const receivedTime = Date.now();
                 // Read the first byte of the buffer to determine the kind of message

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

@@ -72,6 +72,8 @@ export class WHC06 extends Device {
             if (!this.bluetooth.gatt) {
                 throw new Error("GATT is not available on this device");
             }
+            // Update timestamp
+            this.updateTimestamp();
             // Device has no services / characteristics, so we directly call onSuccess
             onSuccess();
             this.bluetooth.addEventListener("advertisementreceived", (event) => {

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

@@ -138,6 +138,22 @@ export declare abstract class Device extends BaseModel implements IDevice {
      * @protected
      */
     protected activeCallback: ActiveCallback;
+    /**
+     * Event listener for handling the 'gattserverdisconnected' event.
+     * This listener delegates the event to the `onDisconnected` method.
+     *
+     * @private
+     * @type {(event: Event) => void}
+     */
+    private onDisconnectedListener;
+    /**
+     * A map that stores notification event listeners keyed by characteristic UUIDs.
+     * This allows for proper addition and removal of event listeners associated with each characteristic.
+     *
+     * @private
+     * @type {Map<string, EventListener>}
+     */
+    private notificationListeners;
     constructor(device: Partial<IDevice>);
     /**
      * Sets the callback function to be called when the activity status changes,
@@ -364,6 +380,16 @@ export declare abstract class Device extends BaseModel implements IDevice {
      * console.log('Calibrated sample:', calibratedSample);
      */
     protected applyTare(sample: number): number;
+    /**
+     * Updates the timestamp of the last device interaction.
+     * This method sets the updatedAt property to the current date and time.
+     * @protected
+     *
+     * @example
+     * device.updateTimestamp();
+     * console.log('Last updated:', device.updatedAt);
+     */
+    protected updateTimestamp: () => void;
     /**
      * Writes a message to the specified characteristic of a Bluetooth device and optionally provides a callback to handle responses.
      * @param {string} serviceId - The service UUID of the Bluetooth device containing the target characteristic.

package/dist/models/device.model.js

@@ -134,6 +134,22 @@ export class Device extends BaseModel {
      * @protected
      */
     activeCallback = (data) => console.log(data);
+    /**
+     * Event listener for handling the 'gattserverdisconnected' event.
+     * This listener delegates the event to the `onDisconnected` method.
+     *
+     * @private
+     * @type {(event: Event) => void}
+     */
+    onDisconnectedListener = (event) => this.onDisconnected(event);
+    /**
+     * A map that stores notification event listeners keyed by characteristic UUIDs.
+     * This allows for proper addition and removal of event listeners associated with each characteristic.
+     *
+     * @private
+     * @type {Map<string, EventListener>}
+     */
+    notificationListeners = new Map();
     constructor(device) {
         super(device);
         this.filters = device.filters || [];
@@ -144,6 +160,8 @@ export class Device extends BaseModel {
         this.massAverage = "0";
         this.massTotalSum = 0;
         this.dataPointCount = 0;
+        this.createdAt = new Date();
+        this.updatedAt = new Date();
     }
     /**
      * Sets the callback function to be called when the activity status changes,
@@ -189,28 +207,19 @@ export class Device extends BaseModel {
      */
     activityCheck = (input) => {
         return new Promise((resolve) => {
-            const startTime = Date.now();
-            const checkActivity = () => {
-                const currentTime = Date.now();
-                const elapsedTime = currentTime - startTime;
-                if (elapsedTime >= this.activeConfig.duration) {
-                    // Determine the activity status based on the most recent input
-                    const activeNow = input > this.activeConfig.threshold;
-                    if (this.isActive !== activeNow) {
-                        this.isActive = activeNow;
-                        if (this.activeCallback) {
-                            this.activeCallback(activeNow);
-                        }
+            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();
-                }
-                else {
-                    // Continue checking until the duration is met
-                    requestAnimationFrame(checkActivity);
                 }
-            };
-            // Start the activity check
-            checkActivity();
+                resolve();
+            }, duration);
         });
     };
     /**
@@ -227,6 +236,9 @@ export class Device extends BaseModel {
      */
     connect = async (onSuccess = () => console.log("Connected successfully"), onError = (error) => console.error(error)) => {
         try {
+            if (typeof navigator === "undefined" || !("bluetooth" in navigator)) {
+                throw new Error("Web Bluetooth API not supported in this environment.");
+            }
             // Request device and set up connection
             const deviceServices = this.getAllServiceUUIDs();
             this.bluetooth = await navigator.bluetooth.requestDevice({
@@ -236,9 +248,7 @@ export class Device extends BaseModel {
             if (!this.bluetooth.gatt) {
                 throw new Error("GATT is not available on this device");
             }
-            this.bluetooth.addEventListener("gattserverdisconnected", (event) => {
-                this.onDisconnected(event);
-            });
+            this.bluetooth.addEventListener("gattserverdisconnected", this.onDisconnectedListener);
             this.server = await this.bluetooth.gatt.connect();
             if (this.server.connected) {
                 await this.onConnected(onSuccess);
@@ -262,22 +272,23 @@ export class Device extends BaseModel {
      */
     disconnect = () => {
         if (this.isConnected()) {
+            this.updateTimestamp();
             // Remove all notification listeners
             this.services.forEach((service) => {
                 service.characteristics.forEach((char) => {
+                    // TODO: remove device-specific logic
                     if (char.characteristic && char.id === "rx") {
                         char.characteristic.stopNotifications();
-                        char.characteristic.removeEventListener("characteristicvaluechanged", (event) => {
-                            const target = event.target;
-                            if (target && target.value) {
-                                this.handleNotifications(target);
-                            }
-                        });
+                        const listener = this.notificationListeners.get(char.uuid);
+                        if (listener) {
+                            char.characteristic.removeEventListener("characteristicvaluechanged", listener);
+                            this.notificationListeners.delete(char.uuid);
+                        }
                     }
                 });
             });
             // Remove disconnect listener
-            this.bluetooth?.removeEventListener("gattserverdisconnected", this.onDisconnected);
+            this.bluetooth?.removeEventListener("gattserverdisconnected", this.onDisconnectedListener);
             // Safely attempt to disconnect the device's GATT server, if available
             this.bluetooth?.gatt?.disconnect();
             // Reset properties
@@ -367,6 +378,10 @@ export class Device extends BaseModel {
      * device.download('json');
      */
     download = (format = "csv") => {
+        if (typeof document === "undefined" || typeof window === "undefined") {
+            console.warn("Download is not supported outside a browser environment.");
+            return;
+        }
         let content = "";
         let mimeType = "";
         let fileName = "";
@@ -453,15 +468,11 @@ export class Device extends BaseModel {
      */
     handleNotifications = (characteristic) => {
         const value = characteristic.value;
-        if (!value) {
+        if (!value)
             return;
-        }
-        if (value.buffer) {
-            console.log(value);
-        }
-        else {
-            console.log(value);
-        }
+        this.updateTimestamp();
+        // Received notification data
+        console.log(value);
     };
     /**
      * Checks if a Bluetooth device is connected.
@@ -508,6 +519,7 @@ export class Device extends BaseModel {
      * });
      */
     onConnected = async (onSuccess) => {
+        this.updateTimestamp();
         if (!this.server) {
             throw new Error("GATT server is not available");
         }
@@ -528,15 +540,17 @@ export class Device extends BaseModel {
                         const element = matchingService.characteristics.find((char) => char.uuid === matchingCharacteristic.uuid);
                         if (element) {
                             element.characteristic = matchingCharacteristic;
-                            // notify
+                            // TODO: remove device-specific logic
                             if (element.id === "rx") {
                                 matchingCharacteristic.startNotifications();
-                                matchingCharacteristic.addEventListener("characteristicvaluechanged", (event) => {
+                                const listener = (event) => {
                                     const target = event.target;
                                     if (target && target.value) {
                                         this.handleNotifications(target);
                                     }
-                                });
+                                };
+                                matchingCharacteristic.addEventListener("characteristicvaluechanged", listener);
+                                this.notificationListeners.set(element.uuid, listener);
                             }
                         }
                     }
@@ -558,9 +572,8 @@ export class Device extends BaseModel {
      * device.onDisconnected(event);
      */
     onDisconnected = (event) => {
-        this.bluetooth = undefined;
-        const device = event.target;
-        console.warn(`Device ${device.name} is disconnected.`);
+        console.warn(`Device ${event.target.name} is disconnected.`);
+        this.disconnect();
     };
     /**
      * Reads the value of the specified characteristic from the device.
@@ -581,8 +594,9 @@ export class Device extends BaseModel {
         // Get the characteristic from the service
         const characteristic = this.getCharacteristic(serviceId, characteristicId);
         if (!characteristic) {
-            throw new Error("Characteristic is undefined");
+            throw new Error(`Characteristic "${characteristicId}" not found in service "${serviceId}"`);
         }
+        this.updateTimestamp();
         // Decode the value based on characteristicId and serviceId
         let decodedValue;
         const decoder = new TextDecoder("utf-8");
@@ -620,6 +634,7 @@ export class Device extends BaseModel {
     tare(duration = 5000) {
         if (this.tareActive)
             return false;
+        this.updateTimestamp();
         this.tareActive = true;
         this.tareDuration = duration;
         this.tareSamples = [];
@@ -654,6 +669,18 @@ export class Device extends BaseModel {
         // Return the current tare-adjusted value
         return this.tareCurrent;
     }
+    /**
+     * Updates the timestamp of the last device interaction.
+     * This method sets the updatedAt property to the current date and time.
+     * @protected
+     *
+     * @example
+     * device.updateTimestamp();
+     * console.log('Last updated:', device.updatedAt);
+     */
+    updateTimestamp = () => {
+        this.updatedAt = new Date();
+    };
     /**
      * Writes a message to the specified characteristic of a Bluetooth device and optionally provides a callback to handle responses.
      * @param {string} serviceId - The service UUID of the Bluetooth device containing the target characteristic.
@@ -679,8 +706,9 @@ export class Device extends BaseModel {
         // Get the characteristic from the service
         const characteristic = this.getCharacteristic(serviceId, characteristicId);
         if (!characteristic) {
-            throw new Error("Characteristic is undefined");
+            throw new Error(`Characteristic "${characteristicId}" not found in service "${serviceId}"`);
         }
+        this.updateTimestamp();
         // Convert the message to Uint8Array if it's a string
         const valueToWrite = typeof message === "string" ? new TextEncoder().encode(message) : message;
         // Write the value to the characteristic

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hangtime/grip-connect",
-  "version": "0.5.9",
+  "version": "0.5.10",
   "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/models/base.model.ts

@@ -8,7 +8,7 @@ export abstract class BaseModel {
   updatedAt?: Date
 
   constructor(base: IBase) {
-    this.id = base.id ? base.id : self.crypto.randomUUID()
+    this.id = base.id ?? globalThis.crypto?.randomUUID()
 
     this.createdAt = base.createdAt
     this.updatedAt = base.updatedAt

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

@@ -159,6 +159,8 @@ export class Entralpi extends Device implements IEntralpi {
     const value: DataView | undefined = characteristic.value
 
     if (value) {
+      // Update timestamp
+      this.updateTimestamp()
       if (value.buffer) {
         const receivedTime: number = Date.now()
         const receivedData: string = (value.getUint16(0) / 100).toFixed(1)

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

@@ -185,6 +185,8 @@ export class ForceBoard extends Device implements IForceBoard {
   handleNotifications = (characteristic: BluetoothRemoteGATTCharacteristic): void => {
     const value: DataView | undefined = characteristic.value
     if (value) {
+      // Update timestamp
+      this.updateTimestamp()
       if (value.buffer) {
         const receivedTime: number = Date.now()
         const dataArray = new Uint8Array(value.buffer)

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

@@ -207,6 +207,8 @@ export class Motherboard extends Device implements IMotherboard {
     const value: DataView | undefined = characteristic.value
 
     if (value) {
+      // Update timestamp
+      this.updateTimestamp()
       if (value.buffer) {
         for (let i = 0; i < value.byteLength; i++) {
           this.receiveBuffer.push(value.getUint8(i))

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

@@ -126,6 +126,8 @@ export class Progressor extends Device implements IProgressor {
     const value: DataView | undefined = characteristic.value
 
     if (value) {
+      // Update timestamp
+      this.updateTimestamp()
       if (value.buffer) {
         const receivedTime: number = Date.now()
         // Read the first byte of the buffer to determine the kind of message

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

@@ -86,6 +86,8 @@ export class WHC06 extends Device implements IWHC06 {
       if (!this.bluetooth.gatt) {
         throw new Error("GATT is not available on this device")
       }
+      // Update timestamp
+      this.updateTimestamp()
 
       // Device has no services / characteristics, so we directly call onSuccess
       onSuccess()

package/src/models/device.model.ts

@@ -158,6 +158,24 @@ export abstract class Device extends BaseModel implements IDevice {
    */
   protected activeCallback: ActiveCallback = (data: boolean) => console.log(data)
 
+  /**
+   * Event listener for handling the 'gattserverdisconnected' event.
+   * This listener delegates the event to the `onDisconnected` method.
+   *
+   * @private
+   * @type {(event: Event) => void}
+   */
+  private onDisconnectedListener = (event: Event) => this.onDisconnected(event)
+
+  /**
+   * A map that stores notification event listeners keyed by characteristic UUIDs.
+   * This allows for proper addition and removal of event listeners associated with each characteristic.
+   *
+   * @private
+   * @type {Map<string, EventListener>}
+   */
+  private notificationListeners = new Map<string, EventListener>()
+
   constructor(device: Partial<IDevice>) {
     super(device)
 
@@ -170,6 +188,9 @@ export abstract class Device extends BaseModel implements IDevice {
     this.massAverage = "0"
     this.massTotalSum = 0
     this.dataPointCount = 0
+
+    this.createdAt = new Date()
+    this.updatedAt = new Date()
   }
 
   /**
@@ -218,29 +239,19 @@ export abstract class Device extends BaseModel implements IDevice {
    */
   protected activityCheck = (input: number): Promise<void> => {
     return new Promise((resolve) => {
-      const startTime = Date.now()
-      const checkActivity = () => {
-        const currentTime = Date.now()
-        const elapsedTime = currentTime - startTime
-
-        if (elapsedTime >= this.activeConfig.duration) {
-          // Determine the activity status based on the most recent input
-          const activeNow = input > this.activeConfig.threshold
-          if (this.isActive !== activeNow) {
-            this.isActive = activeNow
-            if (this.activeCallback) {
-              this.activeCallback(activeNow)
-            }
+      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()
-        } else {
-          // Continue checking until the duration is met
-          requestAnimationFrame(checkActivity)
         }
-      }
-
-      // Start the activity check
-      checkActivity()
+        resolve()
+      }, duration)
     })
   }
 
@@ -261,6 +272,9 @@ export abstract class Device extends BaseModel implements IDevice {
     onError: (error: Error) => void = (error) => console.error(error),
   ): Promise<void> => {
     try {
+      if (typeof navigator === "undefined" || !("bluetooth" in navigator)) {
+        throw new Error("Web Bluetooth API not supported in this environment.")
+      }
       // Request device and set up connection
       const deviceServices = this.getAllServiceUUIDs()
 
@@ -273,9 +287,7 @@ export abstract class Device extends BaseModel implements IDevice {
         throw new Error("GATT is not available on this device")
       }
 
-      this.bluetooth.addEventListener("gattserverdisconnected", (event) => {
-        this.onDisconnected(event)
-      })
+      this.bluetooth.addEventListener("gattserverdisconnected", this.onDisconnectedListener)
 
       this.server = await this.bluetooth.gatt.connect()
 
@@ -301,22 +313,23 @@ export abstract class Device extends BaseModel implements IDevice {
    */
   disconnect = (): void => {
     if (this.isConnected()) {
+      this.updateTimestamp()
       // Remove all notification listeners
       this.services.forEach((service) => {
         service.characteristics.forEach((char) => {
+          // TODO: remove device-specific logic
           if (char.characteristic && char.id === "rx") {
             char.characteristic.stopNotifications()
-            char.characteristic.removeEventListener("characteristicvaluechanged", (event: Event) => {
-              const target = event.target as BluetoothRemoteGATTCharacteristic
-              if (target && target.value) {
-                this.handleNotifications(target)
-              }
-            })
+            const listener = this.notificationListeners.get(char.uuid)
+            if (listener) {
+              char.characteristic.removeEventListener("characteristicvaluechanged", listener)
+              this.notificationListeners.delete(char.uuid)
+            }
           }
         })
       })
       // Remove disconnect listener
-      this.bluetooth?.removeEventListener("gattserverdisconnected", this.onDisconnected)
+      this.bluetooth?.removeEventListener("gattserverdisconnected", this.onDisconnectedListener)
       // Safely attempt to disconnect the device's GATT server, if available
       this.bluetooth?.gatt?.disconnect()
       // Reset properties
@@ -412,6 +425,10 @@ export abstract class Device extends BaseModel implements IDevice {
    * device.download('json');
    */
   download = (format: "csv" | "json" | "xml" = "csv"): void => {
+    if (typeof document === "undefined" || typeof window === "undefined") {
+      console.warn("Download is not supported outside a browser environment.")
+      return
+    }
     let content = ""
     let mimeType = ""
     let fileName = ""
@@ -514,16 +531,11 @@ export abstract class Device extends BaseModel implements IDevice {
    */
   protected handleNotifications = (characteristic: BluetoothRemoteGATTCharacteristic): void => {
     const value = characteristic.value
+    if (!value) return
 
-    if (!value) {
-      return
-    }
-
-    if (value.buffer) {
-      console.log(value)
-    } else {
-      console.log(value)
-    }
+    this.updateTimestamp()
+    // Received notification data
+    console.log(value)
   }
 
   /**
@@ -573,6 +585,8 @@ export abstract class Device extends BaseModel implements IDevice {
    * });
    */
   protected onConnected = async (onSuccess: () => void): Promise<void> => {
+    this.updateTimestamp()
+
     if (!this.server) {
       throw new Error("GATT server is not available")
     }
@@ -600,15 +614,17 @@ export abstract class Device extends BaseModel implements IDevice {
             if (element) {
               element.characteristic = matchingCharacteristic
 
-              // notify
+              // TODO: remove device-specific logic
               if (element.id === "rx") {
                 matchingCharacteristic.startNotifications()
-                matchingCharacteristic.addEventListener("characteristicvaluechanged", (event: Event) => {
+                const listener = (event: Event) => {
                   const target = event.target as BluetoothRemoteGATTCharacteristic
                   if (target && target.value) {
                     this.handleNotifications(target)
                   }
-                })
+                }
+                matchingCharacteristic.addEventListener("characteristicvaluechanged", listener)
+                this.notificationListeners.set(element.uuid, listener)
               }
             }
           } else {
@@ -631,9 +647,8 @@ export abstract class Device extends BaseModel implements IDevice {
    * device.onDisconnected(event);
    */
   protected onDisconnected = (event: Event): void => {
-    this.bluetooth = undefined
-    const device = event.target as BluetoothDevice
-    console.warn(`Device ${device.name} is disconnected.`)
+    console.warn(`Device ${(event.target as BluetoothDevice).name} is disconnected.`)
+    this.disconnect()
   }
 
   /**
@@ -655,8 +670,9 @@ export abstract class Device extends BaseModel implements IDevice {
     // Get the characteristic from the service
     const characteristic = this.getCharacteristic(serviceId, characteristicId)
     if (!characteristic) {
-      throw new Error("Characteristic is undefined")
+      throw new Error(`Characteristic "${characteristicId}" not found in service "${serviceId}"`)
     }
+    this.updateTimestamp()
     // Decode the value based on characteristicId and serviceId
     let decodedValue: string
     const decoder = new TextDecoder("utf-8")
@@ -697,6 +713,7 @@ export abstract class Device extends BaseModel implements IDevice {
    */
   tare(duration = 5000): boolean {
     if (this.tareActive) return false
+    this.updateTimestamp()
     this.tareActive = true
     this.tareDuration = duration
     this.tareSamples = []
@@ -735,6 +752,19 @@ export abstract class Device extends BaseModel implements IDevice {
     return this.tareCurrent
   }
 
+  /**
+   * Updates the timestamp of the last device interaction.
+   * This method sets the updatedAt property to the current date and time.
+   * @protected
+   *
+   * @example
+   * device.updateTimestamp();
+   * console.log('Last updated:', device.updatedAt);
+   */
+  protected updateTimestamp = (): void => {
+    this.updatedAt = new Date()
+  }
+
   /**
    * Writes a message to the specified characteristic of a Bluetooth device and optionally provides a callback to handle responses.
    * @param {string} serviceId - The service UUID of the Bluetooth device containing the target characteristic.
@@ -766,8 +796,9 @@ export abstract class Device extends BaseModel implements IDevice {
     // Get the characteristic from the service
     const characteristic = this.getCharacteristic(serviceId, characteristicId)
     if (!characteristic) {
-      throw new Error("Characteristic is undefined")
+      throw new Error(`Characteristic "${characteristicId}" not found in service "${serviceId}"`)
     }
+    this.updateTimestamp()
     // Convert the message to Uint8Array if it's a string
     const valueToWrite: Uint8Array = typeof message === "string" ? new TextEncoder().encode(message) : message
     // Write the value to the characteristic