From c88978f0ddb529eb83ccfd36c3aee8a8704877b6 Mon Sep 17 00:00:00 2001
From: Thomas Nordquist <t.nordquist@gastromatic.com>
Date: Wed, 22 May 2024 15:06:58 +0200
Subject: [PATCH] fix: fix ui updates

---
 app/src/components/Sidebar/Sidebar.tsx        |  5 +-
 .../Sidebar/TopicPanel/TopicTypeButton.tsx    |  6 +--
 .../src/decoders/BinaryDecoder.ts             | 51 ++-----------------
 app/src/decoders/MessageDecoder.ts            | 12 +++++
 app/src/decoders/SparkplugBDecoder.ts         | 28 ++++++++++
 app/src/decoders/StringDecoder.ts             |  9 ++++
 app/src/decoders/index.ts                     |  6 +++
 app/src/model/TopicViewModel.ts               |  4 +-
 backend/src/Model/Base64Message.ts            |  1 -
 backend/src/Model/TreeNode.ts                 | 18 +------
 backend/src/index.ts                          |  1 -
 src/electron.ts                               |  3 +-
 12 files changed, 67 insertions(+), 77 deletions(-)
 rename backend/src/Model/sparkplugb.ts => app/src/decoders/BinaryDecoder.ts (50%)
 create mode 100644 app/src/decoders/MessageDecoder.ts
 create mode 100644 app/src/decoders/SparkplugBDecoder.ts
 create mode 100644 app/src/decoders/StringDecoder.ts
 create mode 100644 app/src/decoders/index.ts

