rainycode 1.5.8__tar.gz → 1.6.0__tar.gz

{rainycode-1.5.8 → rainycode-1.6.0}/PKG-INFO

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

{rainycode-1.5.8 → rainycode-1.6.0}/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.8 → rainycode-1.6.0}/common_servers/api/wechat_api.py

@@ -89,7 +89,10 @@ async def wechat_oauth_callback(
                     "error": error,
                     "error_description": error_description or "用户拒绝授权",
                 }
-                error_url = f"{redirect_uri}?{urlencode(params)}"
+                # redirect_uri 现在可能已带目标路由（...#/pages/xxx），拼接符按需选，
+                # 使错误信息落在该页自己的 query 上（路由之后）
+                sep = "&" if "?" in redirect_uri else "?"
+                error_url = f"{redirect_uri}{sep}{urlencode(params)}"
                 return RedirectResponse(url=error_url, status_code=302)
 
         raise CustomException(msg="授权失败")

{rainycode-1.5.8 → rainycode-1.6.0}/common_servers/service/auth_svc.py

@@ -531,7 +531,10 @@ class AuthService:
         if state:
             params["state"] = state
 
-        # 使用 # fragment 传递 token，避免出现在服务器日志中
+        # 凭证一律挂在 query 上（token 不落 fragment）：redirect_uri 由前端带上目标页
+        # 路由（https://host/#/pages/xxx），拼出来即 ...#/pages/xxx?access_token=..
+        # 它自身已带参数时（...#/pages/xxx?id=3）用 & 续接。
         fragment = urlencode(params)
-        redirect_url = f"{redirect_uri}#{fragment}"
+        sep = "&" if "?" in redirect_uri else "?"
+        redirect_url = f"{redirect_uri}{sep}{fragment}"
         return RedirectResponse(url=redirect_url, status_code=302)

{rainycode-1.5.8 → rainycode-1.6.0}/pyproject.toml

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

{rainycode-1.5.8 → rainycode-1.6.0}/rainycode.egg-info/PKG-INFO

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