Skip to content

fix: fix websockets not being registered #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davemooreuws merged 1 commit into from
Jun 13, 2024
Merged

fix: fix websockets not being registered #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 15 additions & 20 deletions nitric/resources/websockets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,15 @@ async def send(self, socket: str, connection_id: str, data: bytes):
raise exception_from_grpc_error(grpc_err) from grpc_err


class WebsocketWorkerOptions:
"""Options for websocket workers."""

def __init__(self, socket_name: str, event_type: Literal["connect", "disconnect", "message"]):
"""Construct new websocket worker options."""
self.socket_name = socket_name
self.event_type = WebsocketWorkerOptions._to_grpc_event_type(event_type)

@staticmethod
def _to_grpc_event_type(event_type: Literal["connect", "disconnect", "message"]) -> WebsocketEventType:
if event_type == "connect":
return WebsocketEventType.Connect
elif event_type == "disconnect":
return WebsocketEventType.Disconnect
elif event_type == "message":
return WebsocketEventType.Message
else:
raise ValueError(f"Event type {event_type} is unsupported")
def _to_grpc_event_type(event_type: Literal["connect", "disconnect", "message"]) -> WebsocketEventType:
if event_type == "connect":
return WebsocketEventType.Connect
elif event_type == "disconnect":
return WebsocketEventType.Disconnect
elif event_type == "message":
return WebsocketEventType.Message
else:
raise ValueError(f"Event type {event_type} is unsupported")


def _to_resource(b: Websocket) -> ResourceIdentifier:
Expand Down Expand Up @@ -194,11 +185,15 @@ class WebsocketWorker(FunctionServer):
_registration_request: RegistrationRequest
_responses: AsyncNotifierList[ClientMessage]

def __init__(self, socket_name: str, event_type: WebsocketEventType, handler: WebsocketHandler):
def __init__(
self, socket_name: str, event_type: Literal["connect", "disconnect", "message"], handler: WebsocketHandler
):
"""Construct a new WebsocketHandler."""
self._handler = handler
self._responses = AsyncNotifierList()
self._registration_request = RegistrationRequest(socket_name=socket_name, event_type=event_type)
self._registration_request = RegistrationRequest(
socket_name=socket_name, event_type=_to_grpc_event_type(event_type)
)

Nitric._register_worker(self)

Expand Down