pulse-framework 0.1.38a9__py3-none-any.whl → 0.1.40__py3-none-any.whl

pulse/app.py

@@ -71,7 +71,7 @@ from pulse.middleware import (
 	Redirect,
 )
 from pulse.plugin import Plugin
-from pulse.proxy import PulseProxy
+from pulse.proxy import ReactProxyHandler
 from pulse.react_component import ReactComponent, registered_react_components
 from pulse.render_session import RenderSession
 from pulse.request import PulseRequest
@@ -335,11 +335,6 @@ class App:
 		self.setup(server_address)
 		self.status = AppStatus.running
 
-		# In single-server mode, the Pulse server acts as reverse proxy to the React server
-		if self.mode == "single-server":
-			return PulseProxy(
-				self.asgi, lambda: envvars.react_server_address, self.api_prefix
-			)
 		return self.asgi
 
 	def run(
@@ -379,28 +374,6 @@ class App:
 				**cors_config,
 			)
 
-		# Debug middleware to log CORS-related request details
-		# @self.fastapi.middleware("http")
-		# async def cors_debug_middleware(
-		# 	request: Request, call_next: Callable[[Request], Awaitable[Response]]
-		# ):
-		# 	origin = request.headers.get("origin")
-		# 	method = request.method
-		# 	path = request.url.path
-		# 	print(
-		# 		f"[CORS Debug] {method} {path} | Origin: {origin} | "
-		# 		+ f"Mode: {self.mode} | Server: {self.server_address}"
-		# 	)
-		# 	response = await call_next(request)
-		# 	allow_origin = response.headers.get("access-control-allow-origin")
-		# 	if allow_origin:
-		# 		print(f"[CORS Debug] Response allows origin: {allow_origin}")
-		# 	elif origin:
-		# 		logger.warning(
-		# 			f"[CORS Debug] Origin {origin} present but no Access-Control-Allow-Origin header set"
-		# 		)
-		# 	return response
-
 		# Mount PulseContext for all FastAPI routes (no route info). Other API
 		# routes / middleware should be added at the module-level, which means
 		# this middleware will wrap all of them.
@@ -419,8 +392,6 @@ class App:
 			)
 			render_id = request.headers.get("x-pulse-render-id")
 			render = self._get_render_for_session(render_id, session)
-			if render:
-				print(f"Reusing render session {render_id}")
 			with PulseContext.update(session=session, render=render):
 				res: Response = await call_next(request)
 			session.handle_response(res)
@@ -568,6 +539,26 @@ class App:
 		for plugin in self.plugins:
 			plugin.on_setup(self)
 
