Improve POS proxy diagnostics and token compatibility

pages/🎟️ 售票时间集中监控.py

@@ -445,7 +445,30 @@ class PosCashierAPI:
                     timeout=20,
                 )
         resp.raise_for_status()
-        return resp.json()
+        try:
+            return resp.json()
+        except ValueError as exc:
+            content_type = resp.headers.get("Content-Type", "")
+            proxy_status = (
+                resp.headers.get("X-POS-Upstream-Status")
+                or resp.headers.get("X-TMS-Upstream-Status")
+                or "-"
+            )
+            proxy_error = (
+                resp.headers.get("X-POS-Proxy-Error")
+                or resp.headers.get("X-TMS-Proxy-Error")
+                or resp.headers.get("X-EOP-MSG")
+                or "-"
+            )
+            body_preview = redact_sensitive_text(resp.text[:300].replace("\n", " ").strip())
+            raise RuntimeError(
+                "POS 接口返回非 JSON："
+                f"HTTP {resp.status_code}; "
+                f"代理上游状态={proxy_status}; "
+                f"代理错误={proxy_error}; "
+                f"Content-Type={content_type or '-'}; "
+                f"响应预览={body_preview or '<empty>'}"
+            ) from exc
 
     def fetch_sessions(self, show_date: str) -> List[dict]:
         payload = self.request_json(

pos_proxy.py

@@ -71,13 +71,13 @@ def build_pos_url(origin_url, proxy_url=None, origin_base_url=None):
 def with_pos_proxy_headers(headers=None, proxy_url=None):
     headers = dict(headers or {})
     if get_pos_proxy_base_url(proxy_url):
-        proxy_token = (
-            os.getenv(POS_PROXY_TOKEN_ENV, "").strip()
-            or os.getenv(TMS_PROXY_TOKEN_ENV, "").strip()
-            or os.getenv("NEW_API_PROXY_TOKEN", "").strip()
-        )
+        pos_proxy_token = os.getenv(POS_PROXY_TOKEN_ENV, "").strip()
+        tms_proxy_token = os.getenv(TMS_PROXY_TOKEN_ENV, "").strip()
+        proxy_token = pos_proxy_token or tms_proxy_token or os.getenv("NEW_API_PROXY_TOKEN", "").strip()
         if proxy_token:
             headers[POS_PROXY_TOKEN_HEADER] = proxy_token
+        if tms_proxy_token:
+            headers["X-TMS-Proxy-Token"] = tms_proxy_token
     return headers
 
 

tencent-edgeone-pages/edge-functions/_shared/pos-proxy.js

@@ -1,5 +1,6 @@
 const POS_ORIGIN = "https://pos.hengdianfilm.com";
 const PROXY_TOKEN_HEADER = "X-POS-Proxy-Token";
+const TMS_PROXY_TOKEN_HEADER = "X-TMS-Proxy-Token";
 
 export function proxyHeaders(extra = {}) {
   return {
@@ -39,7 +40,10 @@ export function verifyProxyToken(request, context) {
       headers: proxyHeaders({ "X-POS-Proxy-Error": "missing-token-config" }),
     });
   }
-  if (request.headers.get(PROXY_TOKEN_HEADER) !== expectedToken) {
+  if (
+    request.headers.get(PROXY_TOKEN_HEADER) !== expectedToken
+    && request.headers.get(TMS_PROXY_TOKEN_HEADER) !== expectedToken
+  ) {
     return new Response("Proxy token mismatch", {
       status: 403,
       headers: proxyHeaders({ "X-POS-Proxy-Error": "token-mismatch" }),
@@ -51,4 +55,3 @@ export function verifyProxyToken(request, context) {
 export function posUrl(pathAndQuery) {
   return new URL(pathAndQuery, POS_ORIGIN).toString();
 }
-

tencent-edgeone-pages/edge-functions/pos-api/[[default]].js

@@ -16,6 +16,7 @@ export default async function onRequest(context) {
   const targetUrl = posUrl(`${upstreamPath}${requestUrl.search}`);
   const headers = new Headers(request.headers);
   headers.delete("X-POS-Proxy-Token");
+  headers.delete("X-TMS-Proxy-Token");
   headers.delete("Host");
   headers.delete("X-Forwarded-For");
   headers.delete("X-Real-IP");