Update entrypoint.sh

entrypoint.sh

@@ -1,31 +1,49 @@
 #!/bin/sh
-
 # OpenClaw HF Spaces - Production Entrypoint
-# Storage: HF Storage Bucket mounted at /data (100 GB, persists across restarts)
-
-# -- resolve writable home ----------------------------------------
-
+# Storage: HF Storage Bucket at /data (100 GB persistent)
+
+# ----------------------------------------------------------------
+# Logging
+# ----------------------------------------------------------------
+ts() { date -u +"%H:%M:%S"; }
+log()  { echo "[$(ts)] [entrypoint] $*"; }
+warn() { echo "[$(ts)] [entrypoint] WARN: $*"; }
+
+# ----------------------------------------------------------------
+# Storage: resolve OPENCLAW_HOME
+# Prefer /data (HF Storage Bucket). Fall back to /home/user.
+# Retry up to 5s in case the bucket mount is slightly delayed.
+# ----------------------------------------------------------------
 OPENCLAW_HOME=/home/user
 mkdir -p /home/user/.openclaw
 
-if [ -d /data ]; then
-  if touch /data/.bucket-write-test 2>/dev/null; then
-    rm -f /data/.bucket-write-test
+RETRIES=5
+i=0
+while [ $i -lt $RETRIES ]; do
+  if [ -d /data ] && touch /data/.write-test 2>/dev/null; then
+    rm -f /data/.write-test
     OPENCLAW_HOME=/data
     mkdir -p /data/.openclaw
-    echo "[entrypoint] Storage bucket at /data is writable - using persistent storage"
-  else
-    echo "[entrypoint] WARNING: /data exists but is not writable - falling back to ephemeral /home/user"
+    log "Storage bucket /data is writable - using persistent storage"
+    break
   fi
-else
-  echo "[entrypoint] WARNING: /data not found - bucket may not be mounted, using ephemeral /home/user"
+  i=$((i+1))
+  if [ $i -lt $RETRIES ]; then
+    log "Waiting for /data mount... ($i/$RETRIES)"
+    sleep 1
+  fi
+done
+
+if [ "$OPENCLAW_HOME" = "/home/user" ]; then
+  warn "/data not writable after ${RETRIES}s - using ephemeral /home/user"
 fi
 
 export OPENCLAW_HOME
-echo "[entrypoint] OPENCLAW_HOME=$OPENCLAW_HOME"
-
-# -- dynamic provider key export ----------------------------------
+log "OPENCLAW_HOME=$OPENCLAW_HOME"
 
+# ----------------------------------------------------------------
+# Export provider API keys from Secrets
+# ----------------------------------------------------------------
 for VAR in $(env | cut -d= -f1); do
   case "$VAR" in
     OPENCLAW_*|SPACE_*|SYSTEM_*|HF_*|NODE_*|npm_*) continue ;;
@@ -35,7 +53,7 @@ for VAR in $(env | cut -d= -f1); do
       VAL=$(printenv "$VAR" 2>/dev/null || true)
       if [ -n "$VAL" ]; then
         export "$VAR"
-        echo "[entrypoint] exported: $VAR"
+        log "exported: $VAR"
       fi
       ;;
   esac
@@ -43,27 +61,27 @@ done
 
 export HF_TOKEN="${HF_TOKEN:-}"
 
-# -- run setup (patch mode: preserves user settings) --------------
-
-echo "[entrypoint] Running setup..."
+# ----------------------------------------------------------------
+# One-time setup (config write, webhook registration, seed files)
+# ----------------------------------------------------------------
+log "Running setup..."
 node /app/spaces/huggingface/setup-hf-config.mjs || true
-echo "[entrypoint] Setup done."
-
-# -- security audit -----------------------------------------------
+log "Setup done."
 
+# ----------------------------------------------------------------
+# Security audit (non-fatal)
+# ----------------------------------------------------------------
 if [ -f /app/security-check.sh ]; then
   sh /app/security-check.sh || true
 fi
 