+		# In single-server mode, add catch-all route to proxy unmatched requests to React server
+		# This route must be registered last so FastAPI tries all specific routes first
+		# FastAPI will match specific routes before this catch-all, but we add an explicit check
+		# as a safety measure to ensure API routes are never proxied
+		if self.mode == "single-server":
+			proxy_handler = ReactProxyHandler(lambda: envvars.react_server_address)
+
+			@self.fastapi.api_route(
+				"/{path:path}",
+				methods=["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"],
+				include_in_schema=False,
+			)
+			async def proxy_catch_all(request: Request, path: str):  # pyright: ignore[reportUnusedFunction]
+				# Skip WebSocket upgrades (handled by Socket.IO)
+				if request.headers.get("upgrade", "").lower() == "websocket":
+					raise HTTPException(status_code=404, detail="Not found")
+
+				# Proxy all unmatched HTTP requests to React Router
+				return await proxy_handler(request)
+
 		@self.sio.event
 		async def connect(  # pyright: ignore[reportUnusedFunction]
 			sid: str, environ: dict[str, Any], auth: dict[str, str] | None
@@ -902,7 +893,6 @@ class App:
 			self._cancel_render_cleanup(rid)
 
 		# Close all render sessions
-		print("Closing app")
 		for rid in list(self.render_sessions.keys()):
 			self.close_render(rid)
 
@@ -939,7 +929,7 @@ class App:
 			return  # no active render for this user session
 
 		# We don't want to wait for this to resolve
-		create_task(render.call_api(f"/{self.api_prefix}/set-cookies", method="GET"))
+		create_task(render.call_api(f"{self.api_prefix}/set-cookies", method="GET"))
 		sess.scheduled_cookie_refresh = True
 
 

pulse/middleware.py

@@ -1,15 +1,17 @@
 from __future__ import annotations
 
 from collections.abc import Callable, Sequence
-from typing import TYPE_CHECKING, Any, Generic, TypeVar, overload, override
-
-from pulse.messages import ClientMessage, ServerInitMessage
+from typing import Any, Generic, TypeVar, overload, override
+
+from pulse.messages import (
+	ClientMessage,
+	PrerenderPayload,
+	PrerenderResult,
+	ServerInitMessage,
+)
 from pulse.request import PulseRequest
 from pulse.routing import RouteInfo
 
-if TYPE_CHECKING:
-	from pulse.app import PrerenderPayload, PrerenderResult
-
 T = TypeVar("T")
 
 

pulse/proxy.py

@@ -1,46 +1,34 @@
 """
-Proxy ASGI app for forwarding requests to React Router server in single-server mode.
+Proxy handler for forwarding requests to React Router server in single-server mode.
 """
 
 import logging
-from collections.abc import Iterable
-from typing import Callable, cast
+from typing import Callable
 
 import httpx
-from starlette.datastructures import Headers
-from starlette.types import ASGIApp, Receive, Scope, Send
+from fastapi.responses import StreamingResponse
+from starlette.background import BackgroundTask
+from starlette.requests import Request
+from starlette.responses import PlainTextResponse, Response
 
 logger = logging.getLogger(__name__)
 
 
-class PulseProxy:
+class ReactProxyHandler:
 	"""
-	ASGI app that proxies non-API requests to React Router server.
-
-	In single-server mode, Python FastAPI handles /_pulse/* routes and
-	proxies everything else to the React Router server running on an internal port.
+	Handles proxying HTTP requests to React Router server.
 	"""
 
-	def __init__(
-		self,
-		app: ASGIApp,
-		get_react_server_address: Callable[[], str | None],
-		api_prefix: str = "/_pulse",
-	):
-		"""
-		Initialize proxy ASGI app.
+	get_react_server_address: Callable[[], str | None]
+	_client: httpx.AsyncClient | None
 
+	def __init__(self, get_react_server_address: Callable[[], str | None]):
+		"""
 		Args:
-		    app: The ASGI application to wrap (socketio.ASGIApp)
 		    get_react_server_address: Callable that returns the React Router server full URL (or None if not started)
-		    api_prefix: Prefix for API routes that should NOT be proxied (default: "/_pulse")
 		"""
-		self.app: ASGIApp = app
-		self.get_react_server_address: Callable[[], str | None] = (
-			get_react_server_address
-		)
-		self.api_prefix: str = api_prefix
-		self._client: httpx.AsyncClient | None = None
+		self.get_react_server_address = get_react_server_address
+		self._client = None
 
 	@property
 	def client(self) -> httpx.AsyncClient:
@@ -52,37 +40,7 @@ class PulseProxy:
 			)
 		return self._client
 
-	async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
-		"""
-		ASGI application handler.
-
-		Routes starting with api_prefix or WebSocket connections go to FastAPI.
-		Everything else is proxied to React Router.
-		"""
-		if scope["type"] != "http":
-			# Pass through non-HTTP requests (WebSocket, lifespan, etc.)
-			await self.app(scope, receive, send)
-			return
-
-		path = scope["path"]
-
-		# Check if path starts with API prefix or is a WebSocket upgrade
-		if path.startswith(self.api_prefix):
-			# This is an API route, pass through to FastAPI
-			await self.app(scope, receive, send)
-			return
-
-		# Check if this is a WebSocket upgrade request (even if not prefixed)
-		headers = Headers(scope=scope)
-		if headers.get("upgrade", "").lower() == "websocket":
-			# WebSocket request, pass through to FastAPI
-			await self.app(scope, receive, send)
-			return
-
-		# Proxy to React Router server
-		await self._proxy_request(scope, receive, send)
-
-	async def _proxy_request(self, scope: Scope, receive: Receive, send: Send) -> None:
+	async def __call__(self, request: Request) -> Response:
 		"""
 		Forward HTTP request to React Router server and stream response back.
 		"""
@@ -90,103 +48,48 @@ class PulseProxy:
 		react_server_address = self.get_react_server_address()
 		if react_server_address is None:
 			# React server not started yet, return error
-			await send(
-				{
-					"type": "http.response.start",
-					"status": 503,
-					"headers": [(b"content-type", b"text/plain")],
-				}
+			return PlainTextResponse(
+				"Service Unavailable: React server not ready", status_code=503
 			)
-			await send(
-				{
-					"type": "http.response.body",
-					"body": b"Service Unavailable: React server not ready",
-				}
-			)
-			return
 
 		# Build target URL
-		path = scope["path"]
-		query_string = scope.get("query_string", b"").decode("utf-8")
-		# Ensure react_server_address doesn't end with /
-		base_url = react_server_address.rstrip("/")
-		target_path = f"{base_url}{path}"
-		if query_string:
-			target_path += f"?{query_string}"
-
-		# Extract headers
-		headers: dict[str, str] = {}
-		for name, value in cast(Iterable[tuple[bytes, bytes]], scope["headers"]):
-			name = name.decode("latin1")
-			value = value.decode("latin1")
-
-			# Skip host header (will be set by httpx)
-			if name.lower() == "host":
-				continue
-
-			# Collect headers (handle multiple values)
-			existing = headers.get(name)
-			if existing:
-				headers[name] = f"{existing},{value}"
-			else:
-				headers[name] = value
-
-		# Read request body
-		body_parts: list[bytes] = []
-		while True:
-			message = await receive()
-			if message["type"] == "http.request":
-				body_parts.append(message.get("body", b""))
-				if not message.get("more_body", False):
-					break
-		body = b"".join(body_parts)
+		url = react_server_address.rstrip("/") + request.url.path
+		if request.url.query:
+			url += "?" + request.url.query
+
+		# Extract headers, skip host header (will be set by httpx)
+		headers = {k: v for k, v in request.headers.items() if k.lower() != "host"}
 
 		try:
-			# Forward request to React Router
-			method = scope["method"]
-			response = await self.client.request(
-				method=method,
-				url=target_path,
+			# Build request
+			req = self.client.build_request(
+				method=request.method,
+				url=url,
 				headers=headers,
-				content=body,
-			)
-
-			# Send response status
-			await send(
-				{
-					"type": "http.response.start",
-					"status": response.status_code,
-					"headers": [
-						(name.encode("latin1"), value.encode("latin1"))
-						for name, value in response.headers.items()
-					],
-				}
+				content=request.stream(),
 			)
 
-			# Stream response body
-			await send(
-				{
-					"type": "http.response.body",
-					"body": response.content,
-				}
+			# Send request with streaming
+			r = await self.client.send(req, stream=True)
+
+			# Filter out headers that shouldn't be present in streaming responses
+			response_headers = {
+				k: v
+				for k, v in r.headers.items()
+				# if k.lower() not in ("content-length", "transfer-encoding")
+			}
+
+			return StreamingResponse(
+				r.aiter_raw(),
+				background=BackgroundTask(r.aclose),
+				status_code=r.status_code,
+				headers=response_headers,
 			)
 
 		except httpx.RequestError as e:
 			logger.error(f"Proxy request failed: {e}")
-
-			# Send error response
-			await send(
-				{
-					"type": "http.response.start",
-					"status": 502,
-					"headers": [(b"content-type", b"text/plain")],
-				}
-			)
-			await send(
-				{
-					"type": "http.response.body",
-					"body": b"Bad Gateway: Could not reach React Router server",
-				}
+			return PlainTextResponse(
+				"Bad Gateway: Could not reach React Router server", status_code=502
 			)
 
 	async def close(self):

{pulse_framework-0.1.38a9.dist-info → pulse_framework-0.1.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pulse-framework
-Version: 0.1.38a9
+Version: 0.1.40
 Summary: Pulse - Full-stack framework for building real-time React applications in Python
 Requires-Dist: websockets>=12.0
 Requires-Dist: fastapi>=0.104.0

{pulse_framework-0.1.38a9.dist-info → pulse_framework-0.1.40.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pulse/__init__.py,sha256=P2CLvFxP8IPiUsy3Z-hZD-1tbsvhd4eVlMNYg5WOPjE,31709
-pulse/app.py,sha256=a-fHuX1MfA0Whjyy8l2JxroRkJd5VG0Aba31xfKcuFY,29871
+pulse/app.py,sha256=VwalJMondhPfhCaqXpEQH6vBezX7jmm9e24GZNr21M0,29726
 pulse/channel.py,sha256=DuD1mg_xWvkpAWSKZ-EtBYdUzJ8IuKH0fxdgGOvFXpg,13041
 pulse/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulse/cli/cmd.py,sha256=jA1kgw6Dibj8jC_amcRL4mCzfboszLTnVAQtJA3_G-4,14011
@@ -46,9 +46,9 @@ pulse/html/svg.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulse/html/tags.py,sha256=dyG4BY9qthBbO-ihcy9F8mLY6WqQxKFXfpqNYcSMKN0,5182
 pulse/html/tags.pyi,sha256=I8dFoft9w4RvneZ3li1weAdijY1krj9jfO_p2SU6e04,13953
 pulse/messages.py,sha256=Vz6pXUcBlQxHVEzP8jtA4ZBwn0P30oJzU07lzESP2JI,3625
-pulse/middleware.py,sha256=xNPUkeKVCEUJDIHoe5-GT7EvgLxZwWz1rWb6mEchkWY,7921
+pulse/middleware.py,sha256=aMcfkQ2XUT-SMFNa51GYlQp5tnXQwkfbcGlqO4DGcKk,7874
 pulse/plugin.py,sha256=T1HLucOJekRfWMGF17arI3z7qfH-rBw_zPOQEV8v2mw,640
-pulse/proxy.py,sha256=lIt1W8FpItpwl85IxzdzgTwPN8G7kvM5OFYB7YW9iaE,5158
+pulse/proxy.py,sha256=XR2jV5NTLTdiYuJLMBWx2_aMB7Odoa63XQRHSOgA7jM,2709
 pulse/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulse/query.py,sha256=u0KVFNt0d36sfmoxpQXvJ8DjctIHZaM_szlEonRiyRg,12849
 pulse/react_component.py,sha256=Rw1J6cHOX8-K3BnkswVOu2COgneVvRz1OYmyXkX17RM,25993
@@ -65,7 +65,7 @@ pulse/types/event_handler.py,sha256=OF7sOgYBb6iUs59RH1vQIH7aOrGPfs3nAaF7how-4PQ,
 pulse/user_session.py,sha256=kCZtQpYZe2keDXzusd6jsjjw075am0dXrb25jKLg5JU,7578
 pulse/vdom.py,sha256=KTNBh2dVvDy9eXRzhneBJgk7F35MyWec8R_puQ4tSRY,12420
 pulse/version.py,sha256=711vaM1jVIQPgkisGgKZqwmw019qZIsc_QTae75K2pg,1895
-pulse_framework-0.1.38a9.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-pulse_framework-0.1.38a9.dist-info/entry_points.txt,sha256=i7aohd3QaPu5IcuGKKvsQQEiMYMe5HcF56QEsaLVO64,46
-pulse_framework-0.1.38a9.dist-info/METADATA,sha256=aNlTOGPVKDCkzoYDtRCHP3SppJDYfeP2w4SQpPWxS0E,582
-pulse_framework-0.1.38a9.dist-info/RECORD,,
+pulse_framework-0.1.40.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+pulse_framework-0.1.40.dist-info/entry_points.txt,sha256=i7aohd3QaPu5IcuGKKvsQQEiMYMe5HcF56QEsaLVO64,46
+pulse_framework-0.1.40.dist-info/METADATA,sha256=j481f-W5TtovwCzdxBioeaG-rTHLmY7uhMpKc4RP_WU,580
+pulse_framework-0.1.40.dist-info/RECORD,,