From 5c4d05db34b02db89911651d31418c23eeea8aa5 Mon Sep 17 00:00:00 2001
From: Stevie-Ray Hartog <mail@stevie-ray.nl>
Date: Fri, 18 Oct 2024 10:05:46 +0200
Subject: [PATCH] remove struct, explain code

---
 packages/core/src/helpers/struct.ts           | 239 ------------------
 packages/core/src/models/device.model.ts      |   5 +-
 .../core/src/models/device/entralpi.model.ts  |   4 +-
 .../src/models/device/forceboard.model.ts     |   4 +-
 .../src/models/device/progressor.model.ts     |  35 ++-
 5 files changed, 25 insertions(+), 262 deletions(-)
 delete mode 100644 packages/core/src/helpers/struct.ts

diff --git a/packages/core/src/helpers/struct.ts b/packages/core/src/helpers/struct.ts
deleted file mode 100644
index 2c6b036..0000000
--- a/packages/core/src/helpers/struct.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-const rechk = /^([<>])?(([1-9]\d*)?([xcbB?hHiIfdsp]))*$/
-const refmt = /([1-9]\d*)?([xcbB?hHiIfdsp])/g
-
-const str = (v: DataView, o: number, c: number): string =>
-  String.fromCharCode(...Array.from(new Uint8Array(v.buffer, v.byteOffset + o, c)))
-
-const rts = (v: DataView, o: number, c: number, s: string): void => {
-  new Uint8Array(v.buffer, v.byteOffset + o, c).set(s.split("").map((str) => str.charCodeAt(0)))
-}
-
-const pst = (v: DataView, o: number, c: number): string => str(v, o + 1, Math.min(v.getUint8(o), c - 1))
-
-const tsp = (v: DataView, o: number, c: number, s: string): void => {
-  v.setUint8(o, s.length)
-  rts(v, o + 1, c - 1, s)
-}
-
-interface FormatFn {
-  u: (v: DataView) => unknown
-  p: (v: DataView, value: unknown) => void
-}
-
-type LUT = Record<string, (c: number) => [number, number, (o: number) => FormatFn]>
-
-const lut = (le: boolean): LUT => ({
-  x: (c: number) =>
-    [
-      1,
-      c,
-      () => ({
-        u: () => undefined,
-        p: () => undefined,
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  c: (c: number) =>
-    [
-      c,
-      1,
-      (o: number) => ({
-        u: (v: DataView) => str(v, o, 1),
-        p: (v: DataView, s: string) => {
-          rts(v, o, 1, s)
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  "?": (c: number) =>
-    [
-      c,
-      1,
-      (o: number) => ({
-        u: (v: DataView) => Boolean(v.getUint8(o)),
-        p: (v: DataView, B: boolean) => {
-          v.setUint8(o, B ? 1 : 0)
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  b: (c: number) =>
-    [
-      c,
-      1,
-      (o: number) => ({
-        u: (v: DataView) => v.getInt8(o),
-        p: (v: DataView, b: number) => {
-          v.setInt8(o, b)
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  B: (c: number) =>
-    [
-      c,
-      1,
-      (o: number) => ({
-        u: (v: DataView) => v.getUint8(o),
-        p: (v: DataView, B: number) => {
-          v.setUint8(o, B)
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  h: (c: number) =>
-    [
-      c,
-      2,
-      (o: number) => ({
-        u: (v: DataView) => v.getInt16(o, le),
-        p: (v: DataView, h: number) => {
-          v.setInt16(o, h, le)
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  H: (c: number) =>
-    [
-      c,
-      2,
-      (o: number) => ({
-        u: (v: DataView) => v.getUint16(o, le),
-        p: (v: DataView, H: number) => {
-          v.setUint16(o, H, le)
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  i: (c: number) =>
-    [
-      c,
-      4,
-      (o: number) => ({
-        u: (v: DataView) => v.getInt32(o, le),
-        p: (v: DataView, i: number) => {
-          v.setInt32(o, i, le)
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  I: (c: number) =>
-    [
-      c,
-      4,
-      (o: number) => ({
-        u: (v: DataView) => v.getUint32(o, le),
-        p: (v: DataView, I: number) => {
-          v.setUint32(o, I, le)
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  f: (c: number) =>
-    [
-      c,
-      4,
-      (o: number) => ({
-        u: (v: DataView) => v.getFloat32(o, le),
-        p: (v: DataView, f: number) => {
-          v.setFloat32(o, f, le)
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  d: (c: number) =>
-    [
-      c,
-      8,
-      (o: number) => ({
-        u: (v: DataView) => v.getFloat64(o, le),
-        p: (v: DataView, d: number) => {
-          v.setFloat64(o, d, le)
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  s: (c: number) =>
-    [
-      1,
-      c,
-      (o: number) => ({
-        u: (v: DataView) => str(v, o, c),
-        p: (v: DataView, s: string) => {
-          rts(v, o, c, s.slice(0, c))
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-  p: (c: number) =>
-    [
-      1,
-      c,
-      (o: number) => ({
-        u: (v: DataView) => pst(v, o, c),
-        p: (v: DataView, s: string) => {
-          tsp(v, o, c, s.slice(0, c - 1))
-        },
-      }),
-    ] as [number, number, (o: number) => FormatFn],
-})
-
-const errbuf: RangeError = new RangeError("Structure larger than remaining buffer")
-const errval: RangeError = new RangeError("Not enough values for structure")
-
-export default function struct(format: string) {
-  const fns: FormatFn[] = []
-  let size = 0
-  let m: RegExpExecArray | null = rechk.exec(format)
-
-  if (!m) {
-    throw new RangeError("Invalid format string")
-  }
-
-  const t: LUT = lut("<" === m[1])
-  const lu = (n: string, c: string): [number, number, (o: number) => FormatFn] => t[c](n ? parseInt(n, 10) : 1)
-
-  while ((m = refmt.exec(format))) {
-    ;((r: number, s: number, f: (o: number) => FormatFn) => {
-      for (let i = 0; i < r; ++i, size += s) {
-        if (f) {
-          fns.push(f(size))
-        }
-      }
-    })(...lu(...(m.slice(1) as [string, string])))
-  }
-
-  const unpack_from = (arrb: ArrayBuffer, offs: number): unknown[] => {
-    if (arrb.byteLength < (offs | 0) + size) {
-      throw errbuf
-    }
-    const v = new DataView(arrb, offs | 0)
-    return fns.map((f) => f.u(v))
-  }
-
-  const pack_into = (arrb: ArrayBuffer, offs: number, ...values: unknown[]): void => {
-    if (values.length < fns.length) {
-      throw errval
-    }
-    if (arrb.byteLength < offs + size) {
-      throw errbuf
-    }
-    const v = new DataView(arrb, offs)
-    new Uint8Array(arrb, offs, size).fill(0)
-    fns.forEach((f, i) => {
-      f.p(v, values[i])
-    })
-  }
-
-  const pack = (...values: unknown[]): ArrayBuffer => {
-    const b = new ArrayBuffer(size)
-    pack_into(b, 0, ...values)
-    return b
-  }
-
-  const unpack = (arrb: ArrayBuffer): unknown[] => unpack_from(arrb, 0)
-
-  function* iter_unpack(arrb: ArrayBuffer): IterableIterator<unknown[]> {
-    for (let offs = 0; offs + size <= arrb.byteLength; offs += size) {
-      yield unpack_from(arrb, offs)
-    }
-  }
-
-  return Object.freeze({
-    unpack,
-    pack,
-    unpack_from,
-    pack_into,
-    iter_unpack,
-    format,
-    size,
-  })
-}
diff --git a/packages/core/src/models/device.model.ts b/packages/core/src/models/device.model.ts
index 9a1bc1f..3b558eb 100644
--- a/packages/core/src/models/device.model.ts
+++ b/packages/core/src/models/device.model.ts
@@ -437,10 +437,7 @@ export abstract class Device extends BaseModel implements IDevice {
 
     if (value) {
       if (value.buffer) {
-        const buffer: ArrayBuffer = value.buffer
-        console.log(new Uint8Array(buffer))
-        const rawData: DataView = new DataView(buffer)
-        console.log(rawData)
+        console.log(value)
       } else {
         console.log(value)
       }
diff --git a/packages/core/src/models/device/entralpi.model.ts b/packages/core/src/models/device/entralpi.model.ts
index 45b3572..9ef4af7 100644
--- a/packages/core/src/models/device/entralpi.model.ts
+++ b/packages/core/src/models/device/entralpi.model.ts
@@ -161,10 +161,8 @@ export class Entralpi extends Device implements IEntralpi {
 
     if (value) {
       if (value.buffer) {
-        const buffer: ArrayBuffer = value.buffer
-        const rawData: DataView = new DataView(buffer)
         const receivedTime: number = Date.now()
-        const receivedData: string = (rawData.getUint16(0) / 100).toFixed(1)
+        const receivedData: string = (value.getUint16(0) / 100).toFixed(1)
 
         const convertedData = Number(receivedData)
         // Adjust weight by using the tare value
diff --git a/packages/core/src/models/device/forceboard.model.ts b/packages/core/src/models/device/forceboard.model.ts
index c0aa651..9ad9616 100644
--- a/packages/core/src/models/device/forceboard.model.ts
+++ b/packages/core/src/models/device/forceboard.model.ts
@@ -187,11 +187,9 @@ export class ForceBoard extends Device implements IForceBoard {
     const value: DataView | undefined = characteristic.value
     if (value) {
       if (value.buffer) {
-        const buffer: ArrayBuffer = value.buffer
-        const rawData: DataView = new DataView(buffer)
         const receivedTime: number = Date.now()
 
-        const receivedData = rawData.getUint8(4) // Read the value at index 4
+        const receivedData = value.getUint8(4) // Read the value at index 4
         // Convert from LBS to KG
         const convertedReceivedData = receivedData * 0.453592
         // Tare correction
diff --git a/packages/core/src/models/device/progressor.model.ts b/packages/core/src/models/device/progressor.model.ts
index d830571..3d4e314 100644
--- a/packages/core/src/models/device/progressor.model.ts
+++ b/packages/core/src/models/device/progressor.model.ts
@@ -1,6 +1,5 @@
 import { Device } from "../device.model"
 import type { IProgressor } from "../../interfaces/device/progressor.interface"
-import struct from "../../helpers/struct"
 
 /**
  * Represents the possible responses of a Tindeq Progressor device.
@@ -129,15 +128,25 @@ export class Progressor extends Device implements IProgressor {
 
     if (value) {
       if (value.buffer) {
-        const buffer: ArrayBuffer = value.buffer
-        const rawData: DataView = new DataView(buffer)
         const receivedTime: number = Date.now()
-        const [kind] = struct("<bb").unpack(rawData.buffer.slice(0, 2))
+        // Read the first byte of the buffer to determine the kind of message
+        const kind = value.getInt8(0)
+        // Check if the message is a weight measurement
         if (kind === ProgressorResponses.WEIGHT_MEASURE) {
-          const iterable: IterableIterator<unknown[]> = struct("<fi").iter_unpack(rawData.buffer.slice(2))
-          // eslint-disable-next-line prefer-const
-          for (let [weight, seconds] of iterable) {
-            if (typeof weight === "number" && !isNaN(weight) && typeof seconds === "number" && !isNaN(seconds)) {
+          // Start parsing data from the 3rd byte (index 2)
+          let offset = 2
+          // Continue parsing while there's data left in the buffer
+          while (offset < value.byteLength) {
+            // Read a 32-bit float (4 bytes) for the weight, using little-endian
+            const weight = value.getFloat32(offset, true)
+            // Move the offset by 4 bytes
+            offset += 4
+            // Read a 32-bit integer (4 bytes) for the seconds, using little-endian
+            const seconds = value.getInt32(offset, true)
+            // Move the offset by 4 bytes
+            offset += 4
+            // Check if both weight and seconds are valid numbers
+            if (!isNaN(weight) && !isNaN(seconds)) {
               // Tare correction
               const numericData = weight - this.applyTare(weight)
               // Add data to downloadable Array
@@ -171,16 +180,16 @@ export class Progressor extends Device implements IProgressor {
         } else if (kind === ProgressorResponses.COMMAND_RESPONSE) {
           if (!this.writeLast) return
 
-          let value = ""
+          let output = ""
 
           if (this.writeLast === this.commands.GET_BATT_VLTG) {
-            value = new DataView(rawData.buffer, 2).getUint32(0, true).toString()
+            output = new DataView(value.buffer, 2).getUint32(0, true).toString()
           } else if (this.writeLast === this.commands.GET_FW_VERSION) {
-            value = new TextDecoder().decode(rawData.buffer.slice(2))
+            output = new TextDecoder().decode(new Uint8Array(value.buffer).slice(2))
           } else if (this.writeLast === this.commands.GET_ERR_INFO) {
-            value = new TextDecoder().decode(rawData.buffer.slice(2))
+            output = new TextDecoder().decode(new Uint8Array(value.buffer.slice(2)))
           }
-          this.writeCallback(value)
+          this.writeCallback(output)
         } else if (kind === ProgressorResponses.LOW_BATTERY_WARNING) {
           console.warn("⚠️ Low power detected. Please consider connecting to a power source.")
         } else {