Skip to content

Commit f35d781

Browse files
committed
add a callback to message sending
1 parent 4d07c6b commit f35d781

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

nightwatch/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "0.11.1"
1+
__version__ = "0.11.2"
22

33
import re
44
HEX_COLOR_REGEX = re.compile(r"^[A-Fa-f0-9]{6}$")

nightwatch/rics/__init__.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from fastapi.responses import JSONResponse
1313
from starlette.websockets import WebSocketDisconnect, WebSocketState
1414

15+
from nightwatch import __version__
1516
from nightwatch.config import fetch_config
1617

1718
# Load config data
@@ -65,7 +66,7 @@ async def send(self, payload: dict) -> None:
6566
return
6667

6768
try:
68-
if self._callback is not None:
69+
if self._callback is not None and payload["type"] != "message":
6970
payload["data"] = payload.get("data", {}) | {"callback": self._callback}
7071
self._callback = None
7172

@@ -164,6 +165,8 @@ async def connect_endpoint(
164165
continue
165166

166167
await app.state.broadcast({"type": "message", "data": {"user": client.serialize(), "message": message}})
168+
if client._callback is not None:
169+
await client.send({"type": "response"})
167170

168171
case {"type": "user-list", "data": _}:
169172
await client.send({"type": "response", "data": {
@@ -180,6 +183,10 @@ async def connect_endpoint(
180183
await app.state.broadcast({"type": "leave", "data": {"user": client.serialize()}})
181184
await app.state.broadcast({"type": "message", "data": {"message": f"{client.username} has left the server."}})
182185

186+
@app.get("/api/version")
187+
async def route_version() -> JSONResponse:
188+
return JSONResponse({"code": 200, "data": {"version": __version__}})
189+
183190
# Load additional routes
184191
from nightwatch.rics.routing import ( # noqa: E402
185192
files, # noqa: F401

0 commit comments

Comments
 (0)