Update setup-hf-config.mjs

setup-hf-config.mjs

@@ -9,140 +9,127 @@ var CONFIG_PATH = path.join(STATE_DIR, "openclaw.json");
 console.log("[setup] Starting… HOME=" + HOME);
 
 function parseList(val) {
-if (!val || !val.trim()) return [];
-return val.split(",").map(function(s) { return s.trim(); }).filter(Boolean);
+  if (!val || !val.trim()) return [];
+  return val.split(",").map(function(s) { return s.trim(); }).filter(Boolean);
 }
 
 var gatewayToken    = (process.env.OPENCLAW_GATEWAY_TOKEN    || "").trim();
 var gatewayPassword = (process.env.OPENCLAW_GATEWAY_PASSWORD || "").trim();
 
 if (!gatewayToken && !gatewayPassword) {
-console.error("[setup] ERROR: No OPENCLAW_GATEWAY_TOKEN or OPENCLAW_GATEWAY_PASSWORD");
-process.exit(0);
+  console.error("[setup] ERROR: No OPENCLAW_GATEWAY_TOKEN or OPENCLAW_GATEWAY_PASSWORD");
+  process.exit(0);
 }
 
-// FIX 1: default model uses correct google/ prefix
+// ✅ 默认模型（仅默认值，不控制可用模型）
 var defaultModel = (process.env.OPENCLAW_HF_DEFAULT_MODEL || "").trim() ||
-"google/gemini-2.0-flash";
+                   "google/gemini-2.0-flash";
 
-// FIX 2: read GOOGLE_API_KEY first, GEMINI_API_KEY as alias
-var geminiKey     = (process.env.GOOGLE_API_KEY || process.env.GEMINI_API_KEY || "").trim();
-var groqKey       = (process.env.GROQ_API_KEY       || "").trim();
-var anthropicKey  = (process.env.ANTHROPIC_API_KEY  || "").trim();
-var openaiKey     = (process.env.OPENAI_API_KEY     || "").trim();
-var openrouterKey = (process.env.OPENROUTER_API_KEY || "").trim();
-var telegramToken = (process.env.TELEGRAM_BOT_TOKEN || "").trim();
+// 👉 动态扫描所有 API Key / BOT Token，用于日志
+var detectedKeys = Object.keys(process.env)
+  .filter(k => (k.endsWith("_API_KEY") || k.endsWith("_BOT_TOKEN")) && process.env[k]);
+
+// 按字母顺序打印日志，更直观
+detectedKeys.sort();
+console.log("[setup] Detected environment keys:");
+detectedKeys.forEach(k => console.log(" - " + k));
 
 var envProxies = parseList(process.env.OPENCLAW_GATEWAY_TRUSTED_PROXIES);
 var trustedProxies = envProxies.length > 0 ? envProxies : [
-"10.16.4.123", "10.16.7.92",  "10.16.18.232",
-"10.16.34.155","10.16.43.133","10.16.1.206",
-"10.20.1.9",   "10.20.1.222",
-"10.20.26.157","10.20.31.87",
-"10.20.0.1",   "172.17.0.1"
+  "10.16.4.123", "10.16.7.92",  "10.16.18.232",
+  "10.16.34.155","10.16.43.133","10.16.1.206",
+  "10.20.1.9",   "10.20.1.222",
+  "10.20.26.157","10.20.31.87",
+  "10.20.0.1",   "172.17.0.1"
 ];
 
 var config = {
-gateway: {
-auth: gatewayToken
-? { mode: "token",    token:    gatewayToken    }
-: { mode: "password", password: gatewayPassword },
-controlUi: {
-dangerouslyDisableDeviceAuth:            true,
-allowInsecureAuth:                        true,
-dangerouslyAllowHostHeaderOriginFallback: true,
-allowedOrigins: ["*"]
-},
-trustedProxies: trustedProxies
-},
-agents: {
-defaults: {
-model: defaultModel
-}
-},
-env: { vars: {} }
+  gateway: {
+    auth: gatewayToken
+      ? { mode: "token", token: gatewayToken }
+      : { mode: "password", password: gatewayPassword },
+    controlUi: {
+      dangerouslyDisableDeviceAuth: true,
+      allowInsecureAuth: true,
+      dangerouslyAllowHostHeaderOriginFallback: true,
+      allowedOrigins: ["*"]
+    },
+    trustedProxies: trustedProxies
+  },
+  agents: {
+    defaults: {
+      model: defaultModel   // ✅ 只保留默认模型
+    }
+  },
+  env: { vars: {} }       // ✅ 保留结构，但不写入 API Key
 };
 
-// write API keys - GOOGLE_API_KEY is the correct env var name OpenClaw reads
-if (geminiKey) {
-config.env.vars.GOOGLE_API_KEY = geminiKey;
-config.env.vars.GEMINI_API_KEY = geminiKey;
-}
-if (groqKey)       { config.env.vars.GROQ_API_KEY       = groqKey;       }
-if (anthropicKey)  { config.env.vars.ANTHROPIC_API_KEY  = anthropicKey;  }
-if (openaiKey)     { config.env.vars.OPENAI_API_KEY     = openaiKey;     }
-if (openrouterKey) { config.env.vars.OPENROUTER_API_KEY = openrouterKey; }
+// ❌ 删除：所有 API KEY 写入 config 的逻辑
+// 👉 OpenClaw 会直接从环境变量读取（entrypoint 已经 export 了）
 
