From 72dd7aa1beebbf1a67006cf8dc25bb135e5cfd0c Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Thu, 6 Jun 2024 12:14:12 +0200
Subject: [PATCH] update nostr zapper

---
 .../BTCPayServer.Plugins.NIP05.csproj         |  4 +-
 Plugins/BTCPayServer.Plugins.NIP05/Zapper.cs  | 39 ++++++++++---------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Plugins/BTCPayServer.Plugins.NIP05/BTCPayServer.Plugins.NIP05.csproj b/Plugins/BTCPayServer.Plugins.NIP05/BTCPayServer.Plugins.NIP05.csproj
index 393dfd3..e9f35c5 100644
--- a/Plugins/BTCPayServer.Plugins.NIP05/BTCPayServer.Plugins.NIP05.csproj
+++ b/Plugins/BTCPayServer.Plugins.NIP05/BTCPayServer.Plugins.NIP05.csproj
@@ -11,7 +11,7 @@
     <PropertyGroup>
         <Product>Nostr</Product>
         <Description>NIP5 addresses, Zap support, Nostr Wallet Connect Lightning support</Description>
-        <Version>1.1.8</Version>
+        <Version>1.1.9</Version>
 <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
     <!-- Plugin development properties -->
@@ -36,7 +36,7 @@
         <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj" />
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="NNostr.Client" Version="0.0.48" />
+      <PackageReference Include="NNostr.Client" Version="0.0.49" />
     </ItemGroup>
     <ItemGroup>
       <Folder Include="Resources" />
diff --git a/Plugins/BTCPayServer.Plugins.NIP05/Zapper.cs b/Plugins/BTCPayServer.Plugins.NIP05/Zapper.cs
index 249978d..2233864 100644
--- a/Plugins/BTCPayServer.Plugins.NIP05/Zapper.cs
+++ b/Plugins/BTCPayServer.Plugins.NIP05/Zapper.cs
@@ -54,6 +54,7 @@ public class Zapper : IHostedService
     private readonly InvoiceRepository _invoiceRepository;
     private IEventAggregatorSubscription _subscription;
     private readonly ConcurrentBag<PendingZapEvent> _pendingZapEvents = new();
+    private readonly NNostr.Client.NostrClientPool _nostrClientPool;
 
     public async Task<ZapperSettings> GetSettings()
     {
@@ -85,6 +86,7 @@ public class Zapper : IHostedService
         _logger = logger;
         _settingsRepository = settingsRepository;
         _invoiceRepository = invoiceRepository;
+        _nostrClientPool = new NNostr.Client.NostrClientPool();
     }
 
     public Task StartAsync(CancellationToken cancellationToken)
@@ -123,13 +125,14 @@ public class Zapper : IHostedService
                             _logger.LogInformation($"Zapping {relay.Value.Length} to {relay.Key}");
                             var cts = new CancellationTokenSource();
                             cts.CancelAfter(TimeSpan.FromSeconds(30));
-                            using var c = new NostrClient(new Uri(relay.Key));
-                            await c.Connect(cts.Token);
-                            await c.SendEventsAndWaitUntilReceived(relay.Value, cts.Token);
-                            await c.Disconnect();
+                            var pool= await 
+                                _nostrClientPool.GetClientAndConnect(new []{new Uri(relay.Key)}, cts.Token);
+                            using var c = pool.Item2;
+                            await pool.Item1.SendEventsAndWaitUntilReceived(relay.Value, cts.Token);
                         }
                         catch (Exception e)
                         {
+                            _logger.LogError(e, $"Error zapping {relay.Value.Length} events to {relay.Key}");
                         }
                     }));
                 }
@@ -185,31 +188,31 @@ public class Zapper : IHostedService
         var relays = zapRequestEvent.Tags.Where(tag => tag.TagIdentifier == "relays").SelectMany(tag => tag.Data).ToArray();
         
         var tags = zapRequestEvent.Tags.Where(a => a.TagIdentifier.Length == 1).ToList();
-        tags.Add(new()
-        {
-            TagIdentifier = "bolt11",
-            Data = new() {pmd.BOLT11}
-        });
 
-        tags.Add(new()
+
+        tags.AddRange(new[]
         {
-            TagIdentifier = "description",
-            Data = new() {zapRequest}
+            new NostrEventTag
+            {
+                TagIdentifier = "bolt11",
+                Data = new() {pmd.BOLT11}
+            },
+
+            new NostrEventTag()
+            {
+                TagIdentifier = "description",
+                Data = new() {zapRequest}
+            }
         });
 
         var userNostrSettings = await _nip5Controller.GetForStore(arg.Invoice.StoreId);
-        var key = userNostrSettings?.PrivateKey is not null
+        var key = !string.IsNullOrEmpty(userNostrSettings?.PrivateKey)
             ? NostrExtensions.ParseKey(userNostrSettings?.PrivateKey)
             : settings.ZappingKey; 
         
-        var pubkey = userNostrSettings?.PubKey is not null
-            ? userNostrSettings?.PubKey
-            : settings.ZappingPublicKeyHex; 
         var zapReceipt = new NostrEvent()
         {
             Kind = 9735,
-            CreatedAt = DateTimeOffset.UtcNow,
-            PublicKey = pubkey,
             Content = zapRequestEvent.Content,
             Tags = tags
         };