You've already forked AstralRinth
* Add launcher_feature_version to Profile * Misc fixes - Add typing to theme and settings stuff - Push instance route on creation from installing a modpack - Fixed servers not reloading properly when first added * Make old instances scan the logs folder for joined servers on launcher startup * Create AttachedWorldData * Change AttachedWorldData interface * Rename WorldType::World to WorldType::Singleplayer * Implement world display status system * Fix Minecraft font * Fix set_world_display_status Tauri error * Add 'Play instance' option * Add option to disable worlds showing in Home * Fixes - Fix available server filter only showing if there are some available - Fixed server and singleplayer filters sometimes showing when there are only servers or singleplayer worlds - Fixed new worlds not being automatically added when detected - Rephrased Jump back into worlds option description * Fixed sometimes more than 6 items showing up in Jump back in * Fix servers.dat issue with instances you haven't played before * Update a bunch of app dependencies in non-breaking ways * Update dependencies in app-lib that had breaking updates * Update dependencies in app that had breaking updates * Fix too large of bulk requests being made, limit max to 800 #3430 * Also update tauri-plugin-opener * Update app-lib to Rust 2024 * Non-breaking updates in ariadne * Breaking updates in ariadne * Ariadne Rust 2024 * Add hiding from home page, add types to Mods.vue * Make recent worlds go into grid when display is huge * Fix lint * Remove redundant media query * Fix protocol version on home page, and home page being blocked by pinging servers * Clippy fix in app-lib * Clippy fix in app * Clippy fix * More Clippy fixes * Fix Prettier lints * Undo `from_string` changes * Update macos dependencies * Apply updates to app-playground as well * Update Wry + Tauri * Update sysinfo * Update theseus_gui to Rust 2024 * Downgrade rand in ariadne to fix labrinth Labrinth can't use rand 0.9 due to argon2 * Cargo format --------- Signed-off-by: Josiah Glosson <soujournme@gmail.com> Co-authored-by: Prospector <prospectordev@gmail.com> Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com> Co-authored-by: Alejandro González <me@alegon.dev>
62 lines
1.7 KiB
Rust
62 lines
1.7 KiB
Rust
use crate::state::FriendsSocket;
|
|
use crate::state::friends::{TunnelSockets, WriteSocket};
|
|
use ariadne::networking::message::ClientToServerMessage;
|
|
use std::net::SocketAddr;
|
|
use std::sync::Arc;
|
|
use tokio::io::AsyncWriteExt;
|
|
use tokio::net::tcp::OwnedWriteHalf;
|
|
use tokio::sync::Mutex;
|
|
use uuid::Uuid;
|
|
|
|
pub(super) enum InternalTunnelSocket {
|
|
Listening(SocketAddr),
|
|
Connected(Mutex<OwnedWriteHalf>),
|
|
}
|
|
|
|
pub struct TunnelSocket {
|
|
pub(super) socket_id: Uuid,
|
|
pub(super) write: WriteSocket,
|
|
pub(super) sockets: TunnelSockets,
|
|
pub(super) internal: Arc<InternalTunnelSocket>,
|
|
}
|
|
|
|
impl TunnelSocket {
|
|
pub fn socket_id(&self) -> Uuid {
|
|
self.socket_id
|
|
}
|
|
|
|
pub async fn shutdown(self) -> crate::Result<()> {
|
|
if self.sockets.remove(&self.socket_id).is_some() {
|
|
FriendsSocket::send_message(
|
|
&self.write,
|
|
ClientToServerMessage::SocketClose {
|
|
socket: self.socket_id,
|
|
},
|
|
)
|
|
.await?;
|
|
if let InternalTunnelSocket::Connected(ref stream) =
|
|
*self.internal.clone()
|
|
{
|
|
stream.lock().await.shutdown().await?
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl Drop for TunnelSocket {
|
|
fn drop(&mut self) {
|
|
if self.sockets.remove(&self.socket_id).is_some() {
|
|
let write = self.write.clone();
|
|
let socket_id = self.socket_id;
|
|
tokio::spawn(async move {
|
|
let _ = FriendsSocket::send_message(
|
|
&write,
|
|
ClientToServerMessage::SocketClose { socket: socket_id },
|
|
)
|
|
.await;
|
|
});
|
|
}
|
|
}
|
|
}
|