akshare-proxy-patch 0.2.0__tar.gz → 0.2.2__tar.gz

{akshare_proxy_patch-0.2.0 → akshare_proxy_patch-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare-proxy-patch
-Version: 0.2.0
+Version: 0.2.2
 Summary: 针对 AkShare 的底层补丁，自动为东财等接口注入代理认证头，从而避免 `stock_zh_a_spot_em` 等方法报错。
 Home-page: https://github.com/helloyie/akshare-proxy-patch
 Author: cheapproxy.net
@@ -55,6 +55,9 @@ akshare_proxy_patch.install_patch("AUTH_IP", "AUTH_TOKEN")
 - push2.eastmoney.com
 - push2his.eastmoney.com
 
+## TODO 
+- 多线程情况下容易出现问题，需暂时不使用多线程或减少线程数
+
 ## 使用问题交流群
 
 ![8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp](https://cdn.nodeimage.com/i/8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp)

{akshare_proxy_patch-0.2.0 → akshare_proxy_patch-0.2.2}/README.md

@@ -34,6 +34,9 @@ akshare_proxy_patch.install_patch("AUTH_IP", "AUTH_TOKEN")
 - push2.eastmoney.com
 - push2his.eastmoney.com
 
+## TODO 
+- 多线程情况下容易出现问题，需暂时不使用多线程或减少线程数
+
 ## 使用问题交流群
 
 ![8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp](https://cdn.nodeimage.com/i/8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp)

akshare_proxy_patch-0.2.2/akshare_proxy_patch/__init__.py

@@ -0,0 +1,100 @@
+import time
+import threading
+import requests
+from requests.adapters import HTTPAdapter
+from copy import deepcopy
+
+# --- 全局配置与状态 ---
+__version__ = "1.0.2"
+_original_send = HTTPAdapter.send
+_auth_session = requests.Session()
+
+
+class AuthCache:
+    def __init__(self):
+        self.data = None
+        self.expire_at = 0
+        self.lock = threading.Lock()
+        self.ttl = 20
+
+
+_cache = AuthCache()
+
+
+def get_auth_config_with_cache(auth_url, auth_token):
+    now = time.time()
+
+    # 检查缓存是否有效 (双重检查锁前置)
+    if _cache.data and now < _cache.expire_at:
+        return _cache.data
+
+    # 缓存失效，加锁更新
+    with _cache.lock:
+        # 再次检查，防止多个线程同时穿透锁
+        if _cache.data and now < _cache.expire_at:
+            return _cache.data
+
+        try:
+            resp = _auth_session.get(
+                auth_url,
+                params={"token": auth_token, "version": __version__},
+                timeout=5,
+            )
+            data = resp.json()
+            if data.get("ua"):
+                _cache.data = data
+                _cache.expire_at = now + _cache.ttl
+                return data
+            print(f"授权失败: {data.get('error_msg')}")
+        except Exception as e:
+            print(f"请求授权接口异常: {e}")
+
+        return _cache.data
+
+
+def install_patch(auth_ip, auth_token):
+    def patched_send(self, request, **kwargs):
+        # 排除非目标域名，减少性能损耗
+        url = request.url or ""
+        if not any(
+            d in url
+            for d in [
+                "fund.eastmoney.com",
+                "push2.eastmoney.com",
+                "push2his.eastmoney.com",
+            ]
+        ):
+            return _original_send(self, request, **kwargs)
+
+        auth_url = f"http://{auth_ip}:47001/api/akshare-auth"
+
+        for _ in range(30):
+            auth_res = get_auth_config_with_cache(auth_url, auth_token)
+            if not auth_res:
+                time.sleep(0.5)
+                continue
+
+            request.headers["User-Agent"] = auth_res["ua"]
+            request.headers["Cookie"] = (
+                f"nid18={auth_res['nid18']}; nid18_create_time={auth_res['nid18_create_time']}"
+            )
+
+            # 动态注入代理
+            kwargs["proxies"] = {
+                "http": auth_res["proxy"],
+                "https": auth_res["proxy"],
+            }
+            kwargs["timeout"] = 8
+
+            try:
+                resp = _original_send(self, request, **kwargs)
+                if resp.ok:
+                    return resp
+            except Exception:
+                with _cache.lock:
+                    _cache.expire_at = 0
+                time.sleep(0.1)
+
+        return _original_send(self, request, **kwargs)
+
+    HTTPAdapter.send = patched_send

{akshare_proxy_patch-0.2.0 → akshare_proxy_patch-0.2.2}/akshare_proxy_patch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare-proxy-patch
-Version: 0.2.0
+Version: 0.2.2
 Summary: 针对 AkShare 的底层补丁，自动为东财等接口注入代理认证头，从而避免 `stock_zh_a_spot_em` 等方法报错。
 Home-page: https://github.com/helloyie/akshare-proxy-patch
 Author: cheapproxy.net
@@ -55,6 +55,9 @@ akshare_proxy_patch.install_patch("AUTH_IP", "AUTH_TOKEN")
 - push2.eastmoney.com
 - push2his.eastmoney.com
 
+## TODO 
+- 多线程情况下容易出现问题，需暂时不使用多线程或减少线程数
+
 ## 使用问题交流群
 
 ![8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp](https://cdn.nodeimage.com/i/8jmzvNOjKWFzwNUDW0Xiytcpfr50uMr5.webp)

{akshare_proxy_patch-0.2.0 → akshare_proxy_patch-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "akshare-proxy-patch"  # 包名，需在 PyPI 唯一
-version = "0.2.0"
+version = "0.2.2"
 authors = [
   { name="cheapproxy", email="emezxyj1@gmail.com" },
 ]

{akshare_proxy_patch-0.2.0 → akshare_proxy_patch-0.2.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="akshare-proxy-patch",  # 包名，用户 pip install 时的名称
-    version="0.2.0",  # 版本号
+    version="0.2.2",  # 版本号
     author="cheapproxy.net",
     author_email="emezxyj1@gmail.com",
     description="AkShare 报错全局Hook",

akshare_proxy_patch-0.2.0/akshare_proxy_patch/__init__.py

@@ -1,79 +0,0 @@
-import time
-import threading
-import requests
-from requests.adapters import HTTPAdapter
-
-# 1. 备份原始发送方法
-original_send = HTTPAdapter.send
-
-# 2. 线程本地变量：用于标记当前线程是否正在请求“授权接口”，防止递归死循环
-_thread_status = threading.local()
-
-
-def get_auth_config_realtime(auth_url, auth_token):
-    """
-    实时获取授权信息，不使用缓存。
-    """
-    # 标记当前线程进入“授权请求状态”
-    _thread_status.is_authorizing = True
-    try:
-        # 这里的请求会进入 patched_send，但因为 is_authorizing 为 True，会走原逻辑
-        resp = requests.get(auth_url, params={"token": auth_token}, timeout=5)
-        data = resp.json()
-        if data.get("ua"):
-            return data
-    except Exception as e:
-        print(f"[Hook Error] 实时获取授权失败: {e}")
-    finally:
-        # 请求结束，重置标志位
-        _thread_status.is_authorizing = False
-    return None
-
-
-def install_patch(auth_ip, auth_token):
-    """安装全局 Hook"""
-
-    def patched_send(self, request, **kwargs):
-        # 防止递归：如果当前请求是由 get_auth_config 发出的，直接走原逻辑
-        if getattr(_thread_status, "is_authorizing", False):
-            return original_send(self, request, **kwargs)
-        url = request.url
-        # 需要hook的域名列表
-        is_target = any(
-            domain in url
-            for domain in [
-                "fund.eastmoney.com",
-                "push2.eastmoney.com",
-                "push2his.eastmoney.com",
-            ]
-        )
-
-        # 非目标域名，正常放行
-        if not is_target:
-            return original_send(self, request, **kwargs)
-
-        auth_url = f"http://{auth_ip}:47001/api/akshare-auth"
-
-        # 需要 patch 的接口，重试接口
-        for i in range(30):
-            try:
-                auth_res = get_auth_config_realtime(auth_url, auth_token)
-                if auth_res:
-                    request.headers["User-Agent"] = auth_res["ua"]
-                    request.headers["Cookie"] = (
-                        f"nid18={auth_res['nid18']}; nid18_create_time={auth_res['nid18_create_time']}"
-                    )
-                    proxy = auth_res["proxy"]
-                    kwargs["proxies"] = {"http": proxy, "https": proxy}
-                    kwargs["timeout"] = 8
-                else:
-                    print(f"[Hook Warning] 无法获取授权信息，将使用原始请求: {url}")
-                # 调用原始 send 方法完成请求
-                response = original_send(self, request, **kwargs)
-                if response.ok:
-                    return response
-            except:
-                time.sleep(0.01)
-
-    # 关键：全局替换 HTTPAdapter 的 send 方法
-    HTTPAdapter.send = patched_send