chore: extract shared render, watcher, and HMR modules

examples/integration/hyper/src/main.rs

@@ -14,15 +14,19 @@ use tokio::net::TcpListener;
 
 #[path = "../../../../examples/shared/rust/config.rs"]
 mod config;
+#[path = "../../../../examples/shared/rust/hmr.rs"]
+mod hmr;
 #[path = "../../../../examples/shared/rust/output.rs"]
 mod output;
+#[path = "../../../../examples/shared/rust/render.rs"]
 mod render;
 mod routes {
     pub mod assets;
     pub mod hmr;
     pub mod index;
     pub mod not_found;
 }
+#[path = "../../../../examples/shared/rust/watcher.rs"]
 mod watcher;
 
 use crate::config::AppPaths;

examples/integration/hyper/src/routes/hmr.rs

@@ -1,31 +1,14 @@
-use std::fs;
-use std::time::SystemTime;
-
 use bytes::Bytes;
 use http_body_util::Full;
 use hyper::{Response, StatusCode};
 
 use crate::config::AppPaths;
+use crate::hmr::hmr_version;
 
 /// HMR endpoint returning a version derived from the latest modification time
 /// of the template or data file. The client polls this to detect changes.
 pub fn handle_hmr(paths: &AppPaths) -> Response<Full<Bytes>> {
-    let template_mtime = fs::metadata(&paths.template)
-        .and_then(|m| m.modified())
-        .ok();
-    let data_mtime = fs::metadata(&paths.data).and_then(|m| m.modified()).ok();
-
-    let latest: Option<SystemTime> = match (template_mtime, data_mtime) {
-        (Some(t), Some(d)) => Some(if t > d { t } else { d }),
-        (Some(t), None) => Some(t),
-        (None, Some(d)) => Some(d),
-        (None, None) => None,
-    };
-
-    let version_str = latest
-        .and_then(|t| t.duration_since(SystemTime::UNIX_EPOCH).ok())
-        .map(|d| d.as_millis().to_string())
-        .unwrap_or_else(|| "0".to_string());
+    let version_str = hmr_version(&paths.template, &paths.data);
 
     Response::builder()
         .status(StatusCode::OK)

examples/integration/tiny_http/src/main.rs

@@ -7,15 +7,19 @@ use tiny_http::Server;
 
 #[path = "../../../../examples/shared/rust/config.rs"]
 mod config;
+#[path = "../../../../examples/shared/rust/hmr.rs"]
+mod hmr;
 #[path = "../../../../examples/shared/rust/output.rs"]
 mod output;
+#[path = "../../../../examples/shared/rust/render.rs"]
 mod render;
 mod routes {
     pub mod assets;
     pub mod hmr;
     pub mod index;
     pub mod not_found;
 }
+#[path = "../../../../examples/shared/rust/watcher.rs"]
 mod watcher;
 
 use crate::config::AppPaths;

examples/integration/tiny_http/src/routes/hmr.rs

@@ -1,31 +1,13 @@
-use std::fs;
-use std::time::SystemTime;
-
 use tiny_http::{Request, Response, StatusCode};
 
 use crate::config::AppPaths;
+use crate::hmr::hmr_version;
 
-// HMR route which will refresh when the template or data file changes
-// Returns a version derived from the latest modification time of
-// template.html or data.json, so no shared counter is needed.
+/// HMR route which will refresh when the template or data file changes.
+/// Returns a version derived from the latest modification time of
+/// template.html or data.json, so no shared counter is needed.
 pub fn handle_hmr(request: Request, paths: &AppPaths) {
-    let template_mtime = fs::metadata(&paths.template)
-        .and_then(|m| m.modified())
-        .ok();
-    let data_mtime = fs::metadata(&paths.data).and_then(|m| m.modified()).ok();
-
-    let latest: Option<SystemTime> = match (template_mtime, data_mtime) {
-        (Some(t), Some(d)) => Some(if t > d { t } else { d }),
-        (Some(t), None) => Some(t),
-        (None, Some(d)) => Some(d),
-        (None, None) => None,
-    };
-
-    let version_str = latest
-        .and_then(|t| t.duration_since(SystemTime::UNIX_EPOCH).ok())
-        .map(|d| d.as_millis().to_string())
-        .unwrap_or_else(|| "0".to_string());
-
+    let version_str = hmr_version(&paths.template, &paths.data);
     let response = Response::from_string(version_str).with_status_code(StatusCode(200));
     let _ = request.respond(response);
 }

examples/shared/rust/hmr.rs

@@ -0,0 +1,25 @@
+use std::fs;
+use std::path::Path;
+use std::time::SystemTime;
+
+/// Compute an HMR version string from the latest modification time
+/// of the template and data files. Returns a millisecond timestamp
+/// or `"0"` if neither file has a retrievable modification time.
+pub fn hmr_version(template: &Path, data: &Path) -> String {
+    let template_mtime = fs::metadata(template)
+        .and_then(|m| m.modified())
+        .ok();
+    let data_mtime = fs::metadata(data).and_then(|m| m.modified()).ok();
+
+    let latest: Option<SystemTime> = match (template_mtime, data_mtime) {
+        (Some(t), Some(d)) => Some(if t > d { t } else { d }),
+        (Some(t), None) => Some(t),
+        (None, Some(d)) => Some(d),
+        (None, None) => None,
+    };
+
+    latest
+        .and_then(|t| t.duration_since(SystemTime::UNIX_EPOCH).ok())
+        .map(|d| d.as_millis().to_string())
+        .unwrap_or_else(|| "0".to_string())
+}