Housekeeping

Author: MathNodes

src/cli/v2ray.py

@@ -14,6 +14,7 @@
 
 # Platform-conditional imports
 if sys.platform == 'win32':
+    import threading
     import psutil
     import netifaces
     import json
@@ -26,7 +27,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

@@ -1270,7 +1270,7 @@ def connect(self,
                 return
 
         else:  # v2ray
-            if pltfrm == Arch.OSX:
+            if pltfrm in [Arch.OSX, Arch.WINDOWS]:
                 chdir(MeileConfig.BASEBINDIR) 
             conndesc.write("Bringing up V2Ray socks tunnel...\n")
             conndesc.flush()
@@ -1299,30 +1299,13 @@ def connect(self,
                     chdir(MeileConfig.BASEDIR)
                 return
 
-            '''
-            if pltfrm != Arch.OSX:
-                for iface in psutil.net_if_addrs().keys():
-                    if "tun" in iface:
-                        tuniface = True
-                        break
-            else:
-                if psutil.net_if_addrs().get("utun123"):
-                    self.connected = {"v2ray_pid" : v2ray_handler.v2ray_pid, 
-                                      "result": True, 
-                                      "status" : "utun123",
-                                      "session_id" : session_id}
-                    print(self.connected)
-                    tuniface = True
-            '''
-
             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(3.3)
+                sleep(5.3)
                 if self.get_ip_address():
                     self.connected = {"v2ray_pid" : v2ray_handler.v2ray_pid, 
                                       "result": True, 
@@ -1335,7 +1318,7 @@ def connect(self,
                                       "session_id" : session_id}
                 sleep(1)
                 conndesc.close()
-                if pltfrm == Arch.OSX:
+                if pltfrm in [Arch.OSX, Arch.WINDOWS]:
                     chdir(MeileConfig.BASEDIR)
                 return
             else:
@@ -1353,10 +1336,10 @@ def connect(self,
                                   "status": f"Error connecting to v2ray node: {tuniface}",
                                   "session_id" : session_id}
                 print(self.connected)
-                if pltfrm == Arch.OSX:
+                if pltfrm in [Arch.OSX, Arch.WINDOWS]:
                     chdir(MeileConfig.BASEDIR)
                 return
-        if pltfrm == Arch.OSX:
+        if pltfrm in [Arch.OSX, Arch.WINDOWS]:
             chdir(MeileConfig.BASEDIR)
         self.connected = {"v2ray_pid" : None,  
                           "result": False, 

src/typedef/konstants.py

@@ -613,8 +613,8 @@ class IBCTokens():
     #mu_coins     = ["tsent", "udvpn", "uscrt", "uosmo", "uatom", "udec"]
 class TextStrings():
     dash = "-"
-    VERSION = "v2.5.5"
-    BUILD   = "17748518213"
+    VERSION = "v2.6.0"
+    BUILD = "1779933081642"
     RootTag = "SENTINEL"
     GITHUB_API_URL = "https://api.github.com/repos/MathNodes/meile-gui/releases/latest"
     DOWNLOAD_URL   = "https://meile.app"
@@ -953,6 +953,16 @@ class NodeKeys():
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 

src/ui/screens.py

@@ -2379,7 +2379,7 @@ def build_plans(self, data, plans, no_of_nodes, no_of_countries):
                 plan_name=data['plan_name'],
                 num_of_nodes=str(no_of_nodes),
                 num_of_countries=str(no_of_countries),
-                ost=str(plancost) + data['plan_denom'].replace('dvpn', ' p2p') + f"[color=fcb711]    ${plancost_usd}[/color]",
+                cost=str(plancost) + data['plan_denom'].replace('dvpn', ' p2p') + f"[color=fcb711]    ${plancost_usd}[/color]",
                 logo_image=data['logo'],
                 uuid=data['uuid'],
                 id=str(plan['subscription_id']) if plan else str(0),

src/ui/widgets.py

@@ -1913,7 +1913,7 @@ def check_balance(conf: int):
                 check_balance(1)
                 if self.zaddress_balance >= arrr:
                     self.invoice_result = {"success" : True, "id": self.zaddress_balance }
-    '''
+    
     def check_invoice_status_firo(self, address=False, invoice=False, firo=0):
         Request = HTTPRequests.MakeRequest(TIMEOUT=120)
         http = Request.hadapter()
@@ -2193,20 +2193,6 @@ def call_on_success_subscription(self, dt):
             if self.on_success_subscription_payg:
                 self.on_success_subscription_payg()
 
-    '''
-
-    def reparse_coin_deposit(self, deposit):
-        for k,v in CoinsList.ibc_coins.items():
-            try:
-                coin = re.findall(k,deposit)[0]
-                deposit = deposit.replace(coin, v)
-                mu_deposit_amt = int(float(re.findall(r'[0-9]+\.[0-9]+', deposit)[0])*CoinsList.SATOSHI)
-                tru_mu_deposit = str(mu_deposit_amt) + v
-                return tru_mu_deposit
-            except:
-                pass
-    '''
-            
     def closeDialog(self, inst):
         self.dialog.dismiss()
         self.dialog = None
@@ -2393,12 +2379,7 @@ def get_state(self) -> str:
         """Returns the state of panel. Can be `close` or `open` ."""
 
         return self._state
-    '''
-    def add_widget(self, widget, index=0, canvas=None):
-        if isinstance(widget, NodeDetails):
-            self.height = widget.height
-        return super().add_widget(widget)
-    '''
+    
     def add_widget(self, widget, index=0, canvas=None):
         # Don't override height here — let the animation handle it
         return super().add_widget(widget, index=index, canvas=canvas)