xync-client 0.0.44.dev0__tar.gz → 0.0.45.dev0__tar.gz

{xync_client-0.0.44.dev0/xync_client.egg-info → xync_client-0.0.45.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.44.dev0
+Version: 0.0.45.dev0
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client

{xync_client-0.0.44.dev0 → xync_client-0.0.45.dev0}/xync_client/BitGet/etype/ad.py

@@ -21,9 +21,9 @@ class PaymethodInfo(BaseModel):
 
 
 class Ad(BaseAd):
-    exid: int | str | None = Field(alias="id")
+    exid: int | str | None = Field(alias="adNo")
     adEditorTime: str
-    adNo: str
+    # adNo: str
     adType: int
     advImages: List[str]
     advertiseIsEvent: int

{xync_client-0.0.44.dev0 → xync_client-0.0.45.dev0}/xync_client/BitGet/ex.py

@@ -1,7 +1,4 @@
-import json
-import subprocess
 from asyncio import run
-from os.path import dirname
 
 from x_model import init_db
 from xync_schema import models
@@ -35,6 +32,7 @@ class ExClient(BaseExClient):
     _data: dict = {}
 
     headers = {
+        "content-type": "application/json;charset=UTF-8",
         "referer": "https://www.bitget.com/ru/p2p-trade",
     }
 
@@ -43,7 +41,7 @@ class ExClient(BaseExClient):
             resp = await self.session.post(
                 "/v1/p2p/pub/currency/queryAllCoinAndFiat",
                 json={"languageType": 6},
-                headers={"referer": "https://www.bitget.com/ru/p2p-trade"},
+                headers=self.headers,
             )
             res = await resp.json()
             self._data = res["data"]
@@ -99,20 +97,10 @@ class ExClient(BaseExClient):
             "paymethodId": pm_exids or "",
             "languageType": 6,
         }
-        request_json = json.dumps(request_data, separators=(",", ":"))
-        p = subprocess.Popen(
-            [
-                "node",
-                dirname(__file__) + "/req.mjs",
-                "pub/adv/queryAdvList",
-                request_json,
-                json.dumps(self.headers, separators=(",", ":")),
-            ],
-            stdout=subprocess.PIPE,
-        )
-        out = p.stdout.read().decode()
-        ads = json.loads(out)
-        return [ad.Ad(id=_ad["encryptUserId"], **_ad) for _ad in ads["dataList"]]
+        resp = await self.session.post("/v1/p2p/pub/adv/queryAdvList", json=request_data, headers=self.headers)
+        res = await resp.json()
+        ads = res["data"]["dataList"]
+        return [ad.Ad(**_ad) for _ad in ads]
 
     async def cur_pms_map(self) -> dict[str, list[int]]:
         cur_pms_map: list[dict] = (await self._coin_cur_pms())["fiatInfoRespList"]
@@ -123,7 +111,7 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await Ex.get(name="BitGet")
     cl = ExClient(bg)
-    # _ads = await cl.ads("ETH", "PHP", False)
+    _ads = await cl.ads("USDT", "IDR", False)
     await cl.curs()
     await cl.coins()
     await cl.pms()

{xync_client-0.0.44.dev0 → xync_client-0.0.45.dev0/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.44.dev0
+Version: 0.0.45.dev0
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client