xync-client 0.0.80.dev11__tar.gz → 0.0.80.dev14__tar.gz

{xync_client-0.0.80.dev11/xync_client.egg-info → xync_client-0.0.80.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.80.dev11
+Version: 0.0.80.dev14
 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.80.dev11 → xync_client-0.0.80.dev14}/xync_client/Abc/InAgent.py

@@ -1,13 +1,14 @@
 from abc import abstractmethod
 
+from pyro_client.client.file import FileClient
 from xync_schema.models import Actor
 
 from xync_client.Abc.Agent import BaseAgentClient
 
 
 class BaseInAgentClient:
-    def __init__(self, actor: Actor):
-        self.agent_client: BaseAgentClient = actor.client()
+    def __init__(self, actor: Actor, bot: FileClient):
+        self.agent_client: BaseAgentClient = actor.client(bot)
 
     @abstractmethod
     async def start_listen(self) -> bool: ...

xync_client-0.0.80.dev14/xync_client/Bybit/InAgent.py

@@ -0,0 +1,111 @@
+import json
+from asyncio import run
+
+import websockets
+from pyro_client.client.file import FileClient
+from xync_client.Bybit.etype.order import StatusChange, CountDown, SellerCancelChange, Read, Receive, Status
+
+from xync_client.loader import TOKEN
+from xync_schema import models
+
+from xync_client.Abc.InAgent import BaseInAgentClient
+from xync_client.Bybit.agent import AgentClient
+
+
+class InAgentClient(BaseInAgentClient):
+    agent_client: AgentClient
+
+    async def start_listen(self):
+        t = await self.agent_client.ott()
+        ts = int(float(t["time_now"]) * 1000)
+        await self.ws_prv(self.agent_client.actor.agent.auth["deviceId"], t["result"], ts)
+
+    # 3N: [T] - Уведомление об одобрении запроса на сделку
+    async def request_accepted_notify(self) -> int: ...  # id
+
+    async def ws_prv(self, did: str, tok: str, ts: int):
+        u = f"wss://ws2.bybit.com/private?appid=bybit&os=web&deviceid={did}&timestamp={ts}"
+        async with websockets.connect(u) as websocket:
+            auth_msg = json.dumps({"req_id": did, "op": "login", "args": [tok]})
+            await websocket.send(auth_msg)
+
+            sub_msg = json.dumps({"op": "subscribe", "args": ["FIAT_OTC_TOPIC", "FIAT_OTC_ONLINE_TOPIC"]})
+            await websocket.send(sub_msg)
+            sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"SUPER_DEAL"}']})
+            await websocket.send(sub_msg)
+            sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"OTC_ORDER_STATUS"}']})
+            await websocket.send(sub_msg)
+            sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"WEB_THREE_SELL"}']})
+            await websocket.send(sub_msg)
+            sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"APPEALED_CHANGE"}']})
+            await websocket.send(sub_msg)
+
+            sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.cashier.order"]})
+            await websocket.send(sub_msg)
+            sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.cashier.order-eftd-complete-privilege-event"]})
+            await websocket.send(sub_msg)
+            sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.cashier.order-savings-product-event"]})
+            await websocket.send(sub_msg)
+            sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.deal-core.order-savings-complete-event"]})
+            await websocket.send(sub_msg)
+
+            sub_msg = json.dumps({"op": "subscribe", "args": ["FIAT_OTC_TOPIC", "FIAT_OTC_ONLINE_TOPIC"]})
+            await websocket.send(sub_msg)
+
+            while resp := await websocket.recv():
+                if data := json.loads(resp):
+                    match data.get("topic"):
+                        case "OTC_ORDER_STATUS":
+                            match data["type"]:
+                                case "STATUS_CHANGE":
+                                    upd = StatusChange.model_validate(data["data"])
+                                    if upd.status == Status.ws:
+                                        ...
+                                case "COUNT_DOWN":
+                                    upd = CountDown.model_validate(data["data"])
+                                case _:
+                                    self.listen(data)
+                        case "OTC_USER_CHAT_MSG":
+                            match data["type"]:
+                                case "RECEIVE":
+                                    upd = Receive.model_validate(data["data"])
+                                case "READ":
+                                    upd = Read.model_validate(data["data"])
+                                case "CLEAR":
+                                    pass
+                                case _:
+                                    self.listen(data)
+                        case "OTC_USER_CHAT_MSG_V2":
+                            pass
+                        case "SELLER_CANCEL_CHANGE":
+                            upd = SellerCancelChange.model_validate(data["data"])
+                        case None:
+                            if not data.get("success"):
+                                self.listen(data)
+                        case _:
+                            self.listen(data)
+
+    @staticmethod
+    def listen(data: dict):
+        print(data)
+
+
+async def main():
+    from x_model import init_db
+    from xync_client.loader import TORM
+
+    _ = await init_db(TORM, True)
+    # pbot = PyroClient(bot)
+    # await pbot.app.start()
+    # await pbot.app.create_channel("tc")
+    # await pbot.app.stop()
+
+    actor = await models.Actor.filter(ex_id=9, agent__auth__isnull=False).prefetch_related("ex", "agent").first()
+    async with FileClient(TOKEN) as b:
+        cl: InAgentClient = actor.in_client(b)
+        _ = await cl.start_listen()
+        await cl.agent_client.close()
+
+
+if __name__ == "__main__":
+    run(main())

