部署 zai2api 到 HF Space

Dockerfile

@@ -12,12 +12,12 @@ RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -o /zai2api ./cmd/main.go
 
 FROM node:20-bookworm-slim
 
-ENV DEBIAN_FRONTEND=noninteractive \
+ENV DEBIAN_FRONTEND=noninteractive \
     BROWSER_BACKEND=cloak \
-    TOKEN_BOUND_CAPTCHA=true \
+    POOL_SIZE=0 \
     CHROMIUM_PATH=/usr/bin/chromium \
-    CAPTCHA_PROVIDER_URL=http://127.0.0.1:9876 \
-    LOG_LEVEL=info \
+    CAPTCHA_PROVIDER_URL=http://127.0.0.1:9876 \
+    LOG_LEVEL=info \
     PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 
 RUN apt-get update \
@@ -36,15 +36,16 @@ RUN cd /app/captcha-provider \
     && npm ci --omit=dev \
     && npm cache clean --force
 
-COPY --chown=node:node captcha-provider /app/captcha-provider
-COPY --chown=node:node start-space.sh /app/start-space.sh
-
-RUN mkdir -p /app/data \
-    && chown -R node:node /app \
-    && chmod +x /app/start-space.sh
-
-USER node
-
-EXPOSE 7860
-ENTRYPOINT ["tini", "--"]
-CMD ["/app/start-space.sh"]
+COPY --chown=node:node captcha-provider /app/captcha-provider
+COPY --chown=node:node .env /app/.env
+COPY --chown=node:node init.sh /app/init.sh
+
+RUN mkdir -p /app/data \
+    && chown -R node:node /app \
+    && chmod +x /app/init.sh
+
+USER node
+
+EXPOSE 7860
+ENTRYPOINT ["tini", "--"]
+CMD ["/app/init.sh"]

captcha-provider/server.js

@@ -20,7 +20,6 @@ const TOKEN_TTL = Number(process.env.TOKEN_TTL || 240000);  // token 有效期 4
 const REFILL_INTERVAL = Number(process.env.REFILL_INTERVAL || 3000); // 补充间隔 3s
 const FALLBACK_CAPTCHA_PROVIDER_URL = process.env.FALLBACK_CAPTCHA_PROVIDER_URL || '';
 const FALLBACK_CAPTCHA_TIMEOUT = Number(process.env.FALLBACK_CAPTCHA_TIMEOUT || 60000);
-const TOKEN_BOUND_CAPTCHA = process.env.TOKEN_BOUND_CAPTCHA !== 'false' && BROWSER_BACKEND === 'cloak';
 
 // ─── State ───
 let browser = null;
