From 988c7eb7b49c3d66b754ac748b3e4fea7e7701d1 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Sat, 26 Nov 2022 21:36:11 +0000
Subject: [PATCH 1/2] Added websocket test

---
 .../templates/lnurldevice/index.html          | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/lnbits/extensions/lnurldevice/templates/lnurldevice/index.html b/lnbits/extensions/lnurldevice/templates/lnurldevice/index.html
index b0b223fff..75516ff2f 100644
--- a/lnbits/extensions/lnurldevice/templates/lnurldevice/index.html
+++ b/lnbits/extensions/lnurldevice/templates/lnurldevice/index.html
@@ -485,8 +485,9 @@
         outline
         color="grey"
         @click="copyText(lnurlValue, 'LNURL copied to clipboard!')"
-        >Copy LNURL</q-btn
-      >
+        >Copy LNURL</q-btn>
+      <br />
+      {{ websocketMessage }}
       <br />
       <div class="row q-mt-lg q-gutter-sm">
         <q-btn
@@ -534,6 +535,7 @@
         filter: '',
         currency: 'USD',
         lnurlValue: '',
+        websocketMessage: '',
         switches: 0,
         lnurldeviceLinks: [],
         lnurldeviceLinksObj: [],
@@ -631,11 +633,12 @@
         this.qrCodeDialog.data = _.clone(lnurldevice)
         this.qrCodeDialog.data.url =
           window.location.protocol + '//' + window.location.host
-        this.lnurlValueFetch(this.qrCodeDialog.data.switches[0][3])
+        this.lnurlValueFetch(this.qrCodeDialog.data.switches[0][3], this.qrCodeDialog.data.switches[0][0])
         this.qrCodeDialog.show = true
       },
-      lnurlValueFetch: function (lnurl) {
+      lnurlValueFetch: function (lnurl, switchId) {
         this.lnurlValue = lnurl
+        this.websocketConnector('wss://' + window.location.host + '/lnurldevice/ws/' + switchId)
       },
       addSwitch: function () {
         var self = this
@@ -797,6 +800,21 @@
             LNbits.utils.notifyApiError(error)
           })
       },
+      websocketConnector: function(websocketUrl){
+        if ("WebSocket" in window) {
+          this.websocketMessage = "Websocket connected"
+          var ws = new WebSocket(websocketUrl)
+          ws.onmessage = function (evt) { 
+            var received_msg = evt.data
+            this.websocketMessage = "Message recieved: " + received_msg
+          }
+				  ws.onclose = function() { 
+            this.websocketMessage = "Connection closed"
+          };
+        } else {
+          this.websocketMessage = "WebSocket NOT supported by your Browser!"
+        }
+      },
       clearFormDialoglnurldevice() {
         this.formDialoglnurldevice.data = {
           lnurl_toggle: false,

From aa8c5433253143608f42167f9eb2b6bc5e296b02 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Sat, 26 Nov 2022 22:46:46 +0000
Subject: [PATCH 2/2] Added websocket checker for switch

---
 .../templates/lnurldevice/index.html          | 52 ++++++++++++++-----
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/lnbits/extensions/lnurldevice/templates/lnurldevice/index.html b/lnbits/extensions/lnurldevice/templates/lnurldevice/index.html
index 75516ff2f..25dcf8c99 100644
--- a/lnbits/extensions/lnurldevice/templates/lnurldevice/index.html
+++ b/lnbits/extensions/lnurldevice/templates/lnurldevice/index.html
@@ -485,9 +485,19 @@
         outline
         color="grey"
         @click="copyText(lnurlValue, 'LNURL copied to clipboard!')"
-        >Copy LNURL</q-btn>
-      <br />
-      {{ websocketMessage }}
+        >Copy LNURL</q-btn
+      >
+      <q-chip
+        v-if="websocketMessage == 'WebSocket NOT supported by your Browser!' || websocketMessage == 'Connection closed'"
+        clickable
+        color="red"
+        text-color="white"
+        icon="error"
+        >{% raw %}{{ wsMessage }}{% endraw %}</q-chip
+      >
+      <q-chip v-else clickable color="green" text-color="white" icon="check"
+        >{% raw %}{{ wsMessage }}{% endraw %}</q-chip
+      >
       <br />
       <div class="row q-mt-lg q-gutter-sm">
         <q-btn
@@ -624,6 +634,11 @@
         }
       }
     },
+    computed: {
+      wsMessage: function () {
+        return this.websocketMessage
+      }
+    },
     methods: {
       openQrCodeDialog: function (lnurldevice_id) {
         var lnurldevice = _.findWhere(this.lnurldeviceLinks, {
@@ -633,12 +648,17 @@
         this.qrCodeDialog.data = _.clone(lnurldevice)
         this.qrCodeDialog.data.url =
           window.location.protocol + '//' + window.location.host
-        this.lnurlValueFetch(this.qrCodeDialog.data.switches[0][3], this.qrCodeDialog.data.switches[0][0])
+        this.lnurlValueFetch(
+          this.qrCodeDialog.data.switches[0][3],
+          this.qrCodeDialog.data.id
+        )
         this.qrCodeDialog.show = true
       },
       lnurlValueFetch: function (lnurl, switchId) {
         this.lnurlValue = lnurl
-        this.websocketConnector('wss://' + window.location.host + '/lnurldevice/ws/' + switchId)
+        this.websocketConnector(
+          'wss://' + window.location.host + '/lnurldevice/ws/' + switchId
+        )
       },
       addSwitch: function () {
         var self = this
@@ -800,21 +820,25 @@
             LNbits.utils.notifyApiError(error)
           })
       },
-      websocketConnector: function(websocketUrl){
-        if ("WebSocket" in window) {
-          this.websocketMessage = "Websocket connected"
+      websocketConnector: function (websocketUrl) {
+        if ('WebSocket' in window) {
+          self = this
           var ws = new WebSocket(websocketUrl)
-          ws.onmessage = function (evt) { 
+          self.updateWsMessage('Websocket connected')
+          ws.onmessage = function (evt) {
             var received_msg = evt.data
-            this.websocketMessage = "Message recieved: " + received_msg
+            self.updateWsMessage('Message recieved: ' + received_msg)
+          }
+          ws.onclose = function () {
+            self.updateWsMessage('Connection closed')
           }
-				  ws.onclose = function() { 
-            this.websocketMessage = "Connection closed"
-          };
         } else {
-          this.websocketMessage = "WebSocket NOT supported by your Browser!"
+          self.updateWsMessage('WebSocket NOT supported by your Browser!')
         }
       },
+      updateWsMessage: function (message) {
+        this.websocketMessage = message
+      },
       clearFormDialoglnurldevice() {
         this.formDialoglnurldevice.data = {
           lnurl_toggle: false,