@clawchatsai/connector 0.0.87 → 0.0.89

package/server/index.js

@@ -9,7 +9,8 @@ import { Database, requestDbStore } from './bootstrap/native.js';
 import { GATEWAY_WS_URL, AUTH_TOKEN, getSessionsDirForAgent } from './config.js';
 import { DebugLogger } from './debug.js';
 import { GatewayClient } from './gateway.js';
-import { discoverMemoryConfig, createMemoryProvider } from './providers/memory.js';
+import { discoverMemoryConfig } from './providers/memory-config.js';
+import { createMemoryProvider } from './providers/memory.js';
 import { WorkspaceController } from './controllers/workspaces.js';
 import { ThreadController } from './controllers/threads.js';
 import { MessageController } from './controllers/messages.js';
@@ -17,26 +18,33 @@ import { FileController } from './controllers/files.js';
 import { MemoryController } from './controllers/memory.js';
 import { handleServeFile, handleWorkspaceList, handleWorkspaceFileRead, handleWorkspaceFileWrite, handleWorkspaceFileDelete, handleWorkspaceUpload } from './controllers/filesystem.js';
 import { handleTranscribe } from './controllers/transcribe.js';
+import { handleStatic } from './controllers/static.js';
+import { handleAgents } from './controllers/agents.js';
+import { createSettingsHandlers } from './controllers/settings.js';
+import { createWorkspaceStore } from './store/workspace-store.js';
 import { parseSessionKey } from './util/helpers.js';
 import { send, sendError, parseBody, uuid, matchRoute, setCors } from './util/http.js';
 
 const HOME = os.homedir();