@@ -186,21 +185,21 @@ async function acquireToken() {
 
       try {
         return await new Promise((resolve, reject) => {
-          const timeout = setTimeout(() => reject(new Error('captcha timeout')), 25000);
+          const timeout = setTimeout(() => reject(new Error('captcha timeout')), 60000);
           window.initAliyunCaptcha({
             SceneId: sceneId,
             mode: 'popup',
             element: `#${id}`,
             button: `#${triggerId}`,
             language: 'cn',
-            timeout: 10000,
+            timeout: 30000,
             delayBeforeSuccess: false,
             success: (token) => { clearTimeout(timeout); resolve(token); },
             fail: () => {},
             onError: (err) => { clearTimeout(timeout); reject(new Error('captcha error: ' + JSON.stringify(err))); },
             onClose: () => {},
           });
-          setTimeout(() => trigger.click(), 200);
+          setTimeout(() => trigger.click(), 500);
         });
       } finally {
         try { container.remove(); } catch {}
@@ -213,131 +212,6 @@ async function acquireToken() {
   }
 }
 
-function decodeJwtPayload(token) {
-  const parts = String(token || '').split('.');
-  if (parts.length < 2) throw new Error('invalid jwt');
-  const payload = parts[1].replace(/-/g, '+').replace(/_/g, '/');
-  const padded = payload + '='.repeat((4 - payload.length % 4) % 4);
-  return JSON.parse(Buffer.from(padded, 'base64').toString('utf8'));
-}
-
-function extractUserId(jwtToken) {
-  const payload = decodeJwtPayload(jwtToken);
-  if (!payload.id) throw new Error('jwt missing id');
-  return payload.id;
-}
-
-async function launchTokenBrowser() {
-  const proxyURL = process.env.PROXY_SERVER || process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
-
-  if (BROWSER_BACKEND === 'cloak') {
-    const opts = {
-      headless: true,
-      userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
-    };
-    if (proxyURL) opts.proxy = { server: proxyURL };
-    return cloak.launch(opts);
-  }
-
-  const launchOpts = {
-    executablePath: CHROMIUM_PATH,
-    headless: true,
-    args: [
-      '--disable-blink-features=AutomationControlled',
-      '--disable-dev-shm-usage',
-      '--no-sandbox',
-      '--disable-gpu',
-      '--disable-extensions',
-    ],
-  };
-  if (proxyURL) launchOpts.proxy = { server: proxyURL };
-  return chromium.launch(launchOpts);
-}
-
-async function acquireTokenFromChat(jwtToken) {
-  const userId = extractUserId(jwtToken);
-  console.log(`[provider] Captcha requested for user ${String(userId).slice(0, 12)}...`);
-
-  const localBrowser = await launchTokenBrowser();
-  try {
-    const localCtx = await localBrowser.newContext({
-      viewport: { width: 1265, height: 1281 },
-      locale: 'zh-CN',
-      timezoneId: 'Asia/Shanghai',
-      userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
-    });
-    await localCtx.addInitScript(() => {
-      Object.defineProperty(navigator, 'webdriver', { get: () => false });
-      Object.defineProperty(navigator, 'plugins', { get: () => [1, 2, 3, 4, 5] });
-      Object.defineProperty(navigator, 'languages', { get: () => ['zh-CN', 'zh', 'en-US', 'en'] });
-      window.chrome = { runtime: {}, loadTimes: () => ({}) };
-    });
-
-    const freshPage = await localCtx.newPage();
-    await freshPage.goto(ZAI_URL, { waitUntil: 'domcontentloaded', timeout: 30000 });
-    await freshPage.waitForSelector('textarea, [contenteditable="true"], [role="textbox"]', { timeout: 15000 });
-    await freshPage.evaluate((token) => {
-      localStorage.setItem('token', token);
-    }, jwtToken);
-    await freshPage.reload({ waitUntil: 'domcontentloaded', timeout: 30000 });
-    await freshPage.waitForSelector('textarea, [contenteditable="true"], [role="textbox"]', { timeout: 15000 });
-    await freshPage.waitForTimeout(1000);
-
-    let capturedToken = '';
-    let resolveToken;
-    let rejectToken;
-    const tokenPromise = new Promise((resolve, reject) => {
-      resolveToken = resolve;
-      rejectToken = reject;
-    });
-    const captureTimeout = setTimeout(() => rejectToken(new Error('chat captcha timeout')), 25000);
-
-    await freshPage.route('**/api/v2/chat/completions**', async (route) => {
-      try {
-        const body = route.request().postDataJSON();
-        if (body && body.captcha_verify_param) {
-          capturedToken = body.captcha_verify_param;
-          clearTimeout(captureTimeout);
-          await route.abort('blockedbyclient');
-          resolveToken(capturedToken);
-          return;
-        }
-      } catch (err) {
-        console.warn(`[provider] Route parse error: ${err.message}`);
-      }
-      try {
-        await route.continue();
-      } catch {}
-    });
-
-    const inputSelector = 'textarea, [contenteditable="true"], [role="textbox"]';
-    await freshPage.fill(inputSelector, 'hi');
-    const buttonState = await freshPage.evaluate(() => {
-      const btn = document.querySelector('#send-message-button') || document.querySelector('button[type="submit"]');
-      if (!btn) return 'not_found';
-      if (btn.disabled) btn.disabled = false;
-      return 'ready';
-    });
-    if (buttonState === 'not_found') {
-      throw new Error('send button not found');
-    }
-    await freshPage.click('#send-message-button, button[type="submit"]', { timeout: 5000 });
-
-    return await tokenPromise;
-  } finally {
-    try { await localBrowser.close(); } catch {}
-  }
-}
-
-async function readJsonBody(req) {
-  let raw = '';
-  for await (const chunk of req) {
-    raw += chunk;
-    if (raw.length > 1024 * 1024) throw new Error('request body too large');
-  }
-  return raw ? JSON.parse(raw) : {};
-}
-
 async function acquireFallbackToken() {
   if (!FALLBACK_CAPTCHA_PROVIDER_URL) return null;
   if (!process.env.BACKUP_TOKEN) {
@@ -440,39 +314,10 @@ const server = http.createServer(async (req, res) => {
     });
   }
 
-  if (req.url === '/token' && req.method === 'POST') {
-    if (!ready) {
-      return sendJson(res, 503, { ok: false, error: 'not ready', lastError });
-    }
-
-    try {
-      const body = await readJsonBody(req);
-      const jwtToken = body.jwt_token || body.jwtToken || '';
-      if (!jwtToken) {
-        return sendJson(res, 400, { ok: false, error: 'jwt_token required' });
-      }
-      const started = Date.now();
-      const token = await acquireTokenFromChat(jwtToken);
-      const elapsed = Date.now() - started;
-      stats.served++;
-      console.log(`[provider] Served chat captcha token in ${elapsed}ms`);
-      return sendJson(res, 200, { ok: true, token, captcha_verify_param: token, cached: false, elapsed_ms: elapsed });
-    } catch (err) {
-      lastError = err.message;
-      stats.errors++;
-      console.error(`[provider] Chat captcha error: ${err.message}`);
-      return sendJson(res, 500, { ok: false, error: err.message });
-    }
-  }
-
   if (req.method === 'GET' && req.url === '/token') {
     if (!ready) {
       return sendJson(res, 503, { error: 'not ready', lastError });
     }
-
-    if (TOKEN_BOUND_CAPTCHA) {
-      return sendJson(res, 400, { ok: false, error: 'jwt_token required' });
-    }
 
     // 先从池里取
     const cached = getValidToken();
@@ -515,25 +360,21 @@ const server = http.createServer(async (req, res) => {
     }
   }
 
-  sendJson(res, 404, { error: 'Use POST /token or GET /health' });
+  sendJson(res, 404, { error: 'Use GET /token or GET /health' });
 });
 
 // ─── Start ───
 
 server.listen(PORT, HOST, async () => {
   console.log(`[provider] zai-captcha-provider listening on http://${HOST}:${PORT}`);
-  console.log(`[provider] Pool size: ${POOL_SIZE}, TTL: ${TOKEN_TTL}ms`);
+  console.log(`[provider] Pool size: ${POOL_SIZE}, TTL: ${TOKEN_TTL}ms`);
   try {
     await launchBrowser();
-    if (TOKEN_BOUND_CAPTCHA) {
-      console.log('[provider] Token-bound captcha mode enabled; skipping anonymous prefill');
-    } else {
-      // 初始填充池
-      await refillPool();
-      console.log(`[provider] Initial pool filled: ${tokenPool.length} tokens`);
-      // 定期补充
-      setInterval(refillPool, REFILL_INTERVAL);
-    }
+    // 初始填充池
+    await refillPool();
+    console.log(`[provider] Initial pool filled: ${tokenPool.length} tokens`);
+    // 定期补充
+    setInterval(refillPool, REFILL_INTERVAL);
   } catch (err) {
     console.error('[provider] Startup error:', err.message);
     lastError = err.message;

deploy_hf_space.py

@@ -43,11 +43,12 @@ def main() -> None:
             "node_modules/*",
             "captcha-provider/node_modules/*",
             "data/*",
-            "*.log",
-            ".generated-auth-token.txt",
-        ],
-        commit_message="部署 zai2api 到 HF Space",
-    )
+            "*.log",
+            ".generated-auth-token.txt",
+            "proxy-3000.js",
+        ],
+        commit_message="部署 zai2api 到 HF Space",
+    )
 
     api.add_space_secret(
         repo_id=space_id,
@@ -67,11 +68,19 @@ def main() -> None:
         repo_id=space_id,
         key="CAPTCHA_PROVIDER_URL",
         value="http://127.0.0.1:9876",
-    )
+    )
     api.add_space_variable(repo_id=space_id, key="BROWSER_BACKEND", value="cloak")
