rainycode 1.5.7__tar.gz → 1.5.9__tar.gz

{rainycode-1.5.7 → rainycode-1.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.5.7
+Version: 1.5.9
 Summary: FastAPI base modules
 Requires-Python: >=3.10
 Requires-Dist: aerich==0.9.2

{rainycode-1.5.7 → rainycode-1.5.9}/common_base/aiorequests.py

@@ -17,7 +17,9 @@ _CONNECTOR: aiohttp.TCPConnector | None = None
 
 def _get_connector() -> aiohttp.TCPConnector:
     global _CONNECTOR
-    if _CONNECTOR is None:
+    # 判空之外还要判 closed：连接池一旦被别处关闭（见下方 connector_owner 说明），
+    # 这里能重建，避免后续所有请求都拿到已关闭的实例。
+    if _CONNECTOR is None or _CONNECTOR.closed:
         _CONNECTOR = aiohttp.TCPConnector(ssl=_SSL_CONTEXT, limit=300, limit_per_host=100)
     return _CONNECTOR
 
@@ -36,8 +38,13 @@ def parse_url(url, params=None, suffix=None):
 
 async def get(url, params=None, headers=None, suffix=None):
     url = parse_url(url, params, suffix)
+    # connector_owner=False 必须显式传：ClientSession 默认 owner=True，退出 async with 时
+    # 会连带 close 掉模块级共享的 _CONNECTOR；之后新 session 一建出来即 closed，
+    # session.get() 直接抛 RuntimeError: Session is closed（进程重启前不再自愈）。
     async with (
-        aiohttp.ClientSession(connector=_get_connector(), trust_env=True) as session,
+        aiohttp.ClientSession(
+            connector=_get_connector(), trust_env=True, connector_owner=False
+        ) as session,
         session.get(url, headers=headers) as response,
     ):
         text = await response.text()
@@ -47,8 +54,11 @@ async def get(url, params=None, headers=None, suffix=None):
 async def post(url, data=None, headers=None):
     if isinstance(data, dict):
         data = json.dumps(data)
+    # connector_owner=False 的理由同 get()：共享连接池不归单次 session 所有。
     async with (
-        aiohttp.ClientSession(connector=_get_connector(), trust_env=True) as session,
+        aiohttp.ClientSession(
+            connector=_get_connector(), trust_env=True, connector_owner=False
+        ) as session,
         session.post(url, data=data, headers=headers) as response,
     ):
         text = await response.text()

{rainycode-1.5.7 → rainycode-1.5.9}/common_servers/service/auth_svc.py

@@ -179,7 +179,7 @@ class AuthService:
 
         # 构建回调地址
         api_prefix = f"/api/{base_config.app_name}" if base_config.app_name else ""
-        callback_url = f"{base_config.base_url}{api_prefix}/wechat/callback"
+        callback_url = f"{base_config.base_url}{api_prefix}/wechat/oauth/callback"
 
         return WechatUtil.build_oauth_url(
             appid=app_config.app_id,
@@ -278,7 +278,7 @@ class AuthService:
 
         # 构建 snsapi_userinfo 授权链接
         api_prefix = f"/api/{base_config.app_name}" if base_config.app_name else ""
-        callback_url = f"{base_config.base_url}{api_prefix}/wechat/callback"
+        callback_url = f"{base_config.base_url}{api_prefix}/wechat/oauth/callback"
         userinfo_auth_url = WechatUtil.build_oauth_url(
             appid=wechat_app.app_id,
             redirect_uri=callback_url,

{rainycode-1.5.7 → rainycode-1.5.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rainycode"
-version = "1.5.7"
+version = "1.5.9"
 description = "FastAPI base modules"
 requires-python = ">=3.10"
 

{rainycode-1.5.7 → rainycode-1.5.9}/rainycode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.5.7
+Version: 1.5.9
 Summary: FastAPI base modules
 Requires-Python: >=3.10
 Requires-Dist: aerich==0.9.2