From 20cc3637c7268ceb8ca18ce55027ad8584e1cfd8 Mon Sep 17 00:00:00 2001 From: polwex Date: Sun, 22 Jun 2025 14:32:59 +0700 Subject: checkpoint --- bs5/server/dune | 2 -- bs5/server/middleware/logs.ml | 14 ++++++++------ bs5/server/pages/Hydrate.re | 2 +- bs5/server/pages/Index.re | 2 +- bs5/server/pages/RouterRSC.re | 27 +++++++++++++-------------- bs5/server/pages/ServerOnlyRSC.re | 4 +--- bs5/server/pages/SinglePageRSC.re | 2 +- bs5/server/server.ml | 9 +++++---- 8 files changed, 30 insertions(+), 32 deletions(-) (limited to 'bs5/server') diff --git a/bs5/server/dune b/bs5/server/dune index 19ff1eb..d0a8aca 100644 --- a/bs5/server/dune +++ b/bs5/server/dune @@ -1,8 +1,6 @@ ; (include_subdirs qualified) (executable - (enabled_if - (= %{profile} "dev")) (name server) (modules server) (libraries diff --git a/bs5/server/middleware/logs.ml b/bs5/server/middleware/logs.ml index 6925ca4..ea69f89 100644 --- a/bs5/server/middleware/logs.ml +++ b/bs5/server/middleware/logs.ml @@ -1,12 +1,14 @@ let detailed_logger inner_handler request = let method_str = Dream.method_to_string (Dream.method_ request) in let path = Dream.target request in - let user_agent = Dream.header request "User-Agent" |> Option.value ~default:"unknown" in - let client_ip = Dream.client request in - let%lwt () = - Lwt_io.printf "%s %s %s - %s - %s\n" (Ptime_clock.now () |> Ptime.to_rfc3339) method_str path client_ip user_agent - in + (* let user_agent = *) + (* Dream.header request "User-Agent" |> Option.value ~default:"unknown" *) + (* in *) + (* let client_ip = Dream.client request in *) + (* let%lwt () = *) + (* Lwt_io.printf "%s %s %s - %s - %s\n" (Ptime_clock.now () |> Ptime.to_rfc3339) method_str path client_ip user_agent *) + (* in *) let%lwt response = inner_handler request in let status = Dream.status response |> Dream.status_to_int in - let%lwt () = Lwt_io.printf " -> %d\n" status in + let%lwt () = Lwt_io.printf "%s -%s -> %d\n" method_str path status in Lwt.return response diff --git a/bs5/server/pages/Hydrate.re b/bs5/server/pages/Hydrate.re index f887e34..e7cf1dc 100644 --- a/bs5/server/pages/Hydrate.re +++ b/bs5/server/pages/Hydrate.re @@ -1,3 +1,3 @@ -let doc = ; +let doc = ; let toString = ReactDOM.renderToString(doc); let toStatic = ReactDOM.renderToStaticMarkup(doc); diff --git a/bs5/server/pages/Index.re b/bs5/server/pages/Index.re index 685069a..f6f2f56 100644 --- a/bs5/server/pages/Index.re +++ b/bs5/server/pages/Index.re @@ -226,7 +226,7 @@ module App = { let handler = request => DreamRSC.create_from_request( - ~bootstrap_modules=["/static/demo/SinglePageRSC.re.js"], + ~bootstrap_modules=["/static/SinglePageRSC.re.js"], , request, ); diff --git a/bs5/server/pages/RouterRSC.re b/bs5/server/pages/RouterRSC.re index 390a8db..32ae375 100644 --- a/bs5/server/pages/RouterRSC.re +++ b/bs5/server/pages/RouterRSC.re @@ -92,19 +92,18 @@ module App = { Lwt.return( - - - - - //