@johngalt5/bsv-overlay 0.2.10 → 0.2.12

package/index.ts

@@ -157,28 +157,19 @@ function startBackgroundService(env, cliPath, logger) {
           if (event.action === 'queued-for-agent' && event.serviceId) {
             logger?.info?.(`[bsv-overlay] ⚡ Incoming ${event.serviceId} request from ${event.from?.slice(0, 12)}... — waking agent`);
             
-            // Wake the agent via gateway cron.wake RPC (fire-and-forget)
-            const wakeText = `⚡ Incoming overlay service request: ${event.serviceId} from ${event.from?.slice(0, 16)}... (${event.satoshisReceived || '?'} sats paid). Check overlay({ action: "pending-requests" }) for details, fulfill it using your capabilities, then call overlay({ action: "fulfill", requestId: "...", recipientKey: "...", serviceId: "...", result: {...} }).`;
-            (async () => {
-              try {
-                const gatewayUrl = 'http://127.0.0.1:18789';
-                const wakeResp = await fetch(gatewayUrl, {
-                  method: 'POST',
-                  headers: { 'Content-Type': 'application/json' },
-                  body: JSON.stringify({
-                    jsonrpc: '2.0',
-                    id: `overlay-wake-${Date.now()}`,
-                    method: 'cron.wake',
-                    params: { mode: 'now', text: wakeText },
-                  }),
-                });
-                if (wakeResp.ok) {
-                  logger?.info?.('[bsv-overlay] Agent woken for service fulfillment');
-                }
-              } catch (wakeErr: any) {
-                logger?.warn?.('[bsv-overlay] Failed to wake agent:', wakeErr.message);
-              }
-            })();
+            // Write alert file for the cron-based fulfillment checker to pick up
+            const alertDir = path.join(process.env.HOME || '', '.clawdbot', 'bsv-overlay');
+            const alertPath = path.join(alertDir, 'pending-alert.jsonl');
+            try {
+              fs.mkdirSync(alertDir, { recursive: true });
+              fs.appendFileSync(alertPath, JSON.stringify({
+                requestId: event.id,
+                serviceId: event.serviceId,
+                from: event.from,
+                satoshis: event.satoshisReceived,
+                ts: Date.now(),
+              }) + '\n');
+            } catch {}
           }
         } catch {}
       }
@@ -686,8 +677,11 @@ async function handleServiceRequest(params, env, cliPath, config, api) {
     throw new Error(`Service request failed: ${requestOutput.error}`);
   }
 
-  // 7. Poll for response
-  const maxPollAttempts = 12; // ~60 seconds with 5 second intervals
+  // 7. Poll for response (up to 120s, with early return)
+  // The WebSocket background service will also receive the response
+  // asynchronously, so we return a "pending" status if we time out
+  // rather than throwing an error.
+  const maxPollAttempts = 24; // ~120 seconds with 5 second intervals
   let attempts = 0;
   
   while (attempts < maxPollAttempts) {
@@ -699,7 +693,7 @@ async function handleServiceRequest(params, env, cliPath, config, api) {
       const pollOutput = parseCliOutput(pollResult.stdout);
       
       if (pollOutput.success && pollOutput.data) {
-        // FIX: Check pollOutput.data.messages array for service-response
+        // Check pollOutput.data.messages array for service-response
         const messages = pollOutput.data.messages || [];
         for (const msg of messages) {
           if (msg.type === 'service-response' && msg.from === bestProvider.identityKey) {
@@ -720,7 +714,17 @@ async function handleServiceRequest(params, env, cliPath, config, api) {
     }
   }
   
-  throw new Error(`Service request timed out after ${maxPollAttempts * 5} seconds`);
+  // Don't throw — the response may still arrive via WebSocket
+  // Record the spend since payment was already sent
+  recordSpend(walletDir, price, service, bestProvider.agentName);
+  return {
+    provider: bestProvider.agentName,
+    cost: price,
+    status: "pending",
+    message: `Request sent and paid (${price} sats). The provider hasn't responded within 120s, but the response may still arrive via the background WebSocket service. Check notifications later.`,
+    requestId: requestOutput.data?.messageId,
+    providerKey: bestProvider.identityKey,
+  };
 }
 
 async function handleDiscover(params, env, cliPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johngalt5/bsv-overlay",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "Clawdbot BSV Overlay — agent discovery, service marketplace, and micropayments on the BSV blockchain",
   "type": "module",
   "files": [