fastapi-reloader 1.3.2__py2.py3-none-any.whl → 1.3.4__py2.py3-none-any.whl

fastapi_reloader/core.py

@@ -1,7 +1,6 @@
 from asyncio import Queue, ensure_future, sleep
 from collections import defaultdict
 from itertools import count
-from pathlib import Path
 from typing import Literal
 
 from fastapi import APIRouter, Response
@@ -22,26 +21,15 @@ def send_reload_signal():
 reload_router = APIRouter(prefix="/---fastapi-reloader---", tags=["hmr"])
 
 
-runtime_js = Path(__file__, "../runtime.js").resolve().read_text()
-
-
-def get_js():
-    return runtime_js.replace("/0", f"/{get_id()}")
-
-
 @reload_router.head("")
 async def heartbeat():
-    return Response(status_code=200)
-
-
-@reload_router.get("/poller.js")
-async def get_poller_js():
-    return Response(get_js(), media_type="application/javascript")
+    return Response(status_code=202)
 
 
-@reload_router.get("/{key:int}")
-async def simple_refresh_trigger(key: int):
+@reload_router.get("")
+async def subscribe():
     async def event_generator():
+        key = get_id()
         queue = Queue[Literal[0, 1]]()
 
         stopped = False
@@ -66,4 +54,4 @@ async def simple_refresh_trigger(key: int):
             heartbeat_future.cancel()
             requests[key].remove(queue)
 
-    return StreamingResponse(event_generator(), media_type="text/plain")
+    return StreamingResponse(event_generator(), 201, media_type="text/plain")

fastapi_reloader/patcher.py

@@ -1,7 +1,10 @@
 from collections.abc import Awaitable, Callable
 from contextlib import asynccontextmanager
 from copy import copy
+from inspect import ismethod
 from math import inf
+from pathlib import Path
+from types import MethodType
 from typing import Generic, TypeGuard, TypeVar
 
 from asgi_lifespan import LifespanManager
@@ -20,12 +23,19 @@ def is_streaming_response(response: Response) -> TypeGuard[StreamingResponse]:
     return hasattr(response, "body_iterator")
 
 
+INJECTION = f"\n\n<script>\n{Path(__file__, '../runtime.js').resolve().read_text()}\n</script>".encode()
+
+FLAG = " fastapi-reloader-injected "  # to avoid double injection
+
+
 async def _injection_http_middleware(request: Request, call_next: Callable[[Request], Awaitable[Response]]):
     res = await call_next(request)
 
-    if request.method != "GET" or "html" not in (res.headers.get("content-type", "")) or res.headers.get("content-encoding", "identity") != "identity":
+    if request.scope.get(FLAG) or request.method != "GET" or "html" not in (res.headers.get("content-type", "")) or res.headers.get("content-encoding", "identity") != "identity":
         return res
 
+    request.scope[FLAG] = True
+
     async def response():
         if is_streaming_response(res):
             async for chunk in res.body_iterator:
