aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into FinalAdminUI

Browse source
This commit is contained in:
ben 2022-12-16 22:45:54 +00:00
commit 940615cb0b
2 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lnbits/core/views/api.py
View file

@ -388,7 +388,7 @@ async def subscribe_wallet_invoices(request: Request, wallet: Wallet):
yield dict(data=jdata, event=typ) yield dict(data=jdata, event=typ)
except asyncio.CancelledError as e: except asyncio.CancelledError as e:
logger.debug(f"CancelledError on listener {uid}: {e}") logger.debug(f"removing listener for wallet {uid}")
api_invoice_listeners.pop(uid) api_invoice_listeners.pop(uid)
task.cancel() task.cancel()
return return

28
lnbits/wallets/lnbits.py
View file

@ -148,18 +148,26 @@ class LNbitsWallet(Wallet):
while True: while True:
try: try:
async with httpx.AsyncClient(timeout=None, headers=self.key) as client: async with httpx.AsyncClient(timeout=None, headers=self.key) as client:
async with client.stream("GET", url) as r: del client.headers[
"accept-encoding"
] # we have to disable compression for SSEs
async with client.stream(
"GET", url, content="text/event-stream"
) as r:
sse_trigger = False
async for line in r.aiter_lines(): async for line in r.aiter_lines():
if line.startswith("data:"): # The data we want to listen to is of this shape:
try: # event: payment-received
data = json.loads(line[5:]) # data: {.., "payment_hash" : "asd"}
except json.decoder.JSONDecodeError: if line.startswith("event: payment-received"):
sse_trigger = True
continue continue
elif sse_trigger and line.startswith("data:"):
if type(data) is not dict: data = json.loads(line[len("data:") :])
continue sse_trigger = False
yield data["payment_hash"]
yield data["payment_hash"] # payment_hash else:
sse_trigger = False
except (OSError, httpx.ReadError, httpx.ConnectError, httpx.ReadTimeout): except (OSError, httpx.ReadError, httpx.ConnectError, httpx.ReadTimeout):
pass pass