Update setup-hf-config.mjs

setup-hf-config.mjs

@@ -9,117 +9,166 @@ var SPACE_HOST = (process.env.SPACE_HOST || "").trim();
 
 console.log("[setup] Starting… HOME=" + HOME);
 
-// -- helpers --
+// – helpers –
 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);
 }
 function envStr(key) { return (process.env[key] || "").trim(); }
 
-// -- auth --
+// – auth –
 var gatewayToken = envStr("OPENCLAW_GATEWAY_TOKEN");
 var gatewayPassword = envStr("OPENCLAW_GATEWAY_PASSWORD");
 if (!gatewayToken && !gatewayPassword) {
-  console.error("[setup] FATAL: set OPENCLAW_GATEWAY_TOKEN or OPENCLAW_GATEWAY_PASSWORD in Secrets");
-  process.exit(0);
+console.error("[setup] FATAL: set OPENCLAW_GATEWAY_TOKEN or OPENCLAW_GATEWAY_PASSWORD in Secrets");
+process.exit(0);
 }
 
-// -- default model --
+// – default model –
 var defaultModel = envStr("OPENCLAW_HF_DEFAULT_MODEL") || "google/gemini-2.0-flash";
 
+// – dynamic provider key detection –
 var EXCLUDE_PREFIXES = [
-  "OPENCLAW_", "SPACE_", "SYSTEM_", "HF_",
-  "NODE_", "PATH", "HOME", "USER", "PWD", "LANG", "LC_",
-  "npm_", "HOSTNAME", "SHELL", "TERM", "SHLVL"
+"OPENCLAW_", "SPACE_", "SYSTEM_", "HF_",
+"NODE_", "PATH", "HOME", "USER", "PWD", "LANG", "LC_",
+"npm_", "HOSTNAME", "SHELL", "TERM", "SHLVL"
 ];
-
 var INCLUDE_SUFFIXES = [
-  "_API_KEY", "_SECRET_KEY", "_ACCESS_TOKEN",
-  "_BOT_TOKEN", "_AUTH_TOKEN", "_APP_KEY",
-  "_SESSION_KEY", "_COOKIE", "_TOKEN" 
+"_API_KEY", "_SECRET_KEY", "_ACCESS_TOKEN",
+"_BOT_TOKEN", "_AUTH_TOKEN", "_APP_KEY",
+"_SESSION_KEY", "_COOKIE", "_TOKEN"
 ];
-
 function isProviderKey(k){
-  for (let i=0;i<EXCLUDE_PREFIXES.length;i++){ if(k.indexOf(EXCLUDE_PREFIXES[i])===0) return false; }
-  for (let i=0;i<INCLUDE_SUFFIXES.length;i++){ 
-    let s=INCLUDE_SUFFIXES[i]; 
-    if(k.length>s.length && k.indexOf(s)===k.length-s.length) return true; 
-  }
-  return false;
+for (let i=0;i<EXCLUDE_PREFIXES.length;i++){ if(k.indexOf(EXCLUDE_PREFIXES[i])===0) return false; }
+for (let i=0;i<INCLUDE_SUFFIXES.length;i++){
+let s=INCLUDE_SUFFIXES[i];
+if(k.length>s.length && k.indexOf(s)===k.length-s.length) return true;
+}
+return false;
 }
 
 var allKeys = Object.keys(process.env);
 var providerKeys = allKeys.filter(k => isProviderKey(k) && envStr(k));
 providerKeys.sort();
+console.log("[setup] Detected provider keys ("+providerKeys.length+"):");
+providerKeys.forEach(k=>console.log("  + "+k));
 
+// – trusted proxies –
 var envProxies = parseList(envStr("OPENCLAW_GATEWAY_TRUSTED_PROXIES"));
 var trustedProxies = envProxies.length>0 ? envProxies : [
-  "10.16.0.0/12","10.20.0.0/12",
-  "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.16.37.110","10.16.43.246",
-  "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.0.0/12","10.20.0.0/12",
+"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.16.37.110","10.16.43.246",
+"10.20.1.9","10.20.1.222",
+"10.20.26.157","10.20.31.87",
+"10.20.0.1","172.17.0.1"
 ];
 
