Revert Heartbeat logic to upstream

custom_components/localtuya/common.py

@@ -182,7 +182,8 @@ async def _make_connection(self):
             status = await self._interface.status()
             if status is None:
                 raise Exception("Failed to retrieve status")
-
+
+            self._interface.start_heartbeat()
             self.status_updated(status)
 
             if self._disconnect_task is not None:
@@ -340,6 +341,7 @@ async def _make_connection(self):
                 is_gateway=True,
             )
 
+            self._interface.start_heartbeat()
             # Re-add and get status of previously added sub-devices
             # Note this assumes the gateway device has not been tear down
             for subitem in self._sub_devices.items():

custom_components/localtuya/pytuya/__init__.py

@@ -690,6 +690,11 @@ def _status_update(self, msg):
 
     def connection_made(self, transport):
         """Did connect to the device."""
+        self.transport = transport
+        self.on_connected.set_result(True)
+
+    def start_heartbeat(self):
+        """Start the heartbeat transmissions with the device."""
 
         async def heartbeat_loop():
             """Continuously send heart beat updates."""
@@ -712,8 +717,6 @@ async def heartbeat_loop():
             self.transport = None
             transport.close()
 
-        self.transport = transport
-        self.on_connected.set_result(True)
         self.heartbeater = self.loop.create_task(heartbeat_loop())
 
     def data_received(self, data):