From 8b532d9df16268438cddc21d749c17c8ae10b5d0 Mon Sep 17 00:00:00 2001
From: tsightler <tsightler@gmail.com>
Date: Wed, 27 Jan 2021 13:46:55 -0500
Subject: [PATCH] v3.0.4

* Fix reconnect failure for some error cases
* Bump tuyapi version to latest
---
 devices/tuya-device.js | 6 ++----
 package-lock.json      | 8 ++++----
 package.json           | 4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/devices/tuya-device.js b/devices/tuya-device.js
index e345ec8..c92adda 100644
--- a/devices/tuya-device.js
+++ b/devices/tuya-device.js
@@ -601,9 +601,7 @@ class TuyaDevice {
             this.reconnecting = true
             debugError('Error connecting to device id '+this.options.id+'...retry in 10 seconds.')
             await utils.sleep(10)
-            if (!this.device.isConnected) {
-                this.connectDevice()
-            }
+            this.connectDevice()
             this.reconnecting = false
         }
     }
@@ -626,7 +624,7 @@ class TuyaDevice {
                     await utils.sleep(1)
                     this.connectDevice()
                 } else if (this.heartbeatsMissed > 0) {
-                    const errMessage = this.heartbeatsMissed > 1 ? " consecutive heartbeats" : " heartbeat"
+                    const errMessage = this.heartbeatsMissed > 1 ? " heartbeats" : " heartbeat"
                     debugError('Device id '+this.options.id+' has missed '+this.heartbeatsMissed+errMessage)                
                 }
                 this.heartbeatsMissed++
diff --git a/package-lock.json b/package-lock.json
index ffb9207..88cd73f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "tuya-mqtt",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2302,9 +2302,9 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "tuyapi": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/tuyapi/-/tuyapi-6.1.3.tgz",
-      "integrity": "sha512-/7nI3Dr3NwWMDnrz7MSRQw9lW3R5i6lnRStIjPgybZ1Wj1jL/PHuRfeNBPAb8ocNbLQN6JqxbefY4awXmp+LqQ==",
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/tuyapi/-/tuyapi-6.1.4.tgz",
+      "integrity": "sha512-aE1ctVaF1fXUbwMatQvr6GuE1kmVD0QdIIm/9AUJW+mOCOg5SSt2XyTmKc8qirJ6iQ3lZcTnHp9xK6gRAzrOLA==",
       "requires": {
         "debug": "4.1.1",
         "p-queue": "6.6.1",
diff --git a/package.json b/package.json
index 2198aa6..0ead81d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tuya-mqtt",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Control Tuya devices locally via MQTT",
   "homepage": "https://github.com/TheAgentK/tuya-mqtt#readme",
   "main": "tuya-mqtt.js",
@@ -19,7 +19,7 @@
     "json5": "^2.1.3",
     "mqtt": "^4.2.6",
     "supports-color": "^8.1.0",
-    "tuyapi": "^6.1.3",
+    "tuyapi": "^6.1.4",
     "mathjs": "8.1.1"
   },
   "repository": {