-    api.add_space_variable(repo_id=space_id, key="TOKEN_BOUND_CAPTCHA", value="true")
+    api.add_space_variable(repo_id=space_id, key="POOL_SIZE", value="0")
     api.add_space_variable(repo_id=space_id, key="CHROMIUM_PATH", value="/usr/bin/chromium")
-
+    api.add_space_variable(repo_id=space_id, key="LOG_LEVEL", value="info")
+    api.add_space_variable(repo_id=space_id, key="DEBUG_LOGGING", value="false")
+
+    for stale_key in ("TOKEN_BOUND_CAPTCHA", "FALLBACK_CAPTCHA_PROVIDER_URL"):
+        try:
+            api.delete_space_variable(repo_id=space_id, key=stale_key)
+        except Exception:
+            pass
+
     print(f"Space: https://huggingface.co/spaces/{space_id}")
     print(f"App:   https://{space_id.replace('/', '-')}.hf.space")
     if generated_auth_token:

init.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env sh
+set -eu
+
+if [ -f /app/.env ]; then
+  set -a
+  . /app/.env
+  set +a
+fi
+
+: "${PORT:=7860}"
+: "${CAPTCHA_INTERNAL_HOST:=127.0.0.1}"
+: "${CAPTCHA_INTERNAL_PORT:=9876}"
+: "${CAPTCHA_PROVIDER_URL:=http://${CAPTCHA_INTERNAL_HOST}:${CAPTCHA_INTERNAL_PORT}}"
+: "${BROWSER_BACKEND:=cloak}"
+: "${POOL_SIZE:=0}"
+
+export PORT CAPTCHA_PROVIDER_URL BROWSER_BACKEND POOL_SIZE
+
+mkdir -p /app/data
+
+supervise_captcha() {
+  while true; do
+    echo "[space] starting captcha provider on ${CAPTCHA_INTERNAL_HOST}:${CAPTCHA_INTERNAL_PORT}"
+    set +e
+    (
+      cd /app/captcha-provider
+      HOST="${CAPTCHA_INTERNAL_HOST}" PORT="${CAPTCHA_INTERNAL_PORT}" node server.js
+    )
+    code="$?"
+    set -e
+    echo "[space] captcha provider exited with ${code}, restarting in 2s"
+    sleep 2
+  done
+}
+
+supervise_proxy() {
+  while true; do
+    echo "[space] starting zai2api proxy on 0.0.0.0:${PORT}"
+    set +e
+    /app/zai2api
+    code="$?"
+    set -e
+    echo "[space] zai2api proxy exited with ${code}, restarting in 2s"
+    sleep 2
+  done
+}
+
+cleanup() {
+  kill "${CAPTCHA_SUP_PID:-}" "${PROXY_SUP_PID:-}" 2>/dev/null || true
+  wait 2>/dev/null || true
+}
+
+trap 'cleanup; exit 0' INT TERM EXIT
+
+supervise_captcha &
+CAPTCHA_SUP_PID="$!"
+
+supervise_proxy &
+PROXY_SUP_PID="$!"
+
+wait

