Inject HttpClient inside lightning client instances

BTCPayServer/BTCPayServer.csproj

@@ -34,7 +34,7 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.15" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.16" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.9.406" />
     <PackageReference Include="BundlerMinifier.Core" Version="2.9.406" />
     <PackageReference Include="BundlerMinifier.TagHelpers" Version="2.9.406" />

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -64,6 +64,7 @@ namespace BTCPayServer.Hosting
             services.TryAddSingleton<SettingsRepository>();
             services.TryAddSingleton<TorServices>();
             services.TryAddSingleton<SocketFactory>();
+            services.TryAddSingleton<LightningClientFactoryService>();
             services.TryAddSingleton<InvoicePaymentNotification>();
             services.TryAddSingleton<BTCPayServerOptions>(o => o.GetRequiredService<IOptions<BTCPayServerOptions>>().Value);
             services.TryAddSingleton<InvoiceRepository>(o =>

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -19,13 +19,16 @@ namespace BTCPayServer.Payments.Lightning
         public static int LIGHTNING_TIMEOUT = 5000;
 
         NBXplorerDashboard _Dashboard;
+        private readonly LightningClientFactoryService _lightningClientFactory;
         private readonly SocketFactory _socketFactory;
 
         public LightningLikePaymentHandler(
             NBXplorerDashboard dashboard,
+            LightningClientFactoryService lightningClientFactory,
             SocketFactory socketFactory)
         {
             _Dashboard = dashboard;
+            _lightningClientFactory = lightningClientFactory;
             _socketFactory = socketFactory;
         }
         public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(LightningSupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store, BTCPayNetwork network, object preparePaymentObject)
@@ -34,7 +37,7 @@ namespace BTCPayServer.Payments.Lightning
             var test = GetNodeInfo(paymentMethod.PreferOnion, supportedPaymentMethod, network);
             var invoice = paymentMethod.ParentEntity;
             var due = Extensions.RoundUp(invoice.ProductInformation.Price / paymentMethod.Rate, 8);
-            var client = supportedPaymentMethod.CreateClient(network);
+            var client = _lightningClientFactory.Create(supportedPaymentMethod.GetLightningUrl(), network);
             var expiry = invoice.ExpirationTime - DateTimeOffset.UtcNow;
             if (expiry < TimeSpan.Zero)
                 expiry = TimeSpan.FromSeconds(1);
@@ -76,7 +79,7 @@ namespace BTCPayServer.Payments.Lightning
 
             using (var cts = new CancellationTokenSource(LIGHTNING_TIMEOUT))
             {
-                var client = supportedPaymentMethod.CreateClient(network);
+                var client = _lightningClientFactory.Create(supportedPaymentMethod.GetLightningUrl(), network);
                 LightningNodeInformation info = null;
                 try
                 {

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -13,6 +13,8 @@ using BTCPayServer.Lightning;
 using System.Collections.Concurrent;
 using System.Threading.Channels;
 using Microsoft.Extensions.Caching.Memory;
+using System.Net.Http;
+using BTCPayServer.Services;
 
 namespace BTCPayServer.Payments.Lightning
 {
@@ -24,17 +26,20 @@ namespace BTCPayServer.Payments.Lightning
         BTCPayNetworkProvider _NetworkProvider;
         Channel<string> _CheckInvoices = Channel.CreateUnbounded<string>();
         Task _CheckingInvoice;
+        IHttpClientFactory _HttpClientFactory;
         Dictionary<(string, string), LightningInstanceListener> _InstanceListeners = new Dictionary<(string, string), LightningInstanceListener>();
 
         public LightningListener(EventAggregator aggregator,
                               InvoiceRepository invoiceRepository,
                               IMemoryCache memoryCache,
-                              BTCPayNetworkProvider networkProvider)
+                              BTCPayNetworkProvider networkProvider,
+                              IHttpClientFactory httpClientFactory)
         {
             _Aggregator = aggregator;
             _InvoiceRepository = invoiceRepository;
             _memoryCache = memoryCache;
             _NetworkProvider = networkProvider;
+            _HttpClientFactory = httpClientFactory;
         }
 
         async Task CheckingInvoice(CancellationToken cancellation)
@@ -50,7 +55,7 @@ namespace BTCPayServer.Payments.Lightning
                         if (!_InstanceListeners.TryGetValue(instanceListenerKey, out var instanceListener) || 
                             !instanceListener.IsListening)
                         {
-                            instanceListener = instanceListener ?? new LightningInstanceListener(_InvoiceRepository, _Aggregator, listenedInvoice.SupportedPaymentMethod, listenedInvoice.Network);
+                            instanceListener = instanceListener ?? new LightningInstanceListener(_InvoiceRepository, _Aggregator, listenedInvoice.SupportedPaymentMethod, _HttpClientFactory, listenedInvoice.Network);
                             var status = await instanceListener.PollPayment(listenedInvoice, cancellation);
                             if (status is null ||
                                 status is LightningInvoiceStatus.Paid ||
@@ -201,16 +206,19 @@ namespace BTCPayServer.Payments.Lightning
         private readonly InvoiceRepository invoiceRepository;
         private readonly EventAggregator _eventAggregator;
         private readonly BTCPayNetwork network;
+        private readonly LightningClientFactoryService _lightningClientFactory;
 
         public LightningInstanceListener(InvoiceRepository invoiceRepository,
                                         EventAggregator eventAggregator,
                                         LightningSupportedPaymentMethod supportedPaymentMethod,
+                                        LightningClientFactoryService lightningClientFactory,
                                         BTCPayNetwork network)
         {
             this.supportedPaymentMethod = supportedPaymentMethod;
             this.invoiceRepository = invoiceRepository;
             _eventAggregator = eventAggregator;
             this.network = network;
+            _lightningClientFactory = lightningClientFactory;
         }
         internal bool AddListenedInvoice(ListenedInvoice invoice)
         {
@@ -219,7 +227,7 @@ namespace BTCPayServer.Payments.Lightning
 
         internal async Task<LightningInvoiceStatus?> PollPayment(ListenedInvoice listenedInvoice, CancellationToken cancellation)
         {
-            var client = supportedPaymentMethod.CreateClient(network);
+            var client = _lightningClientFactory.Create(supportedPaymentMethod.GetLightningUrl(), network);
             LightningInvoice lightningInvoice = await client.GetInvoice(listenedInvoice.PaymentMethodDetails.InvoiceId);
             if (lightningInvoice?.Status is LightningInvoiceStatus.Paid && 
                 await AddPayment(lightningInvoice, listenedInvoice.InvoiceId))
@@ -245,7 +253,7 @@ namespace BTCPayServer.Payments.Lightning
             Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): Start listening {supportedPaymentMethod.GetLightningUrl().BaseUri}");
             try
             {
-                var lightningClient = supportedPaymentMethod.CreateClient(network);
+                var lightningClient = _lightningClientFactory.Create(supportedPaymentMethod.GetLightningUrl(), network);
                 using (var session = await lightningClient.Listen(cancellation))
                 {
                     // Just in case the payment arrived after our last poll but before we listened.
@@ -290,6 +298,7 @@ namespace BTCPayServer.Payments.Lightning
             if (_ListenedInvoices.IsEmpty)
                 Logs.PayServer.LogInformation($"{supportedPaymentMethod.CryptoCode} (Lightning): No more invoice to listen on {supportedPaymentMethod.GetLightningUrl().BaseUri}, releasing the connection.");
         }
+
         public DateTimeOffset? LastFullPoll { get; set; }
 
         internal async Task PollAllListenedInvoices(CancellationToken cancellation)

BTCPayServer/Payments/Lightning/LightningSupportedPaymentMethod.cs

@@ -60,10 +60,5 @@ namespace BTCPayServer.Payments.Lightning
             LightningChargeUrl = null;
 #pragma warning restore CS0618 // Type or member is obsolete
         }
-
-        public ILightningClient CreateClient(BTCPayNetwork network)
-        {
-            return LightningClientFactory.CreateClient(this.GetLightningUrl(), network.NBitcoinNetwork);
-        }
     }
 }