Merge remote-tracking branch 'fb/multi-decoder/master' into feat/use-tahu-for-sparkplug-decoding

backend/src/Model/Base64Message.ts

@@ -1,5 +1,6 @@
 import { Base64 } from 'js-base64'
 import { Decoder } from './Decoder'
+import { TopicDataType } from './TreeNode'
 
 export class Base64Message {
   private base64Message: string
@@ -26,6 +27,167 @@ export class Base64Message {
     return new Base64Message(Base64.encode(str))
   }
 
+  /* Raw message conversions ('uint8' | 'uint16' | 'uint32' | 'uint64' | 'int8' | 'int16' | 'int32' | 'int64' | 'float' | 'double') */
+  public static format(message: Base64Message | null, type: TopicDataType = 'string'): [string, 'json' | undefined] {
+    if (!message) {
+      return ['', undefined]
+    }
+
+    try {
+      switch (type) {
+        case 'json': {
+          const json = JSON.parse(Base64Message.toUnicodeString(message))
+          return [JSON.stringify(json, undefined, '  '), 'json']
+        }
+        case 'hex': {
+          const hex = Base64Message.toHex(message)
+          return [hex, undefined]
+        }
+        case 'uint8': {
+          const uint = Base64Message.toUInt(message, 1)
+          return [uint ? uint : '', undefined]
+        }
+        case 'uint16': {
+          const uint = Base64Message.toUInt(message, 2)
+          return [uint ? uint : '', undefined]
+        }
+        case 'uint32': {
+          const uint = Base64Message.toUInt(message, 4)
+          return [uint ? uint : '', undefined]
+        }
+        case 'uint64': {
+          const uint = Base64Message.toUInt(message, 8)
+          return [uint ? uint : '', undefined]
+        }
+        case 'int8': {
+          const int = Base64Message.toInt(message, 1)
+          return [int ? int : '', undefined]
+        }
+        case 'int16': {
+          const int = Base64Message.toInt(message, 2)
+          return [int ? int : '', undefined]
+        }
+        case 'int32': {
+          const int = Base64Message.toInt(message, 4)
+          return [int ? int : '', undefined]
+        }
+        case 'int64': {
+          const int = Base64Message.toInt(message, 8)
+          return [int ? int : '', undefined]
+        }
+        case 'float': {
+          const float = Base64Message.toFloat(message, 4)
+          return [float ? float : '', undefined]
+        }
+        case 'double': {
+          const float = Base64Message.toFloat(message, 8)
+          return [float ? float : '', undefined]
+        }
+        default: {
+          const str = Base64Message.toUnicodeString(message)
+          return [str, undefined]
+        }
+      }
+    } catch (error) {
+      const str = Base64Message.toUnicodeString(message)
+      return [str, undefined]
+    }
+  }
+
+  public static toHex(message: Base64Message) {
+    const buf = Buffer.from(message.base64Message, 'base64')
+
+    let str: string = ''
+    buf.forEach(element => {
+      let hex = element.toString(16).toUpperCase()
+      str += `0x${hex.length < 2 ? '0' + hex : hex} `
+    })
+    return str.trimRight()
+  }
+
+  public static toUInt(message: Base64Message, bytes: number) {
+    const buf = Buffer.from(message.base64Message, 'base64')
+
+    let str: String[] = []
+    switch (bytes) {
+      case 1:
+        for (let index = 0; index < buf.length; index += bytes) {
+          str.push(buf.readUInt8(index).toString())
+        }
+        break
+      case 2:
+        for (let index = 0; index < buf.length; index += bytes) {
+          str.push(buf.readUInt16LE(index).toString())
+        }
+        break
+      case 4:
+        for (let index = 0; index < buf.length; index += bytes) {
+          str.push(buf.readUInt32LE(index).toString())
+        }
+        break
+      case 8:
+        for (let index = 0; index < buf.length; index += bytes) {
+          str.push(buf.readBigUInt64LE(index).toString())
+        }
+        break
+      default:
+        return undefined
+    }
+    return str.join(', ')
+  }
+
+  public static toInt(message: Base64Message, bytes: number) {
+    const buf = Buffer.from(message.base64Message, 'base64')
+
+    let str: String[] = []
+    switch (bytes) {
+      case 1:
+        for (let index = 0; index < buf.length; index += bytes) {
+          str.push(buf.readInt8(index).toString())
+        }
+        break
+      case 2:
+        for (let index = 0; index < buf.length; index += bytes) {
+          str.push(buf.readInt16LE(index).toString())
+        }
+        break
+      case 4:
+        for (let index = 0; index < buf.length; index += bytes) {
+          str.push(buf.readInt32LE(index).toString())
+        }
+        break
+      case 8:
+        for (let index = 0; index < buf.length; index += bytes) {
+          str.push(buf.readBigInt64LE(index).toString())
+        }
+        break
+      default:
+        return undefined
+    }
+    return str.join(', ')
+  }
+
+  public static toFloat(message: Base64Message, bytes: number) {
+    const buf = Buffer.from(message.base64Message, 'base64')
+
+    let str: String[] = []
+    switch (bytes) {
+      case 4:
+        for (let index = 0; index < buf.length; index += bytes) {
+          str.push(buf.readFloatLE(index).toString())
+        }
+        break
+      case 8:
+        for (let index = 0; index < buf.length; index += bytes) {
+          str.push(buf.readDoubleLE(index).toString())
+        }
+        break
+      default:
+        return undefined
+    }
+    return str.join(', ')
+  }
+
   public static toDataUri(message: Base64Message, mimeType: string) {
     return `data:${mimeType};base64,${message.base64Message}`
   }

backend/src/Model/TreeNode.ts

@@ -2,6 +2,9 @@ import { Destroyable } from './Destroyable'
 import { Edge, Message, RingBuffer, MessageHistory } from './'
 import { EventDispatcher } from '../../../events'
 
+// export type TopicDataType = 'json' | 'string' | 'hex' | 'integer' | 'unsigned int' | 'floating point'
+export type TopicDataType = 'json' | 'string' | 'hex' | 'uint8' | 'uint16' | 'uint32' | 'uint64' | 'int8' | 'int16' | 'int32' | 'int64' | 'float' | 'double'
+
 export class TreeNode<ViewModel extends Destroyable> {
   public sourceEdge?: Edge<ViewModel>
   public message?: Message
@@ -17,6 +20,7 @@ export class TreeNode<ViewModel extends Destroyable> {
   public onMessage = new EventDispatcher<Message>()
   public onDestroy = new EventDispatcher<TreeNode<ViewModel>>()
   public isTree = false
+  public type: TopicDataType = 'json'
 
   private cachedPath?: string
   private cachedChildTopics?: Array<TreeNode<ViewModel>>

backend/src/Model/index.ts

@@ -1,5 +1,5 @@
 export { Edge } from './Edge'
-export { TreeNode } from './TreeNode'
+export { TreeNode, TopicDataType } from './TreeNode'
 export { Message } from './Message'
 export { TreeNodeFactory } from './TreeNodeFactory'
 export { Tree } from './Tree'