openclaw-overlay-plugin 0.8.6 → 0.8.7

package/dist/index.js

@@ -10,10 +10,11 @@ import { cmdDiscover } from './src/scripts/overlay/discover.js';
 import { cmdRequestService } from './src/scripts/services/request.js';
 import { cmdServiceQueue } from './src/scripts/services/queue.js';
 import { cmdRespondService } from './src/scripts/services/respond.js';
+import { cmdConnect } from './src/scripts/messaging/connect.js';
 import { setNoExit } from './src/scripts/output.js';
-// Track background process for proper lifecycle management
-let backgroundProcess = null;
+// Track background service state
 let serviceRunning = false;
+let abortController = null;
 // Auto-import tracking
 let autoImportInterval = null;
 let knownTxids = new Set();
@@ -164,60 +165,42 @@ function wakeAgent(text, logger, options = {}) {
         body: JSON.stringify({ prompt: text, sessionKey })
     }).catch(() => { });
 }
-function startBackgroundService(config, api) {
-    if (backgroundProcess)
+async function startBackgroundService(config, api) {
+    if (serviceRunning)
         return;
     serviceRunning = true;
+    abortController = new AbortController();
     requestCleanupInterval = setInterval(() => {
         if (serviceRunning)
             wokenRequests.clear();
     }, 5 * 60 * 1000);
-    async function spawnConnect() {
-        if (!serviceRunning)
-            return;
-        const { spawn } = await import('node:child_process');
-        const base = __dirname.endsWith('dist') ? __dirname : path.join(__dirname, 'dist');
-        const cliPath = path.join(base, 'src', 'cli.js');
-        const env = { ...process['env'] };
-        env.BSV_WALLET_DIR = config.walletDir || path.join(os.homedir(), '.openclaw', 'bsv-wallet');
-        env.OVERLAY_URL = config.overlayUrl || 'https://clawoverlay.com';
-        env.BSV_NETWORK = config.network || env.BSV_NETWORK || 'mainnet';
-        const proc = spawn('node', [cliPath, 'connect'], { env, stdio: ['ignore', 'pipe', 'pipe'] });
-        backgroundProcess = proc;
-        proc.stdout?.on('data', (data) => {
-            const lines = data.toString().split('\n').filter(Boolean);
-            for (const line of lines) {
-                try {
-                    const event = JSON.parse(line);
-                    if ((event.action === 'queued-for-agent' || event.action === 'already-queued') && event.serviceId) {
-                        const rid = event.id || `${event.from}-${Date.now()}`;
-                        if (wokenRequests.has(rid))
-                            return;
-                        wokenRequests.add(rid);
-                        const wakeText = `⚡ Incoming overlay service request!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nPaid: ${event.satoshisReceived || '?'} sats\n\nFulfill it now:\n1. overlay({ action: "pending-requests" })\n2. Process the request\n3. overlay({ action: "fulfill", requestId: "${event.id}", recipientKey: "${event.from}", serviceId: "${event.serviceId}", result: { ... } })`;
-                        wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:${rid}` });
-                    }
-                    if (event.type === 'service-response' && event.action === 'received') {
-                        const wakeText = `📬 Overlay service response received!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nStatus: ${event.status}\n\nFull result:\n${JSON.stringify(event.result, null, 2)}`;
-                        wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:resp-${event.requestId || Date.now()}` });
-                    }
-                }
-                catch { }
-            }
-        });
-        proc.on('exit', () => {
-            backgroundProcess = null;
-            if (serviceRunning)
-                setTimeout(spawnConnect, 5000);
-        });
-    }
-    spawnConnect();
+    applyConfigToEnv(config);
+    // Start the connection directly as a library call
+    // This bypasses the child_process detection and is more efficient
+    cmdConnect((event) => {
+        if ((event.action === 'queued-for-agent' || event.action === 'already-queued') && event.serviceId) {
+            const rid = event.id || `${event.from}-${Date.now()}`;
+            if (wokenRequests.has(rid))
+                return;
+            wokenRequests.add(rid);
+            const wakeText = `⚡ Incoming overlay service request!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nPaid: ${event.satoshisReceived || '?'} sats\n\nFulfill it now:\n1. overlay({ action: "pending-requests" })\n2. Process the request\n3. overlay({ action: "fulfill", requestId: "${event.id}", recipientKey: "${event.from}", serviceId: "${event.serviceId}", result: { ... } })`;
+            wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:${rid}` });
+        }
+        if (event.type === 'service-response' && event.action === 'received') {
+            const wakeText = `📬 Overlay service response received!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nStatus: ${event.status}\n\nFull result:\n${JSON.stringify(event.result, null, 2)}`;
+            wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:resp-${event.requestId || Date.now()}` });
+        }
+    }, abortController.signal).catch((err) => {
+        if (serviceRunning && !abortController?.signal.aborted) {
+            api.logger?.error?.(`[openclaw-overlay] WebSocket error: ${err.message}`);
+        }
+    });
 }
 function stopBackgroundService() {
     serviceRunning = false;
-    if (backgroundProcess) {
-        backgroundProcess.kill();
-        backgroundProcess = null;
+    if (abortController) {
+        abortController.abort();
+        abortController = null;
     }
     if (requestCleanupInterval) {
         clearInterval(requestCleanupInterval);
@@ -285,8 +268,8 @@ export function register(api) {
                 await initializeServiceSystem();
             }
             catch { }
-            startBackgroundService(pluginConfig, api);
-            startAutoImport(pluginConfig, api);
+            await startBackgroundService(pluginConfig, api);
+            await startAutoImport(pluginConfig, api);
         },
         stop: () => stopBackgroundService()
     });

