openclaw-safeclaw-plugin 1.0.0 → 1.1.0

package/tui/config.ts

@@ -32,7 +32,7 @@ export const CONFIG_PATH = join(homedir(), '.safeclaw', 'config.json');
 
 export function loadConfig(): SafeClawConfig {
   const defaults: SafeClawConfig = {
-    serviceUrl: 'https://api.safeclaw.eu/api/v1',
+    serviceUrl: 'http://localhost:8420/api/v1',
     apiKey: '',
     timeoutMs: 5000,
     enabled: true,
@@ -57,12 +57,21 @@ export function loadConfig(): SafeClawConfig {
     } catch {
       // Config file unreadable — use defaults
     }
+  } else {
+    console.warn(`[SafeClaw] No config file found at ${CONFIG_PATH} — using defaults (serviceUrl=${defaults.serviceUrl})`);
   }
 
   // Env vars override config file
   if (process.env.SAFECLAW_URL) defaults.serviceUrl = process.env.SAFECLAW_URL;
   if (process.env.SAFECLAW_API_KEY) defaults.apiKey = process.env.SAFECLAW_API_KEY;
-  if (process.env.SAFECLAW_TIMEOUT_MS) defaults.timeoutMs = parseInt(process.env.SAFECLAW_TIMEOUT_MS, 10);
+  if (process.env.SAFECLAW_TIMEOUT_MS) {
+    const parsed = parseInt(process.env.SAFECLAW_TIMEOUT_MS, 10);
+    if (!Number.isNaN(parsed) && parsed > 0) {
+      defaults.timeoutMs = parsed;
+    } else {
+      console.warn(`[SafeClaw] Invalid SAFECLAW_TIMEOUT_MS="${process.env.SAFECLAW_TIMEOUT_MS}", using default ${defaults.timeoutMs}ms`);
+    }
+  }
   if (process.env.SAFECLAW_ENABLED === 'false') defaults.enabled = false;
   if (process.env.SAFECLAW_ENFORCEMENT) defaults.enforcement = process.env.SAFECLAW_ENFORCEMENT as SafeClawConfig['enforcement'];
   if (process.env.SAFECLAW_FAIL_MODE) defaults.failMode = process.env.SAFECLAW_FAIL_MODE as SafeClawConfig['failMode'];
@@ -86,6 +95,19 @@ export function loadConfig(): SafeClawConfig {
   return defaults;
 }
 
+/**
+ * Check whether a URL is a valid http:// or https:// URL.
+ */
+export function isValidServiceUrl(url: string): boolean {
+  if (!url || url.trim() === '') return false;
+  try {
+    const parsed = new URL(url);
+    return parsed.protocol === 'http:' || parsed.protocol === 'https:';
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Persist managed config fields back to ~/.safeclaw/config.json.
  * Reads the existing file (if any), merges the fields SafeClaw manages,
@@ -101,6 +123,14 @@ export function saveConfig(config: SafeClawConfig): void {
     }
   }
 
+  // Normalize serviceUrl: strip trailing slashes (consistent with loadConfig)
+  config.serviceUrl = config.serviceUrl.replace(/\/+$/, '');
+
+  // Validate serviceUrl before saving
+  if (!isValidServiceUrl(config.serviceUrl)) {
+    throw new Error(`Invalid service URL: "${config.serviceUrl}" — must be a valid http:// or https:// URL`);
+  }
+
   // Merge managed fields into existing structure
   existing.enabled = config.enabled;
 
@@ -108,6 +138,9 @@ export function saveConfig(config: SafeClawConfig): void {
     existing.remote = {};
   }
   (existing.remote as Record<string, unknown>).serviceUrl = config.serviceUrl;
+  if (config.apiKey) {
+    (existing.remote as Record<string, unknown>).apiKey = config.apiKey;
+  }
 
   if (!existing.enforcement || typeof existing.enforcement !== 'object') {
     existing.enforcement = {};
@@ -115,6 +148,13 @@ export function saveConfig(config: SafeClawConfig): void {
   (existing.enforcement as Record<string, unknown>).mode = config.enforcement;
   (existing.enforcement as Record<string, unknown>).failMode = config.failMode;
 
+  if (config.agentId) {
+    existing.agentId = config.agentId;
+  }
+  if (config.agentToken) {
+    existing.agentToken = config.agentToken;
+  }
+
   // Ensure parent directory exists
   mkdirSync(dirname(CONFIG_PATH), { recursive: true, mode: 0o700 });