{xync_client-0.0.80.dev11 → xync_client-0.0.80.dev14}/xync_client/Bybit/agent.py

@@ -25,7 +25,7 @@ from xync_schema.models import Actor, Cond, CondSim, Pmcur, PairSide
 
 from xync_client.Abc.Agent import BaseAgentClient
 from xync_client.Abc.xtype import BaseOrderReq, FlatDict
-from xync_client.Bybit.etype.ad import AdPostRequest, AdUpdateRequest, AdDeleteRequest, Ad
+from xync_client.Bybit.etype.ad import AdPostRequest, AdUpdateRequest, AdDeleteRequest, Ad, AdStatus
 from xync_client.Bybit.etype.cred import CredEpyd
 from xync_client.Bybit.etype.order import (
     OrderRequest,
@@ -35,7 +35,7 @@ from xync_client.Bybit.etype.order import (
     OrderItem,
     OrderFull,
     Message,
-    Statuses,
+    Status,
 )
 from xync_client.loader import TORM, TOKEN
 
@@ -44,11 +44,6 @@ class NoMakerException(Exception):
     pass
 
 
-class AdsStatus(IntEnum):
-    REST = 0
-    WORKING = 1
-
-
 class AgentClient(BaseAgentClient):  # Bybit client
     host = "api2.bybit.com"
     headers = {"cookie": ";"}  # rewrite token for public methods
@@ -194,8 +189,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
         delete = await self._post("/fiat/otc/user/payment/new_delete", data)
         return delete
 
-    async def switch_ads(self, new_status: AdsStatus) -> dict:
-        data = {"workStatus": new_status.name}
+    async def switch_ads(self, new_status: AdStatus) -> dict:
+        data = {"workStatus": new_status.name}  # todo: переделать на апи, там status 0 -> 1
         res = await self._post("/fiat/otc/maker/work-config/switch", data)
         return res
 
@@ -219,9 +214,14 @@ class AgentClient(BaseAgentClient):  # Bybit client
         ads = [ad for ad in list_ads if set(ad["payments"]) - {"5", "51"}]
         return float(ads[0]["price"])
 
-    def get_user_ads(self, active: bool = True) -> list:
-        uo = self._post("/fiat/otc/item/personal/list", {"page": "1", "size": "10", "status": "2" if active else "0"})
-        return uo["result"]["items"]
+    def my_ads(self, active: bool = True, page: int = 1) -> list[Ad]:
+        res = self.api.get_ads_list(size="30", page=str(page), status=AdStatus.active if active else AdStatus.sold_out)[
+            "result"
+        ]
+        ads = [Ad.model_validate(ad) for ad in res["items"]]
+        if res["count"] > 30 * page:
+            ads.extend(self.my_ads(active, page + 1))
+        return ads
 
     def get_security_token_create(self):
         data = self._post("/fiat/otc/item/create", self.create_ad_body)
@@ -479,10 +479,10 @@ class AgentClient(BaseAgentClient):  # Bybit client
             order_db, _ = await models.Order.update_or_create(
                 {
                     "amount": o.amount,
-                    "status": OrderStatus[Statuses(o.status).name],
+                    "status": OrderStatus[Status(o.status).name],
                     "created_at": int(o.createDate[:-3]),
                     "payed_at": order.transferDate != "0" and int(order.transferDate[:-3]) or None,
-                    "confirmed_at": Statuses(o.status) == Statuses.completed and int(order.updateDate[:-3]) or None,
+                    "confirmed_at": Status(o.status) == Status.completed and int(order.updateDate[:-3]) or None,
                     "appealed_at": o.status == 30 and int(order.updateDate[:-3]) or None,
                     "cred_id": ecredex.paymentType and credex.cred_id or None,
                     "taker": taker,
@@ -960,10 +960,6 @@ def step(mad, cad) -> float:
     )
 
 
-def listen(data: dict):
-    print(data)
-
-
 class ExcCode(IntEnum):
     FixPriceLimit = 912120022
     RareLimit = 912120050
@@ -983,6 +979,7 @@ async def main():
         b: FileClient
         b.add_handler(MessageHandler(cond_start_handler, command("cond")))
         cl: AgentClient = actor.client(b)
+        cl.my_ads(False)
         # await cl.ex_client.set_pmcurexs(cookies=actor.agent.auth["cookies"])  # 617 -> 639
         # await cl.set_creds()
         # await cl.ex_client.set_pairs()
@@ -1023,8 +1020,8 @@ async def main():
             # cl.get_api_orders(),  # 10, 1738357200000, 1742504399999
             cl.battle(usdt, rub, False, ["volet"], 80.88),  # гонка в стакане покупки - мы продаем
             cl.battle(usdt, rub, True, ["volet"], 80.47),  # гонка в стакане продажи - мы покупаем
-            cl.battle(usdt, rub, False, ["payeer"], 81.3),  # гонка в стакане покупки - мы продаем
-            cl.battle(usdt, rub, True, ["payeer"], 80.46),  # гонка в стакане продажи - мы покупаем
+            cl.battle(usdt, rub, False, ["payeer"], 81.49),  # гонка в стакане покупки - мы продаем
+            cl.battle(usdt, rub, True, ["payeer"], 80.7),  # гонка в стакане продажи - мы покупаем
             cl.battle(eth, rub, False, ["volet"], 300_000),
             cl.battle(eth, rub, True, ["volet"], 296_000),
             cl.battle(eth, rub, False, ["payeer"], 300_000),

{xync_client-0.0.80.dev11 → xync_client-0.0.80.dev14}/xync_client/Bybit/etype/ad.py

@@ -1,3 +1,4 @@
+from enum import StrEnum
 from typing import List, Optional, Any, Literal
 from pydantic import BaseModel
 from xync_schema.xtype import BaseAd
@@ -5,6 +6,11 @@ from xync_schema.xtype import BaseAd
 from xync_client.Abc.xtype import BaseAdUpdate
 
 
+class AdStatus(StrEnum):
+    sold_out = "1"
+    active = "2"
+
+
 class AdsReq(BaseModel):
     tokenId: str
     currencyId: str

{xync_client-0.0.80.dev11 → xync_client-0.0.80.dev14}/xync_client/Bybit/etype/order.py

@@ -7,7 +7,14 @@ from pydantic import BaseModel
 from xync_client.Bybit.etype.cred import CredEpyd
 
 
-class Statuses(IntEnum):
+class Topic(IntEnum):
+    OTC_USER_CHAT_MSG = 1
+    OTC_ORDER_STATUS_V2 = 2
+    OTC_ORDER_STATUS = 3
+    SELLER_CANCEL_CHANGE = 4
+
+
+class Status(IntEnum):
     deleted = 40  # order canceled
     created = 10  # waiting for buyer to pay
     appealable = 20  # waiting for seller to release
@@ -21,6 +28,7 @@ class Statuses(IntEnum):
     request_canceled = 40
     requested = 10
     seller_appeal_disputed_by_buyer = 30
+    ws = 1
 
 
 class OrderRequest(BaseModel):
@@ -273,3 +281,52 @@ class Message(BaseModel):
     read: Literal[0, 1]
     fileName: str
     onlyForCustomer: int
+
+
+class _BaseChange(BaseModel):
+    userId: int
+    makerUserId: int
+    id: str
+    status: Status
+    createDate: int
+    side: int
+    appealedTimes: int
+    totalAppealedTimes: int
+
+
+class StatusChange(_BaseChange):
+    appealVersion: int = None
+
+
+class CountDown(_BaseChange):
+    cancelType: Literal["ACTIVE", "TIMEOUT", ""]
+
+
+class _BaseMsg(BaseModel):
+    userId: int
+    orderId: str
+    message: str = None
+    msgUuid: str
+    msgUuId: str
+    createDate: str
+    contentType: str
+    roleType: Literal["user", "sys", "alarm"]
+
+
+class Receive(_BaseMsg):
+    id: int
+    msgCode: int
+    onlyForCustomer: int
+
+
+class Read(_BaseMsg):
+    readAmount: int
+    read: Literal["111", "101"]
+    orderStatus: Status
+
+
+class SellerCancelChange(BaseModel):
+    userId: int
+    makerUserId: int
+    id: str
+    createDate: int

xync_client-0.0.80.dev14/xync_client/Bybit/ws.py

@@ -0,0 +1,34 @@
+import hmac
+import json
+import websockets
+from time import time
+
+
+async def pub():
+    async with websockets.connect("wss://stream.bybit.com/v5/public/spot") as websocket:
+        sub_msg = json.dumps(
+            {"op": "subscribe", "req_id": "1", "args": ["tickers.BTCUSDT", "tickers.ETHUSDT", "tickers.TONUSDT"]}
+        )
+        await websocket.send(sub_msg)
+        p = {}
+        while resp := await websocket.recv():
+            if data := json.loads(resp).get("data"):
+                p[data["symbol"]] = data["lastPrice"]
+                print(f"BTC: {p.get('BTCUSDT')}\nETH: {p.get('ETHUSDT')}\nTON: {p.get('TONUSDT')}", end="\033[F\033[F")
+
+
+async def priv(key: str, sec: str):
+    async with websockets.connect("wss://stream.bybit.com/v5/private") as websocket:
+        expires = int((time() + 5) * 1000)
+        # Generate signature.
+        signature = str(
+            hmac.new(bytes(sec, "utf-8"), bytes(f"GET/realtime{expires}", "utf-8"), digestmod="sha256").hexdigest()
+        )
+        auth_msg = json.dumps({"op": "auth", "args": [key, expires, signature]})
+        await websocket.send(auth_msg)
+        await websocket.send(json.dumps({"req_id": "100001", "op": "ping"}))
+        sub_msg = json.dumps({"op": "subscribe", "args": ["wallet"]})
+        await websocket.send(sub_msg)
+        while resp := await websocket.recv():
+            if data := json.loads(resp).get("data"):
+                print(data)

{xync_client-0.0.80.dev11 → xync_client-0.0.80.dev14/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.80.dev11
+Version: 0.0.80.dev14
 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.80.dev11 → xync_client-0.0.80.dev14}/xync_client.egg-info/SOURCES.txt

@@ -17,8 +17,6 @@ tests/_todo_refact/Bybit/test_bybit_p2p.py
 tests/_todo_refact/Gate/test_gate.py
 tests/_todo_refact/Wallet/test_agent.py
 tests/_todo_refact/Wallet/test_ex.py
-videos/70a566eb-e9da-47d6-b9fa-1569b5eee48e.webm
-videos/e49ef853-97a0-4882-99de-9c5ce9795471.webm
 xync_client/__init__.py
 xync_client/loader.py
 xync_client/pm_unifier.py

xync_client-0.0.80.dev11/xync_client/Bybit/InAgent.py

@@ -1,44 +0,0 @@
-from asyncio import run
-
-from x_model import init_db
-from xync_schema import models
-
-from xync_client.Abc.InAgent import BaseInAgentClient
-from xync_client.Bybit.agent import AgentClient
-from xync_client.Bybit.ws import prv
-from xync_client.loader import PG_DSN
-
-
-class InAgentClient(BaseInAgentClient):
-    agent_client: AgentClient
-
-    async def start_listen(self):
-        t = await self.agent_client.ott()
-        ts = int(float(t["time_now"]) * 1000)
-        await prv(self.agent_client.actor.agent.auth["deviceId"], t["result"], ts, listen)
-
-    # 3N: [T] - Уведомление об одобрении запроса на сделку
-    async def request_accepted_notify(self) -> int: ...  # id
-
-
-def listen(data: dict):
-    print(data)
-
-
-async def main():
-    from xync_schema import TORM
-
-    _ = await init_db(TORM, True)
-    # pbot = PyroClient(bot)
-    # await pbot.app.start()
-    # await pbot.app.create_channel("tc")
-    # await pbot.app.stop()
-
-    actor = await models.Actor.filter(ex_id=9, agent__auth__isnull=False).prefetch_related("ex", "agent").first()
-    cl: InAgentClient = actor.in_client()
-    _ = await cl.start_listen()
-    await cl.agent_client.close()
-
-
-if __name__ == "__main__":
-    run(main())

xync_client-0.0.80.dev11/xync_client/Bybit/ws.py

@@ -1,68 +0,0 @@
-import hmac
-import json
-import websockets
-from time import time
-
-
-async def pub():
-    async with websockets.connect("wss://stream.bybit.com/v5/public/spot") as websocket:
-        sub_msg = json.dumps(
-            {"op": "subscribe", "req_id": "1", "args": ["tickers.BTCUSDT", "tickers.ETHUSDT", "tickers.TONUSDT"]}
-        )
-        await websocket.send(sub_msg)
-        p = {}
-        while resp := await websocket.recv():
-            if data := json.loads(resp).get("data"):
-                p[data["symbol"]] = data["lastPrice"]
-                print(f"BTC: {p.get('BTCUSDT')}\nETH: {p.get('ETHUSDT')}\nTON: {p.get('TONUSDT')}", end="\033[F\033[F")
-
-
-async def priv(key: str, sec: str):
-    async with websockets.connect("wss://stream.bybit.com/v5/private") as websocket:
-        expires = int((time() + 5) * 1000)
-        # Generate signature.
-        signature = str(
-            hmac.new(bytes(sec, "utf-8"), bytes(f"GET/realtime{expires}", "utf-8"), digestmod="sha256").hexdigest()
-        )
-        auth_msg = json.dumps({"op": "auth", "args": [key, expires, signature]})
-        await websocket.send(auth_msg)
-        await websocket.send(json.dumps({"req_id": "100001", "op": "ping"}))
-        sub_msg = json.dumps({"op": "subscribe", "args": ["wallet"]})
-        await websocket.send(sub_msg)
-        while resp := await websocket.recv():
-            if data := json.loads(resp).get("data"):
-                print(data)
-
-
-async def prv(did: str, tok: str, ts: int, cb: callable):
-    u = f"wss://ws2.bybit.com/private?appid=bybit&os=web&deviceid={did}&timestamp={ts}"
-    async with websockets.connect(u) as websocket:
-        auth_msg = json.dumps({"req_id": did, "op": "login", "args": [tok]})
-        await websocket.send(auth_msg)
-
-        sub_msg = json.dumps({"op": "subscribe", "args": ["FIAT_OTC_TOPIC", "FIAT_OTC_ONLINE_TOPIC"]})
-        await websocket.send(sub_msg)
-        sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"SUPER_DEAL"}']})
-        await websocket.send(sub_msg)
-        sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"OTC_ORDER_STATUS"}']})
-        await websocket.send(sub_msg)
-        sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"WEB_THREE_SELL"}']})
-        await websocket.send(sub_msg)
-        sub_msg = json.dumps({"op": "input", "args": ["FIAT_OTC_TOPIC", '{"topic":"APPEALED_CHANGE"}']})
-        await websocket.send(sub_msg)
-
-        sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.cashier.order"]})
-        await websocket.send(sub_msg)
-        sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.cashier.order-eftd-complete-privilege-event"]})
-        await websocket.send(sub_msg)
-        sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.cashier.order-savings-product-event"]})
-        await websocket.send(sub_msg)
-        sub_msg = json.dumps({"op": "subscribe", "args": ["fiat.deal-core.order-savings-complete-event"]})
-        await websocket.send(sub_msg)
-
-        sub_msg = json.dumps({"op": "subscribe", "args": ["FIAT_OTC_TOPIC", "FIAT_OTC_ONLINE_TOPIC"]})
-        await websocket.send(sub_msg)
-
-        while resp := await websocket.recv():
-            if data := json.loads(resp).get("data"):
-                cb(data)