-// -- build config --
+// – build config –
 var config = {
-  gateway: {
-    auth: gatewayToken ? { mode:"token", token:gatewayToken } : { mode:"password", password:gatewayPassword },
-    controlUi: { allowInsecureAuth:true, allowedOrigins:["*"], dangerouslyDisableDeviceAuth:true, dangerouslyAllowHostHeaderOriginFallback:true },
-    trustedProxies: trustedProxies
-  },
-  agents: { defaults:{ model:defaultModel } },
-  env: { vars:{} }
+gateway: {
+auth: gatewayToken ? { mode:"token", token:gatewayToken } : { mode:"password", password:gatewayPassword },
+controlUi: { allowInsecureAuth:true, allowedOrigins:["*"], dangerouslyDisableDeviceAuth:true, dangerouslyAllowHostHeaderOriginFallback:true },
+trustedProxies: trustedProxies
+},
+agents: { defaults:{ model:defaultModel } },
+env: { vars:{} },
+providers: {}
 };
+
+// 添加所有检测到的 provider keys 到环境变量
 providerKeys.forEach(pk=>{ config.env.vars[pk] = envStr(pk); });
 
-// 🚀 核心修复：移除不支持的根级 providers，将 Secrets 里的网页密码映射到标准环境变量中
+// ⭐ 关键修复：直接在 providers 配置中绑定 Token
+// 这样 OpenClaw 就知道如何使用这些 Token 了
+
+// OpenAI 家族（支持多个变体）
 if (envStr("OPENAI_ACCESS_TOKEN")) {
-  config.env.vars["OPENAI_API_KEY"] = envStr("OPENAI_ACCESS_TOKEN");
+var openaiToken = envStr("OPENAI_ACCESS_TOKEN");
+config.providers["openai"] = { auth: { mode: "token", token: openaiToken } };
+config.providers["openai-codex"] = { auth: { mode: "token", token: openaiToken } };
+console.log("[setup] ✓ OpenAI token bound to providers: openai, openai-codex");
 }
+
+// Anthropic Claude
 if (envStr("ANTHROPIC_SESSION_KEY")) {
-  config.env.vars["ANTHROPIC_API_KEY"] = envStr("ANTHROPIC_SESSION_KEY");
+var claudeToken = envStr("ANTHROPIC_SESSION_KEY");
+config.providers["anthropic"] = { auth: { mode: "token", token: claudeToken } };
+console.log("[setup] ✓ Anthropic token bound to provider: anthropic");
 }
+
+// Moonshot Kimi
 if (envStr("MOONSHOT_ACCESS_TOKEN")) {
-  config.env.vars["MOONSHOT_API_KEY"] = envStr("MOONSHOT_ACCESS_TOKEN");
+var kimiToken = envStr("MOONSHOT_ACCESS_TOKEN");
+config.providers["moonshot"] = { auth: { mode: "token", token: kimiToken } };
+console.log("[setup] ✓ Moonshot token bound to provider: moonshot");
+}
+
+// Google Gemini（通过 Cookie）
+if (envStr("GOOGLE_GEMINI_COOKIE")) {
+var geminiCookie = envStr("GOOGLE_GEMINI_COOKIE");
+config.providers["google"] = { auth: { mode: "cookie", cookie: geminiCookie } };
+config.providers["google-gemini-cli"] = { auth: { mode: "cookie", cookie: geminiCookie } };
+console.log("[setup] ✓ Google Gemini cookie bound to providers: google, google-gemini-cli");
+}
+
+// 阿里通义千问
+if (envStr("QWEN_COOKIE")) {
+var qwenCookie = envStr("QWEN_COOKIE");
+config.providers["qianwen"] = { auth: { mode: "cookie", cookie: qwenCookie } };
+console.log("[setup] ✓ Qwen cookie bound to provider: qianwen");
 }
 
