fix(config): avoid false reload restarts

2026-05-06 18:10:45 +00:00 · 2026-04-23 00:43:58 +01:00
parent c65b232463
commit f437d96ae2
11 changed files with 613 additions and 24 deletions
--- a/scripts/e2e/config-reload-source-docker.sh
+++ b/scripts/e2e/config-reload-source-docker.sh
@@ -0,0 +1,176 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+source "$ROOT_DIR/scripts/lib/docker-e2e-logs.sh"
+
+IMAGE_NAME="${OPENCLAW_CONFIG_RELOAD_E2E_IMAGE:-openclaw-config-reload-e2e}"
+SKIP_BUILD="${OPENCLAW_CONFIG_RELOAD_E2E_SKIP_BUILD:-0}"
+PORT="18789"
+TOKEN="reload-e2e-token"
+CONTAINER_NAME="openclaw-config-reload-e2e-$$"
+
+cleanup() {
+  docker rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true
+}
+trap cleanup EXIT
+
+if [ "$SKIP_BUILD" = "1" ]; then
+  echo "Reusing Docker image: $IMAGE_NAME"
+else
+  echo "Building Docker image..."
+  run_logged config-reload-build docker build -t "$IMAGE_NAME" -f "$ROOT_DIR/scripts/e2e/Dockerfile" "$ROOT_DIR"
+fi
+
+echo "Starting gateway container..."
+docker run -d \
+  --name "$CONTAINER_NAME" \
+  -e COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
+  -e GATEWAY_AUTH_TOKEN_REF="$TOKEN" \
+  -e OPENCLAW_SKIP_CHANNELS=1 \
+  -e OPENCLAW_SKIP_PROVIDERS=1 \
+  -e OPENCLAW_SKIP_GMAIL_WATCHER=1 \
+  -e OPENCLAW_SKIP_CRON=1 \
+  -e OPENCLAW_SKIP_CANVAS_HOST=1 \
+  "$IMAGE_NAME" \
+  bash -lc "set -euo pipefail
+entry=dist/index.mjs
+[ -f \"\$entry\" ] || entry=dist/index.js
+mkdir -p \"\$HOME/.openclaw\"
+cat > \"\$HOME/.openclaw/openclaw.json\" <<'JSON'
+{
+  \"gateway\": {
+    \"port\": $PORT,
+    \"auth\": {
+      \"mode\": \"token\",
+      \"token\": {
+        \"source\": \"env\",
+        \"provider\": \"default\",
+        \"id\": \"GATEWAY_AUTH_TOKEN_REF\"
+      }
+    },
+    \"controlUi\": {
+      \"enabled\": false
+    },
+    \"reload\": {
+      \"mode\": \"hybrid\",
+      \"debounceMs\": 0
+    }
+  },
+  \"plugins\": {
+    \"installs\": {
+      \"lossless-claw\": {
+        \"source\": \"npm\",
+        \"spec\": \"@martian-engineering/lossless-claw\",
+        \"installPath\": \"/tmp/lossless-claw\",
+        \"installedAt\": \"2026-04-22T00:00:00.000Z\",
+        \"resolvedAt\": \"2026-04-22T00:00:00.000Z\"
+      }
+    }
+  }
+}
+JSON
+node \"\$entry\" gateway --port $PORT --bind loopback --allow-unconfigured > /tmp/config-reload-e2e.log 2>&1" >/dev/null
+
+echo "Waiting for gateway..."
+ready=0
+for _ in $(seq 1 180); do
+  if [ "$(docker inspect -f '{{.State.Running}}' "$CONTAINER_NAME" 2>/dev/null || echo false)" != "true" ]; then
+    break
+  fi
+  if docker exec "$CONTAINER_NAME" bash -lc "node --input-type=module -e '
+    import net from \"node:net\";
+    const socket = net.createConnection({ host: \"127.0.0.1\", port: $PORT });
+    const timeout = setTimeout(() => {
+      socket.destroy();
+      process.exit(1);
+    }, 400);
+    socket.on(\"connect\", () => {
+      clearTimeout(timeout);
+      socket.end();
+      process.exit(0);
+    });
+    socket.on(\"error\", () => {
+      clearTimeout(timeout);
+      process.exit(1);
+    });
+  ' >/dev/null 2>&1"; then
+    ready=1
+    break
+  fi
+  sleep 0.5
+done
+
+if [ "$ready" -ne 1 ]; then
+  echo "Gateway failed to start"
+  docker logs "$CONTAINER_NAME" 2>&1 | tail -n 120 || true
+  docker exec "$CONTAINER_NAME" bash -lc "tail -n 120 /tmp/config-reload-e2e.log" || true
+  exit 1
+fi
+
+echo "Checking initial RPC status..."
+docker exec "$CONTAINER_NAME" bash -lc "
+entry=dist/index.mjs
+[ -f \"\$entry\" ] || entry=dist/index.js
+node \"\$entry\" gateway status --url ws://127.0.0.1:$PORT --token '$TOKEN' --require-rpc --timeout 5000 >/tmp/config-reload-status-before.log
+"
+
+echo "Mutating plugin install timestamp metadata..."
+docker exec "$CONTAINER_NAME" bash -lc "node --input-type=module - <<'NODE'
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+const configPath = path.join(os.homedir(), '.openclaw', 'openclaw.json');
+const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+config.plugins.installs['lossless-claw'].installedAt = '2026-04-22T00:01:00.000Z';
+config.plugins.installs['lossless-claw'].resolvedAt = '2026-04-22T00:01:00.000Z';
+fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
+NODE"
+
+sleep 2
+
+if [ "$(docker inspect -f '{{.State.Running}}' "$CONTAINER_NAME" 2>/dev/null || echo false)" != "true" ]; then
+  echo "Gateway container exited after config metadata write"
+  docker logs "$CONTAINER_NAME" 2>&1 | tail -n 120 || true
+  exit 1
+fi
+
+echo "Checking post-write RPC status..."
+docker exec "$CONTAINER_NAME" bash -lc "
+entry=dist/index.mjs
+[ -f \"\$entry\" ] || entry=dist/index.js
+node \"\$entry\" gateway status --url ws://127.0.0.1:$PORT --token '$TOKEN' --require-rpc --timeout 5000 >/tmp/config-reload-status-after.log
+"
+
+echo "Checking reload log..."
+docker exec "$CONTAINER_NAME" bash -lc "node --input-type=module - <<'NODE'
+import fs from 'node:fs';
+
+const log = fs.readFileSync('/tmp/config-reload-e2e.log', 'utf8');
+const reloadLines = log
+  .split('\n')
+  .filter((line) => line.includes('config change detected; evaluating reload'));
+const restartLines = log
+  .split('\n')
+  .filter((line) => line.includes('config change requires gateway restart'));
+if (restartLines.length > 0) {
+  console.error(log.split('\n').slice(-160).join('\n'));
+  throw new Error('unexpected restart-required reload line found');
+}
+for (const line of reloadLines) {
+  for (const needle of ['gateway.auth.token', 'plugins.entries.firecrawl.config.webFetch']) {
+    if (line.includes(needle)) {
+      console.error(log.split('\n').slice(-160).join('\n'));
+      throw new Error('runtime-only path appeared in reload diff: ' + needle);
+    }
+  }
+}
+if (reloadLines.length === 0) {
+  console.error(log.split('\n').slice(-160).join('\n'));
+  throw new Error('expected config reload detection log after metadata write');
+}
+console.log('ok');
+NODE"
+
+echo "Config reload Docker E2E passed."