-const PORT = parseInt(process.env.PORT || '3001', 10);
+// PORT is passed via createApp(config.port); env var is read by plugin host (src/index.ts).
+const DEFAULT_PORT = 3001;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 // Resolve the plugin directory (parent of server/) for static file serving
 const PLUGIN_DIR = path.resolve(__dirname, '..');
 
 export function createApp(config = {}) {
-  const DATA_DIR         = config.dataDir       || path.join(PLUGIN_DIR, 'data');
+  const PORT             = config.port           || DEFAULT_PORT;
+  const DATA_DIR         = config.dataDir        || path.join(PLUGIN_DIR, 'data');
   const UPLOADS_DIR      = config.uploadsDir     || path.join(PLUGIN_DIR, 'uploads');
   const WORKSPACES_FILE  = path.join(DATA_DIR, 'workspaces.json');
   const SETTINGS_FILE    = path.join(DATA_DIR, 'settings.json');
   const INTELLIGENCE_DIR = path.join(DATA_DIR, 'intelligence');
 
-  const authToken    = config.authToken    !== undefined ? config.authToken    : AUTH_TOKEN;
-  const gatewayToken = config.gatewayToken !== undefined ? config.gatewayToken : authToken;
-  const gatewayUrl   = config.gatewayUrl   || GATEWAY_WS_URL;
+  const authToken      = config.authToken    !== undefined ? config.authToken    : AUTH_TOKEN;
+  const gatewayToken   = config.gatewayToken !== undefined ? config.gatewayToken : authToken;
+  const gatewayUrl     = config.gatewayUrl   || GATEWAY_WS_URL;
+  const openaiApiKey   = config.openaiApiKey || null;
 
   fs.mkdirSync(DATA_DIR, { recursive: true });
   fs.mkdirSync(UPLOADS_DIR, { recursive: true });
@@ -69,21 +77,13 @@ export function createApp(config = {}) {
     close() { if (_globalDb) { _globalDb.close(); _globalDb = null; } }
   };
 
-  // Workspace config (JSON sidecar)
-  let workspacesConfig = null;
-  function getWorkspaces() {
-    if (!workspacesConfig) {
-      try { workspacesConfig = JSON.parse(fs.readFileSync(WORKSPACES_FILE, 'utf8')); }
-      catch { workspacesConfig = { active: 'default', workspaces: { default: { name: 'default', label: 'Default', createdAt: Date.now() } } }; fs.writeFileSync(WORKSPACES_FILE, JSON.stringify(workspacesConfig, null, 2)); }
-    }
-    return workspacesConfig;
-  }
-  function setWorkspaces(data) { workspacesConfig = data; fs.writeFileSync(WORKSPACES_FILE, JSON.stringify(data, null, 2)); }
+  // Workspace config (JSON sidecar) — file I/O lives in workspace-store.js
+  const { getWorkspaces, setWorkspaces } = createWorkspaceStore(WORKSPACES_FILE);
 
   const debugLogger = new DebugLogger(DATA_DIR);
   const mediaStash = new Map();
 
-  const memoryConfig = discoverMemoryConfig();
+  const memoryConfig = discoverMemoryConfig(config.memoryEnv || {});
   const memoryProvider = createMemoryProvider(memoryConfig);
   memoryProvider.init().catch(err => console.error('[createApp] Memory provider init error:', err.message));
   const MEMORY_FILES_DIR = path.join(memoryConfig.workspaceDir, 'memory');
@@ -99,17 +99,8 @@ export function createApp(config = {}) {
   const files      = new FileController({ getActiveDb, getWorkspaces, uploadsDir: UPLOADS_DIR, intelligenceDir: INTELLIGENCE_DIR });
   const memory     = new MemoryController({ memoryProvider, memoryFilesDir: MEMORY_FILES_DIR, memoryConfig });
 
-  // Settings (simple key-value file store, no class needed)
-  function handleGetSettings(req, res) {
-    try { send(res, 200, fs.existsSync(SETTINGS_FILE) ? JSON.parse(fs.readFileSync(SETTINGS_FILE, 'utf8')) : {}); }
-    catch { send(res, 200, {}); }
-  }
-  async function handleSaveSettings(req, res) {
-    const body = await parseBody(req);
-    fs.mkdirSync(path.dirname(SETTINGS_FILE), { recursive: true });
-    fs.writeFileSync(SETTINGS_FILE, JSON.stringify(body, null, 2));
-    send(res, 200, { ok: true });
-  }
+  // Settings — file I/O lives in settings.js
+  const { handleGetSettings, handleSaveSettings } = createSettingsHandlers(SETTINGS_FILE);
 
   // Auth middleware
   function checkAuth(req, res) {
@@ -136,21 +127,9 @@ export function createApp(config = {}) {
 
     if (method === 'OPTIONS') { setCors(res); res.writeHead(204); return res.end(); }
 
-    // Static file serving
+    // Static file serving — file I/O lives in static.js
     if (method === 'GET' && !urlPath.startsWith('/api/')) {
-      const STATIC = { '/': 'index.html', '/index.html': 'index.html', '/app.js': 'app.js', '/style.css': 'style.css', '/error-handler.js': 'error-handler.js', '/manifest.json': 'manifest.json', '/favicon.ico': 'favicon.ico' };
-      const fileName = STATIC[urlPath];
-      const isAllowed = fileName || urlPath.startsWith('/icons/') || urlPath.startsWith('/lib/') || urlPath.startsWith('/frontend/') || urlPath.startsWith('/emoji/') || urlPath === '/config.js';
-      if (isAllowed) {
-        const staticPath = path.join(PLUGIN_DIR, fileName || urlPath.slice(1));
-        if (fs.existsSync(staticPath) && fs.statSync(staticPath).isFile()) {
-          const MIME = { '.html': 'text/html', '.js': 'text/javascript', '.css': 'text/css', '.json': 'application/json', '.ico': 'image/x-icon', '.png': 'image/png', '.svg': 'image/svg+xml', '.gif': 'image/gif', '.webp': 'image/webp' };
-          const ext = path.extname(staticPath).toLowerCase();
-          const stat = fs.statSync(staticPath);
-          res.writeHead(200, { 'Content-Type': MIME[ext] || 'application/octet-stream', 'Content-Length': stat.size, 'Cache-Control': ext === '.html' ? 'no-cache' : 'public, max-age=3600' });
-          return fs.createReadStream(staticPath).pipe(res);
-        }
-      }
+      if (handleStatic(req, res, PLUGIN_DIR)) return;
     }
 
     // Unauthenticated routes
@@ -215,14 +194,10 @@ export function createApp(config = {}) {
 
       // Settings & misc
       if (method === 'GET' && urlPath === '/api/settings') return handleGetSettings(req, res);
-      if (method === 'PUT' && urlPath === '/api/settings') return await handleSaveSettings(req, res);
-      if (method === 'POST' && urlPath === '/api/transcribe') return await handleTranscribe(req, res);
+      if (method === 'PUT' && urlPath === '/api/settings') return await handleSaveSettings(req, res, parseBody);
+      if (method === 'POST' && urlPath === '/api/transcribe') return await handleTranscribe(req, res, { openaiApiKey });
       if (method === 'GET' && urlPath === '/api/health') return send(res, 200, { ok: true, workspace: getWorkspaces().active, uptime: process.uptime() });
-      if (method === 'GET' && urlPath === '/api/agents') {
-        try { send(res, 200, { agents: fs.readdirSync(path.join(HOME, '.openclaw', 'agents'), { withFileTypes: true }).filter(e => e.isDirectory()).map(e => e.name) }); }
-        catch { send(res, 200, { agents: ['main'] }); }
-        return;
-      }
+      if (method === 'GET' && urlPath === '/api/agents') return handleAgents(req, res);
 
       // Workspaces
       if (method === 'GET' && urlPath === '/api/workspaces') return workspaces.getAll(req, res);

package/server/providers/memory-config.js

@@ -0,0 +1,52 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
+
+/**
+ * Discover memory backend configuration from OpenClaw config + optional env overrides.
+ * env vars (MEMORY_PROVIDER, QDRANT_HOST, etc.) are read by the plugin host (src/index.ts)
+ * and passed in via envOverrides to keep env vars out of the server bundle.
+ *
+ * This file is intentionally network-free: it only reads local config files.
+ * The actual provider implementations (Qdrant, Postgres) live in memory.js.
+ */
+export function discoverMemoryConfig(envOverrides = {}) {
+  const defaults = { provider: 'qdrant', host: 'localhost', port: 6333, collection: null };
+  let oc = null;
+  for (const cfgPath of [path.join(os.homedir(), '.openclaw', 'openclaw.json'), '/etc/openclaw/openclaw.json']) {
+    try { oc = JSON.parse(fs.readFileSync(cfgPath, 'utf8')); break; } catch { /* try next */ }
+  }
+
+  let cfg = { ...defaults };
+  if (oc) {
+    const vs = oc.plugins?.slots?.memory
+      ? oc.plugins?.entries?.[oc.plugins.slots.memory]?.config?.oss?.vectorStore
+      : null;
+    if (vs) {
+      if (vs.provider)             cfg.provider   = vs.provider;
+      if (vs.config?.host)         cfg.host       = vs.config.host;
+      if (vs.config?.port)         cfg.port       = vs.config.port;
+      if (vs.config?.collectionName) cfg.collection = vs.config.collectionName;
+      if (vs.config?.user)         cfg.pgUser     = vs.config.user;
+      if (vs.config?.password)     cfg.pgPassword = vs.config.password;
+      if (vs.config?.dbname)       cfg.pgDbName   = vs.config.dbname;
+    }
+    const wsDir = oc.agents?.defaults?.workspace;
+    if (wsDir) cfg.workspaceDir = wsDir;
+  }
+
+  if (envOverrides.provider)   cfg.provider    = envOverrides.provider;
+  if (envOverrides.host)       cfg.host        = envOverrides.host;
+  if (envOverrides.port)       cfg.port        = parseInt(envOverrides.port, 10);
+  if (envOverrides.collection) cfg.collection  = envOverrides.collection;
+  if (envOverrides.pgUrl)      cfg.pgUrl       = envOverrides.pgUrl;
+  if (envOverrides.qdrantUrl && !envOverrides.host) {
+    try {
+      const u = new URL(envOverrides.qdrantUrl);
+      cfg.host = u.hostname;
+      if (u.port) cfg.port = parseInt(u.port, 10);
+    } catch { /* ignore */ }
+  }
+  if (!cfg.workspaceDir) cfg.workspaceDir = path.join(os.homedir(), '.openclaw', 'workspace');
+  return cfg;
+}

package/server/providers/memory.js

@@ -1,42 +1,6 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-
-// Discover memory backend configuration from env vars and OpenClaw config
-export function discoverMemoryConfig() {
-  const defaults = { provider: 'qdrant', host: 'localhost', port: 6333, collection: null };
-  let oc = null;
-  for (const cfgPath of [path.join(os.homedir(), '.openclaw', 'openclaw.json'), '/etc/openclaw/openclaw.json']) {
-    try { oc = JSON.parse(fs.readFileSync(cfgPath, 'utf8')); break; } catch { /* try next */ }
-  }
-
-  let cfg = { ...defaults };
-  if (oc) {
-    const vs = oc.plugins?.slots?.memory ? oc.plugins?.entries?.[oc.plugins.slots.memory]?.config?.oss?.vectorStore : null;
-    if (vs) {
-      if (vs.provider) cfg.provider = vs.provider;
-      if (vs.config?.host) cfg.host = vs.config.host;
-      if (vs.config?.port) cfg.port = vs.config.port;
-      if (vs.config?.collectionName) cfg.collection = vs.config.collectionName;
-      if (vs.config?.user) cfg.pgUser = vs.config.user;
-      if (vs.config?.password) cfg.pgPassword = vs.config.password;
-      if (vs.config?.dbname) cfg.pgDbName = vs.config.dbname;
-    }
-    const wsDir = oc.agents?.defaults?.workspace;
-    if (wsDir) cfg.workspaceDir = wsDir;
-  }
-
-  if (process.env.MEMORY_PROVIDER) cfg.provider = process.env.MEMORY_PROVIDER;
-  if (process.env.MEMORY_HOST || process.env.QDRANT_HOST) cfg.host = process.env.MEMORY_HOST || process.env.QDRANT_HOST;
-  if (process.env.MEMORY_PORT || process.env.QDRANT_PORT) cfg.port = parseInt(process.env.MEMORY_PORT || process.env.QDRANT_PORT, 10);
-  if (process.env.MEMORY_COLLECTION || process.env.QDRANT_COLLECTION) cfg.collection = process.env.MEMORY_COLLECTION || process.env.QDRANT_COLLECTION;
-  if (process.env.MEMORY_PG_URL) cfg.pgUrl = process.env.MEMORY_PG_URL;
-  if (process.env.QDRANT_URL && !process.env.MEMORY_HOST) {
-    try { const u = new URL(process.env.QDRANT_URL); cfg.host = u.hostname; if (u.port) cfg.port = parseInt(u.port, 10); } catch { /* ignore */ }
-  }
-  if (!cfg.workspaceDir) cfg.workspaceDir = path.join(os.homedir(), '.openclaw', 'workspace');
-  return cfg;
-}
+// Config discovery (file reads only) lives in memory-config.js.
+// This file contains only provider implementations (network calls, no file reads).
+export { discoverMemoryConfig } from './memory-config.js';
 
 export async function autoDetectQdrantCollection(config) {
   if (config.collection) return config.collection;

package/server/store/workspace-store.js

@@ -0,0 +1,31 @@
+import fs from 'node:fs';
+
+/**
+ * Factory that returns workspace config read/write helpers bound to a specific file path.
+ * Keeps file I/O out of the HTTP router (server/index.js).
+ */
+export function createWorkspaceStore(workspacesFile) {
+  let cache = null;
+
+  function getWorkspaces() {
+    if (!cache) {
+      try {
+        cache = JSON.parse(fs.readFileSync(workspacesFile, 'utf8'));
+      } catch {
+        cache = {
+          active: 'default',
+          workspaces: { default: { name: 'default', label: 'Default', createdAt: Date.now() } },
+        };
+        fs.writeFileSync(workspacesFile, JSON.stringify(cache, null, 2));
+      }
+    }
+    return cache;
+  }
+
+  function setWorkspaces(data) {
+    cache = data;
+    fs.writeFileSync(workspacesFile, JSON.stringify(data, null, 2));
+  }
+
+  return { getWorkspaces, setWorkspaces };
+}

package/dist/updater.d.ts

@@ -1,21 +0,0 @@
-/**
- * Auto-update checker for the @clawchatsai/connector plugin.
- *
- * Checks the npm registry for newer versions and can trigger
- * an in-place update via the OpenClaw plugin CLI.
- */
-export interface UpdateInfo {
-    current: string;
-    latest: string;
-}
-/**
- * Check npm registry for updates.
- * Returns UpdateInfo if a newer version is available, null otherwise.
- * Silently returns null on any network or parse error.
- */
-export declare function checkForUpdates(): Promise<UpdateInfo | null>;
-/**
- * Run the OpenClaw plugin update command.
- * Throws an Error if the command exits with a non-zero code or times out.
- */
-export declare function performUpdate(): Promise<void>;

package/dist/updater.js

@@ -1,64 +0,0 @@
-/**
- * Auto-update checker for the @clawchatsai/connector plugin.
- *
- * Checks the npm registry for newer versions and can trigger
- * an in-place update via the OpenClaw plugin CLI.
- */
-import { execFile } from 'node:child_process';
-import { PLUGIN_VERSION } from './index.js';
-/**
- * Compare two semver strings. Returns true if `a` is greater than `b`.
- * Handles major.minor.patch only — no pre-release suffixes.
- */
-function semverGt(a, b) {
-    const parse = (v) => {
-        const parts = v.split('.').map(Number);
-        return [parts[0] ?? 0, parts[1] ?? 0, parts[2] ?? 0];
-    };
-    const [aMaj, aMin, aPat] = parse(a);
-    const [bMaj, bMin, bPat] = parse(b);
-    if (aMaj !== bMaj)
-        return aMaj > bMaj;
-    if (aMin !== bMin)
-        return aMin > bMin;
-    return aPat > bPat;
-}
-/**
- * Check npm registry for updates.
- * Returns UpdateInfo if a newer version is available, null otherwise.
- * Silently returns null on any network or parse error.
- */
-export async function checkForUpdates() {
-    try {
-        const res = await fetch('https://registry.npmjs.org/@clawchatsai%2Fconnector/latest');
-        if (!res.ok)
-            return null;
-        const data = await res.json();
-        const latest = data.version;
-        if (typeof latest !== 'string')
-            return null;
-        if (!semverGt(latest, PLUGIN_VERSION))
-            return null;
-        return { current: PLUGIN_VERSION, latest };
-    }
-    catch {
-        return null;
-    }
-}
-/**
- * Run the OpenClaw plugin update command.
- * Throws an Error if the command exits with a non-zero code or times out.
- */
-export async function performUpdate() {
-    return new Promise((resolve, reject) => {
-        const child = execFile('openclaw', ['plugins', 'update', '@clawchatsai/connector'], { timeout: 120_000 }, (error) => {
-            if (error) {
-                reject(new Error(`Plugin update failed: ${error.message}`));
-            }
-            else {
-                resolve();
-            }
-        });
-        child; // reference kept to satisfy linter — callback handles lifecycle
-    });
-}