fix: catch error thrown in getMultipleHoldingRegisters (#543)

yaacov · Jan 31, 2024 · 6be368c · 6be368c
1 parent b49090b
commit 6be368c
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/servers/servertcp_handler.js b/servers/servertcp_handler.js
@@ -296,7 +296,13 @@ function _handleReadMultipleRegisters(requestBuffer, vector, unitID, callback) {
                 }
             });
         } else {
-            const values = vector.getMultipleHoldingRegisters(address, length, unitID);
+            let values;
+            try {
+                values = vector.getMultipleHoldingRegisters(address, length, unitID);
+            } catch (error) {
+                callback(error);
+                return;
+            }
             if (values.length === length) {
                 for (i = 0; i < length; i++) {
                     tryAndHandlePromiseOrValue(i, values);
@@ -434,7 +440,13 @@ function _handleReadMultipleRegistersEnron(requestBuffer, vector, unitID, enronT
                 }
             });
         } else {
-            const values = vector.getMultipleHoldingRegisters(address, length, unitID);
+            let values;
+            try {
+                values = vector.getMultipleHoldingRegisters(address, length, unitID);
+            } catch (error) {
+                callback(error);
+                return;
+            }
             if (values.length === length) {
                 for (i = 0; i < length; i++) {
                     tryAndHandlePromiseOrValue(i, values);