feat: use tahu for sparkplug decoding

thomasnordquist · May 17, 2024 · b03cd3c · b03cd3c
1 parent a346c48
commit b03cd3c
Show file tree

Hide file tree

Showing 6 changed files with 269 additions and 442 deletions.
diff --git a/backend/src/Model/sparkplugb.proto.ts b/backend/src/Model/sparkplugb.proto.ts
diff --git a/backend/src/Model/sparkplugb.ts b/backend/src/Model/sparkplugb.ts
@@ -1,18 +1,14 @@
-// cSpell:words protobuf
-import * as protobuf from 'protobufjs'
-import protocol from './sparkplugb.proto'
 import { Base64Message } from './Base64Message'
 import { Decoder } from './Decoder'
-
-const root = protobuf.parse(protocol).root
-/* cspell:disable-next-line */
-export let SparkplugPayload = root.lookupType('com.cirruslink.sparkplug.protobuf.Payload')
+import { get } from 'sparkplug-payload'
+var sparkplug = get("spBv1.0")
 
 export const SparkplugDecoder = {
   decode(input: Buffer): Base64Message {
     try {
-      const message = Base64Message.fromString(
-        JSON.stringify(SparkplugPayload.toObject(SparkplugPayload.decode(new Uint8Array(input))))
+      const message = Base64Message.fromString(JSON.stringify(
+        // @ts-ignore
+        sparkplug.decodePayload(new Uint8Array(input)))
       )
       message.decoder = Decoder.SPARKPLUG
       return message

diff --git a/package.json b/package.json
@@ -107,6 +107,7 @@
     "semantic-release": "^23.0.8",
     "semantic-release-export-data": "^1.0.1",
     "source-map-support": "^0.5.9",
+    "sparkplug-client": "^3.2.4",
     "ts-node": "^10.9.2",
     "tslint": "^6.1.3",
     "tslint-config-airbnb": "^5.11.2",
@@ -126,8 +127,8 @@
     "lowdb": "^1.0.0",
     "mime": "^2.4.4",
     "mqtt": "^4.3.6",
-    "protobufjs": "^6.11.4",
     "sha1": "^1.1.1",
+    "sparkplug-payload": "^1.0.3",
     "uuid": "^8.3.2",
     "yarn-run-all": "^3.1.1"
   }