fixed websocket route function computation

Author: eadwinCode

ellar/common/decorators/controller.py

@@ -1,6 +1,7 @@
 import inspect
 import typing as t
 from abc import ABC
+from types import FunctionType
 
 from ellar.compatible import AttributeDict
 from ellar.constants import (
@@ -14,16 +15,21 @@
 from ellar.core import ControllerBase
 from ellar.core.controller import ControllerType
 from ellar.core.exceptions import ImproperConfiguration
+from ellar.core.routing.controller import ControllerRouteOperationBase
 from ellar.di import RequestScope, injectable
 from ellar.reflect import reflect
 
 if t.TYPE_CHECKING:  # pragma: no cover
     from ellar.core.guard import GuardCanActivate
 
 
-def get_route_functions(cls: t.Type) -> t.Iterable[t.Callable]:
+def get_route_functions(
+    cls: t.Type,
+) -> t.Iterable[t.Union[t.Callable, ControllerRouteOperationBase]]:
     for method in cls.__dict__.values():
-        if hasattr(method, OPERATION_ENDPOINT_KEY):
+        if hasattr(method, OPERATION_ENDPOINT_KEY) or isinstance(
+            method, ControllerRouteOperationBase
+        ):
             yield method
 
 
@@ -33,7 +39,11 @@ def reflect_all_controller_type_routes(cls: t.Type[ControllerBase]) -> None:
     for base_cls in reversed(bases):
         if base_cls not in [ABC, ControllerBase, object]:
             for item in get_route_functions(base_cls):
-                operation = reflect.get_metadata(CONTROLLER_OPERATION_HANDLER_KEY, item)
+                operation = item
+                if callable(item) and type(item) == FunctionType:
+                    operation = reflect.get_metadata(  # type: ignore
+                        CONTROLLER_OPERATION_HANDLER_KEY, item
+                    )
                 reflect.define_metadata(CONTROLLER_CLASS_KEY, cls, item)
                 reflect.define_metadata(
                     CONTROLLER_OPERATION_HANDLER_KEY,

ellar/core/routing/controller/websocket/route.py

@@ -1,6 +1,7 @@
 import typing as t
 
 from starlette.status import WS_1008_POLICY_VIOLATION
+from starlette.websockets import WebSocketState
 
 from ellar.core.context import IExecutionContext
 from ellar.core.exceptions import WebSocketRequestValidationError
@@ -27,6 +28,8 @@ async def _handle_request(self, context: IExecutionContext) -> None:
         if errors:
             websocket = context.switch_to_websocket().get_client()
             exc = WebSocketRequestValidationError(errors)
+            if websocket.client_state == WebSocketState.CONNECTING:
+                await websocket.accept()
             await websocket.send_json(
                 dict(code=WS_1008_POLICY_VIOLATION, errors=exc.errors())
             )

ellar/core/routing/operation_definitions.py

@@ -72,7 +72,7 @@ def _get_ws_operation(
         _operation = _ws_operation_class(**ws_route_parameters.dict())
         setattr(ws_route_parameters.endpoint, OPERATION_ENDPOINT_KEY, True)
         if self._routes is not None and not isinstance(
-            _operation, ControllerRouteOperationBase
+            _operation, ControllerWebsocketRouteOperation
         ):
             self._routes.append(_operation)
         return _operation

ellar/core/routing/websocket/route.py

@@ -2,6 +2,7 @@
 
 from starlette.routing import WebSocketRoute as StarletteWebSocketRoute, compile_path
 from starlette.status import WS_1008_POLICY_VIOLATION
+from starlette.websockets import WebSocketState
 
 from ellar.constants import (
     CONTROLLER_OPERATION_HANDLER_KEY,
@@ -105,6 +106,8 @@ async def _handle_request(self, context: IExecutionContext) -> None:
         if errors:
             websocket = context.switch_to_websocket().get_client()
             exc = WebSocketRequestValidationError(errors)
+            if websocket.client_state == WebSocketState.CONNECTING:
+                await websocket.accept()
             await websocket.send_json(
                 dict(code=WS_1008_POLICY_VIOLATION, errors=exc.errors())
             )