package/dist/src/scripts/messaging/connect.d.ts

@@ -3,6 +3,6 @@
  */
 /**
  * Connect command: establish WebSocket connection for real-time messaging.
- * Note: This function never returns normally - it runs until SIGINT/SIGTERM.
+ * Supports being used as a library with onMessage callback and AbortSignal.
  */
-export declare function cmdConnect(): Promise<void>;
+export declare function cmdConnect(onMessage?: (data: any) => void, signal?: AbortSignal): Promise<void>;

package/dist/src/scripts/messaging/connect.js

@@ -9,9 +9,9 @@ import { processMessage } from './handlers.js';
 import { ensureStateDir } from '../utils/storage.js';
 /**
  * Connect command: establish WebSocket connection for real-time messaging.
- * Note: This function never returns normally - it runs until SIGINT/SIGTERM.
+ * Supports being used as a library with onMessage callback and AbortSignal.
  */
-export async function cmdConnect() {
+export async function cmdConnect(onMessage, signal) {
     let WebSocketClient;
     try {
         const ws = await import('ws');
@@ -33,24 +33,48 @@ export async function cmdConnect() {
             }
             catch { }
         }
-        process.exit(0);
+        // Only exit if we're not running as a library
+        if (!onMessage) {
+            process.exit(0);
+        }
+    }
+    if (!onMessage) {
+        process.on('SIGINT', shutdown);
+        process.on('SIGTERM', shutdown);
+    }
+    if (signal) {
+        signal.addEventListener('abort', () => {
+            shouldReconnect = false;
+            if (currentWs) {
+                try {
+                    currentWs.close();
+                }
+                catch { }
+            }
+        });
     }
-    process.on('SIGINT', shutdown);
-    process.on('SIGTERM', shutdown);
     function connect() {
+        if (signal?.aborted)
+            return;
         const ws = new WebSocketClient(wsUrl);
         currentWs = ws;
         ws.on('open', () => {
             reconnectDelay = 1000; // reset on successful connect
-            console.error(JSON.stringify({ event: 'connected', identity: identityKey, overlay: OVERLAY_URL }));
+            const log = { event: 'connected', identity: identityKey, overlay: OVERLAY_URL };
+            if (onMessage)
+                onMessage(log);
+            else
+                console.error(JSON.stringify(log));
         });
         ws.on('message', async (data) => {
             try {
                 const envelope = JSON.parse(data.toString());
                 if (envelope.type === 'message') {
                     const result = await processMessage(envelope.message, identityKey, privKey);
-                    // Output the result as a JSON line to stdout
-                    console.log(JSON.stringify(result));
+                    if (onMessage)
+                        onMessage(result);
+                    else
+                        console.log(JSON.stringify(result));
                     // Also append to notification log
                     ensureStateDir();
                     try {
@@ -67,7 +91,11 @@ export async function cmdConnect() {
                             });
                         }
                         catch (ackErr) {
-                            console.error(JSON.stringify({ event: 'ack-error', id: result.id, message: String(ackErr) }));
+                            const log = { event: 'ack-error', id: result.id, message: String(ackErr) };
+                            if (onMessage)
+                                onMessage(log);
+                            else
+                                console.error(JSON.stringify(log));
                         }
                     }
                 }
@@ -84,7 +112,10 @@ export async function cmdConnect() {
                         txid: envelope.txid,
                         _ts: Date.now(),
                     };
-                    console.log(JSON.stringify(announcement));
+                    if (onMessage)
+                        onMessage(announcement);
+                    else
+                        console.log(JSON.stringify(announcement));
                     ensureStateDir();
                     try {
                         fs.appendFileSync(PATHS.notifications, JSON.stringify(announcement) + '\n');
@@ -93,22 +124,38 @@ export async function cmdConnect() {
                 }
             }
             catch (err) {
-                console.error(JSON.stringify({ event: 'process-error', message: String(err) }));
+                const log = { event: 'process-error', message: String(err) };
+                if (onMessage)
+                    onMessage(log);
+                else
+                    console.error(JSON.stringify(log));
             }
         });
         ws.on('close', () => {
             currentWs = null;
-            if (shouldReconnect) {
-                console.error(JSON.stringify({ event: 'disconnected', reconnectMs: reconnectDelay }));
+            if (shouldReconnect && !signal?.aborted) {
+                const log = { event: 'disconnected', reconnectMs: reconnectDelay };
+                if (onMessage)
+                    onMessage(log);
+                else
+                    console.error(JSON.stringify(log));
                 setTimeout(connect, reconnectDelay);
                 reconnectDelay = Math.min(reconnectDelay * 2, 30000);
             }
         });
         ws.on('error', (err) => {
-            console.error(JSON.stringify({ event: 'error', message: err.message }));
+            const log = { event: 'error', message: err.message };
+            if (onMessage)
+                onMessage(log);
+            else
+                console.error(JSON.stringify(log));
         });
     }
     connect();
-    // Keep the process alive — never resolves
-    await new Promise(() => { });
+    // Keep alive
+    return new Promise((resolve) => {
+        if (signal) {
+            signal.addEventListener('abort', () => resolve());
+        }
+    });
 }