internal/captcha.go

@@ -1,7 +1,6 @@
 package internal
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -11,14 +10,13 @@ import (
 )
 
 type captchaProviderResponse struct {
-	OK                 bool   `json:"ok"`
-	Token              string `json:"token"`
-	CaptchaVerifyParam string `json:"captcha_verify_param"`
-	Error              string `json:"error"`
+	OK    bool   `json:"ok"`
+	Token string `json:"token"`
+	Error string `json:"error"`
 }
 
 // fetchCaptchaToken 从 captcha provider 服务获取验证码 token
-func fetchCaptchaToken(upstreamToken string) (string, error) {
+func fetchCaptchaToken() (string, error) {
 	if Cfg.CaptchaProviderURL == "" {
 		return "", nil
 	}
@@ -26,8 +24,7 @@ func fetchCaptchaToken(upstreamToken string) (string, error) {
 	url := strings.TrimRight(Cfg.CaptchaProviderURL, "/") + "/token"
 
 	client := &http.Client{Timeout: 35 * time.Second}
-	payload, _ := json.Marshal(map[string]string{"jwt_token": upstreamToken})
-	resp, err := client.Post(url, "application/json", bytes.NewReader(payload))
+	resp, err := client.Get(url)
 	if err != nil {
 		return "", fmt.Errorf("captcha provider request failed: %w", err)
 	}
@@ -50,9 +47,6 @@ func fetchCaptchaToken(upstreamToken string) (string, error) {
 	if !result.OK {
 		return "", fmt.Errorf("captcha provider error: %s", result.Error)
 	}
-	if result.Token == "" {
-		result.Token = result.CaptchaVerifyParam
-	}
 
 	return result.Token, nil
 }

internal/chat.go

@@ -415,7 +415,7 @@ func makeUpstreamRequest(token string, messages []Message, model string, imageUR
 
 	// 注入 captcha_verify_param（如果配置了 captcha provider）
 	if Cfg.CaptchaProviderURL != "" {
-		captchaToken, err := fetchCaptchaToken(token)
+		captchaToken, err := fetchCaptchaToken()
 		if err != nil {
 			LogWarn("[Captcha] Failed to get captcha token: %v", err)
 		} else if captchaToken != "" {