Update main.py

main.py

@@ -1,5 +1,6 @@
 import os
 import logging
+import socket
 import requests
 import dns.resolver
 from heyoo import WhatsApp
@@ -20,39 +21,39 @@ logger = logging.getLogger(__name__)
 load_dotenv()
 
 # Configure DNS resolver with environment variables from Spaces
-nameserver1 = os.getenv('nameserver1', '8.8.8.8')  # Google DNS as fallback
-nameserver2 = os.getenv('nameserver2', '8.8.4.4')  # Google DNS as fallback
-
-resolver = dns.resolver.Resolver()
-resolver.nameservers = [nameserver1, nameserver2]
-
-# Custom session for requests with DNS configuration
-class CustomSession(requests.Session):
-    def resolve_dns(self, hostname):
+nameserver1 = os.getenv('nameserver1', '8.8.8.8')
+nameserver2 = os.getenv('nameserver2', '8.8.4.4')
+
+# Configure global DNS resolution
+def setup_dns():
+    """Configure DNS resolution globally"""
+    resolver = dns.resolver.Resolver()
+    resolver.nameservers = [nameserver1, nameserver2]
+    
+    # Create a custom getaddrinfo function
+    _orig_getaddrinfo = socket.getaddrinfo
+    def new_getaddrinfo(*args, **kwargs):
         try:
-            answer = resolver.resolve(hostname, 'A')
-            return str(answer[0])
+            # If the host is graph.facebook.com, use our custom resolver
+            if args and args[0] == 'graph.facebook.com':
+                answers = resolver.resolve('graph.facebook.com', 'A')
+                ip = str(answers[0])
+                return _orig_getaddrinfo(ip, *args[1:], **kwargs)
         except Exception as e:
-            logger.error(f"DNS resolution failed for {hostname}: {e}")
-            raise
-
-    def send(self, request, **kwargs):
-        if 'graph.facebook.com' in request.url:
-            try:
-                ip = self.resolve_dns('graph.facebook.com')
-                request.url = request.url.replace('graph.facebook.com', ip)
-                request.headers['Host'] = 'graph.facebook.com'
-            except Exception as e:
-                logger.error(f"DNS resolution failed: {e}")
-        return super().send(request, **kwargs)
-
-# Initialize WhatsApp with custom session
+            logger.error(f"DNS resolution failed: {e}")
+        return _orig_getaddrinfo(*args, **kwargs)
+    
+    # Replace the global getaddrinfo function
+    socket.getaddrinfo = new_getaddrinfo
+
+# Setup DNS resolution
+setup_dns()
+
+# Initialize WhatsApp
 try:
-    session = CustomSession()
     messenger = WhatsApp(
         os.getenv("whatsapp_token"),
-        phone_number_id=os.getenv("phone_number_id"),
-        session=session
+        phone_number_id=os.getenv("phone_number_id")
     )
     if not os.getenv("whatsapp_token") or not os.getenv("phone_number_id"):
         raise ValueError("Missing required environment variables")
@@ -66,6 +67,8 @@ VERIFY_TOKEN = "30cca545-3838-48b2-80a7-9e43b1ae8ce4"
 def health_check():
     """Health check endpoint to verify DNS resolution"""
     try:
+        resolver = dns.resolver.Resolver()
+        resolver.nameservers = [nameserver1, nameserver2]
         ip = resolver.resolve('graph.facebook.com', 'A')[0]
         return {
             "status": "healthy",
@@ -184,10 +187,12 @@ def handle_media_message(messenger, data, message_type, mobile):
 def test_connection():
     """Test DNS resolution and connection to Graph API"""
     try:
+        resolver = dns.resolver.Resolver()
+        resolver.nameservers = [nameserver1, nameserver2]
         ip = resolver.resolve('graph.facebook.com', 'A')[0]
         logger.info(f"DNS Resolution successful: {ip}")
         
-        response = session.get('https://graph.facebook.com')
+        response = requests.get('https://graph.facebook.com')
         logger.info(f"HTTPS Connection successful: {response.status_code}")
         
     except Exception as e: