@omnixal/openclaw-nats-plugin 0.1.7 → 0.1.9

package/cli/bun-setup.ts

@@ -7,10 +7,10 @@ import {
 } from './paths';
 import { downloadNatsServer, NATS_VERSION } from './download-nats';
 import { writeNatsConfig } from './nats-config';
-import { generateApiKey, writeEnvVariables } from './env-writer';
+import { generateApiKey, getExistingApiKey, writeEnvVariables } from './env-writer';
 import {
   getServiceManager, generateSystemdUnit, generateLaunchdPlist,
-  installSystemdUnit, installLaunchdPlist, startService,
+  installSystemdUnit, installLaunchdPlist, startService, stopService,
 } from './service-units';
 
 const NATS_SERVICE = 'openclaw-nats';
@@ -46,15 +46,25 @@ export async function bunSetup(): Promise<void> {
   // 5. Generate NATS config
   writeNatsConfig();
 
-  // 6. Generate API key
-  const apiKey = generateApiKey();
+  // 6. Reuse existing API key or generate new one
+  const apiKey = getExistingApiKey() ?? generateApiKey();
 
-  // 7. Write env variables
-  writeEnvVariables({
+  // 7. Write env variables (to OpenClaw .env for hooks, and sidecar .env for the service)
+  const envVars: Record<string, string> = {
     NATS_SIDECAR_URL: 'http://127.0.0.1:3104',
     NATS_PLUGIN_API_KEY: apiKey,
     NATS_SERVERS: 'nats://127.0.0.1:4222',
-  });
+  };
+  writeEnvVariables(envVars);
+
+  // Write .env into sidecar dir so loadDotEnv picks it up
+  const sidecarEnv = [
+    `PORT=3104`,
+    `DB_PATH=${join(DATA_DIR, 'nats-sidecar.db')}`,
+    `NATS_SERVERS=nats://127.0.0.1:4222`,
+    `NATS_PLUGIN_API_KEY=${apiKey}`,
+  ].join('\n');
+  writeFileSync(join(SIDECAR_DIR, '.env'), sidecarEnv, 'utf-8');
 
   // 8. Generate and install service units
   const manager = getServiceManager();
@@ -99,7 +109,10 @@ export async function bunSetup(): Promise<void> {
     console.log('No init system detected, using direct process management');
   }
 
-  // 9. Start services
+  // 9. Stop old processes if running, then start
+  try { stopService(SIDECAR_SERVICE); } catch { /* not running */ }
+  try { stopService(NATS_SERVICE); } catch { /* not running */ }
+
   console.log('\nStarting services...');
   startService(NATS_SERVICE);
   await waitForPort(8222, 10_000);

package/cli/env-writer.ts

@@ -7,6 +7,13 @@ export function generateApiKey(): string {
   return randomBytes(32).toString('hex');
 }
 
+export function getExistingApiKey(): string | null {
+  if (!existsSync(OPENCLAW_ENV)) return null;
+  const content = readFileSync(OPENCLAW_ENV, 'utf-8');
+  const match = content.match(/^NATS_PLUGIN_API_KEY=(.+)$/m);
+  return match?.[1]?.trim() || null;
+}
+
 export function mergeEnvContent(
   existingContent: string,
   variables: Record<string, string>,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnixal/openclaw-nats-plugin",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "NATS JetStream event-driven plugin for OpenClaw",
   "license": "MIT",
   "type": "module",

package/sidecar/src/nats-streams/nats-adapter.service.ts

@@ -55,7 +55,7 @@ export class NatsAdapterService extends BaseService implements OnModuleInit, OnM
   }
 
   isConnected(): boolean {
-    return this._connected && this.adapter !== null && this.adapter.isConnected();
+    return this._connected && this.adapter !== null;
   }
 
   async publish<T>(pattern: string, data: T, options?: PublishOptions): Promise<string | null> {