lightning 5.16.5 → 5.16.6

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Versions
 
-## 5.16.5
+## 5.16.6
 
 - `subscribeToInvoices`: Cancel subscription when there are no event listeners
 

package/lnd_methods/invoices/subscribe_to_invoices.js

@@ -10,6 +10,7 @@ const connectionFailureMessage = 'failed to connect to all addresses';
 const events = ['end', 'error', 'invoice_updated', 'status'];
 const msPerSec = 1e3;
 const restartSubscriptionMs = 1000 * 30;
+const sumOf = arr => arr.reduce((sum, n) => sum + n, Number());
 const updateEvent = 'invoice_updated';
 
 /** Subscribe to invoices
@@ -112,14 +113,30 @@ module.exports = args => {
 
       isFinished = true;
 
+      const listenerCount = eventEmitter.listenerCount(updateEvent);
+
+      // Exit early when there are no listeners
+      if (!listenerCount) {
+        return cbk(null, {listener_count: listenerCount});
+      }
+
+      // Delay restart when there are listeners
       return setTimeout(() => {
-        return cbk(null, {
-          listener_count: eventEmitter.listenerCount(updateEvent),
-        });
+        return cbk(null, {listener_count: listenerCount});
       },
       args.restart_delay_ms || restartSubscriptionMs);
     };
 
+    // Finish early when all listeners are removed
+    eventEmitter.on('removeListener', () => {
+      // Exit early when there are still active listeners
+      if (!!sumOf(events.map(n => eventEmitter.listenerCount(n)))) {
+        return;
+      }
+
+      return finished();
+    });
+
     // Relay invoice updates to the emitter
     subscription.on('data', invoice => {
       try {

package/package.json

@@ -10,7 +10,7 @@
     "@grpc/grpc-js": "1.6.8",
     "@grpc/proto-loader": "0.7.0",
     "@types/express": "4.17.13",
-    "@types/node": "18.6.2",
+    "@types/node": "18.6.3",
     "@types/request": "2.48.8",
     "@types/ws": "8.5.3",
     "async": "3.2.4",
@@ -59,5 +59,5 @@
     "directory": "test/typescript"
   },
   "types": "index.d.ts",
-  "version": "5.16.5"
+  "version": "5.16.6"
 }