Python-3xui 0.0.6__tar.gz → 0.0.8__tar.gz

{python_3xui-0.0.6 → python_3xui-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Python-3xui
-Version: 0.0.6
+Version: 0.0.8
 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
@@ -28,10 +28,9 @@ Description-Content-Type: text/markdown
 <p>I'm not expecting much to be honest, so please feel free to fork it if I abandon the project and you need it!</p>
 <p>Also, if you REALLY want it I can give you the ownership if I step down, you can find my email in the pyproject.toml (I don't check it that much but trust me I do)</p>
 
-<h2>0.0.6 Release Notes</h2>
+<h2>0.0.8 Release Notes</h2>
 <ul>
-<li>Added RegEx support for prod_strings</li>
-<li>Fix dependencies for pyOTP</li>
-<li>Add One-time code support, as well as secrets</li>
-Note that one-time codes only work one time... To ensure consistent logins you need OTP <b>secrets</b> to form new codes
+<li>Improve create_and_add_prod_client to have an expiry_time</li>
+<li>delete_client_by_tgid_all_inbounds -> revoke_client_by_tgid_all_inbounds</li>
+<li>Change vulnerable requirements</li>
 </ul>

{python_3xui-0.0.6 → python_3xui-0.0.8}/README.md

@@ -2,10 +2,9 @@
 <p>I'm not expecting much to be honest, so please feel free to fork it if I abandon the project and you need it!</p>
 <p>Also, if you REALLY want it I can give you the ownership if I step down, you can find my email in the pyproject.toml (I don't check it that much but trust me I do)</p>
 
-<h2>0.0.6 Release Notes</h2>
+<h2>0.0.8 Release Notes</h2>
 <ul>
-<li>Added RegEx support for prod_strings</li>
-<li>Fix dependencies for pyOTP</li>
-<li>Add One-time code support, as well as secrets</li>
-Note that one-time codes only work one time... To ensure consistent logins you need OTP <b>secrets</b> to form new codes
+<li>Improve create_and_add_prod_client to have an expiry_time</li>
+<li>delete_client_by_tgid_all_inbounds -> revoke_client_by_tgid_all_inbounds</li>
+<li>Change vulnerable requirements</li>
 </ul>

{python_3xui-0.0.6 → python_3xui-0.0.8}/pyproject.toml

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

{python_3xui-0.0.6 → python_3xui-0.0.8}/python_3xui/api.py

@@ -1,6 +1,9 @@
+import json
+import logging
 import re
 import time
 from collections.abc import Sequence, Mapping
+from logging import DEBUG
 from typing import Self, Optional, Dict, Iterable, AsyncIterable, Type, Union, Any, List, Tuple, Literal
 from datetime import datetime, UTC
 
@@ -12,7 +15,7 @@ import httpx
 
 from . import util
 from .models import Inbound, SingleInboundClient, ClientStats
-from .util import JsonType, async_range
+from .util import JsonType, async_range, check_xui_response
 
 DataType: Type[str | bytes | Iterable[bytes] | AsyncIterable[bytes]] = Union[str, bytes, Iterable[bytes], AsyncIterable[bytes]]
 PrimitiveData = Optional[Union[str, int, float, bool]]
@@ -76,7 +79,7 @@ class XUIClient:
             two_fac_code: Two-factor authentication code (if enabled).
             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
+        from . import endpoints  # look, I know it's bad, but we need to evade cyclical imports
         self.connected: bool = False
         self.PROD_STRING = re.compile(custom_prod_string)
         self.session: AsyncClient | None = None
@@ -106,23 +109,6 @@ class XUIClient:
             else:
                 self.totp = pyotp.TOTP(self.two_fac_secret)
 
-    #========================singleton pattern========================
-    def __new__(cls, *args, **kwargs):
-        """Create or return the singleton instance.
-
-        Args:
-            *args: Positional arguments passed to __init__.
-            **kwargs: Keyword arguments passed to __init__.
-
-        Returns:
-            The singleton XUIClient instance.
-        """
-        print("initializing client")
-        if cls._instance is None:
-            print("nu instance")
-            cls._instance = super(XUIClient, cls).__new__(cls)
-        return cls._instance
-
     #========================request stuffs========================
     async def _safe_request(self,
                             method: Literal["get", "post", "patch", "delete", "put"],
@@ -142,33 +128,34 @@ class XUIClient:
         Raises:
             RuntimeError: If max retries exceeded or session is invalid.
         """
-        print(f"SAFE REQUEST, {method}, is running to a URL of {kwargs["url"]}")
-        print(str(self.session.base_url) + str(kwargs["url"]))
+        logging.debug("Safe request is running to %s%s", str(self.session.base_url), str(kwargs["url"]))
         async for attempt in async_range(self.max_retries):
             resp = await self.session.request(method=method, **kwargs)
             if resp.status_code // 100 != 2:  #because it can return either 201 or 202
                 if resp.status_code == 404:
                     now: float = datetime.now(UTC).timestamp()
                     if self.session_start is None or now - self.session_start > self.session_duration:
-                        print("Guys, we're not logged in, fixing that rn")
+                        logging.info("Client with IP/Domain %s is not logged in, logging in...", self.base_host)
                         await self.login()
                         continue
                     else:
+                        logging.error("Server returned a status code of %s with a valid session", resp.status_code)
                         raise RuntimeError("""Server returned a 404, and the session should still be valid, likely it's a REAL 404""")
                 else:
-                    raise RuntimeError(f"Wrong status code: {resp.status_code}")
+                    logging.error("Server returned a status code of %s", resp.status_code)
+                    resp.raise_for_status()
 
-            status = await util.check_xui_response_validity(resp)
+            status = await util.check_xui_response(resp)
             if status == "OK":
                 return resp
             elif status == "DB_LOCKED":
                 if attempt + 1 >= self.max_retries:
-                    # resp.status_code = 518 # so the error can simply be handled as a "bad request"
-                    # return resp
                     raise RuntimeError("Too many retries")
                 await asyncio.sleep(self.retry_delay)
                 continue
             else:
+                logging.error("A %s request was unsuccessful (code 200, but success=false).\nPayload: %s",
+                              method, json.dumps(resp.json()))
                 return resp
         raise RuntimeError(f"For some reason safe_request didn't exit, dump:\nmethod:\n{method}\n{kwargs}")
 
@@ -265,15 +252,14 @@ class XUIClient:
             "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
+            if self.totp.interval - datetime.now().timestamp() % self.totp.interval < 3:
+                await asyncio.sleep(3.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")
+        logging.info("Client is logging in with IP/Domain: %s", self.base_host)
         resp = await self.session.post("/login", data=payload)
         if resp.status_code == 200:
             resp_json = resp.json()
@@ -281,7 +267,7 @@ class XUIClient:
                 self.session_start: float = (datetime.now(UTC).timestamp())
                 return
             else:
-                raise ValueError("Error: wrong credentials or failed login")
+                raise ValueError("Error: wrong credentials (including status code) or failed login.")
         else:
             raise RuntimeError(f"Error: server returned a status code of {resp.status_code}")
 
@@ -293,6 +279,7 @@ class XUIClient:
         Returns:
             Self: The XUIClient instance.
         """
+        logging.log(DEBUG, "Client connected with IP/domain %s", self.base_url)
         self.session = AsyncClient(base_url=self.base_url)
         self.connected = True
         return self
@@ -331,12 +318,18 @@ class XUIClient:
             exc_val: The exception value, if an exception occurred.
             exc_tb: The exception traceback, if an exception occurred.
         """
-        print("disconnectin'")
+        if exc_type is None or exc_type == asyncio.exceptions.CancelledError:
+            logging.info("Client is disconnecting at time with IP/Domain %s", self.base_host)
+        else:
+            logging.warning("Client is disconnecting due to an error (may be unrelated):"
+                            "\n%s, with value %s\nStacktrace:%s",
+                            exc_type, exc_val, exc_tb)
+        print(f"Client is disconnecting: {self.base_host}")
         await self.disconnect()
         return
 
     #========================inbound management========================
-    @alru_cache
+    @alru_cache()
     async def get_production_inbounds(self) -> Tuple[Inbound, ...]:
         """Retrieve production inbounds.
 
@@ -371,12 +364,9 @@ class XUIClient:
             timer from 5 to 60*60*24 in the code.
         """
         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)
-            #print(stat)
+            await self.get_production_inbounds()  #fill the cache
+            await asyncio.sleep(3600)  #update every 1h
 
     #========================clients management========================
     async def get_client_with_tgid(self, tgid: int, inbound_id: int | None = None) -> List[ClientStats]:
@@ -405,7 +395,12 @@ class XUIClient:
         resp = await self.clients_end.get_client_with_uuid(uuid)
         return resp
 
-    async def create_and_add_prod_client(self, telegram_id: int, additional_remark: str = None):
+    async def create_and_add_prod_client(self, telegram_id: int, *,
+                                         additional_remark: str | None = None,
+                                         expiry_time: int=0,
+                                         exist_ok: bool = False
+                                         ) -> list[Response]:
+        #TODO: add exist_ok flag
         """Create and add a production client.
 
         This method creates a new client with the given Telegram ID and
@@ -416,6 +411,8 @@ class XUIClient:
         Args:
             telegram_id: The Telegram ID of the client.
             additional_remark: An optional additional remark for the client.
+            expiry_time: Expiry time in SECONDS as a UNIX timestamp.
+            exist_ok: Don't raise any errors if the client is already there (good if you need a refresh job)
 
         Returns:
             List[Response]: A list of responses from the server for each
@@ -423,20 +420,30 @@ class XUIClient:
         """
         production_inbounds: List[Inbound] = await self.get_production_inbounds()
 
-        responses = []
+        tasks = []
         for inb in production_inbounds:
+            tmp_email = util.generate_email_from_tgid_inbid(telegram_id, inb.id)
             client = SingleInboundClient.model_construct(
                 uuid=util.get_uuid_from_tgid(telegram_id),
                 flow="",
-                email=util.generate_email_from_tgid_inbid(telegram_id, inb.id),
+                email=tmp_email,
                 limit_gb=0,
                 enable=True,
                 subscription_id=util.sub_from_tgid(telegram_id),
-                comment=f"{additional_remark}, created at {datetime.now(UTC)}")
-            responses.append(await self.clients_end.add_client(client, inb.id))
+                comment=f"{additional_remark}, created at {datetime.now(UTC)}",
+                expiry_time=expiry_time * 1000
+            )
+            tasks.append(asyncio.create_task(self.clients_end.add_client(client, inb.id)))
+        responses: list[Response] = await asyncio.gather(*tasks)
+        if exist_ok:
+            return responses
+        for resp in responses:
+            json_resp = resp.json()
+            if "duplicate email" in json_resp["msg"].lower():
+                logging.error("ERROR: Client already exists and exist_ok not set: %s", json_resp["msg"])
         return responses
 
-    async def update_client_by_tgid(self, telegram_id: int, inbound_id: int, /,
+    async def update_client_by_tgid(self, telegram_id: int, inbound_id: int, /, *,
                                     security: str | None = None,
                                     password: str | None = None,
                                     flow: Literal["", "xtls-rprx-vision", "xtls-rprx-vision-udp443"] | None = None,
@@ -445,7 +452,8 @@ class XUIClient:
                                     expiry_time: int | None = None,
                                     enable: bool | None = None,
                                     sub_id: str | None = None,
-                                    comment: str | None = None) -> Response:
+                                    comment: str | None = None,
+                                    verbose: bool=True) -> Response:
         """
         Update a client in a specific inbound by Telegram ID.
 
@@ -467,6 +475,13 @@ class XUIClient:
         """
         email = util.generate_email_from_tgid_inbid(telegram_id, inbound_id)
         existing_client = await self.clients_end.get_client_with_email(email)
+        if verbose:
+            if expiry_time < 1e9:
+                logging.warning("Warning: You're trying to update a client with expiry time %s. "
+                                "You set it to expire before 2001, likely because you provided the DURATION. "
+                                "You need to provide a TIMESTAMP. "
+                                "If you want to disable this message, set verbose=false.",
+                                expiry_time)
 
         resp = await self.clients_end.update_single_client(
             SingleInboundClient.model_validate(existing_client.model_dump()),
@@ -497,7 +512,7 @@ class XUIClient:
         resp = await self.clients_end.delete_client_by_email(email, inbound_id)
         return resp
 
-    async def delete_client_by_tgid_all_inbounds(self, telegram_id: int) -> List[Response]:
+    async def revoke_client_by_tgid_all_inbounds(self, telegram_id: int) -> List[Response]:
         """Delete a client from all production inbounds by Telegram ID.
 
         Args:
@@ -513,7 +528,6 @@ 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")
+        logging.info("Clients of of tgid %s deleted", telegram_id)
 
         return responses
-

{python_3xui-0.0.6 → python_3xui-0.0.8}/python_3xui/base_model.py

@@ -27,9 +27,9 @@ class BaseModel(pydantic.BaseModel):
 
     model_config = pydantic.ConfigDict(ignored_types=(cached_property, ))
 
-    def model_post_init(self, context: Any, /) -> None:
-        #print(f"Model {self.__class__}, {self} initialized")
-        ...
+    # def model_post_init(self, context: Any, /) -> None:
+    #     #print(f"Model {self.__class__}, {self} initialized")
+    #     ...
 
 
     @classmethod
@@ -83,7 +83,7 @@ class BaseModel(pydantic.BaseModel):
             inbounds = await Inbound.from_response(response, client, list)
         """
         json_resp: util.JsonType = response.json()
-        valid = util.check_xui_response_validity(json_resp)
+        valid = util.check_xui_response(json_resp)
         if valid == "OK":
             obj = json_resp["obj"]
             if expect is list:
@@ -91,4 +91,4 @@ class BaseModel(pydantic.BaseModel):
             if expect is dict:
                 return cls(**obj, client=client)
         else:
-            raise ValueError(f"Invalid 3X-UI response, code {valid}")
+            raise ValueError(f"Invalid 3X-UI response, code {valid}. Don't use from_response on failed requests.")

{python_3xui-0.0.6 → python_3xui-0.0.8}/python_3xui/endpoints.py

@@ -1,4 +1,5 @@
 import json
+import logging
 from datetime import datetime, UTC
 from typing import Generic, Literal, List, Dict
 
@@ -232,17 +233,9 @@ class Clients(BaseEndpoint):
         else:
             raise TypeError
         # send request
-        print(type(final))
-        print(final)
         data = final.model_dump(by_alias=True)
-        print(type(data))
-        print(json.dumps(data))
-        print(f"{self._url}{endpoint}")
         resp = await self.client.safe_post(f"{self._url}{endpoint}", data=data)
-
         #YOU NEED TO PASS SETTINGS AS A STRING, NOT AS A DICT, YOU FUCKING DUMBASS!
-        print(resp)
-        print(resp.json())
         return resp
 
     async def _request_update_client(self, client: models.InboundClients | models.SingleInboundClient,

{python_3xui-0.0.6 → python_3xui-0.0.8}/python_3xui/models.py

@@ -1,13 +1,12 @@
 import json
-from types import NoneType
 from datetime import datetime, UTC
-from typing import Union, Optional, TypeAlias, Any, Annotated, Literal, List, Dict, ClassVar
+from typing import Union, TypeAlias, Any, Annotated, Literal, List, Dict, ClassVar
 
-from pydantic import field_validator, Field, field_serializer, AfterValidator
 import pydantic
+from pydantic import field_validator, Field, field_serializer
 
 from . import base_model
-from .util import JsonType, auto_s_to_ms_timestamp, s_to_ms_timestamp, ms_to_s_timestamp, auto_ms_to_s_timestamp
+from .util import JsonType, auto_s_to_ms_timestamp, auto_ms_to_s_timestamp
 
 timestamp_seconds: TypeAlias = int
 ip_address: TypeAlias = str

{python_3xui-0.0.6 → python_3xui-0.0.8}/python_3xui/util.py

@@ -14,7 +14,7 @@ import logging
 import random
 import re
 from datetime import UTC, datetime, tzinfo
-from typing import TypeAlias, Union, Dict, Any, List
+from typing import TypeAlias, Union, Dict, Any, List, dataclass_transform
 
 import httpx
 
@@ -180,7 +180,7 @@ def generate_new_subscription(length: int = 16):
     return s
 
 
-async def check_xui_response_validity(response: JsonType | httpx.Response) -> str:
+async def check_xui_response(response: JsonType | httpx.Response) -> str:
     """Validate a 3X-UI API response.
 
     Checks if the response follows the expected 3X-UI API format with
@@ -193,17 +193,18 @@ async def check_xui_response_validity(response: JsonType | httpx.Response) -> st
         str: One of three status strings:
             - "OK": Response is valid and successful.
             - "DB_LOCKED": Database is locked, operation should be retried.
-            - "ERROR": Operation was unsuccessful.
+            - "FAIL": Operation was unsuccessful.
 
     Raises:
         RuntimeError: If the response doesn't match the expected 3X-UI format.
 
     Examples:
-        >>> check_xui_response_validity({"success": True, "msg": "", "obj": {}})
+        >>> check_xui_response({"success": True, "msg": "", "obj": {}})
         'OK'
-        >>> check_xui_response_validity({"success": False, "msg": "database is locked", "obj": None})
+        >>> check_xui_response({"success": False, "msg": "database is locked", "obj": None})
         'DB_LOCKED'
     """
+    #TODO: this is trying to do too much. We'll just check if DB is locked, and then use case-to-case basis to see how they are.
     if isinstance(response, httpx.Response):
         json_resp = response.json()
     else:
@@ -218,11 +219,9 @@ async def check_xui_response_validity(response: JsonType | httpx.Response) -> st
             if "database" in msg.lower() and "locked" in msg.lower() and not success:
                 logging.log(logging.WARNING, "Database is locked, retrying...")
                 return "DB_LOCKED"
-            print(f"Unsuccessful operation! Message: {json_resp["msg"]}")
-            return "ERROR"
+            return "FAIL"
     raise RuntimeError("Validator got something very unexpected (Please don't shove responses with non-20X status codes in here...)")
 
-
 def get_days_until_expiry(expiry_time: int) -> float:
     """Calculate the number of days until a client expires.
 
@@ -231,16 +230,16 @@ def get_days_until_expiry(expiry_time: int) -> float:
 
     Returns:
         Number of days until expiry. Returns negative value if already expired.
-        Returns a very large number (infinity) if expiry_time is 0 (no expiry).
+        Returns a very 0 if expiry_time is 0 (no expiry).
 
     Examples:
-        >>> get_days_until_expiry(int(datetime.now(UTC).timestamp_seconds()) + 86400)  # 1 day from now
+        >>> get_days_until_expiry(int(datetime.now(UTC).timestamp()) + 86400)  # 1 day from now
         1.0
         >>> get_days_until_expiry(0)  # No expiry
         inf
     """
     if expiry_time == 0:
-        return float('inf')
+        return 0
 
     current_timestamp = datetime.now(UTC).timestamp()
     seconds_remaining = expiry_time - current_timestamp

{python_3xui-0.0.6 → python_3xui-0.0.8}/tests/conftest.py

@@ -36,8 +36,9 @@ async def xui_client() -> XUIClient:
     base_path = os.getenv("BASE_PATH")
     username = os.getenv("XUI_USERNAME")
     password = os.getenv("XUI_PASSWORD")
+    two_fac = os.getenv("XUI_2FA_SECRET")
 
-    if not all([base_url, port_str, base_path, username, password]):
+    if not all([base_url, port_str, base_path, username, password, two_fac]):
         pytest.skip("Environment variables for XUIClient not configured (.env file required)")
 
     try:
@@ -48,7 +49,7 @@ async def xui_client() -> XUIClient:
     # Reset singleton for clean test state
     XUIClient._instance = None
 
-    client = XUIClient(base_url, port, base_path, username=username, password=password)
+    client = XUIClient(base_url, port, base_path, username=username, password=password, two_fac_code=two_fac, custom_prod_string="test3")
     client.connect()
 
     # Authenticate

{python_3xui-0.0.6 → python_3xui-0.0.8}/tests/test_non_idempotent_endpoints_clients.py

@@ -36,7 +36,7 @@ class TestClientsEndpoint:
         # Try to find a suitable inbound (preferably with PROD_STRING in remark)
         test_inbound = None
         for inbound in all_inbounds:
-            if xui_client.PROD_STRING in inbound.remark.lower():
+            if xui_client.PROD_STRING.search(inbound.remark.lower()):
                 test_inbound = inbound
                 break
 
@@ -242,7 +242,7 @@ class TestClientsEndpoint:
         print(f"Added test client with email: {test_email}, UUID: {test_uuid} to {len(production_inbounds)} production inbounds")
 
         # Now delete the client from all production inbounds by Telegram ID
-        responses = await xui_client.delete_client_by_tgid_all_inbounds(TEST_TELEGRAM_ID)
+        responses = await xui_client.revoke_client_by_tgid_all_inbounds(TEST_TELEGRAM_ID)
 
         # Validate responses
         assert len(responses) == len(production_inbounds)

{python_3xui-0.0.6 → python_3xui-0.0.8}/tests/test_non_idempotent_endpoints_inbounds.py

@@ -61,7 +61,8 @@ class TestInboundsEndpoint:
         )
 
         # Create the inbound
-        response = await xui_client.inbounds_end.addigga
+        pytest.skip("Not implemented yet")
+        response = await xui_client.inbounds_end.add_inbound()
 
         # Validate response
         assert response.status_code == 200