-// -- Telegram webhook setup --
+// – Telegram webhook setup –
 async function setupTelegram(){
-  var token = envStr("TELEGRAM_BOT_TOKEN");
-  if(!token){ return; }
-
-  if(SPACE_HOST){
-    var webhookUrl = "https://" + SPACE_HOST + "/tg-webhook";
-    var r = await new Promise(resolve=>{
-      var data = JSON.stringify({ url:webhookUrl, drop_pending_updates:true, max_connections:10 });
-      var req = https.request({
-        hostname: "api.telegram.org",
-        path: "/bot"+token+"/setWebhook",
-        method: "POST",
-        headers: { "Content-Type":"application/json", "Content-Length": Buffer.byteLength(data) }
-      }, res=>{
-        let buf="";
-        res.on("data",c=>buf+=c);
-        res.on("end", ()=>{ try{ resolve(JSON.parse(buf)) } catch(e){ resolve(null) } });
-      });
-      req.on("error", ()=>resolve(null));
-      req.setTimeout(8000, ()=>{ req.destroy(); resolve(null); });
-      req.write(data);
-      req.end();
-    });
-  }
-  config.channels = { telegram:{ enabled:true, accounts:{ main:{ botToken:token, apiRoot:"https://api.telegram.org" } } } };
+var token = envStr("TELEGRAM_BOT_TOKEN");
+if(!token){ console.log("[setup] Telegram: disabled (no TELEGRAM_BOT_TOKEN)"); return; }
+
+if(SPACE_HOST){
+var webhookUrl = "https://" + SPACE_HOST + "/tg-webhook";
+var r = await new Promise(resolve=>{
+var data = JSON.stringify({ url:webhookUrl, drop_pending_updates:true, max_connections:10 });
+var req = https.request({
+hostname: "api.telegram.org",
+path: "/bot"+token+"/setWebhook",
+method: "POST",
+headers: { "Content-Type":"application/json", "Content-Length": Buffer.byteLength(data) }
+}, res=>{
+let buf="";
+res.on("data",c=>buf+=c);
+res.on("end", ()=>{ try{ resolve(JSON.parse(buf)) } catch(e){ resolve(null) } });
+});
+req.on("error", ()=>resolve(null));
+req.setTimeout(8000, ()=>{ req.destroy(); resolve(null); });
+req.write(data);
+req.end();
+});
+if(r && r.ok) console.log("[setup] Telegram: webhook registered -> "+webhookUrl);
+else {
+console.log("[setup] Telegram: auto-registration failed (HF outbound blocked)");
+console.log("[setup] Telegram: open this URL in your browser once:");
+console.log("  https://api.telegram.org/bot"+token+"/setWebhook?url="+webhookUrl+"&drop_pending_updates=true");
+}
+} else {
+console.log("[setup] Telegram: set SPACE_HOST in Variables for auto webhook registration");
+}
+
+config.channels = { telegram:{ enabled:true, accounts:{ main:{ botToken:token, apiRoot:"https://api.telegram.org" } } } };
+console.log("[setup] Telegram: configured");
 }
 
 (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");
-  }catch(e){ console.error("[setup] Write failed: "+e.message); process.exit(0); }
-  console.log("[setup] Done! Providers forcefully mapped.");
-})().catch(e=>{ console.error("[setup] Fatal: "+e.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");
+}catch(e){ console.error("[setup] Write failed: "+e.message); process.exit(0); }
+
+console.log("[setup] Done! All provider tokens forcefully bound.");
+console.log("[setup]   auth         = "+(gatewayToken?"token":"password"));
+console.log("[setup]   default model= "+defaultModel);
+console.log("[setup]   providers    = "+Object.keys(config.providers).length);
+console.log("[setup]   config       = "+CONFIG_PATH);
+})().catch(e=>{ console.error("[setup] Fatal: "+e.message); process.exit(0); });