more reliable ws

This commit is contained in:
ari committed 2022-06-06 17:34:06 -04:00
1 parent 61000f2ff1
commit 0ee0a06737
3 files changed
+36 -11

No files matched your search

+12 -2
View File
@@ -1,11 +1,13 @@
import asyncio
import json
from fastapi import APIRouter, WebSocket
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
from src.logger import get_logger
from src.ws_redirect import WSRedirector
router = APIRouter()
logger = get_logger(__name__)
@router.websocket("/api/websocket")
@@ -19,7 +21,15 @@ async def websocket_endpoint(websocket: WebSocket):
async def wait_for_data():
while True:
await conn.send(await websocket.receive_text())
try:
msg_str = await websocket.receive_text()
msg_d = json.loads(msg_str)
if msg_d.get("type") != "auth":
await conn.send(msg_str)
except WebSocketDisconnect:
logger.info("Websocket closed.")
await conn.close()
break
await websocket.accept()
+4
View File
@@ -14,3 +14,7 @@ else:
logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger()
def get_logger(name: str):
return logging.getLogger(name)
+20 -9
View File
@@ -1,12 +1,16 @@
import asyncio
import json
from typing import Any, Callable, Coroutine, Optional
import websockets
from typing import Callable, Coroutine, Optional
from src.logger import get_logger
from websockets.client import connect, WebSocketClientProtocol
from websockets.exceptions import ConnectionClosedOK
from src.env import HASSIO_TOKEN, HASSIO_WS
from src.logger import logger
OnMessage = Callable[[str], Coroutine]
logger = get_logger(__name__)
class WSRedirector:
@@ -19,7 +23,7 @@ class WSRedirector:
self._host = host
self._token = token
self._on_message = on_message
self._client: Optional[Any] = None
self._client: Optional[WebSocketClientProtocol] = None
self._close: bool = False
@property
@@ -31,19 +35,26 @@ class WSRedirector:
return await self._client.send(msg)
async def start(self):
async with websockets.connect(self._host) as websocket:
async with connect(self._host) as websocket:
self._client = websocket
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
while not self.is_closed:
msg = await websocket.recv()
logger.debug(f"WS:MSG: {msg}")
await self.process_message(msg)
try:
msg = await websocket.recv()
# logger.debug(f"HA MSG :--> {msg} {self.is_closed}")
await self.process_message(msg)
except ConnectionClosedOK:
pass
logger.info("Closing socket...")
await websocket.close()
logger.info("Closed socket")
async def process_message(self, msg: str):
await self._on_message(msg)
def close(self):
async def close(self):
self._close = True
await self._client.close()
def __del__(self):
self.close()
asyncio.create_task(self.close())