diff --git a/app/src/components/Sidebar/Sidebar.tsx b/app/src/components/Sidebar/Sidebar.tsx
index c6bbdd7..f925c02 100644
--- a/app/src/components/Sidebar/Sidebar.tsx
+++ b/app/src/components/Sidebar/Sidebar.tsx
@@ -28,10 +28,10 @@ interface Props {
 }
 
 function useUpdateNodeWhenNodeReceivesUpdates(node?: q.TreeNode<any>) {
-  const [lastUpdate, setLastUpdate] = useState(0)
+  const [, setLastUpdate] = useState(0)
   const updateNode = useCallback(
     throttle(() => {
-      setLastUpdate(Date.now())
+      setLastUpdate(node ? node.lastUpdate : 0)
     }, 300),
     [node]
   )
@@ -52,7 +52,6 @@ function Sidebar(props: Props) {
   const { classes, tree, nodePath } = props
   const node = usePollingToFetchTreeNode(tree, nodePath || '')
   useUpdateNodeWhenNodeReceivesUpdates(node)
-  // console.log(node && node.path(), tree, nodePath)
 
   return (
     <div id="Sidebar" className={classes.drawer}>
diff --git a/app/src/components/Sidebar/TopicPanel/TopicTypeButton.tsx b/app/src/components/Sidebar/TopicPanel/TopicTypeButton.tsx
index c982f63..e6f90d5 100644
--- a/app/src/components/Sidebar/TopicPanel/TopicTypeButton.tsx
+++ b/app/src/components/Sidebar/TopicPanel/TopicTypeButton.tsx
@@ -8,7 +8,7 @@ import Popper from '@material-ui/core/Popper'
 import MenuItem from '@material-ui/core/MenuItem'
 import MenuList from '@material-ui/core/MenuList'
 import WarningRounded from '@material-ui/icons/WarningRounded'
-import { IDecoder, decoders } from '../../../../../backend/src/Model/sparkplugb'
+import { MessageDecoder, decoders } from '../../../decoders'
 import { Tooltip } from '@material-ui/core'
 
 export const TopicTypeButton = (props: { node?: q.TreeNode<any> }) => {
@@ -23,7 +23,7 @@ export const TopicTypeButton = (props: { node?: q.TreeNode<any> }) => {
   const [open, setOpen] = React.useState(false)
 
   const selectOption = useCallback(
-    (decoder: IDecoder, format: string) => {
+    (decoder: MessageDecoder, format: string) => {
       if (!node) {
         return
       }
@@ -86,7 +86,7 @@ export const TopicTypeButton = (props: { node?: q.TreeNode<any> }) => {
   )
 }
 
-function DecoderStatus({ node, decoder, format }: { node: q.TreeNode<any>; decoder: IDecoder; format: string }) {
+function DecoderStatus({ node, decoder, format }: { node: q.TreeNode<any>; decoder: MessageDecoder; format: string }) {
   const decoded = useMemo(() => {
     return node.message?.payload && decoder.decode(node.message?.payload, format)
   }, [node.message, decoder, format])
diff --git a/backend/src/Model/sparkplugb.ts b/app/src/decoders/BinaryDecoder.ts
similarity index 50%
rename from backend/src/Model/sparkplugb.ts
rename to app/src/decoders/BinaryDecoder.ts
index cf18dbe..e558c56 100644
--- a/backend/src/Model/sparkplugb.ts
+++ b/app/src/decoders/BinaryDecoder.ts
@@ -1,48 +1,5 @@
-import { Base64Message } from './Base64Message'
-import { Decoder } from './Decoder'
-import { get } from 'sparkplug-payload'
-var sparkplug = get('spBv1.0')
-
-export interface IDecoder<T = string> {
-  /**
-   * Can be used to
-   * @param topic
-   */
-  formats: T[]
-  canDecodeTopic?(topic: string): boolean
-  canDecodeData?(data: Base64Message): boolean
-  decode(input: Base64Message, format: T | string | undefined): Base64Message
-}
-
-export const SparkplugDecoder: IDecoder = {
-  formats: ['Sparkplug'],
-  canDecodeTopic(topic: string) {
-    return !!topic.match(/^spBv1\.0\/[^/]+\/[ND](DATA|CMD|DEATH|BIRTH)\/[^/]+(\/[^/]+)?$/u)
-  },
-  decode(input: Base64Message): Base64Message {
-    try {
-      const message = Base64Message.fromString(
-        JSON.stringify(
-          // @ts-ignore
-          sparkplug.decodePayload(new Uint8Array(input.toBuffer()))
-        )
-      )
-      message.decoder = Decoder.SPARKPLUG
-      return message
-    } catch {
-      const message = new Base64Message(undefined, 'Failed to decode sparkplugb payload')
-      message.decoder = Decoder.NONE
-      return message
-    }
-  },
-}
-
-export const StringDecoder: IDecoder = {
-  formats: ['string'],
-  decode(input: Base64Message): Base64Message {
-    return input
-  },
-}
+import { Base64Message } from '../../../backend/src/Model/Base64Message'
+import { MessageDecoder } from './MessageDecoder'
 
 type BinaryFormats =
   | 'int8'
@@ -59,7 +16,7 @@ type BinaryFormats =
 /**
  * Binary decode primitive binary data type and arrays of these
  */
-export const BinaryDecoder: IDecoder<BinaryFormats> = {
+export const BinaryDecoder: MessageDecoder<BinaryFormats> = {
   formats: ['int8', 'int16', 'int32', 'int64', 'uint8', 'uint16', 'uint32', 'uint64', 'float', 'double'],
   decode(input: Base64Message, format: BinaryFormats): Base64Message {
     const decodingOption = {
@@ -89,5 +46,3 @@ export const BinaryDecoder: IDecoder<BinaryFormats> = {
     return Base64Message.fromString(JSON.stringify(str.length === 1 ? str[0] : str))
   },
 }
-
-export const decoders = [SparkplugDecoder, BinaryDecoder, StringDecoder] as const
diff --git a/app/src/decoders/MessageDecoder.ts b/app/src/decoders/MessageDecoder.ts
new file mode 100644
index 0000000..d5f2ef6
--- /dev/null
+++ b/app/src/decoders/MessageDecoder.ts
@@ -0,0 +1,12 @@
+import { Base64Message } from '../../../backend/src/Model/Base64Message'
+
+export interface MessageDecoder<T = string> {
+  /**
+   * Can be used to
+   * @param topic
+   */
+  formats: T[]
+  canDecodeTopic?(topic: string): boolean
+  canDecodeData?(data: Base64Message): boolean
+  decode(input: Base64Message, format: T | string | undefined): Base64Message
+}
diff --git a/app/src/decoders/SparkplugBDecoder.ts b/app/src/decoders/SparkplugBDecoder.ts
new file mode 100644
index 0000000..d6e3f88
--- /dev/null
+++ b/app/src/decoders/SparkplugBDecoder.ts
@@ -0,0 +1,28 @@
+import { Base64Message } from '../../../backend/src/Model/Base64Message'
+import { Decoder } from '../../../backend/src/Model/Decoder'
+import { get } from 'sparkplug-payload'
+import { MessageDecoder } from './MessageDecoder'
+var sparkplug = get('spBv1.0')
+
+export const SparkplugDecoder: MessageDecoder = {
+  formats: ['Sparkplug'],
+  canDecodeTopic(topic: string) {
+    return !!topic.match(/^spBv1\.0\/[^/]+\/[ND](DATA|CMD|DEATH|BIRTH)\/[^/]+(\/[^/]+)?$/u)
+  },
+  decode(input: Base64Message): Base64Message {
+    try {
+      const message = Base64Message.fromString(
+        JSON.stringify(
+          // @ts-ignore
+          sparkplug.decodePayload(new Uint8Array(input.toBuffer()))
+        )
+      )
+      message.decoder = Decoder.SPARKPLUG
+      return message
+    } catch {
+      const message = new Base64Message(undefined, 'Failed to decode sparkplugb payload')
+      message.decoder = Decoder.NONE
+      return message
+    }
+  },
+}
diff --git a/app/src/decoders/StringDecoder.ts b/app/src/decoders/StringDecoder.ts
new file mode 100644
index 0000000..0c3706f
--- /dev/null
+++ b/app/src/decoders/StringDecoder.ts
@@ -0,0 +1,9 @@
+import { Base64Message } from '../../../backend/src/Model/Base64Message'
+import { MessageDecoder } from './MessageDecoder'
+
+export const StringDecoder: MessageDecoder = {
+  formats: ['string'],
+  decode(input: Base64Message): Base64Message {
+    return input
+  },
+}
diff --git a/app/src/decoders/index.ts b/app/src/decoders/index.ts
new file mode 100644
index 0000000..2971340
--- /dev/null
+++ b/app/src/decoders/index.ts
@@ -0,0 +1,6 @@
+import { StringDecoder } from './StringDecoder'
+import { BinaryDecoder } from './BinaryDecoder'
+import { SparkplugDecoder } from './SparkplugBDecoder'
+export * from './MessageDecoder'
+
+export const decoders = [SparkplugDecoder, BinaryDecoder, StringDecoder] as const
diff --git a/app/src/model/TopicViewModel.ts b/app/src/model/TopicViewModel.ts
index d755f12..45b18c0 100644
--- a/app/src/model/TopicViewModel.ts
+++ b/app/src/model/TopicViewModel.ts
@@ -1,6 +1,6 @@
 import * as q from '../../../backend/src/Model'
 import { Destroyable } from '../../../backend/src/Model/Destroyable'
-import { IDecoder, decoders } from '../../../backend/src/Model/sparkplugb'
+import { MessageDecoder, decoders } from '../decoders'
 import { EventDispatcher } from '../../../events'
 
 function findDecoder<T extends Destroyable>(node: q.TreeNode<T>): TopicDecoder | undefined {
@@ -17,7 +17,7 @@ function findDecoder<T extends Destroyable>(node: q.TreeNode<T>): TopicDecoder |
     : undefined
 }
 
-type TopicDecoder = { decoder: IDecoder; format: string | undefined }
+type TopicDecoder = { decoder: MessageDecoder; format: string | undefined }
 
 export class TopicViewModel implements Destroyable {
   private selected: boolean
diff --git a/backend/src/Model/Base64Message.ts b/backend/src/Model/Base64Message.ts
index f0aa525..4ab6d56 100644
--- a/backend/src/Model/Base64Message.ts
+++ b/backend/src/Model/Base64Message.ts
@@ -33,7 +33,6 @@ export class Base64Message {
     return new Base64Message(Base64.encode(str))
   }
 
-  /* Raw message conversions ('uint8' | 'uint16' | 'uint32' | 'uint64' | 'int8' | 'int16' | 'int32' | 'int64' | 'float' | 'double') */
   public format(type: TopicDataType = 'string'): [string, 'json' | undefined] {
     try {
       switch (type) {
diff --git a/backend/src/Model/TreeNode.ts b/backend/src/Model/TreeNode.ts
index 56bede5..2fff9ab 100644
--- a/backend/src/Model/TreeNode.ts
+++ b/backend/src/Model/TreeNode.ts
@@ -1,24 +1,8 @@
 import { Destroyable } from './Destroyable'
 import { Edge, Message, RingBuffer, MessageHistory } from './'
 import { EventDispatcher } from '../../../events'
-import { IDecoder, decoders } from './sparkplugb'
-import { Base64Message } from './Base64Message'
 
-// 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 type TopicDataType = 'string' | 'json' | 'hex'
 
 export class TreeNode<ViewModel extends Destroyable> {
   public sourceEdge?: Edge<ViewModel>
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 5ca2b1d..3a322ba 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -10,7 +10,6 @@ import {
   makePublishEvent,
   removeConnection,
 } from '../../events'
-import { SparkplugDecoder } from './Model/sparkplugb'
 
 export class ConnectionManager {
   private connections: { [s: string]: DataSource<any> } = {}
diff --git a/src/electron.ts b/src/electron.ts
index 28a96ae..7b4cf77 100644
--- a/src/electron.ts
+++ b/src/electron.ts
@@ -19,6 +19,7 @@ registerCrashReporter()
 //   const electronTelemetry = electronTelemetryFactory('9b0c8ca04a361eb8160d98c5', buildOptions)
 // }
 
+// disable-dev-shm-usage is required to run the debug console
 app.commandLine.appendSwitch('--no-sandbox --disable-dev-shm-usage')
 app.whenReady().then(() => {
   backendRpc.on(makeOpenDialogRpc(), async request => {
@@ -69,8 +70,6 @@ async function createWindow() {
     }
   })
 
-  console.log('icon path', iconPath)
-  mainWindow.webContents.openDevTools({ mode: 'detach' })
   // Load the index.html of the app.
   if (isDev()) {
     mainWindow.loadURL('http://localhost:8080')