hyperquant 0.3__py3-none-any.whl → 0.4__py3-none-any.whl

hyperquant/broker/auth.py

@@ -1,6 +1,7 @@
 import time
 import hashlib
 from typing import Any
+from aiohttp import ClientWebSocketResponse
 from multidict import CIMultiDict
 from yarl import URL
 import pybotters
@@ -27,25 +28,61 @@ class Auth:
 
         # 时间戳 & body
         now_ms = int(time.time() * 1000)
-        raw_body_for_sign = data if isinstance(data, str) else pyjson.dumps(data, separators=(",", ":"), ensure_ascii=False)
+        raw_body_for_sign = (
+            data
+            if isinstance(data, str)
+            else pyjson.dumps(data, separators=(",", ":"), ensure_ascii=False)
+        )
 
         # 签名
         mid_hash = md5_hex(f"{token}{now_ms}")[7:]
         final_hash = md5_hex(f"{now_ms}{raw_body_for_sign}{mid_hash}")
 
         # 设置 headers
-        headers.update({
-            "Authorization": token,
-            "Language": "Chinese",
-            "language": "Chinese",
-            "Content-Type": "application/json",
-            "x-ourbit-sign": final_hash,
-            "x-ourbit-nonce": str(now_ms),
-        })
+        headers.update(
+            {
+                "Authorization": token,
+                "Language": "Chinese",
+                "language": "Chinese",
+                "Content-Type": "application/json",
+                "x-ourbit-sign": final_hash,
+                "x-ourbit-nonce": str(now_ms),
+            }
+        )
 
         # 更新 kwargs.body，保证发出去的与签名一致
         kwargs.update({"data": raw_body_for_sign})
 
         return args
 
-pybotters.auth.Hosts.items['futures.ourbit.com'] = pybotters.auth.Item("ourbit", Auth.ourbit)
+    @staticmethod
+    def ourbit_spot(args: tuple[str, URL], kwargs: dict[str, Any]) -> tuple[str, URL]:
+        method: str = args[0]
+        url: URL = args[1]
+        data = kwargs.get("data") or {}
+        headers: CIMultiDict = kwargs["headers"]
+
+        # 从 session 里取 token
+        session = kwargs["session"]
+        token = session.__dict__["_apis"][pybotters.auth.Hosts.items[url.host].name][0]
+        cookie = f"uc_token={token}; u_id={token}; "
+        headers.update({"cookie": cookie})
+
+        # wss消息增加参数
+        # if headers.get("Upgrade") == "websocket":
+        #     args = (method, url)
+        #     # 拼接 token
+        #     q = dict(url.query)
+        #     q["token"] = token
+        #     url = url.with_query(q)
+
+
+        return args
+
+
+pybotters.auth.Hosts.items["futures.ourbit.com"] = pybotters.auth.Item(
+    "ourbit", Auth.ourbit
+)
+pybotters.auth.Hosts.items["www.ourbit.com"] = pybotters.auth.Item(
+    "ourbit", Auth.ourbit_spot
+)

hyperquant/broker/hyperliquid.py

@@ -27,8 +27,6 @@ import pybotters
 from yarl import URL
 
 from .models.hyperliquid import MyHyperStore
-import uuid
-
 
 def to_cloid(s: str) -> str:
     """