node-intasller api adjusted with the zeuz request abstraction

Author: Muntasib-creator

Framework/deploy_handler/long_poll_handler.py

@@ -238,7 +238,6 @@ def respond_to_key_request(self, request_id: str, private_key_pem: str) -> None:
                     "donor_node_id": node_id,
                     "private_key": private_key_pem
                 },
-                verify=False
             )
 
             if response.ok:
@@ -266,7 +265,7 @@ async def run(self, host: str) -> None:
 
             try:
                 reconnect = True
-                resp = RequestFormatter.request("get", host, verify=False, timeout=70)
+                resp = RequestFormatter.request("get", host, timeout=70)
                 if resp is None:
                     break
 
@@ -290,9 +289,9 @@ async def run(self, host: str) -> None:
 
                 if not resp.ok:
                     print(
-                        "[deploy] facing difficulty communicating with the server, status code:",
+                        "[deploy] Request Error, status code:",
                         resp.status_code,
-                        " | reconnecting",
+                        "| reconnecting",
                     )
 
                     # Encountered a server error, retry.

Framework/install_handler/long_poll_handler.py

@@ -324,62 +324,49 @@ async def run(self) -> None:
             return
         if debug:
             print(f"[installer] Started running")
-        async with httpx.AsyncClient(
-            timeout=httpx.Timeout(70.0), verify=False
-        ) as client:
-            self.client = client
-            while not self.cancel_:
-                if STATE.reconnect_with_credentials is not None:
-                    if debug:
-                        print("[installer] Reconnection requested, stopping...")
-                    break
+        
+        while not self.cancel_:
+            if STATE.reconnect_with_credentials is not None:
+                if debug:
+                    print("[installer] Reconnection requested, stopping...")
+                break
 
-                self.running = True
-                try:
-                    if debug:
-                        print("[installer] Active")
-                    api_key = ConfigModule.get_config_value("Authentication", "api-key")
-                    url = RequestFormatter.form_uri(
-                        f"d/nodes/install/node/listen?node_id={read_node_id()}"
-                    )
+            self.running = True
+            try:
+                if debug:
+                    print("[installer] Active")
+                host = RequestFormatter.form_uri(
+                    f"d/nodes/install/node/listen?node_id={read_node_id()}"
+                )
 
-                    resp = await client.get(url, headers={"X-API-KEY": api_key})
-                    if resp.status_code == httpx.codes.NO_CONTENT:
-                        continue
+                resp = resp = RequestFormatter.request("get", host, timeout=70)
 
-                    if not resp.is_success:
-                        if debug:
-                            print(
-                                "[installer] facing difficulty communicating with the server, status code:",
-                                resp.status_code,
-                                " | reconnecting",
-                            )
-                            print(Fore.YELLOW + str(resp.content))
+                if not resp.ok:
+                    if debug:
+                        print(
+                            "[installer] Request Error, status code:",
+                            resp.status_code,
+                            "| retrying after 15 sec",
+                        )
+                        print(Fore.YELLOW + str(resp.content))
 
-                        await asyncio.sleep(random.randint(1, 3))
-                        continue
+                    await asyncio.sleep(15)
+                    continue
 
-                    try:
-                        data = resp.json()
-                        if data:
-                            validated_data = Response(**data)
-                            await self.on_message(validated_data)
-                    except Exception as e:
-                        print(f"[installer] Error parsing response: {e}")
-                        continue
+                try:
+                    data = resp.json()
+                    if data:
+                        validated_data = Response(**data)
+                        await self.on_message(validated_data)
+                except Exception as e:
+                    print(f"[installer] Type Error in parsing response: {e}")
+                    continue
 
-                except httpx.ReadTimeout:
-                    pass
-                except httpx.ConnectError:
-                    if debug:
-                        print("[installer] Connection error, retrying...")
-                    await asyncio.sleep(random.randint(3, 5))
-                except Exception:
-                    if debug:
-                        traceback.print_exc()
-                    if debug:
-                        print("[installer] RETRYING...")
-                    await asyncio.sleep(random.randint(1, 3))
+            except Exception:
+                if debug:
+                    traceback.print_exc()
+                    print("[installer] RETRYING...")
+                await asyncio.sleep(random.randint(1, 3))
 
             self.running = False
             print("[installer] Stopped running")

Framework/install_handler/utils.py

@@ -1,5 +1,5 @@
 import datetime
-import httpx
+import asyncio
 import platform
 from Framework.Utilities import RequestFormatter, ConfigModule, CommonUtil
 
@@ -42,9 +42,7 @@ def generate_services_list(services):
 async def send_response(data=None) -> None:
     try:
         from Framework.install_handler.route import services
-        
-        api_key = ConfigModule.get_config_value("Authentication", "api-key")
-        url = RequestFormatter.form_uri("d/nodes/install/server/push")
+        host = RequestFormatter.form_uri("d/nodes/install/server/push")
         data['last_updated'] = datetime.datetime.now(datetime.timezone.utc).timestamp()
         data['version'] = version
         data['node_id'] = read_node_id()
@@ -60,13 +58,20 @@ async def send_response(data=None) -> None:
         if debug: 
             print(f"[installer] Sending response to server: {data}")
 
-        async with httpx.AsyncClient(timeout=30.0, verify=False) as client:
-            resp = await client.post(url, json=data, headers={"X-API-KEY": api_key})
-            if debug: 
-                print(f"[installer] Response status: {resp.status_code}")
-                print(f"[installer] Response content: {resp.content}")
-            if not resp.is_success:
+        for _ in range(3):
+            try:
+                resp = RequestFormatter.request("post", host, json=data, timeout=70)
                 if debug: 
-                    print(f"[installer] Failed to send response: {resp.status_code}")
+                    print(f"[installer] Response status: {resp.status_code}")
+                    print(f"[installer] Response content: {resp.content}")
+                if not resp.ok:
+                    if debug: 
+                        print(f"[installer] Failed to send response: {resp.status_code}")
+                    await asyncio.sleep(3,5)
+                else:
+                    break
+            except Exception as e:
+                if debug: print(e)
+                await asyncio.sleep(3,5)
     except Exception as e:
         print(f"[installer] Error sending response: {e}")