@hangtime/grip-connect 0.5.0 → 0.5.2

package/src/interfaces/device.interface.ts

@@ -1,4 +1,5 @@
 import type { IBase } from "./base.interface"
+import type { massObject } from "../types/notify"
 
 /**
  * Represents a characteristic of a Bluetooth service.
@@ -40,10 +41,32 @@ export interface IDevice extends IBase {
   bluetooth?: BluetoothDevice
 
   /**
-   * Handles the 'disconnected' event.
-   * @param {Event} event - The 'disconnected' event.
+   * Connects to a Bluetooth device.
+   * @param {Function} [onSuccess] - Optional callback function to execute on successful connection. Default logs success.
+   * @param {Function} [onError] - Optional callback function to execute on error. Default logs the error.
    */
-  onDisconnected(event: Event): void
+  connect(onSuccess?: () => void, onError?: (error: Error) => void): Promise<void>
+
+  /**
+   * Disconnects the device if it is currently connected.
+   * - Checks if the device is connected via it's GATT server.
+   * - If the device is connected, it attempts to gracefully disconnect.
+   */
+  disconnect(): void
+
+  /**
+   * Returns UUIDs of all services associated with the device.
+   * @returns {string[]} Array of service UUIDs.
+   */
+  getAllServiceUUIDs(): string[]
+
+  /**
+   * 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.
+   */
+  getCharacteristic(serviceId: string, characteristicId: string): BluetoothRemoteGATTCharacteristic | undefined
 
   /**
    * Handles notifications received from a characteristic.
@@ -51,6 +74,26 @@ export interface IDevice extends IBase {
    */
   handleNotifications(event: Event): void
 
+  /**
+   * Checks if a Bluetooth device is connected.
+   * @returns {boolean} A boolean indicating whether the device is connected.
+   */
+  isConnected(): boolean
+
+  /**
+   * Sets the callback function to be called when notifications are received.
+   * @param {NotifyCallback} callback - The callback function to be set.
+   * @returns {void}
+   */
+  notify(callback: (data: massObject) => void): void
+
+  /**
+   * Defines the type for the callback function.
+   * @callback NotifyCallback
+   * @param {massObject} data - The data passed to the callback.
+   */
+  notifyCallback: (data: massObject) => void
+
   /**
    * Handles the 'connected' event.
    * @param {Function} onSuccess - Callback function to execute on successful connection.
@@ -58,28 +101,53 @@ export interface IDevice extends IBase {
   onConnected(onSuccess: () => void): Promise<void>
 
   /**
-   * Returns UUIDs of all services associated with the device.
-   * @returns {string[]} Array of service UUIDs.
+   * Handles the 'disconnected' event.
+   * @param {Event} event - The 'disconnected' event.
    */
-  getAllServiceUUIDs(): string[]
+  onDisconnected(event: Event): void
 
   /**
-   * Connects to a Bluetooth device.
-   * @param {Function} [onSuccess] - Optional callback function to execute on successful connection. Default logs success.
-   * @param {Function} [onError] - Optional callback function to execute on error. Default logs the error.
+   * Reads the value of the specified characteristic from the device.
+   * @param {string} serviceId - The service ID where the characteristic belongs.
+   * @param {string} characteristicId - The characteristic ID to read from.
+   * @param {number} [duration=0] - The duration to wait before resolving the promise, in milliseconds.
+   * @returns {Promise<string>} A promise that resolves when the read operation is completed.
    */
-  connect(onSuccess?: () => void, onError?: (error: Error) => void): Promise<void>
+  read(serviceId: string, characteristicId: string, duration?: number): Promise<string>
 
   /**
-   * Checks if a Bluetooth device is connected.
-   * @returns {boolean} A boolean indicating whether the device is connected.
+   * 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.
+   * @param {string} characteristicId - The characteristic UUID where the message will be written.
+   * @param {string | Uint8Array | undefined} message - The message to be written to the characteristic. It can be a string or a Uint8Array.
+   * @param {number} [duration=0] - Optional. The time in milliseconds to wait before resolving the promise. Defaults to 0 for immediate resolution.
+   * @param {WriteCallback} [callback=writeCallback] - Optional. A custom callback to handle the response after the write operation is successful.
+   *
+   * @returns {Promise<void>} A promise that resolves once the write operation is complete.
+   *
+   * @throws {Error} Throws an error if the characteristic is undefined.
+   *
+   * @example
+   * // Example usage of the write function with a custom callback
+   * await Progressor.write("progressor", "tx", ProgressorCommands.GET_BATT_VLTG, 250, (data) => {
+   *   console.log(`Battery voltage: ${data}`);
+   * });
    */
