aljaz/BTCPayServerPlugins
1
0
Fork 0
mirror of https://github.com/aljazceru/BTCPayServerPlugins.git synced 2025-12-17 15:44:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

optimistic fix blink

Browse Source
This commit is contained in:
Kukks
2024-03-01 18:09:15 +00:00
parent abd5e3bcf9
commit 9a8299d61e
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/BTCPayServer.Plugins.Blink/BTCPayServer.Plugins.Blink.csproj
View File

@@ -9,7 +9,7 @@
<PropertyGroup> <PropertyGroup>
<Product>Blink</Product> <Product>Blink</Product>
<Description>Blink Lightning support</Description> <Description>Blink Lightning support</Description>
<Version>1.0.7</Version> <Version>1.0.8</Version>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<RootNamespace>BTCPayServer.Plugins.Blink</RootNamespace> <RootNamespace>BTCPayServer.Plugins.Blink</RootNamespace>
</PropertyGroup> </PropertyGroup>

22
Plugins/BTCPayServer.Plugins.Blink/BlinkLightningClient.cs
View File

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
using BTCPayServer.HostedServices; using BTCPayServer.HostedServices;
using BTCPayServer.Lightning; using BTCPayServer.Lightning;
using GraphQL; using GraphQL;
using GraphQL.Client.Abstractions.Websocket;
using GraphQL.Client.Http; using GraphQL.Client.Http;
using GraphQL.Client.Http.Websocket; using GraphQL.Client.Http.Websocket;
using GraphQL.Client.Serializer.Newtonsoft; using GraphQL.Client.Serializer.Newtonsoft;
@@ -458,6 +459,14 @@ expiresIn = (int)createInvoiceRequest.Expiry.TotalMinutes
} }
}); });
_wsSubscriptionDisposable = httpClient.WebsocketConnectionState.Subscribe(state =>
{
if (state == GraphQLWebsocketConnectionState.Disconnected)
{
streamEnded.TrySetResult();
}
});
} }
catch (Exception e) catch (Exception e)
{ {
@@ -468,11 +477,22 @@ expiresIn = (int)createInvoiceRequest.Expiry.TotalMinutes
{ {
_subscription.Dispose(); _subscription.Dispose();
_invoices.Writer.TryComplete(); _invoices.Writer.TryComplete();
_wsSubscriptionDisposable.Dispose();
streamEnded.TrySetResult();
} }
private TaskCompletionSource streamEnded = new();
private readonly IDisposable _wsSubscriptionDisposable;
public async Task<LightningInvoice> WaitInvoice(CancellationToken cancellation) public async Task<LightningInvoice> WaitInvoice(CancellationToken cancellation)
{ {
return await _invoices.Reader.ReadAsync(cancellation); var resultz = await Task.WhenAny(streamEnded.Task, _invoices.Reader.ReadAsync(cancellation).AsTask());
if (resultz is Task<LightningInvoice> res)
{
return await res;
}
throw new Exception("Stream disconnected, cannot await invoice");
} }
} }
public async Task<(Network Network, string DefaultWalletId, string DefaultWalletCurrency)> GetNetworkAndDefaultWallet(CancellationToken cancellation =default) public async Task<(Network Network, string DefaultWalletId, string DefaultWalletCurrency)> GetNetworkAndDefaultWallet(CancellationToken cancellation =default)