fix: noVNC run in foreground with --web; dbus optional; add --wait-url for poll-without-token; doc PUSH_DEBUG

docs/PUSH_DEBUG.md

@@ -45,7 +45,9 @@ HF_TOKEN=你的token python3 scripts/monitor_and_test.py --space-id 你的用户
 
 `--space-id` 默认是 `tao-shen/HuggingRun`，可省略。
 
-### 2.3 等 RUNNING 后跑完整测试（一键「远端是否成功」）
+### 2.3 等 RUNNING / 等 URL 就绪后跑完整测试（一键「远端是否成功」）
+
+**方式 A：有 HF_TOKEN 时**（推荐，可看 API 状态）
 
 ```bash
 # Demo 或默认 Space
@@ -57,7 +59,15 @@ HF_TOKEN=你的token python3 scripts/monitor_and_test.py --wait-running --test \
   --expect noVNC
 ```
 
-脚本会先轮询直到 Space 状态为 RUNNING，再跑：基础 GET、压力请求、多轮持久化检查。**全部通过才 exit 0**，任一失败则 exit 1，便于脚本化「只有远端成功才算数」。
+**方式 B：无 HF_TOKEN 时**（只轮询 URL 直到页面出现期望内容）
+
+```bash
+python3 scripts/monitor_and_test.py --wait-url --test \
+  --url https://你的用户名-你的Space名.hf.space \
+  --expect noVNC --max-wait 900
+```
+
+脚本会先轮询直到 GET 200 且 body 含 `noVNC`（或你给的 `--expect`），再跑：基础 GET、压力请求、多轮持久化检查。**全部通过才 exit 0**，任一失败则 exit 1。
 
 ### 2.4 不等待、直接测当前页面（Space 已 RUNNING 时）
 
@@ -81,11 +91,11 @@ python3 scripts/monitor_and_test.py --url https://xxx.hf.space --test --expect n
    HF_TOKEN=xxx python3 scripts/monitor_and_test.py --wait-running --test --url https://tao-shen-huggingrun.hf.space --expect noVNC
    ```
 
-3. 若 **测试失败**：用 `--logs run` 看容器内报错，修代码后：
+3. 若 **测试失败或一直 503**：用 `--logs run`（以及 `--logs build`）看容器内报错，修代码后：
    ```bash
    git add -A && git commit -m "fix: ..." && git push origin main
    ```
-   然后重复 1–2，直到测试全部通过。
+   然后重复 1–2，直到测试全部通过。**只有远端全部通过才算数。**
 
 ---
 

scripts/monitor_and_test.py

@@ -35,7 +35,7 @@ def get_runtime():
 
 
 def wait_running(max_wait_sec=600, poll_interval=15):
-    """轮询直到 stage == RUNNING 或超时。"""
+    """轮询直到 stage == RUNNING 或超时。需 HF_TOKEN。"""
     start = time.time()
     while (time.time() - start) < max_wait_sec:
         rt, err = get_runtime()
@@ -54,6 +54,22 @@ def wait_running(max_wait_sec=600, poll_interval=15):
     return False
 
 
+def wait_url(url, expect_substrings=None, max_wait_sec=900, poll_interval=20):
+    """轮询 URL 直到 GET 200 且 body 含任一 expect_substrings；无 HF_TOKEN 时用。"""
+    if expect_substrings is None:
+        expect_substrings = ("HuggingRun", "Run anything", "noVNC")
+    start = time.time()
+    while (time.time() - start) < max_wait_sec:
+        status, body = http_get(url, timeout=30)
+        if status == 200 and any(s in body for s in expect_substrings):
+            print(f"[monitor] URL ready: {url}")
+            return True
+        print(f"[monitor] URL not ready: status={status}, waiting {poll_interval}s ...")
+        time.sleep(poll_interval)
+    print("[monitor] Timeout waiting for URL content")
+    return False
+
+
 def http_get(url, timeout=30, retries=3, retry_delay=2):
     """GET url; retry on 502/503/timeout/connection errors (generic HF robustness)."""
     last_status, last_body, last_err = None, "", None
@@ -154,6 +170,8 @@ def main():
     p.add_argument("--max-wait", type=int, default=600)
     p.add_argument("--expect", action="append", dest="expect_substrings",
                    help="Expected substring(s) in response body (basic test). Can repeat. Default: HuggingRun, Run anything")
+    p.add_argument("--wait-url", action="store_true",
+                   help="Poll URL until 200 and body contains one of --expect (no HF_TOKEN needed)")
     args = p.parse_args()
     SPACE_ID = args.space_id
     APP_URL = args.url.rstrip("/")
@@ -168,6 +186,12 @@ def main():
         if not ok:
             sys.exit(1)
 
+    if args.wait_url:
+        ok = wait_url(APP_URL, expect_substrings=expect_substrings or ("HuggingRun", "Run anything", "noVNC"),
+                     max_wait_sec=args.max_wait, poll_interval=20)
+        if not ok:
+            sys.exit(1)
+
     if args.test:
         print(f"[test] Target: {APP_URL}")
         if not test_basic(APP_URL, expect_substrings=expect_substrings):

ubuntu-desktop/start-desktop.sh

@@ -20,8 +20,8 @@ Xvfb "$DISPLAY" -screen 0 1280x720x24 -ac +extension GLX +render -noreset &
 XVFB_PID=$!
 sleep 2
 
-# Start dbus for session (user session only; no system dbus as we run as non-root)
-dbus-daemon --session
+# Start dbus for session (optional; avoid exit on failure so noVNC can still serve)
+dbus-daemon --session 2>/dev/null || true
 
 # Start XFCE (lightweight)
 startxfce4 &
@@ -31,10 +31,5 @@ sleep 3
 # x11vnc: share display :99 on port 5901
 x11vnc -display "$DISPLAY" -rfbport "$VNC_PORT" -forever -shared -noxdamage -bg
 
-# noVNC: web on 7860, proxy to VNC
-if [ -x /opt/noVNC/utils/novnc_proxy ]; then
-  /opt/noVNC/utils/novnc_proxy --listen "$NOVNC_PORT" --vnc "localhost:$VNC_PORT"
-else
-  # Fallback: websockify + simple http serve
-  (cd /opt/noVNC && ./utils/novnc_proxy --listen "$NOVNC_PORT" --vnc "localhost:$VNC_PORT")
-fi
+# noVNC: must run in foreground so container stays alive; serve web from /opt/noVNC
+exec /bin/bash -c "cd /opt/noVNC && exec ./utils/novnc_proxy --listen $NOVNC_PORT --vnc localhost:$VNC_PORT --web /opt/noVNC"