replaced extension specific websockets with the generic websocket

lnbits/extensions/lnurldevice/tasks.py

@@ -8,12 +8,11 @@ from fastapi import HTTPException
 
 from lnbits import bolt11
 from lnbits.core.models import Payment
-from lnbits.core.services import pay_invoice
+from lnbits.core.services import pay_invoice, websocketUpdater
 from lnbits.helpers import get_current_extension_name
 from lnbits.tasks import register_invoice_listener
 
 from .crud import get_lnurldevice, get_lnurldevicepayment, update_lnurldevicepayment
-from .views import updater
 
 
 async def wait_for_paid_invoices():
@@ -36,9 +35,8 @@ async def on_invoice_paid(payment: Payment) -> None:
         lnurldevicepayment = await update_lnurldevicepayment(
             lnurldevicepayment_id=payment.extra.get("id"), payhash="used"
         )
-        return await updater(
+        return await websocketUpdater(
             lnurldevicepayment.deviceid,
-            lnurldevicepayment.pin,
-            lnurldevicepayment.payload,
+            str(lnurldevicepayment.pin) + "-" + str(lnurldevicepayment.payload),
         )
     return

lnbits/extensions/lnurldevice/templates/lnurldevice/index.html

@@ -157,8 +157,8 @@
           unelevated
           color="primary"
           size="md"
-          @click="copyText(wslocation + '/lnurldevice/ws/' + settingsDialog.data.id, 'Link copied to clipboard!')"
-          >{% raw %}{{wslocation}}/lnurldevice/ws/{{settingsDialog.data.id}}{%
+          @click="copyText(wslocation + '/api/v1/ws/' + settingsDialog.data.id, 'Link copied to clipboard!')"
+          >{% raw %}{{wslocation}}/api/v1/ws/{{settingsDialog.data.id}}{%
           endraw %}<q-tooltip> Click to copy URL </q-tooltip>
         </q-btn>
         <q-btn

lnbits/extensions/lnurldevice/views.py

@@ -2,7 +2,7 @@ from http import HTTPStatus
 from io import BytesIO
 
 import pyqrcode
-from fastapi import Request, WebSocket, WebSocketDisconnect
+from fastapi import Request
 from fastapi.param_functions import Query
 from fastapi.params import Depends
 from fastapi.templating import Jinja2Templates
@@ -63,50 +63,3 @@ async def img(request: Request, lnurldevice_id):
             status_code=HTTPStatus.NOT_FOUND, detail="LNURLDevice does not exist."
         )
     return lnurldevice.lnurl(request)
-
-
-##################WEBSOCKET ROUTES########################
-
-
-class ConnectionManager:
-    def __init__(self):
-        self.active_connections: List[WebSocket] = []
-
-    async def connect(self, websocket: WebSocket, lnurldevice_id: str):
-        await websocket.accept()
-        websocket.id = lnurldevice_id
-        self.active_connections.append(websocket)
-
-    def disconnect(self, websocket: WebSocket):
-        self.active_connections.remove(websocket)
-
-    async def send_personal_message(self, message: str, lnurldevice_id: str):
-        for connection in self.active_connections:
-            if connection.id == lnurldevice_id:
-                await connection.send_text(message)
-
-    async def broadcast(self, message: str):
-        for connection in self.active_connections:
-            await connection.send_text(message)
-
-
-manager = ConnectionManager()
-
-
-@lnurldevice_ext.websocket("/ws/{lnurldevice_id}", name="lnurldevice.lnurldevice_by_id")
-async def websocket_endpoint(websocket: WebSocket, lnurldevice_id: str):
-    await manager.connect(websocket, lnurldevice_id)
-    try:
-        while True:
-            data = await websocket.receive_text()
-    except WebSocketDisconnect:
-        manager.disconnect(websocket)
-
-
-async def updater(lnurldevice_id, lnurldevice_pin, lnurldevice_amount):
-    lnurldevice = await get_lnurldevice(lnurldevice_id)
-    if not lnurldevice:
-        return
-    return await manager.send_personal_message(
-        f"{lnurldevice_pin}-{lnurldevice_amount}", lnurldevice_id
-    )