@@ -33,7 +43,7 @@ async def _injection_http_middleware(request: Request, call_next: Callable[[Requ
         else:
             yield res.body
 
-        yield b'\n\n <script src="/---fastapi-reloader---/poller.js"></script>'
+        yield INJECTION
 
     headers = {k: v for k, v in res.headers.items() if k.lower() not in {"content-length", "transfer-encoding"}}
 
@@ -79,6 +89,14 @@ def patch_for_auto_reloading(app: ASGIApp):  # this function is preserved for ba
     if isinstance(app, Starlette):  # both FastAPI and Starlette have user_middleware attribute
         new_app = copy(app)
         new_app.user_middleware = [*app.user_middleware, html_injection_middleware]  # before compression middlewares
+
+        # OTEL patches the app's build_middleware_stack method and keep a reference to the original build_middleware_stack.
+        # But both methods are bound to the original app instance, so we need to rebind them to the new app instance.
+        # The following loop generically rebinds all these methods, preventing potential issues caused by similar patches.
+        for i in dir(new_app):
+            if ismethod(method := getattr(new_app, i)) and method.__self__ is app:
+                setattr(new_app, i, MethodType(method.__func__, new_app))
+
         return _wrap_asgi_app(new_app)
 
     new_app = _wrap_asgi_app(app)

fastapi_reloader/runtime.js

@@ -11,23 +11,37 @@ async function poll() {
   }
 }
 
-async function main() {
-  const response = await fetch("/---fastapi-reloader---/0");
+/** @param {Response} response */
+async function wait(response) {
   const reader = response.body.getReader();
   const decoder = new TextDecoder();
   while (true) {
     const { done, value } = await reader.read();
     if (done) {
-      break;
+      return;
     }
     if (value) {
       const chunk = decoder.decode(value, { stream: true });
       if (chunk.includes("1")) {
-        await poll();
-        location.reload();
+        return;
       }
     }
   }
 }
 
-main();
+async function main() {
+  const response = await fetch("/---fastapi-reloader---").catch(() => null);
+  if (response?.ok && response.body) {
+    await wait(response).catch(() => null);
+    await poll();
+    location.reload();
+  } else {
+    await poll();
+    return await main();
+  }
+}
+
+if (!window.__fastapi_reloader_loaded) {
+  window.__fastapi_reloader_loaded = true;
+  main();
+}

{fastapi_reloader-1.3.2.dist-info → fastapi_reloader-1.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-reloader
-Version: 1.3.2
+Version: 1.3.4
 Project-URL: Homepage, https://github.com/promplate/hmr
 Requires-Dist: asgi-lifespan~=2.0
 Requires-Dist: fastapi~=0.115
@@ -74,6 +74,8 @@ app = html_injection_middleware(app)
 app.user_middleware.append(html_injection_middleware)
 ```
 
+> It's safe to add `html_injection_middleware` in multiple places, even if their scopes overlap. We have safeguards in place to prevent double injection on both server and client side.
+
 The `auto_refresh_middleware` is a convenient wrapper that applies both `reloader_route_middleware` and `html_injection_middleware`. However, you can add them separately for more control:
 
 - **Fine-grained control**: If a sub-router in your application uses compression, you must add `html_injection_middleware` before the compression middleware on that router.

fastapi_reloader-1.3.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+fastapi_reloader-1.3.4.dist-info/METADATA,sha256=7h8S-serIhPPn1UnyUCuIJOA6NgOI-I6oUDQ9mu-xOs,6500
+fastapi_reloader-1.3.4.dist-info/WHEEL,sha256=pz1FfwQ2kf9tI4G8U2ObRTKdvsTSmrreuBTtdnO8pJw,94
+fastapi_reloader-1.3.4.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+fastapi_reloader/__init__.py,sha256=qWjX076aoLEZxZoOIvtmg84khic2FBXpAWuRWVbouTY,309
+fastapi_reloader/core.py,sha256=cqB9uVdPa-0SMafaFH2Ho7m8npD1u503JIGX43oZ4es,1485
+fastapi_reloader/patcher.py,sha256=KJjjbT0uDjZv1Q95slW3MBoUggPrMdCamjnlTy-iTKc,4133
+fastapi_reloader/runtime.js,sha256=kG73Qx2civNzrG36Hfsu9U_esmjYh4EqynpVcmUqB8o,1036
+fastapi_reloader-1.3.4.dist-info/RECORD,,

fastapi_reloader-1.3.2.dist-info/RECORD

@@ -1,8 +0,0 @@
-fastapi_reloader-1.3.2.dist-info/METADATA,sha256=D7-0CWUurSwKz-MdsPAQL-Tm4SE6Lg0X5V_3q3I2qSQ,6314
-fastapi_reloader-1.3.2.dist-info/WHEEL,sha256=pz1FfwQ2kf9tI4G8U2ObRTKdvsTSmrreuBTtdnO8pJw,94
-fastapi_reloader-1.3.2.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-fastapi_reloader/__init__.py,sha256=qWjX076aoLEZxZoOIvtmg84khic2FBXpAWuRWVbouTY,309
-fastapi_reloader/core.py,sha256=pug78QfiDLaX7uBj9zbjAwphMlsFGlam0qEpUnHOhfo,1779
-fastapi_reloader/patcher.py,sha256=MXZjva7zIdSYN4j5RGxBMy2UtJ34pSj3ylwzcKfoAKU,3318
-fastapi_reloader/runtime.js,sha256=pUPeMnMuKGHhBTudp6bFuNTTyZhGSvrvvWy_lWVN8nA,713
-fastapi_reloader-1.3.2.dist-info/RECORD,,