@hangtime/grip-connect 0.1.2 → 0.2.1

package/src/devices/{tindeq.ts → progressor.ts}

@@ -1,22 +1,34 @@
 import { Device } from "./types"
 
-export const Tindeq: Device = {
-  name: "Tindeq",
+export const Progressor: Device = {
+  name: "Progressor",
   services: [
     {
       name: "Progressor Service",
       id: "progressor",
       uuid: "7e4e1701-1ea6-40c9-9dcc-13d34ffead57",
       characteristics: [
+        {
+          name: "Notify",
+          id: "rx",
+          uuid: "7e4e1702-1ea6-40c9-9dcc-13d34ffead57",
+        },
         {
           name: "Write",
           id: "tx",
           uuid: "7e4e1703-1ea6-40c9-9dcc-13d34ffead57",
         },
+      ],
+    },
+    {
+      name: "Secure DFU Service",
+      id: "dfu",
+      uuid: "0000fe59-0000-1000-8000-00805f9b34fb",
+      characteristics: [
         {
-          name: "Notify",
-          id: "rx",
-          uuid: "7e4e1702-1ea6-40c9-9dcc-13d34ffead57",
+          name: "Buttonless DFU",
+          id: "dfu",
+          uuid: "8ec90003-f315-4f60-9fb8-838830daea50",
         },
       ],
     },

package/src/disconnect.ts

@@ -1,12 +1,12 @@
 import { Device } from "./devices/types"
+import { isConnected } from "./is-connected"
 
 /**
  * disconnect
  * @param board
  */
 export const disconnect = (board: Device): void => {
-  if (!board.device) return
-  if (board.device.gatt?.connected) {
-    board.device.gatt?.disconnect()
+  if (isConnected(board)) {
+    board.device?.gatt?.disconnect()
   }
 }

package/src/index.ts

@@ -1,4 +1,6 @@
-export { Climbro, Entralpi, Motherboard, SmartBoard, Tindeq } from "./devices/index"
+export { Climbro, Entralpi, Motherboard, SmartBoard, Progressor } from "./devices/index"
+
+export { battery } from "./battery"
 
 export { calibration } from "./calibration"
 
@@ -6,10 +8,16 @@ export { connect } from "./connect"
 
 export { disconnect } from "./disconnect"
 
+export { isConnected } from "./is-connected"
+
+export { info } from "./info"
+
 export { notify } from "./notify"
 
-export { read } from "./read"
+// export { read } from "./read"
 
 export { stop } from "./stop"
 
 export { stream } from "./stream"
+
+// export { write } from "./write"

package/src/info.ts

@@ -0,0 +1,25 @@
+import { Device } from "./devices/types"
+import { write } from "./write"
+import { read } from "./read"
+import { isConnected } from "./is-connected"
+import { Motherboard, Progressor } from "./devices"
+import { MotherboardCommands, ProgressorCommands } from "./commands"
+
+/**
+ * Get device information
+ * @param board
+ */
+export const info = async (board: Device): Promise<void> => {
+  if (isConnected(board)) {
+    if (board.name === "Motherboard") {
+      await read(Motherboard, "device", "manufacturer", 250)
+      await read(Motherboard, "device", "hardware", 250)
+      await read(Motherboard, "device", "firmware", 250)
+      await write(Motherboard, "uart", "tx", MotherboardCommands.GET_TEXT, 250)
+      await write(Motherboard, "uart", "tx", MotherboardCommands.GET_SERIAL, 250)
+    }
+    if (board.name && board.name.startsWith("Progressor")) {
+      await write(Progressor, "progressor", "tx", ProgressorCommands.GET_FW_VERSION, 250)
+    }
+  }
+}

package/src/is-connected.ts

@@ -0,0 +1,11 @@
+import { Device } from "./devices/types"
+
+/**
+ * Checks if a Bluetooth device is connected
+ * @param board
+ * @return boolean
+ */
+export const isConnected = (board: Device): boolean => {
+  if (!board.device) return false
+  return !!board.device.gatt?.connected
+}

package/src/notify.ts

@@ -1,10 +1,10 @@
-// Define the callback function type
+// Define the callbacks type
 type NotifyCallback = (data: object) => void
 
 // Initialize the callback variable
 export let notifyCallback: NotifyCallback
 
-// Export a function to set the callback
+// Export a cost to set the callback
 export const notify = (callback: NotifyCallback) => {
   notifyCallback = callback
 }

package/src/read.ts

@@ -1,6 +1,7 @@
 import { Device } from "./devices/types"
 import { notifyCallback } from "./notify"
 import { getCharacteristic } from "./characteristic"
+import { isConnected } from "./is-connected"
 
 /**
  * read
@@ -13,7 +14,7 @@ export const read = (
   duration: number = 0,
 ): Promise<void> => {
   return new Promise((resolve, reject) => {
-    if (board.device?.gatt?.connected) {
+    if (isConnected(board)) {
       const characteristic = getCharacteristic(board, serviceId, characteristicId)
 
       if (characteristic) {

package/src/stop.ts

@@ -1,20 +1,20 @@
 import { Device } from "./devices/types"
-import { Motherboard, Tindeq } from "./devices"
-import { MotherboardCommands, TindeqCommands } from "./commands"
 import { write } from "./write"
+import { isConnected } from "./is-connected"
+import { Motherboard, Progressor } from "./devices"
+import { MotherboardCommands, ProgressorCommands } from "./commands"
 
 /**
  * read calibration
  * @param board
  */
 export const stop = async (board: Device): Promise<void> => {
-  if (!board.device) return
-  if (board.device.gatt?.connected) {
+  if (isConnected(board)) {
     if (board.name === "Motherboard") {
-      await write(Motherboard, "uart", "tx", String(MotherboardCommands.STOP_WEIGHT_MEAS), 0)
+      await write(Motherboard, "uart", "tx", MotherboardCommands.STOP_WEIGHT_MEAS, 0)
     }
-    if (board.name === "Tindeq") {
-      await write(Tindeq, "progressor", "tx", String(TindeqCommands.STOP_WEIGHT_MEAS), 0)
+    if (board.name && board.name.startsWith("Progressor")) {
+      await write(Progressor, "progressor", "tx", ProgressorCommands.STOP_WEIGHT_MEAS, 0)
     }
   }
 }

package/src/stream.ts

@@ -1,31 +1,36 @@
 import { Device } from "./devices/types"
-import { Motherboard, Tindeq } from "./devices"
-import { MotherboardCommands, TindeqCommands } from "./commands"
+import { isConnected } from "./is-connected"
 import { write } from "./write"
 import { stop } from "./stop"
+import { Motherboard, Progressor } from "./devices"
+import { MotherboardCommands, ProgressorCommands } from "./commands"
+import { CALIBRATION } from "./data"
+import { calibration } from "./calibration"
 
 /**
  * stream output
  * @param board
  */
 export const stream = async (board: Device, duration: number = 0): Promise<void> => {
-  if (!board.device) return
-  if (board.device.gatt?.connected) {
+  if (isConnected(board)) {
     if (board.name === "Motherboard") {
-      // TODO: add check if device is recalibrated
+      // read calibration (required before reading data)
+      if (!CALIBRATION[0].length) {
+        await calibration(Motherboard)
+      }
       // start stream
-      await write(Motherboard, "uart", "tx", String(MotherboardCommands.START_WEIGHT_MEAS), duration)
-      // end stream
+      await write(Motherboard, "uart", "tx", MotherboardCommands.START_WEIGHT_MEAS, duration)
+      // end stream if duration is set
       if (duration !== 0) {
         await stop(Motherboard)
       }
     }
-    if (board.name === "Tindeq") {
+    if (board.name && board.name.startsWith("Progressor")) {
       // start stream
-      await write(Tindeq, "progressor", "tx", String(TindeqCommands.START_WEIGHT_MEAS), duration)
-      // end stream
+      await write(Progressor, "progressor", "tx", ProgressorCommands.START_WEIGHT_MEAS, duration)
+      // end stream if duration is set
       if (duration !== 0) {
-        await stop(Tindeq)
+        await stop(Progressor)
       }
     }
   }

package/src/write.ts

@@ -1,5 +1,8 @@
 import { Device } from "./devices/types"
+import { isConnected } from "./is-connected"
 import { getCharacteristic } from "./characteristic"
+
+export let lastWrite: string | null = null
 /**
  * write
  * @param characteristic
@@ -9,19 +12,21 @@ export const write = (
   board: Device,
   serviceId: string,
   characteristicId: string,
-  message: string,
+  message: string | undefined,
   duration: number = 0,
 ): Promise<void> => {
   return new Promise((resolve, reject) => {
-    if (board.device?.gatt?.connected) {
-      const encoder = new TextEncoder()
-
+    if (isConnected(board)) {
+      if (!message) return
       const characteristic = getCharacteristic(board, serviceId, characteristicId)
-
       if (characteristic) {
+        const encoder = new TextEncoder()
         characteristic
           .writeValue(encoder.encode(message))
           .then(() => {
+            // update last written message
+            lastWrite = message
+            // handle timeout
             if (duration !== 0) {
               setTimeout(() => {
                 resolve()

package/tsconfig.json

@@ -2,6 +2,6 @@
   "extends": "../../tsconfig.json",
   "include": ["src"],
   "compilerOptions": {
-    "tsBuildInfoFile": "node_modules/.cache/.tsbuildinfo",
-  },
+    "tsBuildInfoFile": "node_modules/.cache/.tsbuildinfo"
+  }
 }

package/src/calibration.d.ts

@@ -1,6 +0,0 @@
-import { Device } from "./devices/types";
-/**
- * write command to get calibration
- * @param board
- */
-export declare const calibration: (board: Device) => Promise<void>;

package/src/calibration.js

@@ -1,16 +0,0 @@
-import { Motherboard } from "./devices";
-import { MotherboardCommands } from "./commands";
-import { write } from "./write";
-/**
- * write command to get calibration
- * @param board
- */
-export const calibration = async (board) => {
-    if (!board.device)
-        return;
-    if (board.device.gatt?.connected) {
-        if (board.name === "Motherboard") {
-            await write(Motherboard, "uart", "tx", String(MotherboardCommands.GET_CALIBRATION), 2500);
-        }
-    }
-};

package/src/characteristic.d.ts

@@ -1,9 +0,0 @@
-/// <reference types="web-bluetooth" />
-import { Device } from "./devices/types";
-/**
- * getCharacteristic
- * @param board
- * @param serviceId
- * @param characteristicId
- */
-export declare const getCharacteristic: (board: Device, serviceId: string, characteristicId: string) => BluetoothRemoteGATTCharacteristic | undefined;

package/src/characteristic.js

@@ -1,15 +0,0 @@
-/**
- * getCharacteristic
- * @param board
- * @param serviceId
- * @param characteristicId
- */
-export const getCharacteristic = (board, serviceId, characteristicId) => {
-    const boardService = board.services.find((service) => service.id === serviceId);
-    if (boardService) {
-        const boardCharacteristic = boardService.characteristics.find((characteristic) => characteristic.id === characteristicId);
-        if (boardCharacteristic) {
-            return boardCharacteristic.characteristic;
-        }
-    }
-};

package/src/commands/climbro.d.ts

@@ -1,6 +0,0 @@
-import { Commands } from "../commands/types";
-/**
- * Warning:
- * Using other commands can seriously harm your device
- */
-export declare const ClimbroCommands: Commands;

package/src/commands/climbro.js

@@ -1,5 +0,0 @@
-/**
- * Warning:
- * Using other commands can seriously harm your device
- */
-export const ClimbroCommands = {};

package/src/commands/entralpi.d.ts

@@ -1,6 +0,0 @@
-import { Commands } from "../commands/types";
-/**
- * Warning:
- * Using other commands can seriously harm your device
- */
-export declare const EntralpiCommands: Commands;

package/src/commands/entralpi.js

@@ -1,5 +0,0 @@
-/**
- * Warning:
- * Using other commands can seriously harm your device
- */
-export const EntralpiCommands = {};

package/src/commands/index.d.ts

@@ -1,5 +0,0 @@
-export { ClimbroCommands } from "./climbro";
-export { EntralpiCommands } from "./entralpi";
-export { MotherboardCommands } from "./motherboard";
-export { SmartBoardCommands } from "./smartboard";
-export { TindeqCommands } from "./tindeq";

package/src/commands/index.js

@@ -1,5 +0,0 @@
-export { ClimbroCommands } from "./climbro";
-export { EntralpiCommands } from "./entralpi";
-export { MotherboardCommands } from "./motherboard";
-export { SmartBoardCommands } from "./smartboard";
-export { TindeqCommands } from "./tindeq";

package/src/commands/motherboard.d.ts

@@ -1,6 +0,0 @@
-import { Commands } from "../commands/types";
-/**
- * Warning:
- * Using other commands can seriously harm your device
- */
-export declare const MotherboardCommands: Commands;

package/src/commands/motherboard.js

@@ -1,13 +0,0 @@
-/**
- * Warning:
- * Using other commands can seriously harm your device
- */
-export const MotherboardCommands = {
-    GET_SERIAL: "#",
-    START_WEIGHT_MEAS: "S30",
-    STOP_WEIGHT_MEAS: "", // All commands will stop the data stream.
-    GET_CALIBRATION: "C",
-    SLEEP: 0,
-    GET_TEXT: "T",
-    DEBUG_STREAM: "D",
-};

package/src/commands/smartboard.d.ts

@@ -1,6 +0,0 @@
-import { Commands } from "../commands/types";
-/**
- * Warning:
- * Using other commands can seriously harm your device
- */
-export declare const SmartBoardCommands: Commands;

package/src/commands/smartboard.js

@@ -1,5 +0,0 @@
-/**
- * Warning:
- * Using other commands can seriously harm your device
- */
-export const SmartBoardCommands = {};

package/src/commands/tindeq.d.ts

@@ -1,11 +0,0 @@
-import { Commands } from "../commands/types";
-/**
- * Warning:
- * Using other commands can seriously harm your device
- */
-export declare const TindeqCommands: Commands;
-export declare const NotificationTypes: {
-    COMMAND_RESPONSE: number;
-    WEIGHT_MEASURE: number;
-    LOW_BATTERY_WARNING: number;
-};

package/src/commands/tindeq.js

@@ -1,23 +0,0 @@
-/**
- * Warning:
- * Using other commands can seriously harm your device
- */
-export const TindeqCommands = {
-    TARE_SCALE: "d", // 0x64,
-    START_WEIGHT_MEAS: "e", // 0x65,
-    STOP_WEIGHT_MEAS: "f", // 0x66,
-    START_PEAK_RFD_MEAS: "g", //  0x67,
-    START_PEAK_RFD_MEAS_SERIES: "h", //  0x68,
-    ADD_CALIB_POINT: "i", //  0x69,
-    SAVE_CALIB: "j", //  0x6a,
-    GET_APP_VERSION: "k", //  0x6b,
-    GET_ERR_INFO: "l", //  0x6c,
-    CLR_ERR_INFO: "m", //  0x6d,
-    SLEEP: "n", // 0x6e,
-    GET_BATT_VLTG: "o", //  0x6f,
-};
-export const NotificationTypes = {
-    COMMAND_RESPONSE: 0,
-    WEIGHT_MEASURE: 1,
-    LOW_BATTERY_WARNING: 2,
-};

package/src/commands/types.d.ts

@@ -1,18 +0,0 @@
-export interface Commands {
-    START_WEIGHT_MEAS?: string;
-    STOP_WEIGHT_MEAS?: string;
-    SLEEP?: number | string;
-    GET_TEXT?: string;
-    GET_SERIAL?: string;
-    DEBUG_STREAM?: string;
-    GET_CALIBRATION?: string;
-    TARE_SCALE?: string;
-    START_PEAK_RFD_MEAS?: string;
-    START_PEAK_RFD_MEAS_SERIES?: string;
-    ADD_CALIB_POINT?: string;
-    SAVE_CALIB?: string;
-    GET_APP_VERSION?: string;
-    GET_ERR_INFO?: string;
-    CLR_ERR_INFO?: string;
-    GET_BATT_VLTG?: string;
-}

package/src/commands/types.js

@@ -1 +0,0 @@
-export {};

package/src/connect.d.ts

@@ -1,7 +0,0 @@
-import { Device } from "./devices/types";
-/**
- * Connect to the BluetoothDevice
- * @param device
- * @param onSuccess
- */
-export declare const connect: (board: Device, onSuccess: () => void) => Promise<void>;

package/src/connect.js

@@ -1,150 +0,0 @@
-import { notifyCallback } from "./notify";
-import { handleMotherboardData } from "./devices/motherboard";
-import { handleEntralpiData } from "./devices/entralpi";
-let server;
-const receiveBuffer = [];
-/**
- * onDisconnected
- * @param board
- * @param event
- */
-const onDisconnected = (event, board) => {
-    board.device = undefined;
-    const device = event.target;
-    console.log(`Device ${device.name} is disconnected.`);
-};
-/**
- * handleNotifications
- * @param event
- * @param onNotify
- */
-const handleNotifications = (event, board) => {
-    const characteristic = event.target;
-    const value = characteristic.value;
-    if (value) {
-        if (board.name === "Motherboard") {
-            for (let i = 0; i < value.byteLength; i++) {
-                receiveBuffer.push(value.getUint8(i));
-            }
-            let idx;
-            while ((idx = receiveBuffer.indexOf(10)) >= 0) {
-                const line = receiveBuffer.splice(0, idx + 1).slice(0, -1); // Combine and remove LF
-                if (line.length > 0 && line[line.length - 1] === 13)
-                    line.pop(); // Remove CR
-                const decoder = new TextDecoder("utf-8");
-                const receivedData = decoder.decode(new Uint8Array(line));
-                handleMotherboardData(characteristic.uuid, receivedData);
-            }
-        }
-        else if (board.name === "ENTRALPI") {
-            if (value.buffer) {
-                const buffer = value.buffer;
-                const rawData = new DataView(buffer);
-                const receivedData = rawData.getUint16(0) / 100;
-                handleEntralpiData(characteristic.uuid, receivedData);
-            }
-        }
-        else if (board.name === "Tindeq") {
-            // TODO: handle Tindeq notify
-        }
-        else {
-            if (notifyCallback) {
-                notifyCallback({ uuid: characteristic.uuid, value: value });
-            }
-        }
-    }
-};
-/**
- * onConnected
- * @param event
- * @param board
- */
-const onConnected = async (board, onSuccess) => {
-    try {
-        const services = await server?.getPrimaryServices();
-        if (!services || services.length === 0) {
-            console.error("No services found");
-            return;
-        }
-        for (const service of services) {
-            const matchingService = board.services.find((boardService) => boardService.uuid === service.uuid);
-            if (matchingService) {
-                // Android bug: Introduce a 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;
-                            // notify
-                            if (element.id === "rx") {
-                                matchingCharacteristic.startNotifications();
-                                matchingCharacteristic.addEventListener("characteristicvaluechanged", (event) => handleNotifications(event, board));
-                            }
-                        }
-                    }
-                    else {
-                        console.warn(`Characteristic ${characteristic.uuid} not found in service ${service.uuid}`);
-                    }
-                }
-            }
-        }
-        // Call the onSuccess callback after successful connection and setup
-        onSuccess();
-    }
-    catch (error) {
-        console.error(error);
-    }
-};
-/**
- * Return all service UUIDs
- * @param device
- */
-function getAllServiceUUIDs(device) {
-    return device.services.map((service) => service.uuid);
-}
-/**
- * Connect to the BluetoothDevice
- * @param device
- * @param onSuccess
- */
-export const connect = async (board, onSuccess) => {
-    try {
-        const deviceServices = getAllServiceUUIDs(board);
-        // setup filter list
-        const filters = [];
-        if (board.name) {
-            filters.push({
-                name: board.name,
-            });
-        }
-        if (board.companyId) {
-            filters.push({
-                manufacturerData: [
-                    {
-                        companyIdentifier: board.companyId,
-                    },
-                ],
-            });
-        }
-        const device = await navigator.bluetooth.requestDevice({
-            filters: filters,
-            optionalServices: deviceServices,
-        });
-        board.device = device;
-        if (!board.device.gatt) {
-            console.error("GATT is not available on this device");
-            return;
-        }
-        server = await board.device?.gatt?.connect();
-        board.device.addEventListener("gattserverdisconnected", (event) => onDisconnected(event, board));
-        if (server.connected) {
-            await onConnected(board, onSuccess);
-        }
-    }
-    catch (error) {
-        console.error(error);
-    }
-};

package/src/devices/climbro.d.ts

@@ -1,2 +0,0 @@
-import { Device } from "./types";
-export declare const Climbro: Device;

package/src/devices/climbro.js

@@ -1,4 +0,0 @@
-export const Climbro = {
-    name: "Climbro",
-    services: [],
-};

package/src/devices/entralpi.d.ts

@@ -1,8 +0,0 @@
-import { Device } from "./types";
-export declare const Entralpi: Device;
-/**
- * handleEntralpiData
- * @param uuid - Unique identifier
- * @param receivedData - Received data string
- */
-export declare function handleEntralpiData(uuid: string, receivedData: number): void;