Update setup-hf-config.mjs

setup-hf-config.mjs

@@ -5,19 +5,11 @@ import https from "node:https";
 // ============================================================
 // OpenClaw HF Spaces - Production Config Writer
 //
-// KEY BEHAVIOR:
-// If openclaw.json exists and is valid -> PATCH only (preserve user settings)
-// If openclaw.json missing -> write fresh template
+// PATCH MODE: if openclaw.json already exists and is valid JSON,
+// only update: auth, env.vars, channels, workspace path.
+// ALL user settings from Control UI are preserved.
 //
-// What gets patched every run:
-//   gateway.auth        (from env OPENCLAW_GATEWAY_TOKEN)
-//   env.vars            (all provider API keys)
-//   channels.telegram   (from env TELEGRAM_BOT_TOKEN)
-//   agents.defaults.workspace (ensure correct path)
-//   gateway.trustedProxies    (ensure not empty)
-//
-// What is NEVER touched when patching:
-//   All user settings from Control UI (model choices, agent config, etc.)
+// FRESH MODE: if no config exists, write full template.
 // ============================================================
 
 var HOME        = process.env.OPENCLAW_HOME || process.env.HOME || "/home/user";
@@ -85,7 +77,26 @@ var trustedProxies = envProxies.length > 0 ? envProxies : [
 "10.20.0.1",      "172.17.0.1",   "127.0.0.1"
 ];
 
-// –– Telegram helpers –––––––––––––––––––
+// –– helpers ———————————————–
+function buildAuth() {
+return gatewayToken
+? { mode: "token",    token:    gatewayToken    }
+: { mode: "password", password: gatewayPassword };
+}
+function buildEnvVars() {
+var vars = {};
+providerKeys.forEach(function(pk) { vars[pk] = (process.env[pk] || "").trim(); });
+return vars;
+}
+function buildTelegramChannel(token) {
+return {
+telegram: {
+enabled:  true,
+accounts: { main: { botToken: token, apiRoot: "https://api.telegram.org" } }
+}
+};
+}
+
 function tgRequest(token, method, body) {
 return new Promise(function(resolve) {
 var data = JSON.stringify(body || {});
@@ -93,16 +104,11 @@ var req  = https.request({
 hostname: "api.telegram.org",
 path:     "/bot" + token + "/" + method,
 method:   "POST",
-headers:  {
-"Content-Type":   "application/json",
-"Content-Length": Buffer.byteLength(data)
-}
+headers:  { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(data) }
 }, function(res) {
 var buf = "";
 res.on("data", function(c) { buf += c; });
-res.on("end",  function() {
-try { resolve(JSON.parse(buf)); } catch (e) { resolve(null); }
-});
+res.on("end",  function() { try { resolve(JSON.parse(buf)); } catch (e) { resolve(null); } });
 });
 req.on("error", function() { resolve(null); });
 req.setTimeout(8000, function() { req.destroy(); resolve(null); });
@@ -111,11 +117,16 @@ req.end();
 });
 }
 
