added add selected miners button

tools/web_monitor/app.py

@@ -25,12 +25,38 @@ def scan(request: Request):
     return templates.TemplateResponse("scan.html", {"request": request})
 
 
+@app.post("/scan/add_miners")
+def add_miners_scan(request: Request):
+    print(request)
+    return scan
+
+
 @app.websocket("/scan/ws")
 async def websocket_scan(websocket: WebSocket):
     await websocket.accept()
+    cur_task = None
     try:
         while True:
-            network_ip = await websocket.receive_text()
+            ws_data = await websocket.receive_text()
+            if "-Cancel-" in ws_data:
+                if cur_task:
+                    cur_task.cancel()
+                    try:
+                        await cur_task
+                    except asyncio.CancelledError:
+                        cur_task = None
+                await websocket.send_text("Cancelled")
+            else:
+                cur_task = asyncio.create_task(do_websocket_scan(websocket, ws_data))
+            if cur_task and cur_task.done():
+                cur_task = None
+    except WebSocketDisconnect:
+        print("Websocket disconnected.")
+        pass
+
+
+async def do_websocket_scan(websocket: WebSocket, network_ip: str):
+    try:
         if "/" in network_ip:
             network_ip, network_subnet = network_ip.split("/")
             network = MinerNetwork(network_ip, mask=network_subnet)
@@ -45,17 +71,17 @@ async def websocket_scan(websocket: WebSocket):
         get_miner_genenerator = miner_factory.get_miner_generator(miners)
         all_miners = []
         async for found_miner in get_miner_genenerator:
-                all_miners.append({"ip": found_miner.ip, "model": await found_miner.get_model()})
+            all_miners.append(
+                {"ip": found_miner.ip, "model": await found_miner.get_model()})
             all_miners.sort(key=lambda x: x["ip"])
             send_miners = []
             for miner in all_miners:
-                    send_miners.append({"ip": str(miner["ip"]), "model": miner["model"]})
+                send_miners.append(
+                    {"ip": str(miner["ip"]), "model": miner["model"]})
             await websocket.send_json(send_miners)
         await websocket.send_text("Done")
-    except WebSocketDisconnect:
+    except asyncio.CancelledError:
-        print("Websocket disconnected.")
+        raise
-        pass
-
 
 if __name__ == "__main__":
     uvicorn.run("app:app", host="127.0.0.1", port=80)

tools/web_monitor/templates/scan.html

@@ -5,11 +5,16 @@
         <div class="input-group mb-3">
           <span class="input-group-text" id="scan-ip">Subnet</span>
           <input type="text" class="form-control" id="messageText" placeholder="192.168.1.0/24" aria-describedby="scan-ip">
-          <button class="btn btn-primary" onclick="sendMessage()" type="button" id="scanButton">Scan</button>
+          <button class="btn btn-danger" onclick="cancelScan()" style="display:none;" type="button" id="cancelButton">Cancel</button>
+          <button class="btn btn-primary" onclick="scanMiners()" type="button" id="scanButton">Scan</button>
         </div>
     </form>
 </div>
 
+<div class="row w-100">
+    <button class="btn btn-primary mb-4" onclick="addMiners()" type="button" id="addButton">Add Selected Miners</button>
+</div>
+
 <div class="row w-100">
     <table class="table table-striped table-responsive" style="max-height:300px;">
         <thead>
@@ -55,6 +60,13 @@
                 document.getElementById("scanButton").disabled = false
                 document.getElementById("selectAllCheckbox").disabled = false
                 document.getElementById("scanStatus").innerHTML = document.getElementById('minerTable').rows.length + " Miners"
+                document.getElementById("cancelButton").style = "display:none;"
+            } else if (event.data == "Cancelled") {
+                document.getElementById("scanButton").innerHTML = "Scan"
+                document.getElementById("scanButton").disabled = false
+                document.getElementById("selectAllCheckbox").disabled = false
+                document.getElementById("scanStatus").innerHTML = document.getElementById('minerTable').rows.length + " Miners"
+                document.getElementById("cancelButton").style = "display:none;"
             } else {
                 var miner_data = JSON.parse(event.data)
                 var miners = document.getElementById('minerTable')
@@ -84,7 +96,7 @@
                 });
             };
         };
-        function sendMessage(event) {
+        function scanMiners(event) {
             var input = document.getElementById("messageText")
             var miners = document.getElementById('minerTable')
             miners.innerHTML = ""
@@ -92,6 +104,7 @@
             document.getElementById("scanButton").innerHTML = "Scanning..."
             document.getElementById("scanButton").disabled = true
             document.getElementById("selectAllCheckbox").disabled = true
+            document.getElementById("cancelButton").style = ""
             if (input.value != "") {
                 ws.send(input.value)
                 event.preventDefault()
@@ -99,6 +112,13 @@
                 ws.send("192.168.1.0/24")
             };
         }
+        function cancelScan(event) {
+            document.getElementById("scanStatus").innerHTML = "Canceling..."
+            document.getElementById("scanButton").innerHTML = "Canceling..."
+            document.getElementById("cancelButton").style = "display:none;"
+            ws.send("-Cancel-")
+        }
+
     </script>
 
 {% endblock content %}