-// Telegram - auto detect best node
+// ====================== Telegram ======================
 async function detectTelegramNode(nodes) {
-for (var i = 0; i < nodes.length; i++) {
-var node = nodes[i];
-try {
-await new Promise(function(resolve, reject) {
-var req = https.get(node + "/bot" + telegramToken + "/getMe", function(res) {
-if (res.statusCode === 200) resolve(true);
-else reject(new Error("Status " + res.statusCode));
-});
-req.on("error", reject);
-req.setTimeout(4000, function() { req.destroy(); reject(new Error("Timeout")); });
-});
-console.log("[setup] Telegram node OK: " + node);
-// FIX 3: correct regex, was //$/ (broken) now /\/$/ (correct)
-return node.replace(/\/$/, "");
-} catch (e) {
-console.log("[setup] Telegram node failed: " + node + " (" + e.message + ")");
-}
-}
-return null;
+  for (var i = 0; i < nodes.length; i++) {
+    var node = nodes[i];
+    try {
+      await new Promise(function(resolve, reject) {
+        var req = https.get(node + "/bot" + (process.env.TELEGRAM_BOT_TOKEN || "") + "/getMe", function(res) {
+          if (res.statusCode === 200) resolve(true);
+          else reject(new Error("Status " + res.statusCode));
+        });
+        req.on("error", reject);
+        req.setTimeout(4000, function() { req.destroy(); reject(new Error("Timeout")); });
+      });
+      console.log("[setup] Telegram node OK: " + node);
+      return node.replace(/\/$/, "");
+    } catch (e) {
+      console.log("[setup] Telegram node failed: " + node + " (" + e.message + ")");
+    }
+  }
+  return null;
 }
 
 var telegramNodes = [
-"https://api.telegram.org",
-"https://tg-api.vercel.app",
-"https://telegram-bot-api.vercel.app"
+  "https://api.telegram.org",
+  "https://tg-api.vercel.app",
+  "https://telegram-bot-api.vercel.app"
 ];
 
 async function setupTelegram() {
-if (!telegramToken) {
-console.log("[setup] Telegram disabled (no token)");
-return;
-}
-var apiRoot = await detectTelegramNode(telegramNodes);
-var finalRoot = apiRoot || "https://api.telegram.org";
-config.channels = {
-telegram: {
-enabled: true,
-accounts: {
-main: { botToken: telegramToken, apiRoot: finalRoot }
-}
-}
-};
-console.log("[setup] Telegram enabled, apiRoot=" + finalRoot);
+  var telegramToken = process.env.TELEGRAM_BOT_TOKEN || "";
+  if (!telegramToken) {
+    console.log("[setup] Telegram disabled (no token)");
+    return;
+  }
+  var apiRoot = await detectTelegramNode(telegramNodes);
+  var finalRoot = apiRoot || "https://api.telegram.org";
+  config.channels = {
+    telegram: {
+      enabled: true,
+      accounts: {
+        main: { botToken: telegramToken, apiRoot: finalRoot }
+      }
+    }
+  };
+  console.log("[setup] Telegram enabled, apiRoot=" + finalRoot);
 }
 
 (async function main() {
-await setupTelegram();
-
-try {
-fs.mkdirSync(STATE_DIR, { recursive: true });
-if (fs.existsSync(CONFIG_PATH)) {
-fs.copyFileSync(CONFIG_PATH, CONFIG_PATH + ".bak");
-}
-fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2), "utf-8");
-console.log("[setup] Config written -> " + CONFIG_PATH);
-} catch (e) {
-console.error("[setup] Write failed: " + e.message);
-process.exit(0);
-}
-
-console.log("[setup] auth="      + (gatewayToken ? "token" : "password"));
-console.log("[setup] model="     + defaultModel);
-console.log("[setup] gemini="    + !!geminiKey);
-console.log("[setup] groq="      + !!groqKey);
-console.log("[setup] anthropic=" + !!anthropicKey);
-console.log("[setup] openai="    + !!openaiKey);
-console.log("[setup] telegram="  + !!telegramToken);
-})().catch(function(err) {
-console.error("[setup] Fatal: " + err.message);
-process.exit(0);
-});
+  await setupTelegram();
+
+  try {
+    fs.mkdirSync(STATE_DIR, { recursive: true });
+    if (fs.existsSync(CONFIG_PATH)) {
+      fs.copyFileSync(CONFIG_PATH, CONFIG_PATH + ".bak");
+    }
+    fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2), "utf-8");
+    console.log("[setup] Config written -> " + CONFIG_PATH);
+  } catch (e) {
+    console.error("[setup] Write failed: " + e.message);
+    process.exit(0);
+  }
+
+  console.log("[setup] auth=" + (gatewayToken ? "token" : "password"));
+  console.log("[setup] default model=" + defaultModel);
+  console.log("[setup] Detected keys count=" + detectedKeys.length);
+})();