Load ASGI bridge after Worker startup

Author: adewale

src/main.py

@@ -10,10 +10,8 @@
 from asset_manifest import HTML_CACHE_VERSION
 from examples import PYTHON_VERSION
 
-try:
-    import asgi as worker_asgi
-except ImportError:  # Allows editor tooling outside Workers, where the js module is unavailable.
-    worker_asgi = None
+if False:  # Ensure the Worker bundler includes the ASGI bridge without importing js during local tooling.
+    import asgi
 
 try:
     from js import Object, Request as JsRequest, caches
@@ -130,6 +128,8 @@ async def not_found(path: str, request: Request):
 
 class Default(WorkerEntrypoint):
     async def fetch(self, request):
+        import asgi
+
         global _CURRENT_WORKER_REQUEST
         _CURRENT_WORKER_REQUEST = request
 
@@ -141,13 +141,13 @@ async def fetch(self, request):
                 cached = await caches.default.match(cache_key)
                 if cached:
                     return cached
-                response = await worker_asgi.fetch(app, request.js_object, self.env)
+                response = await asgi.fetch(app, request.js_object, self.env)
                 if getattr(response, "status", 200) == 200:
                     response.headers.set("Cache-Control", "public, max-age=300, stale-while-revalidate=86400")
                     await caches.default.put(cache_key, response.clone())
                 return response
-            response = await worker_asgi.fetch(app, request.js_object, self.env)
+            response = await asgi.fetch(app, request.js_object, self.env)
             response.headers.set("Cache-Control", "no-store")
             return response
 
-        return await worker_asgi.fetch(app, request.js_object, self.env)
+        return await asgi.fetch(app, request.js_object, self.env)

tests/test_app.py

@@ -393,8 +393,8 @@ def test_worker_entrypoint_uses_fastapi_asgi_bridge(self):
         main_source = (ROOT / "src" / "main.py").read_text()
         self.assertIn("from fastapi import FastAPI, Request", main_source)
         self.assertIn("app = FastAPI", main_source)
-        self.assertIn("import asgi as worker_asgi", main_source)
-        self.assertIn("return await worker_asgi.fetch(app, request.js_object, self.env)", main_source)
+        self.assertIn("import asgi", main_source)
+        self.assertIn("return await asgi.fetch(app, request.js_object, self.env)", main_source)
         self.assertIn("caches.default.match", main_source)
         self.assertIn("caches.default.put", main_source)
         self.assertIn("Cache-Control", main_source)