refactoring in preparation for functional middleware

Author: Archmonger

src/js/packages/@reactpy/client/src/client.ts

@@ -78,6 +78,6 @@ export class ReactPyClient
   }
 
   loadModule(moduleName: string): Promise<ReactPyModule> {
-    return import(`${this.urls.jsModules}/${moduleName}`);
+    return import(`${this.urls.jsModulesPath}/${moduleName}`);
   }
 }

src/js/packages/@reactpy/client/src/mount.tsx

@@ -7,26 +7,26 @@ export function mountReactPy(props: MountProps) {
   // WebSocket route for component rendering
   const wsProtocol = `ws${window.location.protocol === "https:" ? "s" : ""}:`;
   const wsOrigin = `${wsProtocol}//${window.location.host}`;
-  const componentUrl = new URL(`${wsOrigin}/${props.pathPrefix}/`);
+  const componentUrl = new URL(`${wsOrigin}/${props.pathPrefix}/${props.appendComponentPath || ""}`);
 
   // Embed the initial HTTP path into the WebSocket URL
   componentUrl.searchParams.append("http_pathname", window.location.pathname);
   if (window.location.search) {
-    componentUrl.searchParams.append("http_search", window.location.search);
+    componentUrl.searchParams.append("http_query_string", window.location.search);
   }
 
   // Configure a new ReactPy client
   const client = new ReactPyClient({
     urls: {
       componentUrl: componentUrl,
-      query: document.location.search,
-      jsModules: `${window.location.origin}/${props.pathPrefix}/modules/`,
+      jsModulesPath: `${window.location.origin}/${props.pathPrefix}/modules/`,
+      queryString: document.location.search,
     },
     reconnectOptions: {
       interval: props.reconnectInterval || 750,
       maxInterval: props.reconnectMaxInterval || 60000,
-      backoffMultiplier: props.reconnectBackoffMultiplier || 1.25,
       maxRetries: props.reconnectMaxRetries || 150,
+      backoffMultiplier: props.reconnectBackoffMultiplier || 1.25,
     },
     mountElement: props.mountElement,
   });

src/js/packages/@reactpy/client/src/types.ts

@@ -23,8 +23,8 @@ export type CreateReconnectingWebSocketProps = {
 
 export type ReactPyUrls = {
   componentUrl: URL;
-  query: string;
-  jsModules: string;
+  jsModulesPath: string;
+  queryString: string;
 };
 
 export type GenericReactPyClientProps = {
@@ -36,6 +36,7 @@ export type GenericReactPyClientProps = {
 export type MountProps = {
   mountElement: HTMLElement;
   pathPrefix: string;
+  appendComponentPath?: string;
   reconnectInterval?: number;
   reconnectMaxInterval?: number;
   reconnectMaxRetries?: number;

src/reactpy/backend/middleware.py

@@ -26,9 +26,10 @@
 
 
 class ReactPyMiddleware:
-    _asgi_single_callable = True
-    single_root_component: bool = False
+    _asgi_single_callable: bool = True
     root_component: RootComponentConstructor | None = None
+    root_components: dict[str, RootComponentConstructor]
+    multiple_root_components: bool = True
 
     def __init__(
         self,
@@ -53,10 +54,7 @@ def __init__(
 
         # Component attributes
         self.user_app = guarantee_single_callable(app)
-        self.component_dotted_paths = set(root_components)
-        self.components: dict[str, RootComponentConstructor] = import_components(
-            self.component_dotted_paths
-        )
+        self.root_components = import_components(root_components)
 
         # Directory attributes
         self.web_modules_dir = web_modules_dir or REACTPY_WEB_MODULES_DIR.current
@@ -148,12 +146,16 @@ async def run_dispatcher(
     ) -> None:
         # Get the component from the URL.
         try:
-            if not self.parent.single_root_component:
+            if self.parent.multiple_root_components:
                 url_match = re.match(self.parent.dispatcher_pattern, scope["path"])
                 if not url_match:
                     raise RuntimeError("Could not find component in URL path.")
-                dotted_path = url_match[1]
-                component = self.parent.components[dotted_path]
+                dotted_path = url_match["dotted_path"]
+                if dotted_path not in self.parent.root_components:
+                    raise RuntimeError(
+                        f"Attempting to use an unregistered root component {dotted_path}."
+                    )
+                component = self.parent.root_components[dotted_path]
             elif self.parent.root_component:
                 component = self.parent.root_component
             else:

src/reactpy/backend/standalone.py

@@ -22,7 +22,7 @@ class ReactPy(ReactPyMiddleware):
     last_modified = ""
     templates_dir = Path(__file__).parent.parent / "templates"
     index_html_path = templates_dir / "index.html"
-    single_root_component = True
+    multiple_root_components = False
 
     def __init__(
         self,
@@ -66,7 +66,7 @@ async def reactpy_app(
 
         # Store the HTTP response in memory for performance
         if not self.cached_index_html:
-            await self.process_index_html()
+            self.process_index_html()
 
         # Return headers for all HTTP responses
         request_headers = dict(scope["headers"])
@@ -113,11 +113,11 @@ async def reactpy_app(
         )
 
     def match_dispatch_path(self, scope: dict) -> bool:
-        """Check if the path matches the dispatcher path."""
-        return str(scope["path"]).startswith(self.dispatcher_path)
+        """Method override to remove `dotted_path` from the dispatcher URL."""
+        return str(scope["path"]) == self.dispatcher_path
 
-    async def process_index_html(self):
-        """Process the index.html file."""
+    def process_index_html(self):
+        """Process the index.html and store the results in memory."""
         with open(self.index_html_path, encoding="utf-8") as file_handle:
             cached_index_html = file_handle.read()
 
@@ -135,10 +135,7 @@ async def process_index_html(self):
             },
         )
 
-        self.etag = hashlib.md5(
-            self.cached_index_html.encode(), usedforsecurity=False
-        ).hexdigest()
-        self.etag = f'"{self.etag}"'
+        self.etag = f'"{hashlib.md5(self.cached_index_html.encode(), usedforsecurity=False).hexdigest()}"'
         self.last_modified = formatdate(
             os.stat(self.index_html_path).st_mtime, usegmt=True
         )
@@ -152,7 +149,7 @@ async def http_response(
     content_type: bytes = b"text/plain",
     headers: Sequence = (),
 ) -> None:
-    """Send a simple response."""
+    """Sends a HTTP response using the ASGI `send` API."""
     # Head requests don't need body content
     if method == "HEAD":
         await send(