reformatted file structure and reformatted for phones, as well as fixed web sockets for remote devices

tools/web_monitor/scan/__init__.py

@@ -0,0 +1,26 @@
+from fastapi import Request, APIRouter
+
+from tools.web_monitor.template import templates
+from tools.web_monitor.func import get_current_miner_list
+
+from .ws import router as ws_router
+
+router = APIRouter()
+router.include_router(ws_router)
+
+
+@router.get("/")
+def scan(request: Request):
+    return templates.TemplateResponse("scan.html", {
+        "request": request,
+        "cur_miners": get_current_miner_list()
+    })
+
+
+@router.post("/add_miners")
+async def add_miners_scan(request: Request):
+    miners = await request.json()
+    with open("miner_list.txt", "a+") as file:
+        for miner_ip in miners["miners"]:
+            file.write(miner_ip + "\n")
+    return scan

tools/web_monitor/scan/func.py

@@ -0,0 +1,37 @@
+import asyncio
+
+from fastapi import WebSocket
+
+from network import MinerNetwork
+from tools.web_monitor.func import get_current_miner_list
+from tools.web_monitor.miner_factory import miner_factory
+
+
+async def do_websocket_scan(websocket: WebSocket, network_ip: str):
+    cur_miners = get_current_miner_list()
+    try:
+        if "/" in network_ip:
+            network_ip, network_subnet = network_ip.split("/")
+            network = MinerNetwork(network_ip, mask=network_subnet)
+        else:
+            network = MinerNetwork(network_ip)
+        miner_generator = network.scan_network_generator()
+        miners = []
+        async for miner_ip in miner_generator:
+            if miner_ip and str(miner_ip) not in cur_miners:
+                miners.append(miner_ip)
+
+        get_miner_generator = miner_factory.get_miner_generator(miners)
+        all_miners = []
+        async for found_miner in get_miner_generator:
+            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_ip in all_miners:
+                send_miners.append(
+                    {"ip": str(miner_ip["ip"]), "model": miner_ip["model"]})
+            await websocket.send_json(send_miners)
+        await websocket.send_text("Done")
+    except asyncio.CancelledError:
+        raise

tools/web_monitor/scan/ws.py

@@ -0,0 +1,36 @@
+import asyncio
+
+import websockets.exceptions
+from fastapi import WebSocket, WebSocketDisconnect, APIRouter
+
+from tools.web_monitor.scan.func import do_websocket_scan
+
+
+router = APIRouter()
+
+
+@router.websocket("/ws")
+async def websocket_scan(websocket: WebSocket):
+    await websocket.accept()
+    cur_task = None
+    try:
+        while True:
+            ws_data = await websocket.receive_text()
+            if "-Cancel-" in ws_data:
+                if cur_task:
+                    cur_task.cancel()
+                    print("Cancelling scan...")
+                    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.")
+    except websockets.exceptions.ConnectionClosedOK:
+        pass