fix data messages structure

Author: Alberto Iannaccone

src/App.tsx

@@ -122,10 +122,7 @@ export default function App() {
     if (config?.monitorUISettings?.generate) {
       const randomValuesInterval = setInterval(() => {
         const messages = namedVariablesMulti();
-        onMiddlewareMessage({
-          command: null,
-          data: messages,
-        });
+        onMiddlewareMessage(messages);
       }, 32);
       return () => {
         clearInterval(randomValuesInterval);

src/ChartPlotter.tsx

@@ -190,12 +190,12 @@ function _Chart(
   };
 
   useImperativeHandle(ref, () => ({
-    addNewData(data: string[]) {
+    addNewData(message: string[]) {
       if (pause) {
         return;
       }
       // upon message receival update the chart
-      worker.postMessage({ data });
+      worker.postMessage({ message });
     },
   }));
 

src/MessageToBoard.tsx

@@ -14,7 +14,7 @@ export function MessageToBoard({
   const [message, setMessage] = useState("");
 
   const [baudRate, setBaudrate] = useState(
-    config?.pluggableMonitorSettings?.baudarate?.selectedValue
+    config?.pluggableMonitorSettings?.baudrate?.selectedValue
   );
   const [lineEnding, setLineEnding] = useState(
     config?.monitorUISettings?.lineEnding
@@ -24,7 +24,7 @@ export function MessageToBoard({
   );
 
   useEffect(() => {
-    setBaudrate(config?.pluggableMonitorSettings?.baudarate?.selectedValue);
+    setBaudrate(config?.pluggableMonitorSettings?.baudrate?.selectedValue);
   }, [config.pluggableMonitorSettings]);
 
   useEffect(() => {
@@ -42,7 +42,7 @@ export function MessageToBoard({
     { value: "\r\n", label: "Both NL & CR" },
   ];
 
-  const baudrates = config?.pluggableMonitorSettings?.baudarate?.values?.map(
+  const baudrates = config?.pluggableMonitorSettings?.baudrate?.values?.map(
     (baud) => ({
       value: baud,
       label: `${baud} baud`,

src/msgAggregatorWorker.ts

@@ -4,15 +4,15 @@ const ctx: Worker = self as any;
 
 // Respond to message from parent thread
 ctx.addEventListener("message", (event) => {
-  const { command, data } = event.data;
+  const { command, message } = event.data;
 
   if (command === "cleanup") {
     buffer = "";
     discardFirstLine = true;
   }
 
-  if (data) {
-    ctx.postMessage(parseSerialMessages(data));
+  if (message) {
+    ctx.postMessage(parseSerialMessages(message));
   }
 });
 

src/utils.ts

@@ -58,10 +58,7 @@ export namespace PluggableMonitor {
       command: MiddlewareCommand;
       data: Partial<MonitorSettings>;
     };
-    type DataMessage = {
-      command: unknown;
-      data: string[];
-    };
+    type DataMessage = string[];
 
     export type Message =
       | ClientCommandMessage
@@ -72,6 +69,7 @@ export namespace PluggableMonitor {
       message: Message
     ): message is ClientCommandMessage {
       return (
+        !Array.isArray(message) &&
         typeof message.command === "string" &&
         Object.keys(ClientCommand).includes(message.command)
       );
@@ -80,12 +78,13 @@ export namespace PluggableMonitor {
       message: Message
     ): message is MiddlewareCommandMessage {
       return (
+        !Array.isArray(message) &&
         typeof message.command === "string" &&
         Object.keys(MiddlewareCommand).includes(message.command)
       );
     }
     export function isDataMessage(message: Message): message is DataMessage {
-      return Array.isArray(message.data);
+      return Array.isArray(message);
     }
   }
 }