Split commands into subcommands using the routing syntax

server/core/router.py

@@ -1,9 +1,7 @@
 import contextlib
-from typing import Any, Callable, Dict, List, Optional
+from typing import Any, Dict, List, Optional
 
-from .typedefs import Handler, Message
-
-HandlerDecorator = Callable[[Handler], Handler]
+from .typedefs import Handler, HandlerDecorator, Message
 
 
 class RouteError(Exception):

server/core/typedefs.py

@@ -2,6 +2,7 @@
 
 # Type aliases
 Handler = Callable[..., Any]
+HandlerDecorator = Callable[[Handler], Handler]
 Message = Dict[Any, Any]