beignet 0.34.0 → 0.35.1

package/dist/cli/beignet-node.js

@@ -2559,9 +2559,8 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
         this.node.on('peer:connect', (pubkey) => {
             let direction;
             try {
-                direction = this.node
-                    .getPeerManager()
-                    ?.getConnectionInfo(pubkey)?.direction;
+                direction = this.node.getPeerManager()?.getConnectionInfo(pubkey)
+                    ?.direction;
             }
             catch {
                 // The log line must not cost the gossip sync below.
@@ -2604,20 +2603,22 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
             this.emit('peer:connect', { pubkey });
         });
         this.node.on('peer:disconnect', (pubkey, info) => {
-            this.log('info', 'Peer disconnected', {
-                pubkey,
-                ...(info
-                    ? {
-                        closedBy: info.initiator === 'remote' ? 'peer' : 'us',
-                        ...(info.reason ? { reason: info.reason } : {}),
-                        direction: info.direction,
-                        ...(info.uptimeMs !== undefined
-                            ? { uptimeMs: info.uptimeMs }
-                            : {})
-                    }
-                    : {})
-            });
-            this.emit('peer:disconnect', { pubkey });
+            // Subscribers (SSE, webhooks, an embedding app's diagnostics)
+            // get the same cause the log line names.
+            const cause = info
+                ? {
+                    closedBy: info.initiator === 'remote'
+                        ? 'peer'
+                        : 'us',
+                    ...(info.reason ? { reason: info.reason } : {}),
+                    direction: info.direction,
+                    ...(info.uptimeMs !== undefined
+                        ? { uptimeMs: info.uptimeMs }
+                        : {})
+                }
+                : {};
+            this.log('info', 'Peer disconnected', { pubkey, ...cause });
+            this.emit('peer:disconnect', { pubkey, ...cause });
         });
         // The transport error that caused a disconnect (pong timeout, decrypt
         // failure, socket reset, ...) is the only place the reason is known —
@@ -6872,6 +6873,11 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
         if (!channel)
             return null;
         const state = channel.getFullState();
+        // Nothing clears preReestablishState when a marked channel closes, so
+        // it names the earlier state only while the channel is still wrapped.
+        const wrappedState = state.state === types_7.ChannelState.AWAITING_REESTABLISH
+            ? state.preReestablishState
+            : null;
         // Mid-negotiation v2 channels are keyed by temporary id in the peer map
         // (see buildChannelInfo); fall back so diagnostics name the peer too.
         const peerPubkey = this.node.getChannelManager().getPeerForChannel(channelIdBuf) ||
@@ -6904,9 +6910,9 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
         if (state.fundingUnaccounted === true)
             issues.push('FUNDING_UNACCOUNTED: Neither mempool nor chain can account for the funding transaction, so the channel takes no new HTLCs. Routing hints will be skipped. Existing HTLCs still settle, and the quarantine lifts by itself if the funding reappears.');
         if (state.state !== 'NORMAL' &&
-            state.preReestablishState !== 'NORMAL' &&
+            wrappedState !== 'NORMAL' &&
             !acceptsNewThrough) {
-            issues.push(`NOT_NORMAL: Channel state is ${state.state} (pre-reestablish: ${state.preReestablishState || 'none'}). Routing hints require a usable channel.`);
+            issues.push(`NOT_NORMAL: Channel state is ${state.state} (pre-reestablish: ${wrappedState || 'none'}). Routing hints require a usable channel.`);
         }
         if (!state.announceChannel)
             issues.push('PRIVATE_CHANNEL: Channel is private (not announced). Routing hints are required for payments.');
@@ -6920,7 +6926,7 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
             channelId,
             peerPubkey,
             state: state.state,
-            preReestablishState: state.preReestablishState || null,
+            preReestablishState: wrappedState || null,
             isPeerConnected,
             announceChannel: state.announceChannel,
             announcementSigsSent: state.announcementSigsSent || false,