Update wait_for_tunnel helper. Update wait_for_port helper. Update connect() for new helpers. Add Quad9 and localhost to hardcoded DNS servers. Update unified v2ray handler

Author: freQniK

src/cli/v2ray.py

@@ -26,6 +26,7 @@
     import psutil
     from typedef.konstants import ConfParams
     import threading
+    import threading
 
 # ---------------------------------------------------------------------------
 # V2RayHandler – one class per platform, selected at the bottom of this

src/cli/wallet.py

@@ -829,6 +829,8 @@ def fetch_credentials(self, address, session_id, type, conndesc):
         return None, None, None
 
     def write_wireguard_config(self, response, decode, wgkey, conndesc, iface):
+        CONFIG = MeileConfig.read_configuration(MeileConfig.CONFFILE)
+        user_dns = CONFIG['network'].get('dns', '9.9.9.9')
         if len(decode) < 100:
             self.connected = {
                 "v2ray_pid": None,
@@ -884,7 +886,7 @@ def write_wireguard_config(self, response, decode, wgkey, conndesc, iface):
         config.set("Interface", "PrivateKey", wgkey.privkey)
         config.set(
             "Interface", "DNS",
-            ",".join(["127.0.0.1", "1.0.0.1", "1.1.1.1"])
+            ",".join([user_dns, "1.0.0.1", "1.1.1.1"])
         )
 
         config.add_section("Peer")
@@ -1224,46 +1226,39 @@ def connect(self,
             if pltfrm == Arch.LINUX:
                 child = pexpect.spawn(f"pkexec sh -c 'ip link delete {iface}; wg-quick up {config_file}'")
                 child.expect(pexpect.EOF)
-                ok = wait_for_tunnel_iface(iface=["wg99", "utun3"], timeout=300)
-                if ok is None:
-                    self.connected = {"v2ray_pid" : None,  
-                                      "result": False, 
-                                      "status" : "Error bringing up wireguard interface", 
-                                      "session_id" : session_id}
-                    return
+                
             elif pltfrm == Arch.OSX:
                 connectBASH = [sentinel_connect_bash]
                 proc2 = subprocess.Popen(connectBASH)
                 proc2.wait(timeout=30)
                 pid2 = proc2.pid
                 proc_out, proc_err = proc2.communicate()
-                ok = wait_for_tunnel_iface(iface=["wg99", "utun3"], timeout=300)
-                if ok is None:
-                    self.connected = {"v2ray_pid" : None,  
-                                      "result": False, 
-                                      "status" : "Error bringing up wireguard interface", 
-                                      "session_id" : session_id}
-                    return
+                
             elif pltfrm == Arch.WINDOWS:
                 wgup = [gsudo, MeileConfig.WIREGUARD_BIN, "/installtunnelservice", config_file]
                 wg_process = subprocess.Popen(wgup)
-                ok = wait_for_tunnel_iface(iface=["wg99", "utun3"], timeout=300)
-                if ok is None:
-                    self.connected = {"v2ray_pid" : None,  
-                                      "result": False, 
-                                      "status" : "Error bringing up wireguard interface", 
-                                      "session_id" : session_id}
-                    return
 
-            if psutil.net_if_addrs().get(iface) or psutil.net_if_addrs().get("utun3"):
+                
+            #if psutil.net_if_addrs().get(iface) or psutil.net_if_addrs().get("utun3"):
+            tuniface = wait_for_tunnel_iface(iface=[iface, "utun3"], timeout=30)
+            if tuniface is not None:
                 self.connected = {"v2ray_pid" : None,  
                                   "result": True, 
-                                  "status" : iface, 
+                                  "status" : tuniface, 
                                   "session_id" : session_id}
                 conndesc.write("Checking network connection...\n")
                 conndesc.flush()
-                sleep(1)
-                self.get_ip_address()
+                sleep(2)
+                if self.get_ip_address():
+                    self.connected = {"v2ray_pid" : None,
+                                      "result": True, 
+                                      "status" : tuniface, 
+                                      "session_id" : session_id}
+                else:
+                    self.connected = {"v2ray_pid" : None,
+                                      "result": False, 
+                                      "status" : "Error establising connection to internet. Try a differnt node.", 
+                                      "session_id" : session_id}
                 sleep(1)
                 conndesc.close()
                 return
@@ -1303,7 +1298,8 @@ def connect(self,
                 if pltfrm == Arch.OSX:
                     chdir(MeileConfig.BASEDIR)
                 return
-                
+            
+            '''
             if pltfrm != Arch.OSX:
                 for iface in psutil.net_if_addrs().keys():
                     if "tun" in iface:
@@ -1317,12 +1313,16 @@ def connect(self,
                                       "session_id" : session_id}
                     print(self.connected)
                     tuniface = True
-                
-            if tuniface is True:
-                print(self.connected)
+            '''
+
+            tuniface = wait_for_tunnel_iface(iface=["tun", "utun3", "utun123"], timeout=30)
+
+
+            if tuniface is not None:
+                print("Tunnel interface is up:", tuniface)
                 conndesc.write("Checking network connection...\n")
                 conndesc.flush()
-                sleep(1)
+                sleep(3.3)
                 if self.get_ip_address():
                     self.connected = {"v2ray_pid" : v2ray_handler.v2ray_pid, 
                                       "result": True, 

src/helpers/helpers.py

@@ -2,6 +2,7 @@
 import ipaddress
 import socket
 import time
+import psutil
 
 
 def format_byte_size(size, decimals=2, binary_system=True):
@@ -45,31 +46,28 @@ def natural_gateway(ip_with_prefix: str) -> str:
         net64 = ipaddress.ip_network(f"{iface.ip.exploded}/64", strict=False)
         return str(ipaddress.ip_address(int(net64.network_address) + 1))
 
-def wait_for_port(host, port, timeout=300, poll=0.2):
-        deadline = time.monotonic() + timeout
-        while time.monotonic() < deadline:
-            try:
-                with socket.create_connection((host, port), timeout=0.5):
+def wait_for_port(host, port, timeout=120, poll=0.2):
+    deadline = time.monotonic() + timeout
+    while time.monotonic() < deadline:
+        for c in psutil.net_connections(kind="tcp"):
+            if c.status == psutil.CONN_LISTEN and c.laddr.port == port:
+                # optional: also match host
+                if host in ("0.0.0.0", "", c.laddr.ip):
                     return True
-            except OSError:
-                time.sleep(poll)
-        return False
+        time.sleep(poll)
+    return False
 
-def wait_for_tunnel_iface(iface=None, timeout=300, poll=0.2):
+def wait_for_tunnel_iface(iface=None, timeout=30, poll=0.2):
     if not iface:
         raise ValueError("iface must be a non-empty list")
 
-    wanted = set(iface)
     deadline = time.monotonic() + timeout
 
     while time.monotonic() < deadline:
-        present = {name for _, name in socket.if_nameindex()}
-        found = wanted & present
-        if found:
-            # if multiple matched, prefer the order the caller gave
-            for name in iface:
-                if name in found:
-                    return name
+        for tunface in psutil.net_if_addrs().keys():
+            for intface in iface:
+                if tunface.startswith(intface):
+                    return tunface
         time.sleep(poll)
 
     return None

src/typedef/konstants.py

@@ -83,7 +83,8 @@ class HTTParams():
                               "https://cache.noncompliance.org/api/public/card/bc75f719-db4a-44b8-9688-f5793742a203/query/json"
                               ]
 
-    DNSSERVERS = [{'Country' : 'Mexico-1'    , 'ip' : '207.248.224.71'},
+    DNSSERVERS = [{'Country' : 'DNSCrypt'    , 'ip' : '127.0.0.1'},
+                  {'Country' : 'Mexico-1'    , 'ip' : '207.248.224.71'},
                   {'Country' : 'Mexico-2'    , 'ip' : '200.56.98.145'},
                   {'Country' : 'U.S.-1'      , 'ip' : '75.150.197.154'},
                   {'Country' : 'U.S.-2'      , 'ip' : '98.101.194.137'},
@@ -92,7 +93,8 @@ class HTTParams():
                   {'Country' : 'Japan'       , 'ip' : '153.156.93.5'},
                   {'Country' : 'Russia'      , 'ip' : '77.88.8.8'},
                   {'Country' : 'Indonesia'   , 'ip' : '103.184.98.227'},
-                  {'Country' : 'Cloudflare'  , 'ip' : '1.1.1.1'}
+                  {'Country' : 'Cloudflare'  , 'ip' : '1.1.1.1'},
+                  {'Country' : 'Quad9'       , 'ip' : '9.9.9.9'}
                   ]