feat: add timing to all stages, fix OPENROUTER_API_KEY crash, async DNS

Dockerfile

@@ -1,70 +1,82 @@
-# OpenClaw on Hugging Face Spaces — 从源码构建
+# OpenClaw on Hugging Face Spaces — 从源码构建（带计时）
 # 文档: https://huggingface.co/docs/hub/spaces-sdks-docker
 
 FROM node:22-bookworm
+SHELL ["/bin/bash", "-c"]
 
-# Force rebuild - upload_folder persistence v9
-RUN echo "clean-build-v9-upload-folder-$(date +%s)"
+# ── Step 1: System dependencies ──────────────────────────────────────────────
+RUN echo "[build][step1] Installing system deps..." && START=$(date +%s) \
+  && apt-get update && apt-get install -y --no-install-recommends git ca-certificates curl python3 python3-pip \
+  && rm -rf /var/lib/apt/lists/* \
+  && echo "[build][step1] System deps: $(($(date +%s) - START))s"
 
-# 构建依赖（包含 Python3 以便使用 huggingface_hub 做 Dataset 持久化）
-RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates curl python3 python3-pip \
-  && rm -rf /var/lib/apt/lists/*
-RUN pip3 install --no-cache-dir --break-system-packages huggingface_hub
+# ── Step 2: Python dependencies ──────────────────────────────────────────────
+RUN echo "[build][step2] Installing huggingface_hub..." && START=$(date +%s) \
+  && pip3 install --no-cache-dir --break-system-packages huggingface_hub \
+  && echo "[build][step2] huggingface_hub: $(($(date +%s) - START))s"
 
-RUN corepack enable
-RUN curl -fsSL https://bun.sh/install | bash
+# ── Step 3: Node tooling ────────────────────────────────────────────────────
+RUN echo "[build][step3] Enabling corepack + bun..." && START=$(date +%s) \
+  && corepack enable \
+  && curl -fsSL https://bun.sh/install | bash \
+  && echo "[build][step3] Corepack + Bun: $(($(date +%s) - START))s"
 ENV PATH="/root/.bun/bin:${PATH}"
 
+# ── Step 4: Clone OpenClaw ───────────────────────────────────────────────────
 WORKDIR /app
-RUN git clone --depth 1 https://github.com/openclaw/openclaw.git openclaw
+RUN echo "[build][step4] Cloning OpenClaw..." && START=$(date +%s) \
+  && git clone --depth 1 https://github.com/openclaw/openclaw.git openclaw \
+  && echo "[build][step4] Git clone: $(($(date +%s) - START))s"
 WORKDIR /app/openclaw
 
-# 补丁：仅在实际成功解析消息 body 并即将投递回复时记录 inbound，
-# 避免解密失败（Bad MAC）的消息被误计为已接收导致 lastInboundAt 有值但无法回复
+# ── Step 5: Apply patches ───────────────────────────────────────────────────
 COPY patches /app/patches
-RUN if [ -f /app/patches/web-inbound-record-activity-after-body.patch ]; then patch -p1 < /app/patches/web-inbound-record-activity-after-body.patch; fi
+RUN echo "[build][step5] Applying patches..." && START=$(date +%s) \
+  && if [ -f /app/patches/web-inbound-record-activity-after-body.patch ]; then \
+       patch -p1 < /app/patches/web-inbound-record-activity-after-body.patch; \
+     fi \
+  && echo "[build][step5] Patches: $(($(date +%s) - START))s"
 
-RUN pnpm install --frozen-lockfile
-RUN pnpm build
+# ── Step 6: pnpm install ────────────────────────────────────────────────────
+RUN echo "[build][step6] pnpm install..." && START=$(date +%s) \
+  && pnpm install --frozen-lockfile \
+  && echo "[build][step6] pnpm install: $(($(date +%s) - START))s"
+
+# ── Step 7: pnpm build ──────────────────────────────────────────────────────
+RUN echo "[build][step7] pnpm build..." && START=$(date +%s) \
+  && pnpm build \
+  && echo "[build][step7] pnpm build: $(($(date +%s) - START))s"
+
+# ── Step 8: pnpm ui:build ───────────────────────────────────────────────────
 ENV OPENCLAW_PREFER_PNPM=1
-RUN pnpm ui:build
-
-# 验证构建产物完整（包含 Telegram 和 WhatsApp 扩展）
-RUN test -f dist/entry.js && echo "[build-check] dist/entry.js OK" \
- && test -f dist/plugin-sdk/index.js && echo "[build-check] dist/plugin-sdk/index.js OK" \
- && test -d extensions/telegram && echo "[build-check] extensions/telegram OK" \
- && test -d extensions/whatsapp && echo "[build-check] extensions/whatsapp OK" \
- && test -d dist/control-ui && echo "[build-check] dist/control-ui OK"
-
-# 向 Control UI 注入自动 token 配置（让浏览器自动连接，无需手动输入 token）
-RUN python3 << 'PYEOF'
-import pathlib
-p = pathlib.Path('dist/control-ui/index.html')
-script = '<script>!function(){var K="openclaw.control.settings.v1";try{var s=JSON.parse(localStorage.getItem(K)||"{}")||{};if(!s.token){s.token="openclaw-space-default";localStorage.setItem(K,JSON.stringify(s))}}catch(e){}}()</script>'
-h = p.read_text()
-p.write_text(h.replace('</head>', script + '</head>'))
-print('[build-check] Token auto-config injected into Control UI')
-PYEOF
-
-# 不修改内部代码，改用外部 WebSocket 监护脚本处理 515 重连
+RUN echo "[build][step8] pnpm ui:build..." && START=$(date +%s) \
+  && pnpm ui:build \
+  && echo "[build][step8] pnpm ui:build: $(($(date +%s) - START))s"
+
+# ── Step 9: Verify build artifacts ──────────────────────────────────────────
+RUN echo "[build][step9] Verifying build artifacts..." \
+  && test -f dist/entry.js && echo "  OK dist/entry.js" \
+  && test -f dist/plugin-sdk/index.js && echo "  OK dist/plugin-sdk/index.js" \
+  && test -d extensions/telegram && echo "  OK extensions/telegram" \
+  && test -d extensions/whatsapp && echo "  OK extensions/whatsapp" \
+  && test -d dist/control-ui && echo "  OK dist/control-ui"
 
+# ── Step 10: Inject auto-token into Control UI ──────────────────────────────
+COPY --chown=node:node scripts /home/node/scripts
+RUN chmod +x /home/node/scripts/inject-token.sh && bash /home/node/scripts/inject-token.sh
+
+# ── Step 11: Final setup ────────────────────────────────────────────────────
 ENV NODE_ENV=production
-# 禁用 bundled 插件发现（改由 global symlink 提供）；用空目录替代 /dev/null 避免 ENOTDIR 警告
 RUN mkdir -p /app/openclaw/empty-bundled-plugins
 ENV OPENCLAW_BUNDLED_PLUGINS_DIR=/app/openclaw/empty-bundled-plugins
 RUN chown -R node:node /app
 
-# 创建 ~/.openclaw 目录结构
 RUN mkdir -p /home/node/.openclaw/workspace /home/node/.openclaw/credentials
-# Note: openclaw.json is NOT copied here - it will be restored from Dataset by openclaw_sync.py
-# The new persistence system backs up and restores the entire ~/.openclaw directory
 
-# 持久化脚本（完整目录备份） & DNS 修复
-COPY --chown=node:node scripts /home/node/scripts
 COPY --chown=node:node openclaw.json /home/node/scripts/openclaw.json.default
-RUN chmod +x /home/node/scripts/entrypoint.sh
-RUN chmod +x /home/node/scripts/sync_hf.py
-RUN chown -R node:node /home/node
+RUN chmod +x /home/node/scripts/entrypoint.sh \
+  && chmod +x /home/node/scripts/sync_hf.py \
+  && chown -R node:node /home/node
 
 USER node
 ENV HOME=/home/node

openclaw.json

@@ -22,7 +22,7 @@
     "providers": {
       "openrouter": {
         "baseUrl": "https://openrouter.ai/api/v1",
-        "apiKey": "${OPENROUTER_API_KEY}",
+        "apiKey": "__OPENROUTER_API_KEY__",
         "api": "openai-completions",
         "models": [
           {

scripts/entrypoint.sh

@@ -1,41 +1,54 @@
 #!/bin/sh
 set -e
 
+BOOT_START=$(date +%s)
+
 echo "[entrypoint] OpenClaw HuggingFace Spaces Entrypoint"
 echo "[entrypoint] ======================================="
 
-# DNS pre-resolution for WhatsApp
-echo "[entrypoint] Resolving WhatsApp domains via DNS-over-HTTPS..."
-python3 /home/node/scripts/dns-resolve.py /tmp/dns-resolved.json || echo "[entrypoint] DNS pre-resolve had issues (non-fatal)"
-
-# Enable Node.js DNS fix
+# ── DNS pre-resolution (run in BACKGROUND — was 121s blocking) ──────────────
+echo "[entrypoint] Resolving WhatsApp domains via DNS-over-HTTPS (background)..."
+DNS_START=$(date +%s)
+(
+  python3 /home/node/scripts/dns-resolve.py /tmp/dns-resolved.json 2>&1
+  DNS_END=$(date +%s)
+  echo "[TIMER] DNS pre-resolve (background): $((DNS_END - DNS_START))s"
+) &
+DNS_PID=$!
+
+# Enable Node.js DNS fix (will use resolved file when ready)
 export NODE_OPTIONS="${NODE_OPTIONS:+$NODE_OPTIONS }--require /home/node/scripts/dns-fix.cjs"
 
-# Ensure extensions symlink exists
+# ── Extensions symlink ──────────────────────────────────────────────────────
+SYMLINK_START=$(date +%s)
 if [ ! -L /home/node/.openclaw/extensions ]; then
   rm -rf /home/node/.openclaw/extensions 2>/dev/null || true
   ln -s /app/openclaw/extensions /home/node/.openclaw/extensions
   echo "[entrypoint] Created extensions symlink -> /app/openclaw/extensions"
 fi
+echo "[TIMER] Extensions symlink: $(($(date +%s) - SYMLINK_START))s"
 
-# Check for WhatsApp credentials
+# ── WhatsApp credentials check ──────────────────────────────────────────────
 if [ -d /home/node/.openclaw/credentials/whatsapp ]; then
   echo "[entrypoint] Found existing WhatsApp credentials - will use for auto-connect"
 fi
 
-# Build artifacts check
+# ── Build artifacts check ───────────────────────────────────────────────────
 cd /app/openclaw
 echo "[entrypoint] Build artifacts check:"
 test -f dist/entry.js && echo "  OK dist/entry.js" || echo "  WARNING: dist/entry.js missing!"
 test -f dist/plugin-sdk/index.js && echo "  OK dist/plugin-sdk/index.js" || echo "  WARNING: dist/plugin-sdk/index.js missing!"
 echo "  Extensions: $(ls extensions/ 2>/dev/null | wc -l | tr -d ' ') found"
 echo "  Global extensions link: $(readlink /home/node/.openclaw/extensions 2>/dev/null || echo 'NOT SET')"
-echo "  DNS resolved: $(cat /tmp/dns-resolved.json 2>/dev/null || echo 'file missing')"
 
 # Create logs directory
 mkdir -p /home/node/logs
 touch /home/node/logs/app.log
 
-# Start OpenClaw via sync_hf.py
+ENTRYPOINT_END=$(date +%s)
+echo "[TIMER] Entrypoint (before sync_hf.py): $((ENTRYPOINT_END - BOOT_START))s"
+
+# ── Start OpenClaw via sync_hf.py (don't wait for DNS — it runs in bg) ─────
 echo "[entrypoint] Starting OpenClaw via sync_hf.py..."
+echo "[entrypoint] DNS resolution running in background (PID $DNS_PID), app will use it when ready"
 exec python3 -u /home/node/scripts/sync_hf.py

scripts/sync_hf.py

@@ -252,6 +252,14 @@ class OpenClawFullSync:
         default_src = Path(__file__).parent / "openclaw.json.default"
         if default_src.exists():
             shutil.copy2(str(default_src), str(config_path))
+            # Replace placeholder with actual env var value
+            text = config_path.read_text()
+            if "__OPENROUTER_API_KEY__" in text:
+                if OPENROUTER_API_KEY:
+                    text = text.replace("__OPENROUTER_API_KEY__", OPENROUTER_API_KEY)
+                else:
+                    text = text.replace("__OPENROUTER_API_KEY__", "")
+                config_path.write_text(text)
             print("[SYNC] Created openclaw.json from default template")
         else:
             with open(config_path, "w") as f:
@@ -499,10 +507,16 @@ class OpenClawFullSync:
 
 def main():
     try:
+        t_main_start = time.time()
+
+        t0 = time.time()
         sync = OpenClawFullSync()
+        print(f"[TIMER] sync_hf init: {time.time() - t0:.1f}s")
 
         # 1. Restore
+        t0 = time.time()
         sync.load_from_repo()
+        print(f"[TIMER] load_from_repo (restore): {time.time() - t0:.1f}s")
 
         # 2. Background sync
         stop_event = threading.Event()
@@ -510,7 +524,10 @@ def main():
         t.start()
 
         # 3. Start application
+        t0 = time.time()
         process = sync.run_openclaw()
+        print(f"[TIMER] run_openclaw launch: {time.time() - t0:.1f}s")
+        print(f"[TIMER] Total startup (init → app launched): {time.time() - t_main_start:.1f}s")
 
         # Signal handler
         def handle_signal(sig, frame):