跨域

main_v6.py

@@ -87,18 +87,11 @@ def _parse_csv_env(name: str, default: str):
 _cors_allowed_origins = set(_parse_csv_env("PPV5_CORS_ALLOWED_ORIGINS", "https://typst-app-clone.pages.dev"))
 
 def _add_cors_headers(resp):
-    origin = request.headers.get("Origin")
-    if origin and origin in _cors_allowed_origins:
-        resp.headers["Access-Control-Allow-Origin"] = origin
-        resp.headers["Vary"] = "Origin"
-        resp.headers["Access-Control-Allow-Methods"] = "POST, OPTIONS"
-        req_headers = request.headers.get("Access-Control-Request-Headers")
-        resp.headers["Access-Control-Allow-Headers"] = req_headers or "Content-Type"
-        resp.headers["Access-Control-Max-Age"] = "86400"
-
-        if request.headers.get("Access-Control-Request-Private-Network") == "true":
-            resp.headers["Access-Control-Allow-Private-Network"] = "true"
-
+    resp.headers["Access-Control-Allow-Origin"] = "*"
+    resp.headers["Access-Control-Allow-Methods"] = "POST, OPTIONS"
+    resp.headers["Access-Control-Allow-Headers"] = "Content-Type"
+    resp.headers["Access-Control-Allow-Private-Network"] = "true"
+    resp.headers["Access-Control-Max-Age"] = "86400"
     return resp
 
 @app.before_request
@@ -274,8 +267,8 @@ ch, chinese_cht, en, japan, af, az, bs, ca, cs, cy, da, de, es, et, eu, fi, fr,
 
 # 限制同时处理的请求数量为1
 ocr_semaphore = threading.Semaphore(1)
-@app.route('/ppocrv6', methods=['post'])
-@app.route('/ocr', methods=['post'])
+@app.route('/ppocrv6', methods=['POST', 'OPTIONS'])
+@app.route('/ocr', methods=['POST', 'OPTIONS'])
 def ppv6():
     # request.json 只能够接受方法为POST、Body为raw，header 内容为 application/json类型的数据
     # print(request.json, type(request.json))
@@ -289,6 +282,9 @@ def ppv6():
     
     # base64_str = form_data["img"]
 
+    if request.method == "OPTIONS":
+        return _add_cors_headers(app.make_response(("", 204)))
+
     # 非阻塞方式获取信号量
     if not ocr_semaphore.acquire(blocking=False):
         return jsonify({"warning": "wait pre task done."})

run_https.ps1

@@ -53,9 +53,6 @@ $env:PPV5_HOST = "127.0.0.1"
 $env:PPV5_PORT = "9346"
 $env:PPV5_TLS_CERT = $certFile
 $env:PPV5_TLS_KEY = $keyFile
-if (-not $env:PPV5_CORS_ALLOWED_ORIGINS) {
-  $env:PPV5_CORS_ALLOWED_ORIGINS = "https://typst-app-clone.pages.dev"
-}
 
 Set-Location $root
 & $pythonPath (Join-Path $root "main_v6.py")