Bump

Author: Kukks

NNostr.Client/NNostr.Client.csproj

@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>0.0.53</PackageVersion>
+        <PackageVersion>0.0.54</PackageVersion>
         <Title>Nostr Client</Title>
         <Description>A client for Nostr</Description>
         <Copyright>MIT</Copyright>
@@ -18,7 +18,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
+        <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

NNostr.Client/NostrClientPool.cs

@@ -2,28 +2,36 @@
 
 namespace NNostr.Client;
 
-
 public class NostrClientPool : IDisposable
 {
     private readonly ConcurrentDictionary<string, NostrClientWrapper> _clientPool = new();
 
-    private readonly Timer _cleanupTimer;
+    private Timer? _cleanupTimer;
+    private readonly TimeSpan _unusedClientTimeout;
 
     public NostrClientPool(TimeSpan? unusedClientTimeout = null)
     {
-        unusedClientTimeout ??= TimeSpan.FromMinutes(5);
-        _cleanupTimer = new Timer(CleanupExpiredClients, null, unusedClientTimeout.Value, unusedClientTimeout.Value);
+        _unusedClientTimeout = unusedClientTimeout ?? TimeSpan.FromMinutes(5);
+        InitBackgroundTask();
+    }
+
+    protected virtual void InitBackgroundTask()
+    {
+        _cleanupTimer?.Dispose();
+        _cleanupTimer = new Timer(CleanupExpiredClients, null, _unusedClientTimeout, _unusedClientTimeout);
     }
 
     public (INostrClient, IDisposable) GetClient(Uri[] relays)
     {
-        if(relays.Length == 0)
+        if (relays.Length == 0)
             throw new ArgumentException("At least one relay is required", nameof(relays));
-       
+
         var connString = GetConnString(relays);
 
         var clientWrapper = _clientPool.GetOrAdd(connString,
-            k => new NostrClientWrapper(relays.Length > 1? new CompositeNostrClient(relays) : new NostrClient(relays[0])));
+            k => new NostrClientWrapper(relays.Length > 1
+                ? new CompositeNostrClient(relays)
+                : new NostrClient(relays[0])));
 
         clientWrapper.IncrementUsage();
 
@@ -33,12 +41,19 @@ public NostrClientPool(TimeSpan? unusedClientTimeout = null)
     public async Task<(INostrClient, IDisposable)> GetClientAndConnect(Uri[] relays, CancellationToken token)
     {
         var result = GetClient(relays);
-
-        await result.Item1.ConnectAndWaitUntilConnected(token, CancellationToken.None);
-
-        return result;
+        try
+        {
+            await result.Item1.ConnectAndWaitUntilConnected(token, CancellationToken.None);
+            return result;
+        }
+        catch (Exception e)
+        {
+            result.Item2.Dispose();
+            KillClient(relays);
+            throw;
+        }
     }
-    
+
     private string GetConnString(Uri[] relays)
     {
         return string.Join(';', relays.Select(r => r.ToString()));
@@ -67,24 +82,24 @@ public void CleanupExpiredClients(object? state)
         }
     }
 
-    private class UsageDisposable : IDisposable
+    internal class UsageDisposable : IDisposable
     {
-        private readonly NostrClientWrapper _clientWrapper;
+        internal readonly NostrClientWrapper ClientWrapper;
 
         public UsageDisposable(NostrClientWrapper clientWrapper)
         {
-            _clientWrapper = clientWrapper;
+            ClientWrapper = clientWrapper;
         }
 
         public void Dispose()
         {
-            _clientWrapper.DecrementUsage();
+            ClientWrapper.DecrementUsage();
         }
     }
 
     public void Dispose()
     {
-        _cleanupTimer.Dispose();
+        _cleanupTimer?.Dispose();
         foreach (var client in _clientPool.Values)
         {
             client.Dispose();

NNostr.Client/NostrClientWrapper.cs

@@ -3,7 +3,7 @@
 public class NostrClientWrapper : IDisposable
 {
     public INostrClient Client { get; private set; }
-    private int _usageCount = 0;
+    internal int UsageCount = 0;
     private bool _isDisposed = false;
     private DateTimeOffset _lastUsed;
 
@@ -16,13 +16,13 @@ public NostrClientWrapper(INostrClient client)
     public void IncrementUsage()
     {
         _lastUsed = DateTimeOffset.UtcNow;
-        Interlocked.Increment(ref _usageCount);
+        Interlocked.Increment(ref UsageCount);
     }
 
     public void DecrementUsage()
     {
         _lastUsed = DateTimeOffset.UtcNow;
-        if (Interlocked.Decrement(ref _usageCount) == 0 && IsExpired())
+        if (Interlocked.Decrement(ref UsageCount) == 0 && IsExpired())
         {
             Dispose();
         }

NNostr.Tests/ClientTests.cs

@@ -19,6 +19,33 @@ public NostrWalletCOnnectTests()
 
     }
 
+
+    [Fact]
+    public async Task RsspectCancelltaion()
+    {
+        var broken =
+            "nostr+walletconnect://142cc22d6c00258709ae2b5312c54d40420b0aa495839ce5f13ae0025f1263db?relay=wss://relay.getalby.com/v1&secret=e06cffe97a30701d309d8c041ef67e2b37f1524c128ce594501f21cd723350d8";
+        
+        var result = NIP47.ParseUri(new Uri(broken));
+
+        var pool = new NostrClientPool();
+        
+        var cts = new CancellationTokenSource();
+        var connectionResult = pool.GetClientAndConnect(result.relays, cts.Token);
+   
+       var res =  await connectionResult;
+       Assert.Equal(1, Assert.IsType<NostrClientPool.UsageDisposable>(res.Item2).ClientWrapper.UsageCount);
+       
+       var connectionResult2 = await pool.GetClientAndConnect(result.relays, cts.Token);
+
+       Assert.Equal(2, Assert.IsType<NostrClientPool.UsageDisposable>(connectionResult2.Item2).ClientWrapper.UsageCount);
+       Assert.Equal(res.Item1, connectionResult2.Item1);
+       
+       
+       
+    }
+    
+
      // [Fact]
     public async Task CanParseUri()
     {