diff --git a/pipboyMESH/mesh_server.py b/pipboyMESH/mesh_server.py index c7f68e2..becb7f0 100644 --- a/pipboyMESH/mesh_server.py +++ b/pipboyMESH/mesh_server.py @@ -80,7 +80,7 @@ class Servlet: self.msh_state = AVAILABLE self.lstChange["state"] = time() await self.ws_update({"event": WS_EVENT_STATE, "data": self.msh_state}) - await self.ws_update({"event": WS_EVENT_MYID, "data": self.device.my_node_id}) + await self.ws_update({"event": WS_EVENT_MYID, "data": self.device.nid}) while True: self.pulse = time() @@ -148,10 +148,15 @@ class Servlet: try: await websocket.send_json({"type":WS_TYPE_INIT, "event": WS_EVENT_MYID, "data": self.device.nid}) #await websocket.send_json({"type":WS_TYPE_INIT, "event": WS_EVENT_MYNODE, "data": self.nodes.get(self.device.nid).__dict__ if self.device.nid in self.nodes else None}) - await websocket.send_json({"type":WS_TYPE_INIT, "event": WS_EVENT_CHANNEL, "data": [channel.__dict__ for channel in self.channels.values()]}) + for channel in self.channels.values(): + await websocket.send_json({"type":WS_TYPE_INIT, "event": WS_EVENT_CHANNEL, "data": channel.__dict__}) + await websocket.send_json({"type":WS_TYPE_INIT, "event": WS_EVENT_STATE, "data": self.msh_state}) - await websocket.send_json({"type":WS_TYPE_INIT, "event": WS_EVENT_NODE, "data": [{"id": node.num, "name": str(node)} for node in self.nodes.values()]}) - await websocket.send_json({"type":WS_TYPE_INIT, "event": WS_EVENT_MESSAGE, "data": [message.__dict__ for message in self.message]}) + for node in self.nodes.values(): + await websocket.send_json({"type":WS_TYPE_INIT, "event": WS_EVENT_NODE, "data": {"id": node.num, "name": str(node)}}) + + for message in self.message: + await websocket.send_json({"type":WS_TYPE_INIT, "event": WS_EVENT_MESSAGE, "data": message.__dict__}) except: traceback.print_exc() pass diff --git a/pipboyMESH/readme b/pipboyMESH/readme index 134c0bd..92d9068 100644 --- a/pipboyMESH/readme +++ b/pipboyMESH/readme @@ -1,3 +1,6 @@ Created on MiniMeshT (https://github.com/allanrbo/MiniMeshT) -need install fastapi uvicorn \ No newline at end of file +need install fastapi uvicorn + +python3 -m pip install --user --break-system-packages pyserial-asyncio +python3 -m pip install --user --break-system-packages uvicorn[standart] fastapi \ No newline at end of file diff --git a/pipboyUI/angular.json b/pipboyUI/angular.json index d4aee25..d40ae12 100644 --- a/pipboyUI/angular.json +++ b/pipboyUI/angular.json @@ -68,6 +68,9 @@ }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "proxyConfig": "proxy.conf.json" + }, "configurations": { "production": { "browserTarget": "pipboyUI:build:production" diff --git a/pipboyUI/dist/pipboy-ui/index.html b/pipboyUI/dist/pipboy-ui/index.html index 4c6903e..5eeffe1 100644 --- a/pipboyUI/dist/pipboy-ui/index.html +++ b/pipboyUI/dist/pipboy-ui/index.html @@ -5,11 +5,11 @@ - +