package/index.ts

@@ -11,11 +11,12 @@ import { cmdDiscover } from './src/scripts/overlay/discover.js';
 import { cmdRequestService } from './src/scripts/services/request.js';
 import { cmdServiceQueue } from './src/scripts/services/queue.js';
 import { cmdRespondService } from './src/scripts/services/respond.js';
+import { cmdConnect } from './src/scripts/messaging/connect.js';
 import { setNoExit } from './src/scripts/output.js';
 
-// Track background process for proper lifecycle management
-let backgroundProcess: any = null;
+// Track background service state
 let serviceRunning = false;
+let abortController: AbortController | null = null;
 
 // Auto-import tracking
 let autoImportInterval: any = null;
@@ -176,59 +177,44 @@ function wakeAgent(text: string, logger: any, options: { sessionKey?: string } =
   }).catch(() => {});
 }
 
-function startBackgroundService(config: any, api: any) {
-  if (backgroundProcess) return;
+async function startBackgroundService(config: any, api: any) {
+  if (serviceRunning) return;
   serviceRunning = true;
+  abortController = new AbortController();
 
   requestCleanupInterval = setInterval(() => {
     if (serviceRunning) wokenRequests.clear();
   }, 5 * 60 * 1000);
   
-  async function spawnConnect() {
-    if (!serviceRunning) return;
-    const { spawn } = await import('node:child_process');
-    const base = __dirname.endsWith('dist') ? __dirname : path.join(__dirname, 'dist');
-    const cliPath = path.join(base, 'src', 'cli.js');
-    
-    const env = { ...(process as any)['env'] };
-    env.BSV_WALLET_DIR = config.walletDir || path.join(os.homedir(), '.openclaw', 'bsv-wallet');
-    env.OVERLAY_URL = config.overlayUrl || 'https://clawoverlay.com';
-    env.BSV_NETWORK = config.network || env.BSV_NETWORK || 'mainnet';
-
-    const proc = spawn('node', [cliPath, 'connect'], { env, stdio: ['ignore', 'pipe', 'pipe'] });
-    backgroundProcess = proc;
-    
-    proc.stdout?.on('data', (data: any) => {
-      const lines = data.toString().split('\n').filter(Boolean);
-      for (const line of lines) {
-        try {
-          const event = JSON.parse(line);
-          if ((event.action === 'queued-for-agent' || event.action === 'already-queued') && event.serviceId) {
-            const rid = event.id || `${event.from}-${Date.now()}`;
-            if (wokenRequests.has(rid)) return;
-            wokenRequests.add(rid);
-            const wakeText = `⚡ Incoming overlay service request!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nPaid: ${event.satoshisReceived || '?'} sats\n\nFulfill it now:\n1. overlay({ action: "pending-requests" })\n2. Process the request\n3. overlay({ action: "fulfill", requestId: "${event.id}", recipientKey: "${event.from}", serviceId: "${event.serviceId}", result: { ... } })`;
-            wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:${rid}` });
-          }
-          if (event.type === 'service-response' && event.action === 'received') {
-            const wakeText = `📬 Overlay service response received!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nStatus: ${event.status}\n\nFull result:\n${JSON.stringify(event.result, null, 2)}`;
-            wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:resp-${event.requestId || Date.now()}` });
-          }
-        } catch {}
-      }
-    });
-    
-    proc.on('exit', () => {
-      backgroundProcess = null;
-      if (serviceRunning) setTimeout(spawnConnect, 5000);
-    });
-  }
-  spawnConnect();
+  applyConfigToEnv(config);
+  
+  // Start the connection directly as a library call
+  // This bypasses the child_process detection and is more efficient
+  cmdConnect((event: any) => {
+    if ((event.action === 'queued-for-agent' || event.action === 'already-queued') && event.serviceId) {
+      const rid = event.id || `${event.from}-${Date.now()}`;
+      if (wokenRequests.has(rid)) return;
+      wokenRequests.add(rid);
+      const wakeText = `⚡ Incoming overlay service request!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nPaid: ${event.satoshisReceived || '?'} sats\n\nFulfill it now:\n1. overlay({ action: "pending-requests" })\n2. Process the request\n3. overlay({ action: "fulfill", requestId: "${event.id}", recipientKey: "${event.from}", serviceId: "${event.serviceId}", result: { ... } })`;
+      wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:${rid}` });
+    }
+    if (event.type === 'service-response' && event.action === 'received') {
+      const wakeText = `📬 Overlay service response received!\n\nService: ${event.serviceId}\nFrom: ${event.from}\nStatus: ${event.status}\n\nFull result:\n${JSON.stringify(event.result, null, 2)}`;
+      wakeAgent(wakeText, api.logger, { sessionKey: `hook:openclaw-overlay:resp-${event.requestId || Date.now()}` });
+    }
+  }, abortController.signal).catch((err) => {
+    if (serviceRunning && !abortController?.signal.aborted) {
+      api.logger?.error?.(`[openclaw-overlay] WebSocket error: ${err.message}`);
+    }
+  });
 }
 
 function stopBackgroundService() {
   serviceRunning = false;
-  if (backgroundProcess) { backgroundProcess.kill(); backgroundProcess = null; }
+  if (abortController) {
+    abortController.abort();
+    abortController = null;
+  }
   if (requestCleanupInterval) { clearInterval(requestCleanupInterval); requestCleanupInterval = null; }
   wokenRequests.clear();
   if (autoImportInterval) { clearInterval(autoImportInterval); autoImportInterval = null; }
@@ -288,8 +274,8 @@ export function register(api: any) {
     id: "openclaw-overlay-relay",
     start: async () => {
       try { await initializeServiceSystem(); } catch {}
-      startBackgroundService(pluginConfig, api);
-      startAutoImport(pluginConfig, api);
+      await startBackgroundService(pluginConfig, api);
+      await startAutoImport(pluginConfig, api);
     },
     stop: () => stopBackgroundService()
   });

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "openclaw-overlay-plugin",
   "name": "BSV Overlay Network",
   "description": "OpenClaw Overlay — decentralized agent marketplace with BSV micropayments",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "skills": [
     "./SKILL.md"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-overlay-plugin",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "Openclaw BSV Overlay — agent discovery, service marketplace, and micropayments on the BSV blockchain",
   "publishConfig": {
     "access": "public"

package/src/scripts/messaging/connect.ts

@@ -11,9 +11,9 @@ import { ensureStateDir } from '../utils/storage.js';
 
 /**
  * Connect command: establish WebSocket connection for real-time messaging.
- * Note: This function never returns normally - it runs until SIGINT/SIGTERM.
+ * Supports being used as a library with onMessage callback and AbortSignal.
  */
-export async function cmdConnect(): Promise<void> {
+export async function cmdConnect(onMessage?: (data: any) => void, signal?: AbortSignal): Promise<void> {
   let WebSocketClient: any;
   try {
     const ws = await import('ws');
@@ -34,19 +34,36 @@ export async function cmdConnect(): Promise<void> {
     if (currentWs) {
       try { currentWs.close(); } catch {}
     }
-    process.exit(0);
+    // Only exit if we're not running as a library
+    if (!onMessage) {
+      process.exit(0);
+    }
   }
 
-  process.on('SIGINT', shutdown);
-  process.on('SIGTERM', shutdown);
+  if (!onMessage) {
+    process.on('SIGINT', shutdown);
+    process.on('SIGTERM', shutdown);
+  }
+
+  if (signal) {
+    signal.addEventListener('abort', () => {
+      shouldReconnect = false;
+      if (currentWs) {
+        try { currentWs.close(); } catch {}
+      }
+    });
+  }
 
   function connect() {
+    if (signal?.aborted) return;
     const ws = new WebSocketClient(wsUrl);
     currentWs = ws;
 
     ws.on('open', () => {
       reconnectDelay = 1000; // reset on successful connect
-      console.error(JSON.stringify({ event: 'connected', identity: identityKey, overlay: OVERLAY_URL }));
+      const log = { event: 'connected', identity: identityKey, overlay: OVERLAY_URL };
+      if (onMessage) onMessage(log);
+      else console.error(JSON.stringify(log));
     });
 
     ws.on('message', async (data: any) => {
@@ -54,8 +71,9 @@ export async function cmdConnect(): Promise<void> {
         const envelope = JSON.parse(data.toString());
         if (envelope.type === 'message') {
           const result = await processMessage(envelope.message, identityKey, privKey);
-          // Output the result as a JSON line to stdout
-          console.log(JSON.stringify(result));
+          
+          if (onMessage) onMessage(result);
+          else console.log(JSON.stringify(result));
 
           // Also append to notification log
           ensureStateDir();
@@ -72,7 +90,9 @@ export async function cmdConnect(): Promise<void> {
                 body: JSON.stringify({ identity: identityKey, messageIds: [result.id] }),
               });
             } catch (ackErr: any) {
-              console.error(JSON.stringify({ event: 'ack-error', id: result.id, message: String(ackErr) }));
+              const log = { event: 'ack-error', id: result.id, message: String(ackErr) };
+              if (onMessage) onMessage(log);
+              else console.error(JSON.stringify(log));
             }
           }
         }
@@ -90,32 +110,45 @@ export async function cmdConnect(): Promise<void> {
             txid: envelope.txid,
             _ts: Date.now(),
           };
-          console.log(JSON.stringify(announcement));
+          if (onMessage) onMessage(announcement);
+          else console.log(JSON.stringify(announcement));
+          
           ensureStateDir();
           try {
             fs.appendFileSync(PATHS.notifications, JSON.stringify(announcement) + '\n');
           } catch {}
         }
       } catch (err: any) {
-        console.error(JSON.stringify({ event: 'process-error', message: String(err) }));
+        const log = { event: 'process-error', message: String(err) };
+        if (onMessage) onMessage(log);
+        else console.error(JSON.stringify(log));
       }
     });
 
     ws.on('close', () => {
       currentWs = null;
-      if (shouldReconnect) {
-        console.error(JSON.stringify({ event: 'disconnected', reconnectMs: reconnectDelay }));
+      if (shouldReconnect && !signal?.aborted) {
+        const log = { event: 'disconnected', reconnectMs: reconnectDelay };
+        if (onMessage) onMessage(log);
+        else console.error(JSON.stringify(log));
+        
         setTimeout(connect, reconnectDelay);
         reconnectDelay = Math.min(reconnectDelay * 2, 30000);
       }
     });
 
     ws.on('error', (err: any) => {
-      console.error(JSON.stringify({ event: 'error', message: err.message }));
+      const log = { event: 'error', message: err.message };
+      if (onMessage) onMessage(log);
+      else console.error(JSON.stringify(log));
     });
   }
 
   connect();
-  // Keep the process alive — never resolves
-  await new Promise(() => {});
+  // Keep alive
+  return new Promise((resolve) => {
+    if (signal) {
+      signal.addEventListener('abort', () => resolve());
+    }
+  });
 }