Compare commits
11 Commits
d69cf115c8
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
ffb05e3a0a
|
|||
|
8fda4f79ed
|
|||
|
f16d8b1dca
|
|||
|
7566c2908f
|
|||
|
89ec65f0d2
|
|||
|
bad6baa9de
|
|||
|
4369090a53
|
|||
|
1ef5e4d01a
|
|||
|
572beb66f7
|
|||
|
366b6fbca7
|
|||
|
d80dece8a7
|
1802
Cargo.lock
generated
1802
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -11,8 +11,11 @@ Simple server and GUI for LAN parties.
|
||||
```bash
|
||||
# install Tauri CLI
|
||||
cargo install tauri-cli
|
||||
|
||||
# install Deno with a package manager or from https://deno.land/
|
||||
```
|
||||
|
||||
|
||||
### Build
|
||||
#### Frontend
|
||||
```bash
|
||||
@ -23,7 +26,7 @@ cargo tauri dev # prefix with RUST_LOG=your_module=debug or similary for more
|
||||
cargo tauri build --no-bundle
|
||||
|
||||
# Production
|
||||
cargo tauri build --profile release-lto # also bundles everything into a nice platform-specific installer
|
||||
cargo tauri build -- --profile release-lto # also bundles everything into a nice platform-specific installer
|
||||
|
||||
# on wayland you probably need to set this env var
|
||||
WEBKIT_DISABLE_DMABUF_RENDERER=1
|
||||
@ -38,5 +41,5 @@ deno outdated --update --latest
|
||||
./server.sh [options...] # prefix with RUST_LOG=your_module=debug or similary for more verbose output
|
||||
|
||||
# Production
|
||||
cargo build --profile release-lto
|
||||
cargo build --profile release-lto -p lanspread-server
|
||||
```
|
||||
|
||||
@ -10,7 +10,7 @@ use s2n_quic::{Client as QuicClient, Connection, client::Connect, provider::limi
|
||||
use tokio::{
|
||||
io::AsyncWriteExt,
|
||||
sync::{
|
||||
Mutex,
|
||||
RwLock,
|
||||
mpsc::{UnboundedReceiver, UnboundedSender},
|
||||
},
|
||||
};
|
||||
@ -162,7 +162,7 @@ async fn download_game_files(
|
||||
}
|
||||
|
||||
struct Ctx {
|
||||
game_dir: Arc<Mutex<Option<String>>>,
|
||||
game_dir: Arc<RwLock<Option<String>>>,
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_lines)]
|
||||
@ -181,7 +181,7 @@ pub async fn run(
|
||||
|
||||
// client context
|
||||
let ctx = Ctx {
|
||||
game_dir: Arc::new(Mutex::new(None)),
|
||||
game_dir: Arc::new(RwLock::new(None)),
|
||||
};
|
||||
|
||||
loop {
|
||||
@ -230,7 +230,7 @@ pub async fn run(
|
||||
continue;
|
||||
}
|
||||
ClientCommand::SetGameDir(game_dir) => {
|
||||
*ctx.game_dir.lock().await = Some(game_dir.clone());
|
||||
*ctx.game_dir.write().await = Some(game_dir.clone());
|
||||
continue;
|
||||
}
|
||||
ClientCommand::DownloadGameFiles {
|
||||
@ -239,7 +239,7 @@ pub async fn run(
|
||||
} => {
|
||||
log::info!("got ClientCommand::DownloadGameFiles");
|
||||
|
||||
let games_folder = { ctx.game_dir.lock().await.clone() };
|
||||
let games_folder = { ctx.game_dir.read().await.clone() };
|
||||
if let Some(games_folder) = games_folder {
|
||||
let tx_notify_ui = tx_notify_ui.clone();
|
||||
tokio::task::spawn(async move {
|
||||
@ -312,7 +312,7 @@ pub async fn run(
|
||||
let (mut rx, mut tx) = stream.split();
|
||||
|
||||
if let Err(e) = tx.send(data).await {
|
||||
log::error!("failed to send request to server {:?}", e);
|
||||
log::error!("failed to send request to server {e:?}");
|
||||
}
|
||||
|
||||
let mut data = BytesMut::new();
|
||||
@ -344,7 +344,7 @@ pub async fn run(
|
||||
file_descriptions.len()
|
||||
);
|
||||
|
||||
let games_folder = { ctx.game_dir.lock().await.clone() };
|
||||
let games_folder = { ctx.game_dir.read().await.clone() };
|
||||
|
||||
match games_folder {
|
||||
Some(games_folder) => {
|
||||
|
||||
@ -11,10 +11,7 @@ use gethostname::gethostname;
|
||||
use lanspread_compat::eti;
|
||||
use lanspread_db::db::{Game, GameDB};
|
||||
use lanspread_mdns::{
|
||||
DaemonEvent,
|
||||
LANSPREAD_INSTANCE_NAME,
|
||||
LANSPREAD_SERVICE_TYPE,
|
||||
MdnsAdvertiser,
|
||||
DaemonEvent, LANSPREAD_INSTANCE_NAME, LANSPREAD_SERVICE_TYPE, MdnsAdvertiser,
|
||||
};
|
||||
use tracing_subscriber::EnvFilter;
|
||||
use uuid::Uuid;
|
||||
@ -53,11 +50,10 @@ fn spawn_mdns_task(server_addr: SocketAddr) -> eyre::Result<()> {
|
||||
|
||||
tokio::spawn(async move {
|
||||
while let Ok(event) = mdns.monitor.recv() {
|
||||
tracing::debug!("mDNS: {:?}", &event);
|
||||
tracing::trace!("mDNS: {:?}", &event);
|
||||
if let DaemonEvent::Error(e) = event {
|
||||
tracing::error!("mDNS: {e}");
|
||||
tokio::time::sleep(Duration::from_secs(1)).await;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@ -171,10 +171,5 @@ fn get_relative_path(base: &Path, deep_path: &Path) -> std::io::Result<PathBuf>
|
||||
full_canonical
|
||||
.strip_prefix(&base_canonical)
|
||||
.map(std::path::Path::to_path_buf)
|
||||
.map_err(|_| {
|
||||
std::io::Error::new(
|
||||
std::io::ErrorKind::Other,
|
||||
"Path is not within base directory",
|
||||
)
|
||||
})
|
||||
.map_err(|_| std::io::Error::other("Path is not within base directory"))
|
||||
}
|
||||
|
||||
BIN
crates/lanspread-tauri-deno-ts/src-tauri/binaries/unrar-aarch64-apple-darwin
Executable file
BIN
crates/lanspread-tauri-deno-ts/src-tauri/binaries/unrar-aarch64-apple-darwin
Executable file
Binary file not shown.
@ -11,16 +11,16 @@ use lanspread_db::db::{Game, GameDB};
|
||||
use lanspread_mdns::{LANSPREAD_INSTANCE_NAME, LANSPREAD_SERVICE_TYPE, discover_service};
|
||||
use tauri::{AppHandle, Emitter as _, Manager};
|
||||
use tauri_plugin_shell::{ShellExt, process::Command};
|
||||
use tokio::sync::{Mutex, mpsc::UnboundedSender};
|
||||
use tokio::sync::{Mutex, RwLock, mpsc::UnboundedSender};
|
||||
|
||||
// Learn more about Tauri commands at https://tauri.app/develop/calling-rust/
|
||||
|
||||
struct LanSpreadState {
|
||||
server_addr: Mutex<Option<SocketAddr>>,
|
||||
server_addr: RwLock<Option<SocketAddr>>,
|
||||
client_ctrl: UnboundedSender<ClientCommand>,
|
||||
games: Arc<Mutex<GameDB>>,
|
||||
games: Arc<RwLock<GameDB>>,
|
||||
games_in_download: Arc<Mutex<HashSet<String>>>,
|
||||
games_folder: Arc<Mutex<String>>,
|
||||
games_folder: Arc<RwLock<String>>,
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
@ -71,7 +71,7 @@ fn run_as_admin(file: &str, params: &str, dir: &str) -> bool {
|
||||
PCWSTR::from_raw(file_wide.as_ptr()),
|
||||
PCWSTR::from_raw(params_wide.as_ptr()),
|
||||
PCWSTR::from_raw(dir_wide.as_ptr()),
|
||||
windows::Win32::UI::WindowsAndMessaging::SW_SHOWNORMAL,
|
||||
windows::Win32::UI::WindowsAndMessaging::SW_HIDE,
|
||||
)
|
||||
};
|
||||
|
||||
@ -85,7 +85,7 @@ fn run_game_windows(id: String, state: tauri::State<LanSpreadState>) {
|
||||
const FIRST_START_DONE_FILE: &str = ".softlan_first_start_done";
|
||||
|
||||
let games_folder =
|
||||
tauri::async_runtime::block_on(async { state.inner().games_folder.lock().await.clone() });
|
||||
tauri::async_runtime::block_on(async { state.inner().games_folder.read().await.clone() });
|
||||
|
||||
let games_folder = PathBuf::from(games_folder);
|
||||
if !games_folder.exists() {
|
||||
@ -143,7 +143,10 @@ fn run_game(id: String, state: tauri::State<LanSpreadState>) {
|
||||
run_game_windows(id, state);
|
||||
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
log::error!("run_game not implemented for this platform: id={id}, state={state:?}");
|
||||
{
|
||||
let _ = state;
|
||||
log::error!("run_game not implemented for this platform: id={id}");
|
||||
}
|
||||
}
|
||||
|
||||
fn set_game_install_state_from_path(game_db: &mut GameDB, path: &Path, installed: bool) {
|
||||
@ -177,7 +180,7 @@ fn update_game_directory(app_handle: tauri::AppHandle, path: String) {
|
||||
.state::<LanSpreadState>()
|
||||
.inner()
|
||||
.games_folder
|
||||
.lock()
|
||||
.write()
|
||||
.await;
|
||||
|
||||
*games_folder = path.clone();
|
||||
@ -202,7 +205,7 @@ fn update_game_directory(app_handle: tauri::AppHandle, path: String) {
|
||||
.state::<LanSpreadState>()
|
||||
.inner()
|
||||
.games
|
||||
.lock()
|
||||
.write()
|
||||
.await;
|
||||
|
||||
// Reset all games to uninstalled
|
||||
@ -236,11 +239,7 @@ async fn find_server(app: AppHandle) {
|
||||
Ok(server_addr) => {
|
||||
log::info!("Found server at {server_addr}");
|
||||
let state: tauri::State<LanSpreadState> = app.state();
|
||||
{
|
||||
// mutex scope
|
||||
let mut addr = state.server_addr.lock().await;
|
||||
*addr = Some(server_addr);
|
||||
}
|
||||
*state.server_addr.write().await = Some(server_addr);
|
||||
state
|
||||
.client_ctrl
|
||||
.send(ClientCommand::ServerAddr(server_addr))
|
||||
@ -263,8 +262,7 @@ async fn update_game_db(games: Vec<Game>, app: AppHandle) {
|
||||
let state = app.state::<LanSpreadState>();
|
||||
|
||||
// Store games list
|
||||
let mut state_games = state.games.lock().await;
|
||||
*state_games = GameDB::from(games.clone());
|
||||
*state.games.write().await = GameDB::from(games.clone());
|
||||
|
||||
// Tell Frontend about new games list
|
||||
if let Err(e) = app.emit("games-list-updated", Some(games)) {
|
||||
@ -358,11 +356,11 @@ pub fn run() {
|
||||
tokio::sync::mpsc::unbounded_channel::<ClientEvent>();
|
||||
|
||||
let lanspread_state = LanSpreadState {
|
||||
server_addr: Mutex::new(None),
|
||||
server_addr: RwLock::new(None),
|
||||
client_ctrl: tx_client_control,
|
||||
games: Arc::new(Mutex::new(GameDB::empty())),
|
||||
games: Arc::new(RwLock::new(GameDB::empty())),
|
||||
games_in_download: Arc::new(Mutex::new(HashSet::new())),
|
||||
games_folder: Arc::new(Mutex::new("".to_string())),
|
||||
games_folder: Arc::new(RwLock::new("".to_string())),
|
||||
};
|
||||
|
||||
tauri::Builder::default()
|
||||
@ -448,7 +446,7 @@ pub fn run() {
|
||||
.state::<LanSpreadState>()
|
||||
.inner()
|
||||
.games_folder
|
||||
.lock()
|
||||
.read()
|
||||
.await
|
||||
.clone();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user