-  isConnected(): boolean
+  write(
+    serviceId: string,
+    characteristicId: string,
+    message: string | Uint8Array | undefined,
+    duration?: number,
+    callback?: (data: string) => void,
+  ): Promise<void>
 
   /**
-   * Disconnects the device if it is currently connected.
-   * - Checks if the device is connected via it's GATT server.
-   * - If the device is connected, it attempts to gracefully disconnect.
+   * A default write callback that logs the response
    */
-  disconnect(): void
+  writeCallback: (data: string) => void
+  /**
+   * The last message written to the device.
+   * @type {string | Uint8Array | null}
+   */
+  writeLast: string | Uint8Array | null
 }

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

@@ -1,9 +1,7 @@
 import { Device } from "../device.model"
 import type { IEntralpi } from "../../interfaces/device/entralpi.interface"
-import { notifyCallback } from "../../notify"
 import { applyTare } from "../../tare"
 import { checkActivity } from "../../is-active"
-import { read } from "../../read"
 
 // Constants
 let MASS_MAX = "0"
@@ -27,7 +25,7 @@ export class Entralpi extends Device implements IEntralpi {
           characteristics: [
             {
               name: "System ID",
-              id: "id",
+              id: "system",
               uuid: "00002a23-0000-1000-8000-00805f9b34fb",
             },
             {
@@ -136,11 +134,25 @@ export class Entralpi extends Device implements IEntralpi {
 
   /**
    * Retrieves battery or voltage information from the device.
-   * @returns {Promise<string | undefined>} A Promise that resolves with the battery or voltage information,
+   * @returns {Promise<string | undefined>} A Promise that resolves with the battery or voltage information.
    */
   battery = async (): Promise<string | undefined> => {
     if (this.isConnected()) {
-      return await read(this, "battery", "level", 250)
+      return await this.read("battery", "level", 250)
+    }
+    // If device is not found, return undefined
+    return undefined
+  }
+
+  /**
+   * Retrieves IEEE 11073-20601 Regulatory Certification from the device.
+   * @returns {Promise<string>} A Promise that resolves with the certification.
+   */
+  certification = async (): Promise<string | undefined> => {
+    // Check if the device is connected
+    if (this.isConnected()) {
+      // Read certification from the device
+      return await this.read("device", "certification", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -148,13 +160,13 @@ export class Entralpi extends Device implements IEntralpi {
 
   /**
    * Retrieves firmware version from the device.
-   * @returns {Promise<string>} A Promise that resolves with the firmware version,
+   * @returns {Promise<string>} A Promise that resolves with the firmware version.
    */
   firmware = async (): Promise<string | undefined> => {
     // Check if the device is connected
     if (this.isConnected()) {
       // Read firmware version from the Motherboard
-      return await read(this, "device", "firmware", 250)
+      return await this.read("device", "firmware", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -197,7 +209,7 @@ export class Entralpi extends Device implements IEntralpi {
         checkActivity(numericData)
 
         // Notify with weight data
-        notifyCallback({
+        this.notifyCallback({
           massMax: MASS_MAX,
           massAverage: MASS_AVERAGE,
           massTotal: Math.max(-1000, numericData).toFixed(1),
@@ -208,13 +220,13 @@ export class Entralpi extends Device implements IEntralpi {
 
   /**
    * Retrieves hardware version from the device.
-   * @returns {Promise<string>} A Promise that resolves with the hardware version,
+   * @returns {Promise<string>} A Promise that resolves with the hardware version.
    */
   hardware = async (): Promise<string | undefined> => {
     // Check if the device is connected
     if (this.isConnected()) {
       // Read hardware version from the device
-      return await read(this, "device", "hardware", 250)
+      return await this.read("device", "hardware", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -222,13 +234,13 @@ export class Entralpi extends Device implements IEntralpi {
 
   /**
    * Retrieves manufacturer information from the device.
-   * @returns {Promise<string>} A Promise that resolves with the manufacturer information,
+   * @returns {Promise<string>} A Promise that resolves with the manufacturer information.
    */
   manufacturer = async (): Promise<string | undefined> => {
     // Check if the device is connected
     if (this.isConnected()) {
       // Read manufacturer information from the device
-      return await read(this, "device", "manufacturer", 250)
+      return await this.read("device", "manufacturer", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -236,13 +248,28 @@ export class Entralpi extends Device implements IEntralpi {
 
   /**
    * Retrieves model number from the device.
-   * @returns {Promise<string>} A Promise that resolves with the model number,
+   * @returns {Promise<string>} A Promise that resolves with the model number.
    */
   model = async (): Promise<string | undefined> => {
     // Check if the device is connected
     if (this.isConnected()) {
       // Read model number from the Entralpi
-      return await read(this, "device", "model", 250)
+      return await this.read("device", "model", 250)
+    }
+    // If device is not found, return undefined
+    return undefined
+  }
+
+  /**
+   * Retrieves PnP ID from the device, a set of values that used to create a device ID value that is unique for this device.
+   * Included in the characteristic is a Vendor ID Source field, a Vendor ID field, a Product ID field and a Product Version field
+   * @returns {Promise<string>} A Promise that resolves with the PnP ID.
+   */
+  pnp = async (): Promise<string | undefined> => {
+    // Check if the device is connected
+    if (this.isConnected()) {
+      // Read software version from the Entralpi
+      return await this.read("device", "pnp", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -250,13 +277,27 @@ export class Entralpi extends Device implements IEntralpi {
 
   /**
    * Retrieves software version from the device.
-   * @returns {Promise<string>} A Promise that resolves with the software version,
+   * @returns {Promise<string>} A Promise that resolves with the software version.
    */
   software = async (): Promise<string | undefined> => {
     // Check if the device is connected
     if (this.isConnected()) {
       // Read software version from the Entralpi
-      return await read(this, "device", "software", 250)
+      return await this.read("device", "software", 250)
+    }
+    // If device is not found, return undefined
+    return undefined
+  }
+
+  /**
+   * Retrieves system id from the device.
+   * @returns {Promise<string>} A Promise that resolves with the system id.
+   */
+  system = async (): Promise<string | undefined> => {
+    // Check if the device is connected
+    if (this.isConnected()) {
+      // Read system id from the device
+      return await this.read("device", "system", 250)
     }
     // If device is not found, return undefined
     return undefined

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

@@ -1,6 +1,5 @@
 import { Device } from "../device.model"
 import type { IForceBoard } from "../../interfaces/device/forceboard.interface"
-import { read } from "../../read"
 
 /**
  * Represents a PitchSix Force Board device
@@ -171,7 +170,7 @@ export class ForceBoard extends Device implements IForceBoard {
    */
   battery = async (): Promise<string | undefined> => {
     if (this.isConnected()) {
-      return await read(this, "battery", "level", 250)
+      return await this.read("battery", "level", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -184,7 +183,7 @@ export class ForceBoard extends Device implements IForceBoard {
   humidity = async (): Promise<string | undefined> => {
     // Check if the device is connected
     if (this.isConnected()) {
-      return await read(this, "humidity", "level", 250)
+      return await this.read("humidity", "level", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -198,7 +197,7 @@ export class ForceBoard extends Device implements IForceBoard {
     // Check if the device is connected
     if (this.isConnected()) {
       // Read manufacturer information from the device
-      return await read(this, "device", "manufacturer", 250)
+      return await this.read("device", "manufacturer", 250)
     }
     // If device is not found, return undefined
     return undefined

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

@@ -1,7 +1,6 @@
 import { Device } from "../device.model"
 import type { IKilterBoard } from "../../interfaces/device/kilterboard.interface"
 import { KilterBoardPacket, KilterBoardPlacementRoles } from "../../commands/kilterboard"
-import { write } from "../../write"
 
 /**
  * Aurora Climbing Advertising service
@@ -206,7 +205,7 @@ export class KilterBoard extends Device implements IKilterBoard {
    */
   async writeMessageSeries(messages: Uint8Array[]) {
     for (const message of messages) {
-      await write(this, "uart", "tx", message)
+      await this.write("uart", "tx", message)
     }
   }
   /**
@@ -214,7 +213,7 @@ export class KilterBoard extends Device implements IKilterBoard {
    * @param {ClimbPlacement[]} [config] - Optional color or array of climb placements for the LEDs. Ignored if placements are 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 = async (config?: "green" | "red" | "orange" | ClimbPlacement[]): Promise<number[] | undefined> => {
+  led = async (config?: ClimbPlacement[]): Promise<number[] | undefined> => {
     // Handle Kilterboard logic: process placements and send payload if connected
     if (Array.isArray(config)) {
       // Prepares byte arrays for transmission based on a list of climb placements.

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

@@ -1,15 +1,10 @@
 import { Device } from "../device.model"
 import type { IMotherboard } from "../../interfaces/device/motherboard.interface"
-import { notifyCallback } from "../../notify"
-import { write, writeCallback } from "../../write"
 import { applyTare } from "../../tare"
 import { MotherboardCommands } from "../../commands"
 import { checkActivity } from "../../is-active"
-import { lastWrite } from "../../write"
 import { DownloadPackets, emptyDownloadPackets } from "../../download"
 import type { DownloadPacket } from "../../types/download"
-import { read } from "../../read"
-import { stop } from "../../stop"
 
 // Constants
 const PACKET_LENGTH = 32
@@ -156,7 +151,7 @@ export class Motherboard extends Device implements IMotherboard {
    */
   battery = async (): Promise<string | undefined> => {
     if (this.isConnected()) {
-      return await read(this, "battery", "level", 250)
+      return await this.read("battery", "level", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -170,7 +165,7 @@ export class Motherboard extends Device implements IMotherboard {
     // Check if the device is connected
     if (this.isConnected()) {
       // Write the command to get calibration data to the device
-      await write(this, "uart", "tx", MotherboardCommands.GET_CALIBRATION, 2500, (data) => {
+      await this.write("uart", "tx", MotherboardCommands.GET_CALIBRATION, 2500, (data) => {
         console.log(data)
       })
     }
@@ -184,7 +179,7 @@ export class Motherboard extends Device implements IMotherboard {
     // Check if the device is connected
     if (this.isConnected()) {
       // Read firmware version from the Motherboard
-      return await read(this, "device", "firmware", 250)
+      return await this.read("device", "firmware", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -289,7 +284,7 @@ export class Motherboard extends Device implements IMotherboard {
             checkActivity(center)
 
             // Notify with weight data
-            notifyCallback({
+            this.notifyCallback({
               massTotal: Math.max(-1000, left + center + right).toFixed(1),
               massMax: MASS_MAX,
               massAverage: MASS_AVERAGE,
@@ -297,7 +292,7 @@ export class Motherboard extends Device implements IMotherboard {
               massCenter: Math.max(-1000, packet.masses[1]).toFixed(1),
               massRight: Math.max(-1000, packet.masses[2]).toFixed(1),
             })
-          } else if (lastWrite === MotherboardCommands.GET_CALIBRATION) {
+          } else if (this.writeLast === MotherboardCommands.GET_CALIBRATION) {
             // check data integrity
             if ((receivedData.match(/,/g) || []).length === 3) {
               const parts: string[] = receivedData.split(",")
@@ -306,7 +301,7 @@ export class Motherboard extends Device implements IMotherboard {
             }
           } else {
             // unhandled data
-            writeCallback(receivedData)
+            this.writeCallback(receivedData)
           }
         }
       }
@@ -321,7 +316,7 @@ export class Motherboard extends Device implements IMotherboard {
     // Check if the device is connected
     if (this.isConnected()) {
       // Read hardware version from the device
-      return await read(this, "device", "hardware", 250)
+      return await this.read("device", "hardware", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -343,8 +338,8 @@ export class Motherboard extends Device implements IMotherboard {
       // Default to "off" color if config is not set or not found in colorMapping
       const color = typeof config === "string" && colorMapping[config] ? config : "off"
       const [redValue, greenValue] = colorMapping[color]
-      await write(this, "led", "red", new Uint8Array(redValue))
-      await write(this, "led", "green", new Uint8Array(greenValue), 1250)
+      await this.write("led", "red", new Uint8Array(redValue))
+      await this.write("led", "green", new Uint8Array(greenValue), 1250)
     }
     return undefined
   }
@@ -357,7 +352,7 @@ export class Motherboard extends Device implements IMotherboard {
     // Check if the device is connected
     if (this.isConnected()) {
       // Read manufacturer information from the device
-      return await read(this, "device", "manufacturer", 250)
+      return await this.read("device", "manufacturer", 250)
     }
     // If device is not found, return undefined
     return undefined
@@ -372,7 +367,7 @@ export class Motherboard extends Device implements IMotherboard {
     if (this.isConnected()) {
       // Write serial number command to the Motherboard and read output
       let response: string | undefined = undefined
-      await write(this, "uart", "tx", MotherboardCommands.GET_SERIAL, 250, (data) => {
+      await this.write("uart", "tx", MotherboardCommands.GET_SERIAL, 250, (data) => {
         response = data
       })
       return response
@@ -381,6 +376,17 @@ export class Motherboard extends Device implements IMotherboard {
     return undefined
   }
 
+  /**
+   * Stops the data stream on the specified device.
+   * @returns {Promise<void>} A promise that resolves when the stream is stopped.
+   */
+  stop = async (): Promise<void> => {
+    if (this.isConnected()) {
+      // Stop stream of device
+      await this.write("uart", "tx", MotherboardCommands.STOP_WEIGHT_MEAS, 0)
+    }
+  }
+
   /**
    * Starts streaming data from the specified device.
    * @param {number} [duration=0] - The duration of the stream in milliseconds. If set to 0, stream will continue indefinitely.
@@ -397,10 +403,10 @@ export class Motherboard extends Device implements IMotherboard {
         await this.calibration()
       }
       // Start streaming data
-      await write(this, "uart", "tx", MotherboardCommands.START_WEIGHT_MEAS, duration)
+      await this.write("uart", "tx", MotherboardCommands.START_WEIGHT_MEAS, duration)
       // Stop streaming if duration is set
       if (duration !== 0) {
-        await stop(this)
+        await this.stop()
       }
     }
   }
@@ -419,7 +425,7 @@ export class Motherboard extends Device implements IMotherboard {
     if (this.isConnected()) {
       // Write text information command to the Motherboard and read output
       let response: string | undefined = undefined
-      await write(this, "uart", "tx", MotherboardCommands.GET_TEXT, 250, (data) => {
+      await this.write("uart", "tx", MotherboardCommands.GET_TEXT, 250, (data) => {
         response = data
       })
       return response

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

@@ -1,13 +1,10 @@
 import { Device } from "../device.model"
 import type { IProgressor } from "../../interfaces/device/progressor.interface"
-import { notifyCallback } from "../../notify"
-import { applyTare } from "../../tare"
-import { checkActivity } from "../../is-active"
 import { ProgressorCommands, ProgressorResponses } from "../../commands/progressor"
-import struct from "../../struct"
+import struct from "../../helpers/struct"
+import { checkActivity } from "../../is-active"
 import { DownloadPackets, emptyDownloadPackets } from "../../download"
-import { lastWrite, write, writeCallback } from "../../write"
-import { stop } from "../../stop"
+import { applyTare } from "../../tare"
 
 // Constants
 let MASS_MAX = "0"
@@ -63,7 +60,7 @@ export class Progressor extends Device implements IProgressor {
   battery = async (): Promise<string | undefined> => {
     if (this.isConnected()) {
       let response: string | undefined = undefined
-      await write(this, "progressor", "tx", ProgressorCommands.GET_BATT_VLTG, 250, (data) => {
+      await this.write("progressor", "tx", ProgressorCommands.GET_BATT_VLTG, 250, (data) => {
         response = data
       })
       return response
@@ -81,7 +78,7 @@ export class Progressor extends Device implements IProgressor {
     if (this.isConnected()) {
       // Read firmware version from the device
       let response: string | undefined = undefined
-      await write(this, "progressor", "tx", ProgressorCommands.GET_FW_VERSION, 250, (data) => {
+      await this.write("progressor", "tx", ProgressorCommands.GET_FW_VERSION, 250, (data) => {
         response = data
       })
       return response
@@ -135,7 +132,7 @@ export class Progressor extends Device implements IProgressor {
               // Check if device is being used
               checkActivity(weight)
 
-              notifyCallback({
+              this.notifyCallback({
                 massMax: MASS_MAX,
                 massAverage: MASS_AVERAGE,
                 massTotal: Math.max(-1000, weight).toFixed(1),
@@ -143,18 +140,18 @@ export class Progressor extends Device implements IProgressor {
             }
           }
         } else if (kind === ProgressorResponses.COMMAND_RESPONSE) {
-          if (!lastWrite) return
+          if (!this.writeLast) return
 
           let value = ""
 
-          if (lastWrite === ProgressorCommands.GET_BATT_VLTG) {
+          if (this.writeLast === ProgressorCommands.GET_BATT_VLTG) {
             value = new DataView(data.buffer, 2).getUint32(0, true).toString()
-          } else if (lastWrite === ProgressorCommands.GET_FW_VERSION) {
+          } else if (this.writeLast === ProgressorCommands.GET_FW_VERSION) {
             value = new TextDecoder().decode(data.buffer.slice(2))
-          } else if (lastWrite === ProgressorCommands.GET_ERR_INFO) {
+          } else if (this.writeLast === ProgressorCommands.GET_ERR_INFO) {
             value = new TextDecoder().decode(data.buffer.slice(2))
           }
-          writeCallback(value)
+          this.writeCallback(value)
         } else if (kind === ProgressorResponses.LOW_BATTERY_WARNING) {
           console.warn("⚠️ Low power detected. Please consider connecting to a power source.")
         } else {
@@ -164,6 +161,17 @@ export class Progressor extends Device implements IProgressor {
     }
   }
 
+  /**
+   * Stops the data stream on the specified device.
+   * @returns {Promise<void>} A promise that resolves when the stream is stopped.
+   */
+  stop = async (): Promise<void> => {
+    if (this.isConnected()) {
+      // Stop stream of device
+      await this.write("progressor", "tx", ProgressorCommands.STOP_WEIGHT_MEAS, 0)
+    }
+  }
+
   /**
    * Starts streaming data from the specified device.
    * @param {number} [duration=0] - The duration of the stream in milliseconds. If set to 0, stream will continue indefinitely.
@@ -174,10 +182,10 @@ export class Progressor extends Device implements IProgressor {
       // Reset download packets
       emptyDownloadPackets()
       // Start streaming data
-      await write(this, "progressor", "tx", ProgressorCommands.START_WEIGHT_MEAS, duration)
+      await this.write("progressor", "tx", ProgressorCommands.START_WEIGHT_MEAS, duration)
       // Stop streaming if duration is set
       if (duration !== 0) {
-        await stop(this)
+        await this.stop()
       }
     }
   }

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

@@ -1,7 +1,6 @@
 import { Device } from "../device.model"
 import { applyTare } from "../../tare"
 import { checkActivity } from "../../is-active"
-import { notifyCallback } from "../../notify"
 import type { IWHC06 } from "../../interfaces/device/wh-c06.interface"
 
 // Constants
@@ -57,14 +56,15 @@ export class WHC06 extends Device implements IWHC06 {
         throw new Error("GATT is not available on this device")
       }
 
+      // Device has no services / characteristics
+      onSuccess()
+
       // WH-C06
       const MANUFACTURER_ID = 256 // 0x0100
 
       this.bluetooth.addEventListener("advertisementreceived", (event) => {
         const data = event.manufacturerData.get(MANUFACTURER_ID)
         if (data) {
-          // Device has no services / characteristics
-          onSuccess()
           // Handle recieved data
           const weight = (data.getUint8(WEIGHT_OFFSET) << 8) | data.getUint8(WEIGHT_OFFSET + 1)
           // const stable = (data.getUint8(STABLE_OFFSET) & 0xf0) >> 4
@@ -90,7 +90,7 @@ export class WHC06 extends Device implements IWHC06 {
           checkActivity(numericData)
 
           // Notify with weight data
-          notifyCallback({
+          this.notifyCallback({
             massMax: MASS_MAX,
             massAverage: MASS_AVERAGE,
             massTotal: Math.max(-1000, numericData).toFixed(1),