feat(connector.py): require ACK for HELLO message, retry if not received

src/judas_client/connector.py

@@ -83,6 +83,7 @@ class Connector:
             self.socket.connect((self.host, self.port))
             self.socket.settimeout(self.socket_timeout)
             self.logger.info(f"[+] Connected to {self.host}:{self.port}")
+            self.send_hello()
         except (
             socket.timeout,
             ConnectionRefusedError,
@@ -95,7 +96,7 @@ class Connector:
                 f"[.] Retrying connection in {retry_interval} s..."
             )
             time.sleep(retry_interval)
-            self.connect(retry_interval=min(60, retry_interval * 2))
+            self.connect(retry_interval=min(30, retry_interval * 2))
 
     def send(self, data: bytes) -> None:
         self.logger.debug(f"[>] Sending data: {data}")
@@ -117,6 +118,7 @@ class Connector:
             data: bytes = self.socket.recv(4096)
             if not data:
                 self.logger.warning("[!] Received empty message")
+                return b""
             self.logger.debug(f"[<] Received data: {data}")
             return data
         except socket.error as e:
@@ -128,11 +130,33 @@ class Connector:
         self.socket.close()
         self.logger.info("Connection closed.")
 
+    def reconnect(self) -> None:
+        self.logger.debug("Reconnecting...")
+        self.close()
+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.connect()
+
+    def send_hello(self) -> None:
+        self.logger.debug("[.] Sending hello message...")
+        hello_message: Message = Message.hello(self.mac_address)
+        acknowledged: bool = False
+        while not acknowledged:
+            self.send(hello_message.to_bytes())
+            self.logger.debug("[.] Hello message sent, waiting for ACK...")
+            acknowledged = self._check_ack()
+            if not acknowledged:
+                self.logger.warning(
+                    "[!] Hello message not acknowledged, retrying..."
+                )
+                time.sleep(1)
+
     def _loop(self) -> None:
         self.logger.debug("Starting main loop...")
         while True:
+            time.sleep(1)
             data: bytes = self.receive()
             if not data:
+                self.reconnect()
                 continue
             message = Message.from_bytes(data.strip())
             self.logger.info(f"[<] Message received: {message}")
@@ -140,14 +164,11 @@ class Connector:
             #     self.logger.debug("[.] ACK verified")
             # else:
             #     self.logger.error("[!] ACK verification failed")
-            time.sleep(1)
 
     def run(self) -> None:
         self.logger.debug("Running Connector...")
         try:
             self.connect()
-            # send hello message
-            self.send(Message.hello(self.mac_address).to_bytes())
             self._loop()
         except KeyboardInterrupt:
             self.logger.info("Interrupted by user.")