From 109ba132f14bfd92f96d017b7376b941a02aa63b Mon Sep 17 00:00:00 2001
From: Flechaa <50523969+Flechaa@users.noreply.github.com>
Date: Thu, 2 Jan 2025 00:59:54 +0000
Subject: [PATCH 1/2] Fix null message crash and drop array messages

---
 packages/connections/src/lib/deviceControlConnection.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/connections/src/lib/deviceControlConnection.ts b/packages/connections/src/lib/deviceControlConnection.ts
index 4b10b4a..e8ba104 100644
--- a/packages/connections/src/lib/deviceControlConnection.ts
+++ b/packages/connections/src/lib/deviceControlConnection.ts
@@ -88,7 +88,7 @@ export class DeviceControlConnection extends EventEmitter {
       // Do nothing
     }
 
-    if (typeof msg !== 'object') {
+    if (typeof msg !== 'object' || Array.isArray(msg) || msg == null) {
       this.log.error(`Device /control - error decoding message, disconnecting`);
       this.ws.close();
       return;

From 2cbe9cdded91fb88a4206abf65c0d9df7da54505 Mon Sep 17 00:00:00 2001
From: Flechaa <50523969+Flechaa@users.noreply.github.com>
Date: Thu, 2 Jan 2025 12:44:26 +0000
Subject: [PATCH 2/2] Fix getMemoryUsage null property crash

---
 packages/connections/src/lib/deviceControlConnection.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/connections/src/lib/deviceControlConnection.ts b/packages/connections/src/lib/deviceControlConnection.ts
index e8ba104..415f89a 100644
--- a/packages/connections/src/lib/deviceControlConnection.ts
+++ b/packages/connections/src/lib/deviceControlConnection.ts
@@ -164,7 +164,7 @@ export class DeviceControlConnection extends EventEmitter {
     //< {"id":7,"status":200,"body":{"memFree":123, ...}}
 
     const memory = await this.executeCommand<MemoryStatus>('getMemoryUsage', null, 5000);
-    if (typeof memory === 'object') {
+    if (typeof memory === 'object' && !Array.isArray(msg) && msg != null) {
       this.lastMemory = memory; // spy on result
     }
     return memory;