2020117-agent 0.6.5 → 0.6.7

package/dist/agent.js

@@ -85,7 +85,7 @@ import { SwarmNode, topicFromKind } from './swarm.js';
 import { createProcessor } from './processor.js';
 import { generateInvoice } from './lnurl.js';
 import { generateKeypair, loadSovereignKeys, saveSovereignKeys, loadAgentName, signEvent, signEventWithPow, nip44Encrypt, nip44Decrypt, pubkeyFromPrivkey, RelayPool, } from './nostr.js';
-import { parseNwcUri, nwcGetBalance, nwcPayLightningAddress } from './nwc.js';
+import { parseNwcUri, nwcGetBalance, nwcPayLightningAddress, nwcMakeInvoice } from './nwc.js';
 import { readFileSync } from 'fs';
 import WebSocket from 'ws';
 // Polyfill global WebSocket for Node.js < 22 (needed by ws tunnel)
@@ -258,10 +258,11 @@ async function setupNostr(label) {
     // 7. Subscribe to NIP-XX prompts (Kind 25802)
     subscribeNipXX(label);
     // 8. Subscribe to DVM requests (Kind 5xxx)
-    // P2P-only: still subscribes but handleDvmRequest will ignore broadcast jobs,
-    // only responding to direct requests (p tag = our pubkey)
-    subscribeDvmRequests(label);
-    subscribeDvmResults(label);
+    // P2P-only: skip relay subscription entirely — only serve P2P customers
+    if (!P2P_ONLY) {
+        subscribeDvmRequests(label);
+        subscribeDvmResults(label);
+    }
     // 9. Start heartbeat (Kind 30333 to relay)
     const pricing = {};
     const priceSats = SATS_PER_CHUNK * CHUNKS_PER_PAYMENT;
@@ -552,12 +553,6 @@ async function handleDvmRequest(label, event) {
     // Skip own events
     if (event.pubkey === state.sovereignKeys.pubkey)
         return;
-    // P2P-only mode: only handle direct requests (p tag pointing to us)
-    if (P2P_ONLY) {
-        const isDirected = event.tags.some(t => t[0] === 'p' && t[1] === state.sovereignKeys.pubkey);
-        if (!isDirected)
-            return;
-    }
     // Dedup: skip already-seen events
     if (!markSeen(event.id))
         return;
@@ -832,11 +827,21 @@ function markSeen(eventId) {
     }
     return true;
 }
-/** Send a billing tick to the customer — generate Lightning invoice */
+/** Send a billing tick to the customer — generate Lightning invoice.
+ *  Prefers NWC make_invoice (if nwc_uri configured), falls back to LNURL-pay. */
 async function sendBillingTick(node, session, amount, label) {
     const tickId = randomBytes(4).toString('hex');
     try {
-        const bolt11 = await generateInvoice(LIGHTNING_ADDRESS, amount);
+        let bolt11;
+        if (state.nwcParsed) {
+            // NWC make_invoice: wallet generates invoice directly — no lightning address needed
+            const result = await nwcMakeInvoice(state.nwcParsed, amount * 1000, `2020117 session ${session.sessionId}`);
+            bolt11 = result.bolt11;
+        }
+        else {
+            // Fallback: LNURL-pay via lightning address
+            bolt11 = await generateInvoice(LIGHTNING_ADDRESS, amount);
+        }
         node.send(session.socket, {
             type: 'session_tick',
             id: tickId,
@@ -877,8 +882,8 @@ async function startSwarmListener(label) {
         if (msg.type === 'session_start') {
             const processorUrl = process.env.PROCESSOR || '';
             const proxyMode = processorUrl.startsWith('http://') || processorUrl.startsWith('https://');
-            if (!proxyMode && !LIGHTNING_ADDRESS) {
-                node.send(socket, { type: 'error', id: msg.id, message: 'Provider Lightning Address not configured' });
+            if (!proxyMode && !LIGHTNING_ADDRESS && !state.nwcParsed) {
+                node.send(socket, { type: 'error', id: msg.id, message: 'Provider payment not configured (need --lightning-address or --nwc)' });
                 return;
             }
             const paymentMethod = 'invoice';
@@ -916,7 +921,7 @@ async function startSwarmListener(label) {
                 pubkey: state.sovereignKeys?.pubkey,
             });
             if (proxyMode) {
-                if (billingAmount <= 0 || !LIGHTNING_ADDRESS) {
+                if (billingAmount <= 0 || (!LIGHTNING_ADDRESS && !state.nwcParsed)) {
                     // Free proxy — open TCP pipe immediately
                     startTcpProxy(session, node, processorUrl, label);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "2020117-agent",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "2020117 agent runtime — Nostr-native relay subscription + Hyperswarm P2P + Lightning payments",
   "type": "module",
   "bin": {