more reliable ws
This commit is contained in:
1 parent
61000f2ff1
commit
0ee0a06737
3 files changed
+36
-11
No files matched your search
@@ -1,11 +1,13 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
import json
|
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
|
from src.ws_redirect import WSRedirector
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
logger = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@router.websocket("/api/websocket")
|
@router.websocket("/api/websocket")
|
||||||
@@ -19,7 +21,15 @@ async def websocket_endpoint(websocket: WebSocket):
|
|||||||
|
|
||||||
async def wait_for_data():
|
async def wait_for_data():
|
||||||
while True:
|
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()
|
await websocket.accept()
|
||||||
|
|
||||||
|
|||||||
@@ -14,3 +14,7 @@ else:
|
|||||||
logging.basicConfig(level=logging.NOTSET)
|
logging.basicConfig(level=logging.NOTSET)
|
||||||
|
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
def get_logger(name: str):
|
||||||
|
return logging.getLogger(name)
|
||||||
@@ -1,12 +1,16 @@
|
|||||||
|
import asyncio
|
||||||
import json
|
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.env import HASSIO_TOKEN, HASSIO_WS
|
||||||
from src.logger import logger
|
from src.logger import logger
|
||||||
|
|
||||||
OnMessage = Callable[[str], Coroutine]
|
OnMessage = Callable[[str], Coroutine]
|
||||||
|
logger = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class WSRedirector:
|
class WSRedirector:
|
||||||
@@ -19,7 +23,7 @@ class WSRedirector:
|
|||||||
self._host = host
|
self._host = host
|
||||||
self._token = token
|
self._token = token
|
||||||
self._on_message = on_message
|
self._on_message = on_message
|
||||||
self._client: Optional[Any] = None
|
self._client: Optional[WebSocketClientProtocol] = None
|
||||||
self._close: bool = False
|
self._close: bool = False
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@@ -31,19 +35,26 @@ class WSRedirector:
|
|||||||
return await self._client.send(msg)
|
return await self._client.send(msg)
|
||||||
|
|
||||||
async def start(self):
|
async def start(self):
|
||||||
async with websockets.connect(self._host) as websocket:
|
async with connect(self._host) as websocket:
|
||||||
self._client = websocket
|
self._client = websocket
|
||||||
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
|
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
|
||||||
while not self.is_closed:
|
while not self.is_closed:
|
||||||
msg = await websocket.recv()
|
try:
|
||||||
logger.debug(f"WS:MSG: {msg}")
|
msg = await websocket.recv()
|
||||||
await self.process_message(msg)
|
# 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):
|
async def process_message(self, msg: str):
|
||||||
await self._on_message(msg)
|
await self._on_message(msg)
|
||||||
|
|
||||||
def close(self):
|
async def close(self):
|
||||||
self._close = True
|
self._close = True
|
||||||
|
await self._client.close()
|
||||||
|
|
||||||
def __del__(self):
|
def __del__(self):
|
||||||
self.close()
|
asyncio.create_task(self.close())
|
||||||
Reference in new issue
Block a user