-async function setupWebhook(token) {
-if (!SPACE_HOST) {
-console.log("[setup] Telegram: set SPACE_HOST for auto webhook");
-return;
-}
+// –– main –––––––––––––––––––––––––
+(async function() {
+fs.mkdirSync(STATE_DIR, { recursive: true });
+fs.mkdirSync(WORKSPACE,  { recursive: true });
+fs.mkdirSync(path.join(WORKSPACE, "memory"), { recursive: true });
+
+var token = envStr("TELEGRAM_BOT_TOKEN");
+
+// Register webhook if possible
+if (token && SPACE_HOST) {
 var url = "https://" + SPACE_HOST + "/tg-webhook";
 var r = await tgRequest(token, "setWebhook", {
 url: url, drop_pending_updates: true, max_connections: 10
@@ -123,78 +134,47 @@ url: url, drop_pending_updates: true, max_connections: 10
 if (r && r.ok) {
 console.log("[setup] Telegram: webhook registered -> " + url);
 } else {
-console.log("[setup] Telegram: webhook failed (HF outbound blocked). Open in browser:");
+console.log("[setup] Telegram: webhook failed. Open in browser:");
 console.log("  https://api.telegram.org/bot" + token +
 "/setWebhook?url=" + url + "&drop_pending_updates=true");
 }
+} else if (!token) {
+console.log("[setup] Telegram: disabled (no TELEGRAM_BOT_TOKEN)");
 }
 
-function buildAuth() {
-return gatewayToken
-? { mode: "token",    token:    gatewayToken    }
-: { mode: "password", password: gatewayPassword };
-}
-
-function buildEnvVars() {
-var vars = {};
-providerKeys.forEach(function(pk) {
-vars[pk] = (process.env[pk] || "").trim();
-});
-return vars;
-}
-
-// –– main –––––––––––––––––––––––––
-(async function() {
-fs.mkdirSync(STATE_DIR, { recursive: true });
-fs.mkdirSync(WORKSPACE,  { recursive: true });
-fs.mkdirSync(path.join(WORKSPACE, "memory"), { recursive: true });
-
-var token = envStr("TELEGRAM_BOT_TOKEN");
-if (token) await setupWebhook(token);
-
-// –– PATCH MODE: existing valid config found ––––
+// –– PATCH MODE: existing valid config found ––
 if (fs.existsSync(CONFIG_PATH)) {
-var raw = fs.readFileSync(CONFIG_PATH, "utf-8").trim();
+var raw    = fs.readFileSync(CONFIG_PATH, "utf-8").trim();
 var parsed = null;
-try { parsed = JSON.parse(raw); } catch (e) { /* invalid, fall through to fresh write */ }
+try { parsed = JSON.parse(raw); } catch (e) { /* fall through to fresh write */ }
 
 if (parsed) {
-  // Patch only env-derived fields, preserve everything else
-  parsed.gateway        = parsed.gateway        || {};
-  parsed.gateway.auth   = buildAuth();
+  parsed.gateway                   = parsed.gateway         || {};
+  parsed.gateway.auth              = buildAuth();
   if (!parsed.gateway.trustedProxies || parsed.gateway.trustedProxies.length < 5) {
-    parsed.gateway.trustedProxies = trustedProxies;
-  }
-  parsed.agents                         = parsed.agents         || {};
-  parsed.agents.defaults                = parsed.agents.defaults || {};
-  parsed.agents.defaults.workspace      = WORKSPACE;
-  parsed.env                            = parsed.env            || {};
-  parsed.env.vars                       = buildEnvVars();
-
-  if (token) {
-    parsed.channels = {
-      telegram: {
-        enabled:  true,
-        accounts: { main: { botToken: token, apiRoot: "https://api.telegram.org" } }
-      }
-    };
+    parsed.gateway.trustedProxies  = trustedProxies;
   }
+  parsed.agents                    = parsed.agents          || {};
+  parsed.agents.defaults           = parsed.agents.defaults || {};
+  parsed.agents.defaults.workspace = WORKSPACE;
+  parsed.env                       = parsed.env             || {};
+  parsed.env.vars                  = buildEnvVars();
+  if (token) parsed.channels       = buildTelegramChannel(token);
 
   fs.copyFileSync(CONFIG_PATH, CONFIG_PATH + ".bak");
   fs.writeFileSync(CONFIG_PATH, JSON.stringify(parsed, null, 2), "utf-8");
   console.log("[setup] Patched existing config (user settings preserved)");
-  console.log("[setup]   workspace = " + WORKSPACE);
   console.log("[setup]   env.vars  = " + providerKeys.length);
+  console.log("[setup]   workspace = " + WORKSPACE);
   return;
 }
 }
 
-// –– FRESH MODE: no config or invalid config ––––
-console.log("[setup] No valid config found - writing fresh template");
-
+// –– FRESH MODE: no config or invalid config ––
+console.log("[setup] Writing fresh config template");
 var config = {
 gateway: {
-auth: buildAuth(),
+auth:           buildAuth(),
 controlUi: {
 allowInsecureAuth:                        true,
 allowedOrigins:                           ["*"],
@@ -203,20 +183,10 @@ dangerouslyAllowHostHeaderOriginFallback: true
 },
 trustedProxies: trustedProxies
 },
-agents: {
-defaults: { model: defaultModel, workspace: WORKSPACE }
-},
-env: { vars: buildEnvVars() }
+agents: { defaults: { model: defaultModel, workspace: WORKSPACE } },
+env:    { vars: buildEnvVars() }
 };
-
-if (token) {
-config.channels = {
-telegram: {
-enabled:  true,
-accounts: { main: { botToken: token, apiRoot: "https://api.telegram.org" } }
-}
-};
-}
+if (token) config.channels = buildTelegramChannel(token);
 
 fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2), "utf-8");
 console.log("[setup] Done.");