fpx-engine 0.7.6__tar.gz → 0.7.7__tar.gz

{fpx_engine-0.7.6 → fpx_engine-0.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fpx-engine
-Version: 0.7.6
+Version: 0.7.7
 Summary: Автоматизация работы с FunPay
 Author-email: Be My Code <gettofarmila@gmail.com>
 Project-URL: Homepage, https://github.com/bymyforge/fpx
@@ -36,17 +36,20 @@ Dynamic: license-file
 
 <p align="center">
   <a href="https://github.com/bymyforge/fpx" target="_blank">
-    <img src="https://img.shields.io/badge/GitHub-181717?style=for-the-badge&logo=github&logoColor=white" alt="GitHub">
-  </a>
-  <a href="https://fpx.readthedocs.io/ru/latest/" target="_blank">
-    <img src="https://img.shields.io/badge/Документация-00b0ff?style=for-the-badge&logo=read-the-docs&logoColor=white" alt="Read the Docs">
-  </a>
-  <a href="https://t.me/fpx_engine" target="_blank">
-    <img src="https://img.shields.io/badge/Телеграм_Чат-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Telegram">
-  </a>
-  <a href="https://pypi.org/project/fpx-engine/" target="_blank">
-    <img src="https://img.shields.io/badge/PyPI-3775A9?style=for-the-badge&logo=pypi&logoColor=white" alt="PyPI">
-  </a>
+<img src="https://img.shields.io/badge/GitHub-temp_inactive-lightgrey?style=for-the-badge&logo=github&logoColor=white" alt="GitHub (temp inactive)">
+</a>
+<a href="https://gitlab.com/funpayx/fpx" target="_blank">
+<img src="https://img.shields.io/badge/GitLab-FC6D26?style=for-the-badge&logo=gitlab&logoColor=white" alt="GitLab">
+</a>
+<a href="https://fpx.readthedocs.io/ru/latest/" target="_blank">
+<img src="https://img.shields.io/badge/Документация-00b0ff?style=for-the-badge&logo=read-the-docs&logoColor=white" alt="Read the Docs">
+</a>
+<a href="https://t.me/fpx_engine" target="_blank">
+<img src="https://img.shields.io/badge/Телеграм_Чат-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Телеграм Чат">
+</a>
+<a href="https://pypi.org/project/fpx-engine/" target="_blank">
+<img src="https://img.shields.io/badge/PyPI-3775A9?style=for-the-badge&logo=pypi&logoColor=white" alt="PyPI">
+</a>
 </p>
 
 ---

{fpx_engine-0.7.6 → fpx_engine-0.7.7}/README.md

@@ -11,17 +11,20 @@
 
 <p align="center">
   <a href="https://github.com/bymyforge/fpx" target="_blank">
-    <img src="https://img.shields.io/badge/GitHub-181717?style=for-the-badge&logo=github&logoColor=white" alt="GitHub">
-  </a>
-  <a href="https://fpx.readthedocs.io/ru/latest/" target="_blank">
-    <img src="https://img.shields.io/badge/Документация-00b0ff?style=for-the-badge&logo=read-the-docs&logoColor=white" alt="Read the Docs">
-  </a>
-  <a href="https://t.me/fpx_engine" target="_blank">
-    <img src="https://img.shields.io/badge/Телеграм_Чат-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Telegram">
-  </a>
-  <a href="https://pypi.org/project/fpx-engine/" target="_blank">
-    <img src="https://img.shields.io/badge/PyPI-3775A9?style=for-the-badge&logo=pypi&logoColor=white" alt="PyPI">
-  </a>
+<img src="https://img.shields.io/badge/GitHub-temp_inactive-lightgrey?style=for-the-badge&logo=github&logoColor=white" alt="GitHub (temp inactive)">
+</a>
+<a href="https://gitlab.com/funpayx/fpx" target="_blank">
+<img src="https://img.shields.io/badge/GitLab-FC6D26?style=for-the-badge&logo=gitlab&logoColor=white" alt="GitLab">
+</a>
+<a href="https://fpx.readthedocs.io/ru/latest/" target="_blank">
+<img src="https://img.shields.io/badge/Документация-00b0ff?style=for-the-badge&logo=read-the-docs&logoColor=white" alt="Read the Docs">
+</a>
+<a href="https://t.me/fpx_engine" target="_blank">
+<img src="https://img.shields.io/badge/Телеграм_Чат-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Телеграм Чат">
+</a>
+<a href="https://pypi.org/project/fpx-engine/" target="_blank">
+<img src="https://img.shields.io/badge/PyPI-3775A9?style=for-the-badge&logo=pypi&logoColor=white" alt="PyPI">
+</a>
 </p>
 
 ---

{fpx_engine-0.7.6 → fpx_engine-0.7.7}/fpx/_api/_client.py

@@ -1,4 +1,5 @@
 import json
+import secrets
 
 
 class FunPayClient:
@@ -6,6 +7,15 @@ class FunPayClient:
         self._account = account
         self.client = http_client
 
+    async def refresh_session_cookies(self) -> dict:
+        objects = [{"type": "chat_counter", "id": "0", "tag": secrets.token_hex(4), "data": False}]
+        payload = {"objects": json.dumps(objects)}
+        headers = {"X-Requested-With": "XMLHttpRequest"}
+
+        r = await self.client.request("POST", "/runner/", data=payload, headers=headers)
+
+        return r
+
     async def get_chats_page(self) -> str:
         r = await self._account._request_engine.execute("GET", "/chat/")
         return r.text

{fpx_engine-0.7.6 → fpx_engine-0.7.7}/fpx/classes/account/account.py

@@ -1,3 +1,5 @@
+import asyncio
+import re
 from dataclasses import dataclass, field
 from typing import Optional
 
@@ -14,6 +16,7 @@ from fpx.classes.account.subclasses.order import OrderManager
 from fpx.classes.account.subclasses.profile import ProfileManager
 from fpx.classes.account.subclasses.review import ReviewManager
 from fpx.middlewares._request_engine import RequestEngine
+from fpx.utils.errors import FpxRefreshCookieError
 
 
 @dataclass
@@ -62,3 +65,36 @@ class Account:
 
         result = await self._client.upload_image(image_data)
         return result["fileId"]
+
+    async def _refresh_cookies(self):
+        cookies = await self._client.refresh_session_cookies()
+        headers = cookies.headers
+        MAX_AGE_RE = re.compile(r"max-age=(\d+)", re.IGNORECASE)
+        for raw_cookie in headers.get_list("set-cookie"):
+            if raw_cookie.startswith("golden_seal="):
+                match = MAX_AGE_RE.search(raw_cookie)
+                return int(match.group(1)) if match else None
+        return None
+
+    async def refresh_cookies_cycle(self):
+        """
+        Обновление gseal и PHPSESSID.
+        Запускает цикл обновления куков.
+        Сам внутри обновляет куки каждую неделю.
+
+        Raises:
+            FpxRefreshCookieError: Ошибка обновления куков
+        """
+        while True:
+            ex_time = None
+            atts = 0
+            while ex_time is None:
+                try:
+                    ex_time = await self._refresh_cookies()
+                except Exception as e:
+                    atts += 1
+                    if atts > 3:
+                        raise FpxRefreshCookieError(f"Ошибка обновления куков: {e}")
+                if ex_time is None:
+                    await asyncio.sleep(15)
+            await asyncio.sleep(ex_time)

{fpx_engine-0.7.6 → fpx_engine-0.7.7}/fpx/classes/account/subclasses/profile.py

@@ -157,6 +157,8 @@ class ProfileManager:
             html = await self._account._client.get_finance_page()
             step = "парсинг данных"
             balance = self._account._parser.parse_finanses(html)
+        except fpx_err.FpxAuthError:
+            raise
         except Exception as e:
             raise fpx_err.FpxGetProfileError(f"При сборе баланса, выполняя {step} произошла ошибка: {e}")
         return balance

{fpx_engine-0.7.6 → fpx_engine-0.7.7}/fpx/main.py

@@ -1,3 +1,4 @@
+import asyncio
 import re
 
 import httpx
@@ -15,6 +16,11 @@ class FunPayTools:
     def __init__(
         self, gkey: str, gseal: str | None = None, storage: BaseStorage | None = None, proxy=None, http_client=None
     ):
+        if gseal or gseal is None:
+            print(
+                "ВАЖНО: С выхода релиза 0.8.0 аргумент gseal будет удалён, теперь он подставляется "
+                "автоматически, просьба не передавать аргумент gseal во избежание проблем."
+            )
         if not gkey:
             raise FpxAuthError("gkey и gseal не могут быть None.")
         if not GKEY_PATTERN.match(gkey):
@@ -22,7 +28,9 @@ class FunPayTools:
         if gseal:
             if not GSEAL_PATTERN.match(gseal):
                 raise FpxAuthError("Неверный формат gseal, перепроверь его.")
-        self._cookies = {"golden_key": gkey, "golden_seal": gseal, "locale": "ru"}
+        self._cookies = {"golden_key": gkey, "locale": "ru"}
+        if gseal:
+            self._cookies["golden_seal"] = gseal
         self._headers = {
             "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0",
             "Accept-Language": "ru-RU,ru;q=0.9",
@@ -58,14 +66,28 @@ class FunPayTools:
         self.account._request_engine.runner = self.runner
         self.storage = storage or MemoryStorage()
         self.runner.storage = self.storage
+        self._refresh_task: asyncio.Task | None = None
+
+        try:
+            loop = asyncio.get_running_loop()
+            self._refresh_task = loop.create_task(self.account.refresh_cookies_cycle())
+        except RuntimeError:
+            pass
 
     async def __aenter__(self):
+        self._refresh_task = asyncio.create_task(self.account.refresh_cookies_cycle())
         return self
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         await self.shutdown()
 
     async def shutdown(self):
+        if self._refresh_task and not self._refresh_task.done():
+            self._refresh_task.cancel()
+            try:
+                await self._refresh_task
+            except asyncio.CancelledError:
+                pass
         if hasattr(self, "runner") and self.runner.is_running:
             self.runner.is_running = False
         if self._client and not self._client.is_closed:

{fpx_engine-0.7.6 → fpx_engine-0.7.7}/fpx/middlewares/_request_engine.py

@@ -15,8 +15,6 @@ class RequestEngine:
         attempts = 3
         backoff = 1.5  # множитель времени ожидания
         if method.upper() in ("POST", "PUT", "DELETE"):
-            if "golden_seal" in self._client.cookies:
-                raise fpx_err.FpxAbsentGoldenSeal()
             if "data" not in kwargs:
                 kwargs["data"] = {}
             if "headers" not in kwargs:
@@ -48,6 +46,8 @@ class RequestEngine:
                     sleep_time = backoff ** float(attempt)
                     await asyncio.sleep(sleep_time)
                     continue
+                if response.url == "https://funpay.com/account/login":
+                    raise fpx_err.FpxAuthError("Неверный gkey, обнови свои куки.")
                 return response
             except httpx.ReadTimeout as e:
                 if method.upper() == "GET":

{fpx_engine-0.7.6 → fpx_engine-0.7.7}/fpx/utils/errors.py

@@ -42,6 +42,13 @@ class FpxHandlerError(FpxError):
 # аккаунт
 
 
+class FpxRefreshCookieError(FpxAccountError):
+    """Ошибка обновления куков"""
+
+    def __init__(self, message="Ошибка обновления куков"):
+        super().__init__(message)
+
+
 class FpxAbsentGoldenSeal(FpxAccountError):
     """Для POST запроса обязателен gseal."""
 

{fpx_engine-0.7.6 → fpx_engine-0.7.7}/fpx_engine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fpx-engine
-Version: 0.7.6
+Version: 0.7.7
 Summary: Автоматизация работы с FunPay
 Author-email: Be My Code <gettofarmila@gmail.com>
 Project-URL: Homepage, https://github.com/bymyforge/fpx
@@ -36,17 +36,20 @@ Dynamic: license-file
 
 <p align="center">
   <a href="https://github.com/bymyforge/fpx" target="_blank">
-    <img src="https://img.shields.io/badge/GitHub-181717?style=for-the-badge&logo=github&logoColor=white" alt="GitHub">
-  </a>
-  <a href="https://fpx.readthedocs.io/ru/latest/" target="_blank">
-    <img src="https://img.shields.io/badge/Документация-00b0ff?style=for-the-badge&logo=read-the-docs&logoColor=white" alt="Read the Docs">
-  </a>
-  <a href="https://t.me/fpx_engine" target="_blank">
-    <img src="https://img.shields.io/badge/Телеграм_Чат-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Telegram">
-  </a>
-  <a href="https://pypi.org/project/fpx-engine/" target="_blank">
-    <img src="https://img.shields.io/badge/PyPI-3775A9?style=for-the-badge&logo=pypi&logoColor=white" alt="PyPI">
-  </a>
+<img src="https://img.shields.io/badge/GitHub-temp_inactive-lightgrey?style=for-the-badge&logo=github&logoColor=white" alt="GitHub (temp inactive)">
+</a>
+<a href="https://gitlab.com/funpayx/fpx" target="_blank">
+<img src="https://img.shields.io/badge/GitLab-FC6D26?style=for-the-badge&logo=gitlab&logoColor=white" alt="GitLab">
+</a>
+<a href="https://fpx.readthedocs.io/ru/latest/" target="_blank">
+<img src="https://img.shields.io/badge/Документация-00b0ff?style=for-the-badge&logo=read-the-docs&logoColor=white" alt="Read the Docs">
+</a>
+<a href="https://t.me/fpx_engine" target="_blank">
+<img src="https://img.shields.io/badge/Телеграм_Чат-26A5E4?style=for-the-badge&logo=telegram&logoColor=white" alt="Телеграм Чат">
+</a>
+<a href="https://pypi.org/project/fpx-engine/" target="_blank">
+<img src="https://img.shields.io/badge/PyPI-3775A9?style=for-the-badge&logo=pypi&logoColor=white" alt="PyPI">
+</a>
 </p>
 
 ---

{fpx_engine-0.7.6 → fpx_engine-0.7.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fpx-engine"
-version = "0.7.6"
+version = "0.7.7"
 authors = [
   { name="Be My Code", email="gettofarmila@gmail.com" },
 ]