fastapi-reloader 1.2.1__py2.py3-none-any.whl → 1.3.1__py2.py3-none-any.whl

fastapi_reloader/core.py

@@ -33,6 +33,11 @@ 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")
+
+
 @reload_router.get("/{key:int}")
 async def simple_refresh_trigger(key: int):
     async def event_generator():

fastapi_reloader/patcher.py

@@ -1,24 +1,49 @@
 from collections.abc import Awaitable, Callable
 from contextlib import asynccontextmanager
+from copy import copy
 from math import inf
 from typing import TypeGuard
 
 from asgi_lifespan import LifespanManager
 from fastapi import FastAPI, Request, Response
 from fastapi.responses import StreamingResponse
+from starlette.applications import Starlette
 from starlette.middleware import Middleware
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.types import ASGIApp
 
-from .core import get_js, reload_router
+from .core import reload_router
 
 
 def is_streaming_response(response: Response) -> TypeGuard[StreamingResponse]:
-    # In fact, it may not be a fastapi's StreamingResponse, but a starlette's one with the same interface
+    # In fact, it may not be a Starlette's StreamingResponse, but an internal one with the same interface
     return hasattr(response, "body_iterator")
 
 
-def patch_for_auto_reloading(app: ASGIApp):
+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":
+        return res
+
+    async def response():
+        if is_streaming_response(res):
+            async for chunk in res.body_iterator:
+                yield chunk
+        else:
+            yield res.body
+
+        yield b'\n\n <script src="/---fastapi-reloader---/poller.js"></script>'
+
+    headers = {k: v for k, v in res.headers.items() if k.lower() not in {"content-length", "transfer-encoding"}}
+
+    return StreamingResponse(response(), res.status_code, headers, res.media_type)
+
+
+injection_middleware = Middleware(BaseHTTPMiddleware, dispatch=_injection_http_middleware)
+
+
+def _reloader_middleware(app: ASGIApp):
     @asynccontextmanager
     async def lifespan(_):
         async with LifespanManager(app, inf, inf):
@@ -28,24 +53,16 @@ def patch_for_auto_reloading(app: ASGIApp):
     new_app.include_router(reload_router)
     new_app.mount("/", app)
 
-    async def hmr_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", "")):
-            return res
-
-        async def response():
-            if is_streaming_response(res):
-                async for chunk in res.body_iterator:
-                    yield chunk
-            else:
-                yield res.body
-            yield f"\n\n <script> {get_js()} </script>".encode()
+    return new_app
 
-        headers = {k: v for k, v in res.headers.items() if k.lower() not in {"content-length", "content-encoding", "transfer-encoding"}}
 
-        return StreamingResponse(response(), res.status_code, headers, res.media_type)
+def patch_for_auto_reloading(app: ASGIApp):
+    if isinstance(app, Starlette):  # both FastAPI and Starlette have user_middleware attribute
+        new_app = copy(app)
+        new_app.user_middleware = [*app.user_middleware, injection_middleware]  # before compression middlewares
+        return _reloader_middleware(new_app)
 
-    new_app.user_middleware.append(Middleware(BaseHTTPMiddleware, dispatch=hmr_middleware))  # the last middleware is the first one to be called
+    new_app = _reloader_middleware(app)
+    new_app.user_middleware.append(injection_middleware)  # the last middleware is the first one to be called
 
     return new_app

fastapi_reloader/runtime.js

@@ -1,4 +1,17 @@
-(async function () {
+async function poll() {
+  while (true) {
+    try {
+      const res = await fetch("/---fastapi-reloader---", { method: "HEAD" });
+      if (res.ok) {
+        break;
+      } else if (res.status !== 502) {
+        return;
+      }
+    } catch (error) {}
+  }
+}
+
+async function main() {
   const response = await fetch("/---fastapi-reloader---/0");
   const reader = response.body.getReader();
   const decoder = new TextDecoder();
@@ -10,20 +23,11 @@
     if (value) {
       const chunk = decoder.decode(value, { stream: true });
       if (chunk.includes("1")) {
-        while (true) {
-          try {
-            const res = await fetch("/---fastapi-reloader---", {
-              method: "HEAD",
-            });
-            if (res.ok) {
-              break;
-            } else if (res.status !== 502) {
-              return;
-            }
-          } catch (error) {}
-        }
+        await poll();
         location.reload();
       }
     }
   }
-})();
+}
+
+main();

{fastapi_reloader-1.2.1.dist-info → fastapi_reloader-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-reloader
-Version: 1.2.1
+Version: 1.3.1
 Project-URL: Homepage, https://github.com/promplate/hmr
 Requires-Dist: asgi-lifespan~=2.0
 Requires-Dist: fastapi~=0.115

fastapi_reloader-1.3.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+fastapi_reloader-1.3.1.dist-info/METADATA,sha256=xKLO2Z0ZWciUVgTReqnzDklb611n6zA5PEthLU59ODA,2270
+fastapi_reloader-1.3.1.dist-info/WHEEL,sha256=pz1FfwQ2kf9tI4G8U2ObRTKdvsTSmrreuBTtdnO8pJw,94
+fastapi_reloader-1.3.1.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+fastapi_reloader/__init__.py,sha256=VE5m-0M92Weme8COqLs0LwIx5g6FHhqyOLGAgY6Zkzs,145
+fastapi_reloader/core.py,sha256=eAyPhBZaFiKepy5NcU966adAJwqFTpHlK_uXn1cJQU8,1676
+fastapi_reloader/patcher.py,sha256=nwn9sJW8KsXUr7dSPClWuPCanP453ymazfetVtuPaDA,2436
+fastapi_reloader/runtime.js,sha256=pUPeMnMuKGHhBTudp6bFuNTTyZhGSvrvvWy_lWVN8nA,713
+fastapi_reloader-1.3.1.dist-info/RECORD,,

fastapi_reloader-1.2.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-fastapi_reloader-1.2.1.dist-info/METADATA,sha256=6zo0A2A0mHvuK2wTyuv6VUMBf795MrYB3d4rL6ROwmE,2270
-fastapi_reloader-1.2.1.dist-info/WHEEL,sha256=pz1FfwQ2kf9tI4G8U2ObRTKdvsTSmrreuBTtdnO8pJw,94
-fastapi_reloader-1.2.1.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-fastapi_reloader/__init__.py,sha256=VE5m-0M92Weme8COqLs0LwIx5g6FHhqyOLGAgY6Zkzs,145
-fastapi_reloader/core.py,sha256=lrfBJoavB2sDzkvN5UyWV91Xm69iLCuigg7pzKKVGfc,1547
-fastapi_reloader/patcher.py,sha256=pwomRoZUbWth2SA5L7zEQsAy4qBuepnOYyOqCnqig2Y,1909
-fastapi_reloader/runtime.js,sha256=H9SCpyGpBUmfvcdlzpU4RXnIBCYSQwIqXZ7jd1bdtSo,743
-fastapi_reloader-1.2.1.dist-info/RECORD,,