8900 commited on
Update setup-hf-config.mjs
Browse files- setup-hf-config.mjs +16 -24
setup-hf-config.mjs
CHANGED
|
@@ -27,14 +27,12 @@ if (!gatewayToken && !gatewayPassword) {
|
|
| 27 |
// -- default model --
|
| 28 |
var defaultModel = envStr("OPENCLAW_HF_DEFAULT_MODEL") || "google/gemini-2.0-flash";
|
| 29 |
|
| 30 |
-
// -- dynamic provider key detection --
|
| 31 |
var EXCLUDE_PREFIXES = [
|
| 32 |
"OPENCLAW_", "SPACE_", "SYSTEM_", "HF_",
|
| 33 |
"NODE_", "PATH", "HOME", "USER", "PWD", "LANG", "LC_",
|
| 34 |
"npm_", "HOSTNAME", "SHELL", "TERM", "SHLVL"
|
| 35 |
];
|
| 36 |
|
| 37 |
-
// 【🚀这里是我为你增强的自动识别词库,加了SESSION_KEY和COOKIE,实现一劳永逸】
|
| 38 |
var INCLUDE_SUFFIXES = [
|
| 39 |
"_API_KEY", "_SECRET_KEY", "_ACCESS_TOKEN",
|
| 40 |
"_BOT_TOKEN", "_AUTH_TOKEN", "_APP_KEY",
|
|
@@ -53,10 +51,7 @@ function isProviderKey(k){
|
|
| 53 |
var allKeys = Object.keys(process.env);
|
| 54 |
var providerKeys = allKeys.filter(k => isProviderKey(k) && envStr(k));
|
| 55 |
providerKeys.sort();
|
| 56 |
-
console.log("[setup] Detected provider keys ("+providerKeys.length+"):");
|
| 57 |
-
providerKeys.forEach(k=>console.log(" + "+k));
|
| 58 |
|
| 59 |
-
// -- trusted proxies --
|
| 60 |
var envProxies = parseList(envStr("OPENCLAW_GATEWAY_TRUSTED_PROXIES"));
|
| 61 |
var trustedProxies = envProxies.length>0 ? envProxies : [
|
| 62 |
"10.16.0.0/12","10.20.0.0/12",
|
|
@@ -76,14 +71,27 @@ var config = {
|
|
| 76 |
trustedProxies: trustedProxies
|
| 77 |
},
|
| 78 |
agents: { defaults:{ model:defaultModel } },
|
| 79 |
-
env: { vars:{} }
|
|
|
|
| 80 |
};
|
| 81 |
providerKeys.forEach(pk=>{ config.env.vars[pk] = envStr(pk); });
|
| 82 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 83 |
// -- Telegram webhook setup --
|
| 84 |
async function setupTelegram(){
|
| 85 |
var token = envStr("TELEGRAM_BOT_TOKEN");
|
| 86 |
-
if(!token){
|
| 87 |
|
| 88 |
if(SPACE_HOST){
|
| 89 |
var webhookUrl = "https://" + SPACE_HOST + "/tg-webhook";
|
|
@@ -104,18 +112,8 @@ async function setupTelegram(){
|
|
| 104 |
req.write(data);
|
| 105 |
req.end();
|
| 106 |
});
|
| 107 |
-
if(r && r.ok) console.log("[setup] Telegram: webhook registered -> "+webhookUrl);
|
| 108 |
-
else {
|
| 109 |
-
console.log("[setup] Telegram: auto-registration failed (HF outbound blocked)");
|
| 110 |
-
console.log("[setup] Telegram: open this URL in your browser once:");
|
| 111 |
-
console.log(" https://api.telegram.org/bot"+token+"/setWebhook?url="+webhookUrl+"&drop_pending_updates=true");
|
| 112 |
-
}
|
| 113 |
-
} else {
|
| 114 |
-
console.log("[setup] Telegram: set SPACE_HOST in Variables for auto webhook registration");
|
| 115 |
}
|
| 116 |
-
|
| 117 |
config.channels = { telegram:{ enabled:true, accounts:{ main:{ botToken:token, apiRoot:"https://api.telegram.org" } } } };
|
| 118 |
-
console.log("[setup] Telegram: configured");
|
| 119 |
}
|
| 120 |
|
| 121 |
(async function main(){
|
|
@@ -125,11 +123,5 @@ async function setupTelegram(){
|
|
| 125 |
if(fs.existsSync(CONFIG_PATH)) fs.copyFileSync(CONFIG_PATH, CONFIG_PATH+".bak");
|
| 126 |
fs.writeFileSync(CONFIG_PATH, JSON.stringify(config,null,2),"utf-8");
|
| 127 |
}catch(e){ console.error("[setup] Write failed: "+e.message); process.exit(0); }
|
| 128 |
-
|
| 129 |
-
console.log("[setup] Done.");
|
| 130 |
-
console.log("[setup] auth = "+(gatewayToken?"token":"password"));
|
| 131 |
-
console.log("[setup] model = "+defaultModel);
|
| 132 |
-
console.log("[setup] proxies = "+trustedProxies.length);
|
| 133 |
-
console.log("[setup] env.vars = "+providerKeys.length);
|
| 134 |
-
console.log("[setup] config = "+CONFIG_PATH);
|
| 135 |
})().catch(e=>{ console.error("[setup] Fatal: "+e.message); process.exit(0); });
|
|
|
|
| 27 |
// -- default model --
|
| 28 |
var defaultModel = envStr("OPENCLAW_HF_DEFAULT_MODEL") || "google/gemini-2.0-flash";
|
| 29 |
|
|
|
|
| 30 |
var EXCLUDE_PREFIXES = [
|
| 31 |
"OPENCLAW_", "SPACE_", "SYSTEM_", "HF_",
|
| 32 |
"NODE_", "PATH", "HOME", "USER", "PWD", "LANG", "LC_",
|
| 33 |
"npm_", "HOSTNAME", "SHELL", "TERM", "SHLVL"
|
| 34 |
];
|
| 35 |
|
|
|
|
| 36 |
var INCLUDE_SUFFIXES = [
|
| 37 |
"_API_KEY", "_SECRET_KEY", "_ACCESS_TOKEN",
|
| 38 |
"_BOT_TOKEN", "_AUTH_TOKEN", "_APP_KEY",
|
|
|
|
| 51 |
var allKeys = Object.keys(process.env);
|
| 52 |
var providerKeys = allKeys.filter(k => isProviderKey(k) && envStr(k));
|
| 53 |
providerKeys.sort();
|
|
|
|
|
|
|
| 54 |
|
|
|
|
| 55 |
var envProxies = parseList(envStr("OPENCLAW_GATEWAY_TRUSTED_PROXIES"));
|
| 56 |
var trustedProxies = envProxies.length>0 ? envProxies : [
|
| 57 |
"10.16.0.0/12","10.20.0.0/12",
|
|
|
|
| 71 |
trustedProxies: trustedProxies
|
| 72 |
},
|
| 73 |
agents: { defaults:{ model:defaultModel } },
|
| 74 |
+
env: { vars:{} },
|
| 75 |
+
providers: {} // 专门为网页版 Token 增加提供商配置
|
| 76 |
};
|
| 77 |
providerKeys.forEach(pk=>{ config.env.vars[pk] = envStr(pk); });
|
| 78 |
|
| 79 |
+
// 🚀 核心修复:强制把 Secrets 里的网页密码绑定给具体的模型!
|
| 80 |
+
if (envStr("OPENAI_ACCESS_TOKEN")) {
|
| 81 |
+
config.providers["openai"] = { auth: { mode: "token", token: envStr("OPENAI_ACCESS_TOKEN") } };
|
| 82 |
+
config.providers["openai-codex"] = { auth: { mode: "token", token: envStr("OPENAI_ACCESS_TOKEN") } };
|
| 83 |
+
}
|
| 84 |
+
if (envStr("ANTHROPIC_SESSION_KEY")) {
|
| 85 |
+
config.providers["anthropic"] = { auth: { mode: "token", token: envStr("ANTHROPIC_SESSION_KEY") } };
|
| 86 |
+
}
|
| 87 |
+
if (envStr("MOONSHOT_ACCESS_TOKEN")) {
|
| 88 |
+
config.providers["moonshot"] = { auth: { mode: "token", token: envStr("MOONSHOT_ACCESS_TOKEN") } };
|
| 89 |
+
}
|
| 90 |
+
|
| 91 |
// -- Telegram webhook setup --
|
| 92 |
async function setupTelegram(){
|
| 93 |
var token = envStr("TELEGRAM_BOT_TOKEN");
|
| 94 |
+
if(!token){ return; }
|
| 95 |
|
| 96 |
if(SPACE_HOST){
|
| 97 |
var webhookUrl = "https://" + SPACE_HOST + "/tg-webhook";
|
|
|
|
| 112 |
req.write(data);
|
| 113 |
req.end();
|
| 114 |
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 115 |
}
|
|
|
|
| 116 |
config.channels = { telegram:{ enabled:true, accounts:{ main:{ botToken:token, apiRoot:"https://api.telegram.org" } } } };
|
|
|
|
| 117 |
}
|
| 118 |
|
| 119 |
(async function main(){
|
|
|
|
| 123 |
if(fs.existsSync(CONFIG_PATH)) fs.copyFileSync(CONFIG_PATH, CONFIG_PATH+".bak");
|
| 124 |
fs.writeFileSync(CONFIG_PATH, JSON.stringify(config,null,2),"utf-8");
|
| 125 |
}catch(e){ console.error("[setup] Write failed: "+e.message); process.exit(0); }
|
| 126 |
+
console.log("[setup] Done! Providers forcefully mapped.");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 127 |
})().catch(e=>{ console.error("[setup] Fatal: "+e.message); process.exit(0); });
|