@clawchatsai/connector 0.0.41 → 0.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawchatsai/connector",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "type": "module",
   "description": "ClawChats OpenClaw plugin — P2P tunnel + local API bridge",
   "main": "dist/index.js",

package/server.js

@@ -334,14 +334,14 @@ function getActiveDb() {
   return getDb(getWorkspaces().active);
 }
 
-let _globalDb = null;
-function getGlobalDb() {
-  if (_globalDb) return _globalDb;
-  fs.mkdirSync(DATA_DIR, { recursive: true });
-  const dbPath = path.join(DATA_DIR, 'global.db');
-  _globalDb = new Database(dbPath);
-  _globalDb.pragma('journal_mode = WAL');
-  _globalDb.exec(`
+const _globalDbCache = new Map(); // keyed by resolved dbPath
+function getGlobalDb(dataDir = DATA_DIR) {
+  const dbPath = path.join(dataDir, 'global.db');
+  if (_globalDbCache.has(dbPath)) return _globalDbCache.get(dbPath);
+  fs.mkdirSync(dataDir, { recursive: true });
+  const db = new Database(dbPath);
+  db.pragma('journal_mode = WAL');
+  db.exec(`
     CREATE TABLE IF NOT EXISTS custom_emojis (
       name TEXT NOT NULL,
       pack TEXT NOT NULL DEFAULT 'slackmojis',
@@ -351,7 +351,8 @@ function getGlobalDb() {
       PRIMARY KEY (name, pack)
     )
   `);
-  return _globalDb;
+  _globalDbCache.set(dbPath, db);
+  return db;
 }
 
 function closeDb(workspaceName) {
@@ -363,11 +364,40 @@ function closeDb(workspaceName) {
 }
 
 function closeAllDbs() {
-  for (const [name, db] of dbCache) {
-    db.close();
-  }
+  for (const [, db] of dbCache) db.close();
   dbCache.clear();
-  if (_globalDb) { _globalDb.close(); _globalDb = null; }
+  for (const [, db] of _globalDbCache) db.close();
+  _globalDbCache.clear();
+}
+
+function _createFtsTables(db) {
+  db.exec(`
+    CREATE VIRTUAL TABLE messages_fts USING fts5(
+      content,
+      content=messages,
+      content_rowid=rowid,
+      tokenize='porter unicode61'
+    );
+    CREATE TRIGGER messages_ai AFTER INSERT ON messages BEGIN
+      INSERT INTO messages_fts(rowid, content) VALUES (new.rowid, new.content);
+    END;
+    CREATE TRIGGER messages_ad AFTER DELETE ON messages BEGIN
+      INSERT INTO messages_fts(messages_fts, rowid, content) VALUES('delete', old.rowid, old.content);
+    END;
+    CREATE TRIGGER messages_au AFTER UPDATE ON messages BEGIN
+      INSERT INTO messages_fts(messages_fts, rowid, content) VALUES('delete', old.rowid, old.content);
+      INSERT INTO messages_fts(rowid, content) VALUES (new.rowid, new.content);
+    END;
+  `);
+}
+
+function _dropFtsTables(db) {
+  db.exec(`
+    DROP TABLE IF EXISTS messages_fts;
+    DROP TRIGGER IF EXISTS messages_ai;
+    DROP TRIGGER IF EXISTS messages_ad;
+    DROP TRIGGER IF EXISTS messages_au;
+  `);
 }
 
 function migrate(db) {
@@ -428,30 +458,29 @@ function migrate(db) {
   db.exec('CREATE INDEX IF NOT EXISTS idx_unread_thread ON unread_messages(thread_id)');
 
   // FTS5 table — CREATE VIRTUAL TABLE doesn't support IF NOT EXISTS in all versions,
-  // so check if it exists first
+  // so check existence first, then verify integrity and auto-repair if corrupted.
   const hasFts = db.prepare(
     "SELECT name FROM sqlite_master WHERE type='table' AND name='messages_fts'"
   ).get();
   if (!hasFts) {
-    db.exec(`
-      CREATE VIRTUAL TABLE messages_fts USING fts5(
-        content,
-        content=messages,
-        content_rowid=rowid,
-        tokenize='porter unicode61'
-      );
-
-      CREATE TRIGGER messages_ai AFTER INSERT ON messages BEGIN
-        INSERT INTO messages_fts(rowid, content) VALUES (new.rowid, new.content);
-      END;
-      CREATE TRIGGER messages_ad AFTER DELETE ON messages BEGIN
-        INSERT INTO messages_fts(messages_fts, rowid, content) VALUES('delete', old.rowid, old.content);
-      END;
-      CREATE TRIGGER messages_au AFTER UPDATE ON messages BEGIN
-        INSERT INTO messages_fts(messages_fts, rowid, content) VALUES('delete', old.rowid, old.content);
-        INSERT INTO messages_fts(rowid, content) VALUES (new.rowid, new.content);
-      END;
-    `);
+    _createFtsTables(db);
+  } else {
+    // Integrity check: corruption causes all message writes to 500.
+    // Attempt rebuild first; if that fails, drop entirely for graceful degradation
+    // (messages still save, search returns empty until next restart recreates the table).
+    try {
+      db.prepare("INSERT INTO messages_fts(messages_fts) VALUES('integrity-check')").run();
+    } catch (err) {
+      console.warn('[DB] messages_fts integrity check failed, attempting rebuild:', err.message);
+      try {
+        db.prepare("INSERT INTO messages_fts(messages_fts) VALUES('rebuild')").run();
+        console.log('[DB] messages_fts rebuilt successfully — search index restored');
+      } catch (rebuildErr) {
+        console.error('[DB] messages_fts rebuild failed, dropping FTS for graceful degradation:', rebuildErr.message);
+        _dropFtsTables(db);
+        // On the next gateway restart the table will be recreated fresh via the !hasFts path
+      }
+    }
   }
 }
 
@@ -879,24 +908,29 @@ function handleGetThreads(req, res, params, query) {
   let threads, total;
   if (search) {
     // FTS5 search across messages, return matching thread IDs
-    const ftsQuery = `
-      SELECT DISTINCT m.thread_id
-      FROM messages m
-      JOIN messages_fts ON messages_fts.rowid = m.rowid
-      WHERE messages_fts MATCH ?
-    `;
-    const matchingIds = db.prepare(ftsQuery).all(search).map(r => r.thread_id);
-    if (matchingIds.length === 0) {
+    try {
+      const ftsQuery = `
+        SELECT DISTINCT m.thread_id
+        FROM messages m
+        JOIN messages_fts ON messages_fts.rowid = m.rowid
+        WHERE messages_fts MATCH ?
+      `;
+      const matchingIds = db.prepare(ftsQuery).all(search).map(r => r.thread_id);
+      if (matchingIds.length === 0) {
+        return send(res, 200, { threads: [], total: 0, page });
+      }
+      const placeholders = matchingIds.map(() => '?').join(',');
+      total = db.prepare(
+        `SELECT COUNT(*) as c FROM threads WHERE id IN (${placeholders})`
+      ).get(...matchingIds).c;
+      threads = db.prepare(
+        `SELECT t.*, (SELECT MAX(m.timestamp) FROM messages m WHERE m.thread_id = t.id) as last_message_at
+         FROM threads t WHERE t.id IN (${placeholders}) ORDER BY t.pinned DESC, t.sort_order DESC, t.updated_at DESC LIMIT ? OFFSET ?`
+      ).all(...matchingIds, limit, offset);
+    } catch (ftsErr) {
+      console.warn('[DB] FTS thread search failed, returning empty results:', ftsErr.message);
       return send(res, 200, { threads: [], total: 0, page });
     }
-    const placeholders = matchingIds.map(() => '?').join(',');
-    total = db.prepare(
-      `SELECT COUNT(*) as c FROM threads WHERE id IN (${placeholders})`
-    ).get(...matchingIds).c;
-    threads = db.prepare(
-      `SELECT t.*, (SELECT MAX(m.timestamp) FROM messages m WHERE m.thread_id = t.id) as last_message_at
-       FROM threads t WHERE t.id IN (${placeholders}) ORDER BY t.pinned DESC, t.sort_order DESC, t.updated_at DESC LIMIT ? OFFSET ?`
-    ).all(...matchingIds, limit, offset);
   } else {
     total = db.prepare('SELECT COUNT(*) as c FROM threads').get().c;
     threads = db.prepare(
@@ -1183,29 +1217,34 @@ function handleSearch(req, res, params, query) {
   const offset = (page - 1) * limit;
 
   // FTS5 search with snippet
-  const results = db.prepare(`
-    SELECT
-      m.id as messageId,
-      m.thread_id as threadId,
-      t.title as threadTitle,
-      m.role,
-      snippet(messages_fts, 0, '<mark>', '</mark>', '...', 40) as content,
-      m.timestamp
-    FROM messages_fts
-    JOIN messages m ON messages_fts.rowid = m.rowid
-    JOIN threads t ON m.thread_id = t.id
-    WHERE messages_fts MATCH ?
-    ORDER BY rank
-    LIMIT ? OFFSET ?
-  `).all(q, limit, offset);
-
-  const totalRow = db.prepare(`
-    SELECT COUNT(*) as c
-    FROM messages_fts
-    WHERE messages_fts MATCH ?
-  `).get(q);
-
-  send(res, 200, { results, total: totalRow.c });
+  try {
+    const results = db.prepare(`
+      SELECT
+        m.id as messageId,
+        m.thread_id as threadId,
+        t.title as threadTitle,
+        m.role,
+        snippet(messages_fts, 0, '<mark>', '</mark>', '...', 40) as content,
+        m.timestamp
+      FROM messages_fts
+      JOIN messages m ON messages_fts.rowid = m.rowid
+      JOIN threads t ON m.thread_id = t.id
+      WHERE messages_fts MATCH ?
+      ORDER BY rank
+      LIMIT ? OFFSET ?
+    `).all(q, limit, offset);
+
+    const totalRow = db.prepare(`
+      SELECT COUNT(*) as c
+      FROM messages_fts
+      WHERE messages_fts MATCH ?
+    `).get(q);
+
+    send(res, 200, { results, total: totalRow.c });
+  } catch (ftsErr) {
+    console.warn('[DB] FTS message search failed, returning empty results:', ftsErr.message);
+    send(res, 200, { results: [], total: 0 });
+  }
 }
 
 // --- Export ---
@@ -3485,12 +3524,17 @@ export function createApp(config = {}) {
     const search = query.search || '';
     let threads, total;
     if (search) {
-      const ftsQuery = `SELECT DISTINCT m.thread_id FROM messages m JOIN messages_fts ON messages_fts.rowid = m.rowid WHERE messages_fts MATCH ?`;
-      const matchingIds = db.prepare(ftsQuery).all(search).map(r => r.thread_id);
-      if (matchingIds.length === 0) return send(res, 200, { threads: [], total: 0, page });
-      const placeholders = matchingIds.map(() => '?').join(',');
-      total = db.prepare(`SELECT COUNT(*) as c FROM threads WHERE id IN (${placeholders})`).get(...matchingIds).c;
-      threads = db.prepare(`SELECT * FROM threads WHERE id IN (${placeholders}) ORDER BY pinned DESC, sort_order DESC, updated_at DESC LIMIT ? OFFSET ?`).all(...matchingIds, limit, offset);
+      try {
+        const ftsQuery = `SELECT DISTINCT m.thread_id FROM messages m JOIN messages_fts ON messages_fts.rowid = m.rowid WHERE messages_fts MATCH ?`;
+        const matchingIds = db.prepare(ftsQuery).all(search).map(r => r.thread_id);
+        if (matchingIds.length === 0) return send(res, 200, { threads: [], total: 0, page });
+        const placeholders = matchingIds.map(() => '?').join(',');
+        total = db.prepare(`SELECT COUNT(*) as c FROM threads WHERE id IN (${placeholders})`).get(...matchingIds).c;
+        threads = db.prepare(`SELECT * FROM threads WHERE id IN (${placeholders}) ORDER BY pinned DESC, sort_order DESC, updated_at DESC LIMIT ? OFFSET ?`).all(...matchingIds, limit, offset);
+      } catch (ftsErr) {
+        console.warn('[DB] FTS thread search failed, returning empty results:', ftsErr.message);
+        return send(res, 200, { threads: [], total: 0, page });
+      }
     } else {
       total = db.prepare('SELECT COUNT(*) as c FROM threads').get().c;
       threads = db.prepare('SELECT * FROM threads ORDER BY pinned DESC, sort_order DESC, updated_at DESC LIMIT ? OFFSET ?').all(limit, offset);
@@ -3697,14 +3741,19 @@ export function createApp(config = {}) {
     const page = parseInt(query.page || '1', 10);
     const limit = Math.min(parseInt(query.limit || '20', 10), 100);
     const offset = (page - 1) * limit;
-    const results = db.prepare(`
-      SELECT m.id as messageId, m.thread_id as threadId, t.title as threadTitle, m.role,
-        snippet(messages_fts, 0, '<mark>', '</mark>', '...', 40) as content, m.timestamp
-      FROM messages_fts JOIN messages m ON messages_fts.rowid = m.rowid JOIN threads t ON m.thread_id = t.id
-      WHERE messages_fts MATCH ? ORDER BY rank LIMIT ? OFFSET ?
-    `).all(q, limit, offset);
-    const totalRow = db.prepare(`SELECT COUNT(*) as c FROM messages_fts WHERE messages_fts MATCH ?`).get(q);
-    send(res, 200, { results, total: totalRow.c });
+    try {
+      const results = db.prepare(`
+        SELECT m.id as messageId, m.thread_id as threadId, t.title as threadTitle, m.role,
+          snippet(messages_fts, 0, '<mark>', '</mark>', '...', 40) as content, m.timestamp
+        FROM messages_fts JOIN messages m ON messages_fts.rowid = m.rowid JOIN threads t ON m.thread_id = t.id
+        WHERE messages_fts MATCH ? ORDER BY rank LIMIT ? OFFSET ?
+      `).all(q, limit, offset);
+      const totalRow = db.prepare(`SELECT COUNT(*) as c FROM messages_fts WHERE messages_fts MATCH ?`).get(q);
+      send(res, 200, { results, total: totalRow.c });
+    } catch (ftsErr) {
+      console.warn('[DB] FTS message search failed, returning empty results:', ftsErr.message);
+      send(res, 200, { results: [], total: 0 });
+    }
   }
 
   function _handleExport(req, res) {
@@ -4368,7 +4417,7 @@ export function createApp(config = {}) {
     // Custom emoji listing (no auth)
     if (method === 'GET' && urlPath === '/api/emoji') {
       try {
-        const db = getGlobalDb();
+        const db = getGlobalDb(_DATA_DIR);
         const rows = db.prepare('SELECT name, pack, url, mime_type FROM custom_emojis ORDER BY created_at DESC').all();
         res.writeHead(200, { 'Content-Type': 'application/json', 'Cache-Control': 'public, max-age=300' });
         return res.end(JSON.stringify(rows));
@@ -4412,7 +4461,7 @@ export function createApp(config = {}) {
         if (urlLower.endsWith('.gif')) mimeType = 'image/gif';
         else if (urlLower.endsWith('.webp')) mimeType = 'image/webp';
         else if (urlLower.endsWith('.jpg') || urlLower.endsWith('.jpeg')) mimeType = 'image/jpeg';
-        const db = getGlobalDb();
+        const db = getGlobalDb(_DATA_DIR);
         db.prepare('INSERT OR REPLACE INTO custom_emojis (name, pack, url, mime_type) VALUES (?, ?, ?, ?)').run(safeName, targetPack, url, mimeType);
         res.writeHead(200, { 'Content-Type': 'application/json' });
         return res.end(JSON.stringify({ name: safeName, pack: targetPack, url, mime_type: mimeType }));
@@ -4424,7 +4473,7 @@ export function createApp(config = {}) {
       try {
         const { name, pack } = await parseBody(req);
         if (!name || !pack) { res.writeHead(400, { 'Content-Type': 'application/json' }); return res.end(JSON.stringify({ error: 'Missing name or pack' })); }
-        const db = getGlobalDb();
+        const db = getGlobalDb(_DATA_DIR);
         db.prepare('DELETE FROM custom_emojis WHERE name = ? AND pack = ?').run(name, pack);
         res.writeHead(200, { 'Content-Type': 'application/json' });
         return res.end(JSON.stringify({ ok: true }));
@@ -4581,7 +4630,7 @@ if (isDirectRun) {
     app.gatewayClient.connect();
 
     // Initialize global DB (custom emojis, etc.)
-    getGlobalDb();
+    getGlobalDb(_DATA_DIR);
   });
 
   // Graceful shutdown