Update setup-hf-config.mjs

setup-hf-config.mjs

@@ -1,46 +1,33 @@
-import fs   from "node:fs";
+import fs from "node:fs";
 import path from "node:path";
 import https from "node:https";
 
-// ============================================================
-// OpenClaw HF Spaces - Production Config Writer
-// Runs ONCE per container lifetime (entrypoint.sh marker).
-// Always writes fresh config from env vars.
-// ============================================================
-
-var HOME        = process.env.OPENCLAW_HOME || process.env.HOME || "/home/user";
-var STATE_DIR   = path.join(HOME, ".openclaw");
+var HOME = process.env.OPENCLAW_HOME || process.env.HOME || "/home/user";
+var STATE_DIR = path.join(HOME, ".openclaw");
 var CONFIG_PATH = path.join(STATE_DIR, "openclaw.json");
-var WORKSPACE   = path.join(STATE_DIR, "workspace");
-var SPACE_HOST  = (process.env.SPACE_HOST || "").trim();
+var SPACE_HOST = (process.env.SPACE_HOST || "").trim();
 
 console.log("[setup] Starting… HOME=" + HOME);
 
+// -- helpers --
 function parseList(val) {
 if (!val || !val.trim()) return [];
-return val.split(",").map(function(s) { return s.trim(); }).filter(Boolean);
-}
-
-function envStr(key) {
-return (process.env[key] || "").trim();
+return val.split(",").map(function(s){ return s.trim(); }).filter(Boolean);
 }
+function envStr(key) { return (process.env[key] || "").trim(); }
 
-// –– auth –––––––––––––––––––––––––
-
-var gatewayToken    = envStr("OPENCLAW_GATEWAY_TOKEN");
+// -- 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");
+console.error("[setup] FATAL: set OPENCLAW_GATEWAY_TOKEN or OPENCLAW_GATEWAY_PASSWORD in Secrets");
 process.exit(0);
 }
 
-// –– model ———————————————––
-
+// -- default model --
 var defaultModel = envStr("OPENCLAW_HF_DEFAULT_MODEL") || "google/gemini-2.0-flash";
 
-// –– provider keys —————————————–
-
+// -- dynamic provider key detection --
 var EXCLUDE_PREFIXES = [
 "OPENCLAW_", "SPACE_", "SYSTEM_", "HF_",
 "NODE_", "PATH", "HOME", "USER", "PWD", "LANG", "LC_",
@@ -50,157 +37,95 @@ var INCLUDE_SUFFIXES = [
 "_API_KEY", "_SECRET_KEY", "_ACCESS_TOKEN",
 "_BOT_TOKEN", "_AUTH_TOKEN", "_APP_KEY"
 ];
-
-function isProviderKey(k) {
-var i;
-for (i = 0; i < EXCLUDE_PREFIXES.length; i++) {
-if (k.indexOf(EXCLUDE_PREFIXES[i]) === 0) return false;
-}
-for (i = 0; i < INCLUDE_SUFFIXES.length; i++) {
-var s = INCLUDE_SUFFIXES[i];
-if (k.length > s.length && k.indexOf(s) === k.length - s.length) return true;
+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;
 }
 
-var providerKeys = Object.keys(process.env).filter(function(k) {
-return isProviderKey(k) && (process.env[k] || "").trim();
-}).sort();
-
-console.log("[setup] Detected provider keys (" + providerKeys.length + "):");
-providerKeys.forEach(function(k) { console.log("  + " + k); });
-
-// –– trusted proxies —————————————
-
-var envProxies     = parseList(envStr("OPENCLAW_GATEWAY_TRUSTED_PROXIES"));
-var trustedProxies = envProxies.length > 0 ? envProxies : [
-"10.0.0.0/8",
-"172.16.0.0/12",
-"192.168.0.0/16",
-"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",
-"127.0.0.1"
+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"
 ];
 
-// –– 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
-},
+auth: gatewayToken ? { mode:"token", token:gatewayToken } : { mode:"password", password:gatewayPassword },
+controlUi: { allowInsecureAuth:true, allowedOrigins:["*"], dangerouslyDisableDeviceAuth:true, dangerouslyAllowHostHeaderOriginFallback:true },
 trustedProxies: trustedProxies
 },
-agents: {
-defaults: {
-model:     defaultModel,
-workspace: WORKSPACE
-}
-},
-env: { vars: {} }
+agents: { defaults:{ model:defaultModel } },
+env: { vars:{} }
 };
+providerKeys.forEach(pk=>{ config.env.vars[pk] = envStr(pk); });
 
-providerKeys.forEach(function(pk) {
-config.env.vars[pk] = (process.env[pk] || "").trim();
-});
-
-// –– Telegram –––––––––––––––––––––––
+// -- Telegram webhook setup --
+async function setupTelegram(){
+var token = envStr("TELEGRAM_BOT_TOKEN");
+if(!token){ console.log("[setup] Telegram: disabled (no TELEGRAM_BOT_TOKEN)"); return; }
 
-function tgRequest(token, method, body) {
-return new Promise(function(resolve) {
-var data = JSON.stringify(body || {});
-var req  = https.request({
+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 + "/" + method,
-method:   "POST",
-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); }
-});
+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", function() { resolve(null); });
-req.setTimeout(8000, function() { req.destroy(); 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");
 }
-
-async function setupTelegram() {
-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 tgRequest(token, "setWebhook", {
-url:                  webhookUrl,
-drop_pending_updates: true,
-max_connections:      10
-});
-if (r && r.ok) {
-console.log("[setup] Telegram: webhook registered -> " + webhookUrl);
 } else {
-console.log("[setup] Telegram: auto-registration failed");
-console.log("[setup] 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 for auto webhook");
+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" }
-}
-}
-};
+config.channels = { telegram:{ enabled:true, accounts:{ main:{ botToken:token, apiRoot:"https://api.telegram.org" } } } };
 console.log("[setup] Telegram: configured");
 }
 
-// –– main –––––––––––––––––––––––––
-
-(async function() {
-fs.mkdirSync(STATE_DIR, { recursive: true });
-fs.mkdirSync(WORKSPACE,  { recursive: true });
-fs.mkdirSync(path.join(WORKSPACE, "memory"), { recursive: true });
-
+(async function main(){
 await setupTelegram();
-
-if (fs.existsSync(CONFIG_PATH)) {
-fs.copyFileSync(CONFIG_PATH, CONFIG_PATH + ".bak");
-}
-fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2), "utf-8");
+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.");
-console.log("[setup]   auth      = " + (gatewayToken ? "token" : "password"));
-console.log("[setup]   model     = " + defaultModel);
-console.log("[setup]   workspace = " + WORKSPACE);
-console.log("[setup]   proxies   = " + trustedProxies.length);
-console.log("[setup]   env.vars  = " + providerKeys.length);
-console.log("[setup]   config    = " + CONFIG_PATH);
-})().catch(function(e) {
-console.error("[setup] Fatal: " + e.message);
-process.exit(0);
-});
+console.log("[setup]   auth      = "+(gatewayToken?"token":"password"));
+console.log("[setup]   model     = "+defaultModel);
+console.log("[setup]   proxies   = "+trustedProxies.length);
+console.log("[setup]   env.vars  = "+providerKeys.length);
+console.log("[setup]   config    = "+CONFIG_PATH);
+})().catch(e=>{ console.error("[setup] Fatal: "+e.message); process.exit(0); });