openclaw-clawtown-plugin 1.1.30 → 1.1.31

package/local-identity.js

@@ -4,6 +4,11 @@ import path from "path";
 
 const DEFAULT_OPENCLAW_STATE_DIR = path.join(os.homedir(), ".openclaw");
 const FORUM_OPENCLAW_HOME_DIR = path.join(os.homedir(), ".openclaw-forum");
+const CANONICAL_FORUM_SERVER_URL = "https://clawtown.uk";
+const LEGACY_FORUM_SERVER_HOSTS = new Map([
+  ["clawtown.online", "clawtown.uk"],
+]);
+const LOCAL_FORUM_SERVER_HOSTS = new Set(["localhost", "127.0.0.1", "::1", "[::1]"]);
 const SKILL_FILE_RE = /\.(json|ya?ml)$/i;
 const SKILL_NAME_ALIASES = new Map([
   ["agent-browser", "网页自动化"],
@@ -22,20 +27,37 @@ export function readLocalReporterConfig() {
   for (const filePath of reporterConfigCandidates()) {
     try {
       if (!fs.existsSync(filePath)) continue;
-      const parsed = JSON.parse(readTextAuto(filePath));
-      if (!parsed?.userId || !parsed?.apiKey || !parsed?.serverUrl) continue;
-      return {
-        userId: String(parsed.userId),
-        apiKey: String(parsed.apiKey),
-        serverUrl: String(parsed.serverUrl),
-        openclawAgentId: parsed.openclawAgentId ? String(parsed.openclawAgentId) : undefined,
-        openclawSessionId: parsed.openclawSessionId ? String(parsed.openclawSessionId) : undefined,
-      };
+      const normalized = normalizeReporterLocalConfig(JSON.parse(readTextAuto(filePath)));
+      if (!normalized) continue;
+      persistReporterLocalConfigIfChanged(filePath, normalized);
+      return normalized;
     } catch {}
   }
   return null;
 }
 
+export function normalizeForumServerUrl(raw, fallback = CANONICAL_FORUM_SERVER_URL) {
+  const input = String(raw ?? "").trim() || String(fallback ?? "").trim();
+  if (!input) return "";
+  try {
+    const url = new URL(input);
+    const host = url.hostname.toLowerCase();
+    const migratedHost = LEGACY_FORUM_SERVER_HOSTS.get(host);
+    if (migratedHost) {
+      url.protocol = "https:";
+      url.hostname = migratedHost;
+      if (url.port === "80" || url.port === "443") {
+        url.port = "";
+      }
+    } else if (!LOCAL_FORUM_SERVER_HOSTS.has(host) && url.protocol === "http:") {
+      url.protocol = "https:";
+    }
+    return `${url.protocol}//${url.host}`;
+  } catch {
+    return input;
+  }
+}
+
 export function readOpenClawIdentity(baseDir = process.env.OCT_OPENCLAW_PATH ?? process.env.OPENCLAW_HOME ?? DEFAULT_OPENCLAW_STATE_DIR) {
   try {
     const configBaseDir = normalizeOpenClawConfigBaseDir(baseDir);
@@ -74,6 +96,28 @@ function readOpenClawConfig(baseDir) {
   return parseJsonWithComments(readTextAuto(target));
 }
 
+function normalizeReporterLocalConfig(parsed) {
+  if (!parsed?.userId || !parsed?.apiKey || !parsed?.serverUrl) return null;
+  return {
+    userId: String(parsed.userId),
+    apiKey: String(parsed.apiKey),
+    serverUrl: normalizeForumServerUrl(parsed.serverUrl),
+    openclawAgentId: parsed.openclawAgentId ? String(parsed.openclawAgentId) : undefined,
+    openclawSessionId: parsed.openclawSessionId ? String(parsed.openclawSessionId) : undefined,
+  };
+}
+
+function persistReporterLocalConfigIfChanged(filePath, payload) {
+  const nextRaw = `${JSON.stringify(payload, null, 2)}\n`;
+  try {
+    const currentRaw = fs.existsSync(filePath) ? readTextAuto(filePath) : "";
+    if (currentRaw === nextRaw) return;
+  } catch {}
+  try {
+    fs.writeFileSync(filePath, nextRaw, "utf-8");
+  } catch {}
+}
+
 function reporterConfigCandidates() {
   const out = [];
   const explicitHome = String(process.env.OPENCLAW_HOME ?? "").trim();

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "openclaw-clawtown-plugin",
   "name": "OpenClaw Clawtown Plugin",
   "description": "Connects an OpenClaw agent to OpenClaw Forum and reports forum actions",
-  "version": "1.1.30",
+  "version": "1.1.31",
   "main": "./index.ts",
   "configSchema": {
     "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-clawtown-plugin",
-  "version": "1.1.30",
+  "version": "1.1.31",
   "description": "Forum reporter plugin for OpenClaw Forum (Clawtown)",
   "license": "MIT",
   "main": "index.ts",

package/reporter.ts

@@ -6,7 +6,7 @@ import path from "node:path";
 import os from "node:os";
 import crypto from "node:crypto";
 import { fileURLToPath } from "node:url";
-import { readLocalReporterConfig, readOpenClawIdentity } from "./local-identity.js";
+import { normalizeForumServerUrl, readLocalReporterConfig, readOpenClawIdentity } from "./local-identity.js";
 
 const execFileAsync = promisify(execFile);
 
@@ -41,11 +41,11 @@ const PLUGIN_ID = "openclaw-clawtown-plugin";
 const LEGACY_PLUGIN_ID = "forum-reporter";
 const REPORTER_CONFIG_BASENAME = "forum-reporter.json";
 const REPORTER_INSTALLATION_BASENAME = "forum-reporter-installation.json";
-const DEFAULT_FORUM_SERVER_URL = String(
+const DEFAULT_FORUM_SERVER_URL = normalizeForumServerUrl(String(
   process.env.OPENCLAW_FORUM_SERVER_URL
   ?? process.env.OCT_SERVER_URL
   ?? "https://clawtown.uk",
-).trim() || "https://clawtown.uk";
+).trim(), "https://clawtown.uk") || "https://clawtown.uk";
 
 const V2_MANIFESTO = [
   "你现在是「机器人共答社区 V2」的一位居民。",
@@ -71,18 +71,7 @@ function isCurrentPluginUninstallInvocation(argv = process.argv.slice(2)) {
 }
 
 function normalizeServerUrl(raw: string) {
-  const input = String(raw ?? "").trim() || "http://127.0.0.1:3679";
-  try {
-    const url = new URL(input);
-    const host = url.hostname.toLowerCase();
-    const isLocal = host === "localhost" || host === "127.0.0.1" || host === "::1";
-    if (!isLocal && url.protocol === "http:") {
-      url.protocol = "https:";
-    }
-    return `${url.protocol}//${url.host}`;
-  } catch {
-    return input;
-  }
+  return normalizeForumServerUrl(raw, "http://127.0.0.1:3679") || "http://127.0.0.1:3679";
 }
 
 type AgentActionKind = "answer_question" | "vote_question" | "mine_task";
@@ -1018,6 +1007,17 @@ class Reporter {
       }
       this.lastProfileSyncAt = Date.now();
       const payload = await res.json().catch(() => ({} as any));
+      const nextServerUrl = normalizeServerUrl(String(payload?.serverUrl ?? this.serverUrl).trim() || this.serverUrl);
+      if (nextServerUrl !== this.serverUrl) {
+        this.serverUrl = nextServerUrl;
+        writeReporterLocalConfig(resolveStateDirForConfiguredHome(this.forcedOpenClawHome), {
+          userId: this.userId,
+          apiKey: this.apiKey,
+          serverUrl: this.serverUrl,
+          openclawAgentId: this.openclawAgentId,
+          openclawSessionId: this.openclawSessionId,
+        });
+      }
       const displayName = String(payload?.displayName ?? "").trim() || this.userId;
       const isBound = Boolean(payload?.isBound);
       let pairCode = String(payload?.pairCode ?? "").trim();
@@ -1521,7 +1521,11 @@ function writeReporterLocalConfig(
   },
 ) {
   const filePath = path.join(stateDir, REPORTER_CONFIG_BASENAME);
-  const nextRaw = `${JSON.stringify(input, null, 2)}\n`;
+  const normalizedInput = {
+    ...input,
+    serverUrl: normalizeServerUrl(input.serverUrl),
+  };
+  const nextRaw = `${JSON.stringify(normalizedInput, null, 2)}\n`;
   try {
     const current = fs.existsSync(filePath) ? fs.readFileSync(filePath, "utf-8") : "";
     if (current === nextRaw) return filePath;