aljaz/nutshell
1
0
Fork 0
mirror of https://github.com/aljazceru/nutshell.git synced 2025-12-23 19:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Another changes for LNbits API (#739)

Browse Source 
* pending -> status; sse -> websocket

* paid_invoices_stream only for incoming

* fix backward compatibility

* loop

* 'retro-compatible' paid invoice stream

---------

Co-authored-by: lollerfirst <lollerfirst@gmail.com>
This commit is contained in:
iwarp
2025-06-01 12:20:03 +02:00
committed by GitHub
parent 266685bde0
commit 67b7ea6b72
1 changed files with 78 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
cashu/lightning/lnbits.py
View File

@@ -7,6 +7,8 @@ import httpx
from bolt11 import (
decode,
)
from loguru import logger
from websockets.client import connect
from ..core.base import Amount, MeltQuote, Unit
from ..core.helpers import fee_reserve
@@ -39,6 +41,8 @@ class LNbitsWallet(LightningBackend):
verify=not settings.debug,
headers={"X-Api-Key": settings.mint_lnbits_key},
)
self.ws_url = f"{self.endpoint.replace('http', 'ws', 1)}/api/v1/ws/{settings.mint_lnbits_key}"
self.old_api = True
async def status(self) -> StatusResponse:
try:
@@ -154,11 +158,13 @@ class LNbitsWallet(LightningBackend):
result=PaymentResult.UNKNOWN, error_message=data["detail"]
)
if data["paid"]:
status = data.get("details", {}).get("status", None)
if data.get("paid", False):
result = PaymentResult.SETTLED
elif not data["paid"] and data["details"]["pending"]:
elif status == "pending" or data.get("details", {}).get("pending", False):
result = PaymentResult.PENDING
elif not data["paid"] and not data["details"]["pending"]:
elif status == "failed":
result = PaymentResult.FAILED
else:
result = PaymentResult.UNKNOWN
@@ -190,11 +196,13 @@ class LNbitsWallet(LightningBackend):
result=PaymentResult.UNKNOWN, error_message="invalid response"
)
if data["paid"]:
status = data.get("details", {}).get("status", None)
if data.get("paid", False):
result = PaymentResult.SETTLED
elif not data["paid"] and data["details"]["pending"]:
elif status == "pending" or data.get("details", {}).get("pending", False):
result = PaymentResult.PENDING
elif not data["paid"] and not data["details"]["pending"]:
elif status == "failed":
result = PaymentResult.FAILED
else:
result = PaymentResult.UNKNOWN
@@ -221,6 +229,8 @@ class LNbitsWallet(LightningBackend):
)
async def paid_invoices_stream(self) -> AsyncGenerator[str, None]:
# --- LNBITS RETRO-COMPATIBILITY ---
if self.old_api:
url = f"{self.endpoint}/api/v1/payments/sse"
try:
@@ -241,6 +251,9 @@ class LNbitsWallet(LightningBackend):
) as r:
sse_trigger = False
async for line in r.aiter_lines():
if "Payment does not exist." in line:
logger.debug("New API detected. Setting old_api = False")
self.old_api = False
# The data we want to listen to is of this shape:
# event: payment-received
# data: {.., "payment_hash" : "asd"}
@@ -257,4 +270,29 @@ class LNbitsWallet(LightningBackend):
except (OSError, httpx.ReadError, httpx.ConnectError, httpx.ReadTimeout):
pass
if self.old_api:
await asyncio.sleep(1)
return
# --- END LNBITS RETRO-COMPATIBILITY ---
try:
async with connect(self.ws_url) as ws:
logger.info("connected to LNbits fundingsource websocket.")
while True:
message = await ws.recv()
message_dict = json.loads(message)
if (
message_dict
and message_dict.get("payment")
and message_dict["payment"].get("payment_hash")
and message_dict["payment"].get("amount") > 0
):
payment_hash = message_dict["payment"]["payment_hash"]
logger.info(f"payment-received: {payment_hash}")
yield payment_hash
except Exception as exc:
logger.error(
f"lost connection to LNbits fundingsource websocket: '{exc}'"
"retrying in 5 seconds"
)
await asyncio.sleep(5)