Python-3xui 0.0.2__tar.gz → 0.0.4__tar.gz

{python_3xui-0.0.2 → python_3xui-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Python-3xui
-Version: 0.0.2
+Version: 0.0.4
 Summary: 3x-ui wrapper for python
 Project-URL: Homepage, https://github.com/Artem-Potapov/3x-py
 Project-URL: Issues, https://github.com/Artem-Potapov/3x-py/issues

{python_3xui-0.0.2 → python_3xui-0.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Python-3xui"
-version = "0.0.2"
+version = "0.0.4"
 authors = [
   { name="JustMe_001", email="justme001.causation755@passinbox.com" },
 ]

{python_3xui-0.0.2 → python_3xui-0.0.4}/python_3xui/api.py

@@ -1,7 +1,9 @@
+import time
 from collections.abc import Sequence, Mapping
 from typing import Self, Optional, Dict, Iterable, AsyncIterable, Type, Union, Any, List, Tuple, Literal
 from datetime import datetime, UTC
 
+import pyotp
 from httpx import Response, AsyncClient
 from async_lru import alru_cache
 import asyncio
@@ -73,6 +75,7 @@ class XUIClient:
             session_duration: Maximum session duration in seconds. Defaults to 3600.
         """
         from . import endpoints # look, I know it's bad, but we need to evade cyclical imports
+        self.connected: bool = False
         self.PROD_STRING = "tester-777"
         self.session: AsyncClient | None = None
         self.base_host: str = base_website
@@ -83,13 +86,23 @@ class XUIClient:
         self.session_duration: int = session_duration
         self.xui_username: str | None = username
         self.xui_password: str | None = password
-        self.two_fac_code: str | None = two_fac_code
+        self.two_fac_secret: str | None = two_fac_code
+        self.totp: pyotp.TOTP | None = None
         self.max_retries: int = 5
         self.retry_delay: int = 1
         # endpoints
         self.server_end = endpoints.Server(self)
         self.clients_end = endpoints.Clients(self)
         self.inbounds_end = endpoints.Inbounds(self)
+        #init self.totp
+        if self.two_fac_secret:
+            if self.two_fac_secret.isdigit() and len(self.two_fac_secret) <= 8:
+                #print("WARNING: You seem to have entered a 2FA **code**, not a 2FA secret."
+                      #"Although entering the secret is dangerous, there is no other way to provide a consistent way"
+                      #"for continuous login. This code will only work for this specific login.")
+                self.totp = None
+            else:
+                self.totp = pyotp.TOTP(self.two_fac_secret)
 
     #========================singleton pattern========================
     def __new__(cls, *args, **kwargs):
@@ -249,6 +262,13 @@ class XUIClient:
             "username": self.xui_username,
             "password": self.xui_password,
         }
+        if self.totp:
+            if self.totp.interval - datetime.now().timestamp() % self.totp.interval < 1:
+                await asyncio.sleep(1.1) # just to not submit an invalid code
+            payload["twoFactorCode"] = self.totp.now()
+        else:
+            if self.two_fac_secret:
+                payload["twoFactorCode"] = self.two_fac_secret
 
         #print(self.session.base_url)
         #print("WE'RE LOGGING IN")
@@ -272,6 +292,7 @@ class XUIClient:
             Self: The XUIClient instance.
         """
         self.session = AsyncClient(base_url=self.base_url)
+        self.connected = True
         return self
 
     async def disconnect(self) -> None:
@@ -279,6 +300,7 @@ class XUIClient:
 
         This method closes the async HTTP client session.
         """
+        self.connected = False
         await self.session.aclose()
 
     async def __aenter__(self) -> Self:
@@ -313,7 +335,7 @@ class XUIClient:
 
     #========================inbound management========================
     @alru_cache
-    async def get_production_inbounds(self) -> List[Inbound]:
+    async def get_production_inbounds(self) -> Tuple[Inbound, ...]:
         """Retrieve production inbounds.
 
         This method fetches all inbounds and filters them based on the
@@ -333,7 +355,7 @@ class XUIClient:
         if len(usable_inbounds) == 0:
             raise RuntimeError("No production inbounds found! Change prod_string!")
 
-        return usable_inbounds
+        return tuple(usable_inbounds)
 
     async def clear_prod_inbound_cache(self):
         """Clear the production inbound cache.
@@ -346,15 +368,12 @@ class XUIClient:
             This method currently runs every 10 seconds. Please change the
             timer from 5 to 60*60*24 in the code.
         """
-        #This is useless for now, but later get_production_inbounds() will be cached,
-        # and this will clear the cache every 24 hours or so, to make sure the client
-        # always has the most up-to-date inbounds list
-        while True:
+        while self.connected:
             #print("You're seeing this message because I forgot to remove it in api.update_inbounds() !")
             #print("Please change the timer from 5 to 60*60*24!")
             self.get_production_inbounds.cache_clear()
             await self.get_production_inbounds() #fill the cache
-            await asyncio.sleep(10)
+            await asyncio.sleep(60*10)
             ##print(stat)
 
     #========================clients management========================
@@ -491,6 +510,7 @@ class XUIClient:
             email = util.generate_email_from_tgid_inbid(telegram_id, inbound.id)
             resp = await self.clients_end.delete_client_by_email(email, inbound.id)
             responses.append(resp)
+        #print("Inbound deleted")
 
         return responses