-# -- auto-approve pending device pairings -------------------------
-
-# Sub-agents connecting as nodes require device pairing.
-# This loop detects pending pairing requests and approves them automatically.
-
+# ----------------------------------------------------------------
+# Auto-approve pending device pairings (background)
+# ----------------------------------------------------------------
 (
   DEVICES_DIR="$OPENCLAW_HOME/.openclaw/devices"
   mkdir -p "$DEVICES_DIR"
-  echo "[auto-pair] Device auto-approval started"
+  log "Device auto-pairing watcher started"
   while true; do
     sleep 8
     PENDING="$DEVICES_DIR/pending.json"
@@ -71,63 +89,77 @@ fi
     if [ -f "$PENDING" ]; then
       node - << 'JSEOF'
 const fs = require('fs');
-const devDir = process.env.OPENCLAW_HOME + '/.openclaw/devices';
-const pendingPath = devDir + '/pending.json';
-const pairedPath  = devDir + '/paired.json';
+const dir  = process.env.OPENCLAW_HOME + '/.openclaw/devices';
+const pend = dir + '/pending.json';
+const pair = dir + '/paired.json';
 try {
-  const raw = fs.readFileSync(pendingPath, 'utf-8').trim();
+  const raw = fs.readFileSync(pend, 'utf-8').trim();
   if (!raw || raw === '[]' || raw === '{}') process.exit(0);
   let pending = JSON.parse(raw);
   if (!Array.isArray(pending)) pending = Object.values(pending);
   if (pending.length === 0) process.exit(0);
   let paired = [];
-  if (fs.existsSync(pairedPath)) {
-    try { paired = JSON.parse(fs.readFileSync(pairedPath, 'utf-8')); } catch(e) {}
-  }
+  try { paired = JSON.parse(fs.readFileSync(pair, 'utf-8')); } catch(e) {}
   if (!Array.isArray(paired)) paired = [];
-  const pairedIds = new Set(paired.map(function(d) { return d.id || d.deviceId || d.name; }));
-  const toApprove = pending.filter(function(d) {
-    return !pairedIds.has(d.id || d.deviceId || d.name);
-  });
-  if (toApprove.length > 0) {
-    const approved = toApprove.map(function(d) {
-      return Object.assign({}, d, { approved: true, approvedAt: new Date().toISOString() });
-    });
-    paired = paired.concat(approved);
-    fs.writeFileSync(pairedPath, JSON.stringify(paired, null, 2));
-    fs.writeFileSync(pendingPath, '[]');
-    console.log('[auto-pair] Approved ' + toApprove.length + ' device(s)');
-  }
+  const ids = new Set(paired.map(function(d){ return d.id||d.deviceId||d.name; }));
+  const todo = pending.filter(function(d){ return !ids.has(d.id||d.deviceId||d.name); });
+  if (todo.length === 0) process.exit(0);
+  const now = new Date().toISOString();
+  paired = paired.concat(todo.map(function(d){
+    return Object.assign({}, d, { approved: true, approvedAt: now });
+  }));
+  fs.writeFileSync(pair, JSON.stringify(paired, null, 2));
+  fs.writeFileSync(pend, '[]');
+  console.log('[auto-pair] Approved ' + todo.length + ' device(s)');
 } catch(e) { /* ignore */ }
 JSEOF
     fi
   done
 ) &
 
-# -- gateway loop -------------------------------------------------
-
-# Gateway exits on config save (OpenClaw full process restart).
-# When OpenClaw restarts it spawns a child process then the parent exits.
-# We must wait for port 7860 to be free before starting a new instance.
+# ----------------------------------------------------------------
+# Gateway loop
+#
+# OpenClaw restart behaviour:
+#   - On config save it spawns a child process (new gateway) then
+#     the parent exits with code 0.
+#   - The child inherits the port 7860 lock.
+#   - We must NOT restart until the child also exits (port is free).
+#
+# Normal crash: port is immediately free, loop restarts quickly.
+# Config-save restart: port stays held by child; we wait up to 90s.
+# ----------------------------------------------------------------
+log "Starting gateway loop..."
 
-echo "[entrypoint] Starting gateway loop..."
 while true; do
-  echo "[entrypoint] Gateway starting..."
+  log "Gateway starting..."
+
   node /app/openclaw.mjs gateway \
     --allow-unconfigured \
     --bind lan \
     --port 7860
-  EXIT_CODE=$?
-  echo "[entrypoint] Gateway exited (code $EXIT_CODE) - waiting for port 7860 to clear..."
-  WAIT=0
+  CODE=$?
+
+  log "Gateway exited (code $CODE)"
+
+  # Wait for port 7860 to be released before starting a new instance
+  WAITED=0
   while nc -z 127.0.0.1 7860 2>/dev/null; do
+    if [ $WAITED -eq 0 ]; then
+      log "Port 7860 still held (spawned child running) - waiting..."
+    fi
     sleep 2
-    WAIT=$((WAIT+2))
-    if [ $WAIT -ge 60 ]; then
-      echo "[entrypoint] Port 7860 still in use after 60s - forcing restart anyway"
+    WAITED=$((WAITED + 2))
+    if [ $WAITED -ge 90 ]; then
+      warn "Port 7860 still in use after 90s - forcing restart"
       break
     fi
   done
-  echo "[entrypoint] Restarting gateway..."
+
+  if [ $WAITED -gt 0 ]; then
+    log "Port free after ${WAITED}s"
+  fi
+
   sleep 1
+  log "Restarting gateway..."
 done