Merge pull request #70 from joyja/portErrorRetry

Port error retry
joyja · Sep 26, 2020 · 4ecb4e4 · 4ecb4e4
2 parents 1f221ac + 5b362be
commit 4ecb4e4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/device/__tests__/device.js b/src/device/__tests__/device.js
@@ -159,7 +159,7 @@ describe(`Modbus: `, () => {
     modbus.client.connectTCP.mockReset()
   })
   test(`Disconnect calls client close throws an error on reject.`, async () => {
-    modbus.client.close.mockImplementation(() => {
+    modbus.client.close.mockImplementation((callback) => {
       throw new Error(`Close connection failed.`)
     })
     expect(await modbus.disconnect().catch((e) => e)).toMatchInlineSnapshot(

diff --git a/src/device/modbus.js b/src/device/modbus.js
@@ -93,10 +93,9 @@ class Modbus extends Model {
       logger.info(`Disconnecting from modbus device ${this.device.name}`)
       const logText = `Closed connection to modbus device ${this.device.name}.`
       if (this.connected) {
-        this.client.close(() => {
-          logger.info(logText)
-          resolve()
-        })
+        this.client.close(() => {})
+        logger.info(logText)
+        resolve()
       } else {
         logger.info(logText)
         resolve()
@@ -300,9 +299,15 @@ class ModbusSource extends Model {
             }
           )
         }).catch(async (error) => {
-          if (error.name === 'TransactionTimedOutError') {
+          if (
+            error.name === 'TransactionTimedOutError' ||
+            error.name === 'PortNotOpenError'
+          ) {
+            logger.info(`Connection Timed Out on device ${this.device.name}`)
             await this.modbus.disconnect()
             await this.modbus.connect()
+          } else {
+            logger.error(error)
           }
         })
       } else if (this.registerType === 'HOLDING_REGISTER') {
@@ -326,6 +331,8 @@ class ModbusSource extends Model {
           if (error.name === 'TransactionTimedOutError') {
             await this.modbus.disconnect()
             await this.modbus.connect()
+          } else {
+            logger.error(error)
           }
         })
       } else if (this.registerType === 'DISCRETE_INPUT') {
@@ -349,6 +356,8 @@ class ModbusSource extends Model {
           if (error.name === 'TransactionTimedOutError') {
             await this.modbus.disconnect()
             await this.modbus.connect()
+          } else {
+            logger.error(error)
           }
         })
       }