Skip to content

A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.

fix: preview serves stale project after switching projects

esenginedc519a885f69
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index 73410178a..875faa335 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -43,14 +43,18 @@ fn start_preview_server(
port: u16,
) -> Result<u16, String> {
let mut server_lock = state.preview_server.lock().unwrap();
+ let new_dir = PathBuf::from(&project_dir);
if let Some(ref server) = *server_lock {
if server.is_running() {
+ if server.project_dir() != new_dir {
+ server.set_project_dir(new_dir);
+ }
return Ok(server.port());
}
}
- let mut server = PreviewServer::new(PathBuf::from(project_dir), port);
+ let mut server = PreviewServer::new(new_dir, port);
let port = server.start()?;
*server_lock = Some(server);
Ok(port)
diff --git a/desktop/src-tauri/src/preview_server.rs b/desktop/src-tauri/src/preview_server.rs
index 5cd2ffbe5..306ee3122 100644
--- a/desktop/src-tauri/src/preview_server.rs
+++ b/desktop/src-tauri/src/preview_server.rs
@@ -5,7 +5,7 @@ use std::collections::HashMap;
use std::io::Write;
use std::path::PathBuf;
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
-use std::sync::{Arc, Condvar, Mutex};
+use std::sync::{Arc, Condvar, Mutex, RwLock};
use std::thread;
use tiny_http::{Header, Response, Server};
@@ -19,7 +19,7 @@ pub struct PreviewServer {
server: Option<Arc<Server>>,
worker_handle: Option<thread::JoinHandle<()>>,
reload_signal: Arc<ReloadSignal>,
- project_dir: PathBuf,
+ project_dir: Arc<RwLock<PathBuf>>,
port: u16,
}
@@ -75,7 +75,7 @@ impl PreviewServer {
server: None,
worker_handle: None,
reload_signal: Arc::new(ReloadSignal::new()),
- project_dir,
+ project_dir: Arc::new(RwLock::new(project_dir)),
port,
}
}
@@ -91,7 +91,7 @@ impl PreviewServer {
let server = Arc::new(server);
self.server = Some(Arc::clone(&server));
- let project_dir = self.project_dir.clone();
+ let project_dir = Arc::clone(&self.project_dir);
let reload_signal = Arc::clone(&self.reload_signal);
let handle = thread::spawn(move || {
@@ -107,6 +107,8 @@ impl PreviewServer {
continue;
}
+ let current_dir = project_dir.read().unwrap().clone();
+
let response = match path {
"" | "index.html" => serve_html(),
"favicon.ico" => serve_empty(),
@@ -132,7 +134,7 @@ impl PreviewServer {
"wasm/spine42.wasm" => serve_embedded(embedded_assets::SPINE42_WASM, "application/wasm"),
"wasm/physics.js" => serve_embedded(embedded_assets::PHYSICS_JS, "application/javascript"),
"wasm/physics.wasm" => serve_embedded(embedded_assets::PHYSICS_WASM, "application/wasm"),
- _ => serve_project_file(&project_dir, path),
+ _ => serve_project_file(&current_dir, path),
};
let _ = request.respond(response);
@@ -165,6 +167,14 @@ impl PreviewServer {
pub fn port(&self) -> u16 {
self.port
}
+
+ pub fn project_dir(&self) -> PathBuf {
+ self.project_dir.read().unwrap().clone()
+ }
+
+ pub fn set_project_dir(&self, dir: PathBuf) {
+ *self.project_dir.write().unwrap() = dir;
+ }
}
// =============================================================================