aicq-chat-plugin 2.4.1 → 2.5.1

package/cli.js

@@ -3,14 +3,18 @@
  * AICQ Chat Plugin — CLI Entry Point
  *
  * Usage:
- *   aicq-plugin           Start the plugin server (default port 6109)
- *   aicq-plugin start     Start the plugin server
- *   aicq-plugin status    Check plugin status
- *   aicq-plugin --port    Specify port (default 6109)
- *   aicq-plugin --help    Show help
+ *   npx aicq-chat-plugin           Start plugin + auto-install to OpenClaw
+ *   aicq-plugin                    Same as above
+ *   aicq-plugin start              Start the plugin server
+ *   aicq-plugin install            Install plugin to OpenClaw only
+ *   aicq-plugin status             Check plugin status
+ *   aicq-plugin --port <port>      Specify port (default 6109)
+ *   aicq-plugin --help             Show help
  */
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
+const fs = require('fs');
 const path = require('path');
+const os = require('os');
 
 const args = process.argv.slice(2);
 const command = args[0] || 'start';
@@ -30,15 +34,137 @@ for (let i = 0; i < args.length; i++) {
   }
 }
 
+// ── Find OpenClaw installation ──────────────────────────────────────
+function findOpenClawDir() {
+  const candidates = [
+    path.join(os.homedir(), '.openclaw'),
+    path.join(os.homedir(), 'openclaw'),
+    path.join(os.homedir(), '.config', 'openclaw'),
+  ];
+  if (process.env.OPENCLAW_HOME) {
+    candidates.unshift(process.env.OPENCLAW_HOME);
+  }
+  for (const dir of candidates) {
+    if (fs.existsSync(dir)) return dir;
+  }
+  return null;
+}
+
+// ── Copy plugin files to OpenClaw plugins directory ─────────────────
+function installToOpenClaw() {
+  const openclawDir = findOpenClawDir();
+  if (!openclawDir) {
+    console.log('[AICQ] OpenClaw not found, skipping auto-install.');
+    console.log('[AICQ] If you have OpenClaw installed, set OPENCLAW_HOME environment variable.');
+    return false;
+  }
+
+  const PLUGIN_ID = 'aicq-chat';
+  const pluginsDir = path.join(openclawDir, 'plugins');
+  const targetDir = path.join(pluginsDir, PLUGIN_ID);
+  const sourceDir = path.resolve(__dirname);
+
+  // Check if already installed and up-to-date
+  const targetPluginJson = path.join(targetDir, 'openclaw.plugin.json');
+  if (fs.existsSync(targetPluginJson)) {
+    try {
+      const existing = JSON.parse(fs.readFileSync(targetPluginJson, 'utf8'));
+      const current = JSON.parse(fs.readFileSync(path.join(sourceDir, 'openclaw.plugin.json'), 'utf8'));
+      if (existing.version === current.version) {
+        console.log(`[AICQ] Plugin already installed at ${targetDir} (v${current.version})`);
+        return true;
+      }
+    } catch (e) {}
+  }
+
+  console.log(`[AICQ] Found OpenClaw at: ${openclawDir}`);
+  console.log(`[AICQ] Installing plugin to ${targetDir}...`);
+
+  // Create plugins directory if needed
+  if (!fs.existsSync(pluginsDir)) {
+    fs.mkdirSync(pluginsDir, { recursive: true });
+  }
+
+  // Files and dirs to copy
+  const filesToCopy = [
+    'index.js', 'cli.js', 'postinstall.js',
+    'openclaw.plugin.json', 'package.json', 'README.md',
+  ];
+  const dirsToCopy = ['lib', 'public'];
+
+  // Create target directory
+  if (!fs.existsSync(targetDir)) {
+    fs.mkdirSync(targetDir, { recursive: true });
+  }
+
+  // Copy files
+  for (const file of filesToCopy) {
+    const src = path.join(sourceDir, file);
+    const dest = path.join(targetDir, file);
+    if (fs.existsSync(src)) {
+      fs.copyFileSync(src, dest);
+    }
+  }
+
+  // Copy directories
+  for (const dir of dirsToCopy) {
+    const src = path.join(sourceDir, dir);
+    const dest = path.join(targetDir, dir);
+    if (fs.existsSync(src)) {
+      if (fs.existsSync(dest)) {
+        fs.rmSync(dest, { recursive: true, force: true });
+      }
+      copyDirRecursive(src, dest);
+    }
+  }
+
+  // Install npm dependencies in target
+  console.log('[AICQ] Installing plugin dependencies...');
+  try {
+    execSync('npm install --production', {
+      cwd: targetDir,
+      stdio: 'pipe',
+      timeout: 120000,
+    });
+    console.log('[AICQ] Dependencies installed.');
+  } catch (e) {
+    console.log('[AICQ] Warning: npm install failed. You may need to run manually:');
+    console.log(`  cd ${targetDir} && npm install`);
+  }
+
+  console.log(`[AICQ] Plugin installed to: ${targetDir}`);
+  console.log('[AICQ] Restart OpenClaw to activate the plugin.');
+  return true;
+}
+
+// ── Recursively copy a directory ────────────────────────────────────
+function copyDirRecursive(src, dest) {
+  fs.mkdirSync(dest, { recursive: true });
+  const entries = fs.readdirSync(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name === 'node_modules') continue;
+      copyDirRecursive(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
+// ── Help ────────────────────────────────────────────────────────────
 if (command === '--help' || command === '-h') {
   console.log(`
 AICQ Chat Plugin — End-to-End Encrypted Chat for OpenClaw
 
 Usage:
+  npx aicq-chat-plugin              Start plugin + auto-install to OpenClaw
   aicq-plugin [command] [options]
 
 Commands:
-  start     Start the plugin server (default)
+  start     Install to OpenClaw (if needed) and start plugin server (default)
+  install   Install plugin to OpenClaw only (don't start server)
   status    Check if the plugin is running
 
 Options:
@@ -50,15 +176,19 @@ Environment Variables:
   AICQ_PORT               Plugin server port
   AICQ_SERVER_URL         AICQ server URL
   AICQ_DATA_DIR           Data directory (default: ~/.aicq-plugin)
+  OPENCLAW_HOME           OpenClaw installation directory
 
 Examples:
-  aicq-plugin                        # Start on default port
-  aicq-plugin --port 8080            # Start on port 8080
-  aicq-plugin -s http://localhost    # Connect to local server
+  npx aicq-chat-plugin              # Install + start
+  aicq-plugin                       # Start on default port
+  aicq-plugin install               # Install to OpenClaw only
+  aicq-plugin --port 8080           # Start on port 8080
+  aicq-plugin -s http://localhost   # Connect to local server
 `);
   process.exit(0);
 }
 
+// ── Status ──────────────────────────────────────────────────────────
 if (command === 'status') {
   const http = require('http');
   const req = http.get(`http://localhost:${port}/api/status`, (res) => {
@@ -80,7 +210,7 @@ if (command === 'status') {
   });
   req.on('error', () => {
     console.log(`AICQ Plugin is not running on port ${port}.`);
-    console.log(`Start it with: aicq-plugin --port ${port}`);
+    console.log(`Start it with: npx aicq-chat-plugin`);
   });
   req.setTimeout(3000, () => {
     req.destroy();
@@ -89,7 +219,15 @@ if (command === 'status') {
   process.exit(0);
 }
 
-// Start the plugin server
+// ── Install only ────────────────────────────────────────────────────
+if (command === 'install') {
+  installToOpenClaw();
+  process.exit(0);
+}
+
+// ── Start (default) — auto-install then run ─────────────────────────
+installToOpenClaw();
+
 console.log(`[AICQ] Starting plugin on port ${port}`);
 console.log(`[AICQ] Server: ${serverUrl}`);
 

package/lib/crypto.js

@@ -31,7 +31,13 @@ function generateExchangeKeypair() {
 
 function signMessage(message, secretKeyHex) {
   const secretKey = Buffer.from(secretKeyHex, 'hex');
-  const messageBytes = naclUtil.decodeUTF8(message);
+  // If message looks like hex (64 chars), treat as raw bytes to match server's bytes.fromhex()
+  let messageBytes;
+  if (/^[0-9a-fA-F]{64}$/.test(message)) {
+    messageBytes = Buffer.from(message, 'hex');
+  } else {
+    messageBytes = naclUtil.decodeUTF8(message);
+  }
   const signature = nacl.sign.detached(messageBytes, secretKey);
   return Buffer.from(signature).toString('hex');
 }
@@ -39,7 +45,13 @@ function signMessage(message, secretKeyHex) {
 function verifySignature(message, signatureHex, publicKeyHex) {
   try {
     const publicKey = Buffer.from(publicKeyHex, 'hex');
-    const messageBytes = naclUtil.decodeUTF8(message);
+    // If message looks like hex (64 chars), treat as raw bytes to match server
+    let messageBytes;
+    if (/^[0-9a-fA-F]{64}$/.test(message)) {
+      messageBytes = Buffer.from(message, 'hex');
+    } else {
+      messageBytes = naclUtil.decodeUTF8(message);
+    }
     const signature = Buffer.from(signatureHex, 'hex');
     return nacl.sign.detached.verify(messageBytes, signature, publicKey);
   } catch (e) {

package/lib/server-client.js

@@ -53,9 +53,13 @@ class ServerClient {
       public_key: identity.signing_public_key,
       agent_name: identity.nickname || agentId,
     });
-    if (data.accessToken) {
-      this.jwtToken = data.accessToken;
+    if (data.access_token || data.accessToken) {
+      this.jwtToken = data.access_token || data.accessToken;
       this.currentAgentId = agentId;
+      // Store server-side account ID for WS auth (nodeId must match JWT sub)
+      if (data.account && data.account.id) {
+        this.serverAccountId = data.account.id;
+      }
     }
     return data;
   }
@@ -83,9 +87,13 @@ class ServerClient {
       challenge,
     });
 
-    if (loginData.accessToken) {
-      this.jwtToken = loginData.accessToken;
+    if (loginData.access_token || loginData.accessToken) {
+      this.jwtToken = loginData.access_token || loginData.accessToken;
       this.currentAgentId = agentId;
+      // Store server-side account ID for WS auth (nodeId must match JWT sub)
+      if (loginData.account && loginData.account.id) {
+        this.serverAccountId = loginData.account.id;
+      }
     }
     return loginData;
   }
@@ -198,7 +206,7 @@ class ServerClient {
         console.log('[WS] Connected, sending auth...');
         this.ws.send(JSON.stringify({
           type: 'online',
-          nodeId: this.currentAgentId,
+          nodeId: this.serverAccountId || this.currentAgentId,
           token: this.jwtToken,
         }));
       });

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "aicq-chat",
   "name": "AICQ Encrypted Chat",
-  "version": "2.2.0",
+  "version": "2.5.1",
   "description": "End-to-end encrypted chat plugin for OpenClaw agents — Node.js implementation with full UI",
   "entry": "index.js",
   "activation": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicq-chat-plugin",
-  "version": "2.4.1",
+  "version": "2.5.1",
   "description": "AICQ End-to-end Encrypted Chat Plugin for OpenClaw — Full UI with friend management, group chat, file transfer, and AI agent communication",
   "main": "index.js",
   "bin": {

package/postinstall.js

@@ -2,26 +2,187 @@
 /**
  * AICQ Chat Plugin — Post-install script
  *
- * Displays setup information after npm install.
+ * Automatically installs the plugin into OpenClaw's plugins directory.
+ * OpenClaw requires plugins to be in ~/.openclaw/plugins/<plugin-id>/
+ * with an openclaw.plugin.json file to recognize them.
  */
 
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const { execSync } = require('child_process');
+
+const PLUGIN_ID = 'aicq-chat';
+const PLUGIN_DIR = path.resolve(__dirname);
+
+// ── Find OpenClaw installation ──────────────────────────────────────
+function findOpenClawDir() {
+  const candidates = [
+    path.join(os.homedir(), '.openclaw'),
+    path.join(os.homedir(), 'openclaw'),
+    path.join(os.homedir(), '.config', 'openclaw'),
+  ];
+
+  // Check environment variable
+  if (process.env.OPENCLAW_HOME) {
+    candidates.unshift(process.env.OPENCLAW_HOME);
+  }
+
+  for (const dir of candidates) {
+    if (fs.existsSync(dir)) {
+      return dir;
+    }
+  }
+  return null;
+}
+
+// ── Copy plugin files to OpenClaw plugins directory ─────────────────
+function installToOpenClaw(openclawDir) {
+  const pluginsDir = path.join(openclawDir, 'plugins');
+  const targetDir = path.join(pluginsDir, PLUGIN_ID);
+
+  // Create plugins directory if needed
+  if (!fs.existsSync(pluginsDir)) {
+    fs.mkdirSync(pluginsDir, { recursive: true });
+  }
+
+  // Files to copy (from package.json "files" field)
+  const filesToCopy = [
+    'index.js',
+    'cli.js',
+    'postinstall.js',
+    'openclaw.plugin.json',
+    'package.json',
+    'README.md',
+  ];
+
+  const dirsToCopy = [
+    'lib',
+    'public',
+  ];
+
+  // Remove old installation if exists
+  if (fs.existsSync(targetDir)) {
+    console.log(`[AICQ] Updating existing plugin at ${targetDir}`);
+    // Don't remove the entire dir — preserve node_modules and data
+  } else {
+    console.log(`[AICQ] Installing plugin to ${targetDir}`);
+    fs.mkdirSync(targetDir, { recursive: true });
+  }
+
+  // Copy individual files
+  for (const file of filesToCopy) {
+    const src = path.join(PLUGIN_DIR, file);
+    const dest = path.join(targetDir, file);
+    if (fs.existsSync(src)) {
+      fs.copyFileSync(src, dest);
+    }
+  }
+
+  // Copy directories
+  for (const dir of dirsToCopy) {
+    const src = path.join(PLUGIN_DIR, dir);
+    const dest = path.join(targetDir, dir);
+    if (fs.existsSync(src)) {
+      // Remove old and copy fresh
+      if (fs.existsSync(dest)) {
+        fs.rmSync(dest, { recursive: true, force: true });
+      }
+      copyDirRecursive(src, dest);
+    }
+  }
+
+  // Install npm dependencies in the target directory
+  console.log('[AICQ] Installing plugin dependencies...');
+  try {
+    execSync('npm install --production', {
+      cwd: targetDir,
+      stdio: 'pipe',
+      timeout: 120000,
+    });
+    console.log('[AICQ] Dependencies installed.');
+  } catch (e) {
+    console.log('[AICQ] Warning: npm install failed. You may need to run it manually:');
+    console.log(`  cd ${targetDir} && npm install`);
+  }
+
+  return targetDir;
+}
+
+// ── Recursively copy a directory ────────────────────────────────────
+function copyDirRecursive(src, dest) {
+  fs.mkdirSync(dest, { recursive: true });
+  const entries = fs.readdirSync(src, { withFileTypes: true });
+
+  for (const entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+
+    if (entry.isDirectory()) {
+      // Skip node_modules — will be installed fresh
+      if (entry.name === 'node_modules') continue;
+      copyDirRecursive(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
+// ── Main ────────────────────────────────────────────────────────────
 console.log('');
 console.log('  ╔══════════════════════════════════════════════╗');
-console.log('  ║       AICQ Chat Plugin Installed!            ║');
-console.log('  ╠══════════════════════════════════════════════╣');
-console.log('  ║                                              ║');
-console.log('  ║   Start the plugin:                          ║');
-console.log('  ║     npx aicq-plugin                          ║');
-console.log('  ║                                              ║');
-console.log('  ║   Or install globally:                       ║');
-console.log('  ║     npm install -g aicq-chat-plugin          ║');
-console.log('  ║     aicq-plugin                              ║');
-console.log('  ║                                              ║');
-console.log('  ║   Options:                                   ║');
-console.log('  ║     --port <port>    Server port (6109)       ║');
-console.log('  ║     --server <url>   AICQ server URL         ║');
-console.log('  ║                                              ║');
-console.log('  ║   Chat UI: http://localhost:6109             ║');
-console.log('  ║   Docs: https://aicq.online                  ║');
+console.log('  ║       AICQ Chat Plugin — Installing...       ║');
 console.log('  ╚══════════════════════════════════════════════╝');
 console.log('');
+
+// Try to auto-install into OpenClaw
+const openclawDir = findOpenClawDir();
+
+if (openclawDir) {
+  console.log(`[AICQ] Found OpenClaw at: ${openclawDir}`);
+  try {
+    const installedDir = installToOpenClaw(openclawDir);
+    console.log('');
+    console.log('  ╔══════════════════════════════════════════════╗');
+    console.log('  ║     AICQ Plugin Installed Successfully!      ║');
+    console.log('  ╠══════════════════════════════════════════════╣');
+    console.log('  ║                                              ║');
+    console.log('  ║   Plugin installed to:                       ║');
+    console.log(`  ║     ${installedDir}`);
+    console.log('  ║                                              ║');
+    console.log('  ║   Restart OpenClaw to activate the plugin.   ║');
+    console.log('  ║                                              ║');
+    console.log('  ║   Chat UI: http://localhost:6109             ║');
+    console.log('  ║   Docs: https://aicq.online                  ║');
+    console.log('  ╚══════════════════════════════════════════════╝');
+    console.log('');
+  } catch (e) {
+    console.error('[AICQ] Auto-install failed:', e.message);
+    console.log('');
+    printManualInstructions();
+  }
+} else {
+  console.log('[AICQ] OpenClaw not found — skipping auto-install.');
+  console.log('');
+  printManualInstructions();
+}
+
+function printManualInstructions() {
+  console.log('  ╔══════════════════════════════════════════════╗');
+  console.log('  ║       AICQ Chat Plugin Installed!            ║');
+  console.log('  ╠══════════════════════════════════════════════╣');
+  console.log('  ║                                              ║');
+  console.log('  ║   Manual install to OpenClaw:                ║');
+  console.log('  ║     mkdir -p ~/.openclaw/plugins/aicq-chat   ║');
+  console.log('  ║     cp -r ' + PLUGIN_DIR + '/* ~/.openclaw/plugins/aicq-chat/ ║');
+  console.log('  ║     cd ~/.openclaw/plugins/aicq-chat         ║');
+  console.log('  ║     npm install                              ║');
+  console.log('  ║                                              ║');
+  console.log('  ║   Or start standalone:                       ║');
+  console.log('  ║     npx aicq-plugin                          ║');
+  console.log('  ║                                              ║');
+  console.log('  ║   Chat UI: http://localhost:6109             ║');
+  console.log('  ║   Docs: https://aicq.online                  ║');
+  console.log('  ╚══════════════════════════════════════════════╝');
+  console.log('');
+}