* start new server settings tabs * update properties tab to match design * better stying in general tab * feat: add suffix input for hostname field * implement tables for allocations and DNS records * add tags for dns record type * small gap adjustment * polish advanced page * adjust properties page hierarchy * fix searching properties, empty state and projection radius appearing * pnpm prepr * update copy to match designs * fix suffix input component * style fixes and match heading size * small fix * fix search allocations placeholder * adjust table styles * move all installation settings helper text to below input * update icon to use overflow menu buttons * fix modal to be consistent * open advanced properties when search * remove other and custom properties, and update styles * remove hide/show all java versions * handle mc 26 * refactor: move server settings pages into /ui and add app ServerSettingsModal * hook up server pages for app * add server page header to app * hook up server settings modal * use large size * fix card box shadow style * fix hostname input for app * fix app/website card containers * implement external tabs for billing and admin billing * fix save banner fixed to parent instead of page body * remove unused prop to FriendsList causing warning in app * fix client-only not available for app * fix bottom cut off * wire node auth * implement full copy buttons * dedup copy button tailwind styles * fix hover class not working in @apply * fix spacing * fix error validation styles * apply consistent styles and spacing * feat: update hosting server card (#5609) * fix type errors * fix some stylesheets not imported for storybook * add server listing stories * add fix for frontend stylesheet imports * remove props. * convert copy code to use tailwind * update server listing component styles * update server info label styles * start status/player count info label, more style updates and fixes * add new server card buttons * hook up server cards and implement updated styles * hook up on download button * fix tauri throwing error when api returns 204 No Content * hook up purchase server modal in app * fix upgrading state loading icon * pnpm prepr * filter out servers past 30 days after cancellation * do not apply opacity on lock or spiner icons * fix disabled server icon background * update pending change stage * handle known suspension states * refactor: reduce code duplication for server listing * update disabled state text color * fix loading icon color * clean up copy * fix disabled opacity for server card * update server listing files kept to be countdown * implement resubscribe modal * implement proper provisioning state for resubscribe * fix duplicate attribute and pnpm prepr * feat: add shared UI package auth DI * feat: update purchase server flow (#5714) * implement server list empty state component * fix stories and adjust spacing * implement select plan design refresh * implement auth for empty server list * use refs instead of reactive * pnpm prepr * fix auth usage for empty servers list * move app auth provider setup to src/providers/setup * pnpm prepr * fix max height * style fix * fix getCreds no auth is blocking api client * implement servers guest plan modal and signin which redirects back to modal's next step * refactor guest plan select logic into provider * implement sign in or create account popup * remove force empty serverList * add download button for suspended mod and generic * add handling for when user logs out * QA pass style fixes * more consistent page styles * fix duplicate export * refactor: remove all fallback stuff from resubscribe modal * implement shared download latest backup util * i18n pass * pnpm prepr * fix region being selected if ping failed * pnpm prepr * feat: servers in app finalization (#5744) * feat: start on shared console implementation into logs and overview pages * fix: terminal gap issues * feat: swap word wrap for full screen * fix: stats cards alignment * fix: stats * feat: fix console clear + remove copy * fix: lint * fix: use reset not clear * feat: shared server header & overview page for app and website (#5736) * feat: implement shared server header for app and website * feat: implement wrapped overview page with shared composable and hook it up * pnpm prepr * fix: bugs * qa: cleanup * feat: root.vue shared layout * feat: delete old options pages + fix discovery frontend * fix: discovery * fix: misc style/layout issues * fix page padding * fix: modal height jankiness * feat: implement server install content in app and server setup modal with DI * fix: spacing * remove servers in app feature flag * Revert "remove servers in app feature flag" This reverts commit 86e284c4bdd6fa42c3c8fbaf1efbec41f4d1c6d2. * fix: qa * feat: remove legacy components from apps/frontend/src/components/ui/servers --------- Co-authored-by: Calum H. (IMB11) <contact@cal.engineer> * qa pass (#5738) * fix: qa * feat: qa * fix: server icon fetch fails due to global node auth race condition overriding each other * fix: lint * fix: server icon upload/sync and centralize logic * fix: server settings modal not closing for server reset * fix: better server sorting * feat: copy address in server listing card * fix: notification panel in modal and when overlapping with action bar * fix: empty server list empty state flashing when refresh, fixed by adding isReady auth flag * feat: use floating action bar for save banner * fix: saving state in save bar * fix: edit server icon styling * fix: confirm modal to have consistent buttons * feat: loading animation for server panel + caching improvements for app * pnpm prepr * feat: search page deduplication (#5754) * fix: action bar behind modal * fix: remove warning modal for stopping * fix: server cards states * we hate webkit we hate webkit * fix: update allocation creation to not use modal * fix: properties tab spacing and styles * feat: add files tab copy * fix: advanced properties icon * fix: remove back to all servers link * feat: add files tab link in copy * fix: server header styles to be consistent with instance * fix: add header icons back * feat: update instance settings icon to be consistent * fix: icon container * feat: upload state persistence across tabs * fix: server labels text wrapping * fix: use surface-5 border * fix: loading spinner showing with onboarding below * feat: new server button shows purchase modal in website * fix: billing page not showing quarterly interval * fix: server downgrade not showing updated subscription notification * fix: server settings invalidate saved state and remove server context provider since its already provided in the page * pnpm prepr * add stripe publishable key to app build * feat: console highlighting * fix: rename servers title to modrinth hosting * feat: search fix * fix: qa/styles * fix: ip click active and remove power dont ask again * fix: qa * feat: highlighting fix console * fix: disable conflicts action * fix: error dismiss bug * feat: modal clarification * fix: files perms issue * fix: lint * feat: modal fix * enable show uptime * fix: add loading state to edit server icon * fix: notification panel take in has sidebar from settings * fix: consistency pass on app settings * fix: consistency pass on instance settings * pnpm prepr * fix: nagivate to billing button in app to go to website * fix: stripe return url in app causing app to open modrinth.com in tauri * refactor: better show polling UI code * fix: new server polling comparison to use server ids instead of length * fix: buttonstyled story * fix: button styling * fix: content.vue regression * feat: project url redirects * fix: breadcrumbs * fix: purchase with newly added card * fix: console ordering problems * fix: app-frontend missing env config and staging environment * fix: log syncing for instances and server panel accidentally * fix: QA issues * fix: server page loading state * fix: stats card logic * fix: lint * fix: qa * fix: console height padding * fix: terminal padding + loading indicator * feat: update medal server listing styling * fix: no upgrade button for medal server listing in app * fix: go to overview instead of content tab after onboarding * fix: qa * fix: teleport modals to body * fix: logs tab + qa * fix: local storage for user preferences * fix: qa loading indic * feat: considitonal debug and trace * fix: jump to top on install bug * feat: swap out server hard drive icon to server stack icon * feat: servers in app feature flag default true * fix: highlight row ufll * fix: webkit thing onto a tag * fix: input field * fix: clear fix * fix: lint * fix: fmt * feat: improve share modal and bring it back for sharing log * pnpm prepr * fix: menu overflowing * feat: remove servers in app feature flag * fix: server stat charts no longer showing color * fix: library nav no primary state * fix: better modal height and width * fix: highlighting bugs * fix: empty states * fix: delay import to fix overview page slow load on MacOS * fix: medal server listing too bright on light mode * fix: admon analysis + fix logs * fix: bug * fix: clear purchase intent from sign-in after closing modal * performance: improve server manage stats loading by splitting reactivity * fix: deploy + admon + disable highlighting * fix: clippy --------- Co-authored-by: tdgao <mr.trumgao@gmail.com> Co-authored-by: Truman Gao <106889354+tdgao@users.noreply.github.com> * feat: temp wrangler * fix: lint * fix: logs upload * fix: console empty state and admon regressions * fix: fields * feat: log deleting + prefetch for Logs.vue * feat: move delete before share * feat: clear endpoint * feat: we ball! --------- Co-authored-by: Calum H. <calum@modrinth.com> Co-authored-by: Calum H. (IMB11) <contact@cal.engineer>
868 lines
30 KiB
Rust
868 lines
30 KiB
Rust
use crate::event::emit::{emit_process, emit_profile};
|
|
#[cfg(feature = "tauri")]
|
|
use crate::event::{LogEvent, LogPayload};
|
|
use crate::event::{ProcessPayloadType, ProfilePayloadType};
|
|
use crate::profile;
|
|
use crate::util::io::IOError;
|
|
use crate::util::rpc::RpcServer;
|
|
use chrono::{DateTime, NaiveDateTime, TimeZone, Utc};
|
|
use dashmap::DashMap;
|
|
use quick_xml::Reader;
|
|
use quick_xml::events::Event;
|
|
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
use std::collections::VecDeque;
|
|
use std::fmt::Debug;
|
|
use std::fs::OpenOptions;
|
|
use std::io::Write;
|
|
use std::path::{Path, PathBuf};
|
|
use std::process::ExitStatus;
|
|
use std::sync::LazyLock;
|
|
#[cfg(feature = "tauri")]
|
|
use tauri::Emitter;
|
|
use tempfile::TempDir;
|
|
use tokio::io::{AsyncBufReadExt, BufReader};
|
|
use tokio::process::{Child, Command};
|
|
use uuid::Uuid;
|
|
|
|
const LAUNCHER_LOG_PATH: &str = "launcher_log.txt";
|
|
const LOG_BUFFER_CAPACITY: usize = 50_000;
|
|
|
|
struct LogRingBuffer {
|
|
lines: VecDeque<String>,
|
|
}
|
|
|
|
impl LogRingBuffer {
|
|
fn new() -> Self {
|
|
Self {
|
|
lines: VecDeque::new(),
|
|
}
|
|
}
|
|
|
|
fn push(&mut self, line: String) {
|
|
if self.lines.len() >= LOG_BUFFER_CAPACITY {
|
|
self.lines.pop_front();
|
|
}
|
|
self.lines.push_back(line);
|
|
}
|
|
|
|
fn get_all(&self) -> Vec<String> {
|
|
self.lines.iter().cloned().collect()
|
|
}
|
|
|
|
fn clear(&mut self) {
|
|
self.lines.clear();
|
|
}
|
|
}
|
|
|
|
static LOG_BUFFERS: LazyLock<DashMap<String, LogRingBuffer>> =
|
|
LazyLock::new(DashMap::new);
|
|
|
|
pub fn push_log_line(profile_path: &str, line: String) {
|
|
LOG_BUFFERS
|
|
.entry(profile_path.to_string())
|
|
.or_insert_with(LogRingBuffer::new)
|
|
.push(line);
|
|
}
|
|
|
|
pub fn get_log_buffer(profile_path: &str) -> Vec<String> {
|
|
LOG_BUFFERS
|
|
.get(profile_path)
|
|
.map(|buf| buf.get_all())
|
|
.unwrap_or_default()
|
|
}
|
|
|
|
pub fn clear_log_buffer(profile_path: &str) {
|
|
if let Some(mut buf) = LOG_BUFFERS.get_mut(profile_path) {
|
|
buf.clear();
|
|
}
|
|
}
|
|
|
|
pub fn remove_log_buffer(profile_path: &str) {
|
|
LOG_BUFFERS.remove(profile_path);
|
|
}
|
|
|
|
pub struct ProcessManager {
|
|
processes: DashMap<Uuid, Process>,
|
|
}
|
|
|
|
impl Default for ProcessManager {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
impl ProcessManager {
|
|
pub fn new() -> Self {
|
|
Self {
|
|
processes: DashMap::new(),
|
|
}
|
|
}
|
|
|
|
#[allow(clippy::too_many_arguments)]
|
|
pub async fn insert_new_process(
|
|
&self,
|
|
profile_path: &str,
|
|
mut mc_command: Command,
|
|
post_exit_command: Option<String>,
|
|
logs_folder: PathBuf,
|
|
xml_logging: bool,
|
|
main_class_keep_alive: TempDir,
|
|
rpc_server: RpcServer,
|
|
post_process_init: impl AsyncFnOnce(
|
|
&ProcessMetadata,
|
|
&RpcServer,
|
|
) -> crate::Result<()>,
|
|
) -> crate::Result<ProcessMetadata> {
|
|
mc_command.stdout(std::process::Stdio::piped());
|
|
mc_command.stderr(std::process::Stdio::piped());
|
|
mc_command.stdin(std::process::Stdio::piped());
|
|
|
|
let mut mc_proc = mc_command.spawn().map_err(IOError::from)?;
|
|
|
|
let stdout = mc_proc.stdout.take();
|
|
let stderr = mc_proc.stderr.take();
|
|
|
|
let mut process = Process {
|
|
metadata: ProcessMetadata {
|
|
uuid: Uuid::new_v4(),
|
|
start_time: Utc::now(),
|
|
profile_path: profile_path.to_string(),
|
|
},
|
|
child: mc_proc,
|
|
rpc_server,
|
|
_main_class_keep_alive: main_class_keep_alive,
|
|
};
|
|
|
|
if let Err(e) =
|
|
post_process_init(&process.metadata, &process.rpc_server).await
|
|
{
|
|
tracing::error!("Failed to run post-process init: {e}");
|
|
let _ = process.child.kill().await;
|
|
return Err(e);
|
|
}
|
|
|
|
let metadata = process.metadata.clone();
|
|
|
|
if !logs_folder.exists() {
|
|
tokio::fs::create_dir_all(&logs_folder)
|
|
.await
|
|
.map_err(|e| IOError::with_path(e, &logs_folder))?;
|
|
}
|
|
|
|
let log_path = logs_folder.join(LAUNCHER_LOG_PATH);
|
|
|
|
clear_log_buffer(profile_path);
|
|
|
|
{
|
|
let mut log_file = OpenOptions::new()
|
|
.write(true)
|
|
.create(true)
|
|
.truncate(true)
|
|
.open(&log_path)
|
|
.map_err(|e| IOError::with_path(e, &log_path))?;
|
|
|
|
// Initialize with timestamp header
|
|
let now = chrono::Local::now();
|
|
writeln!(
|
|
log_file,
|
|
"# Minecraft launcher log started at {}",
|
|
now.format("%Y-%m-%d %H:%M:%S")
|
|
)
|
|
.map_err(|e| IOError::with_path(e, &log_path))?;
|
|
writeln!(log_file, "# Profile: {profile_path} \n")
|
|
.map_err(|e| IOError::with_path(e, &log_path))?;
|
|
writeln!(log_file).map_err(|e| IOError::with_path(e, &log_path))?;
|
|
}
|
|
|
|
if let Some(stdout) = stdout {
|
|
let log_path_clone = log_path.clone();
|
|
|
|
let profile_path = metadata.profile_path.clone();
|
|
tokio::spawn(async move {
|
|
Process::process_output(
|
|
&profile_path,
|
|
stdout,
|
|
log_path_clone,
|
|
xml_logging,
|
|
)
|
|
.await;
|
|
});
|
|
}
|
|
|
|
if let Some(stderr) = stderr {
|
|
let log_path_clone = log_path.clone();
|
|
|
|
let profile_path = metadata.profile_path.clone();
|
|
tokio::spawn(async move {
|
|
Process::process_output(
|
|
&profile_path,
|
|
stderr,
|
|
log_path_clone,
|
|
xml_logging,
|
|
)
|
|
.await;
|
|
});
|
|
}
|
|
|
|
tokio::spawn(Process::sequential_process_manager(
|
|
profile_path.to_string(),
|
|
post_exit_command,
|
|
metadata.uuid,
|
|
));
|
|
|
|
self.processes.insert(process.metadata.uuid, process);
|
|
|
|
emit_process(
|
|
profile_path,
|
|
metadata.uuid,
|
|
ProcessPayloadType::Launched,
|
|
"Launched Minecraft",
|
|
)
|
|
.await?;
|
|
|
|
Ok(metadata)
|
|
}
|
|
|
|
pub fn get(&self, id: Uuid) -> Option<ProcessMetadata> {
|
|
self.processes.get(&id).map(|x| x.metadata.clone())
|
|
}
|
|
|
|
pub fn get_rpc(&self, id: Uuid) -> Option<RpcServer> {
|
|
self.processes.get(&id).map(|x| x.rpc_server.clone())
|
|
}
|
|
|
|
pub fn get_all(&self) -> Vec<ProcessMetadata> {
|
|
self.processes
|
|
.iter()
|
|
.map(|x| x.value().metadata.clone())
|
|
.collect()
|
|
}
|
|
|
|
pub fn try_wait(
|
|
&self,
|
|
id: Uuid,
|
|
) -> crate::Result<Option<Option<ExitStatus>>> {
|
|
if let Some(mut process) = self.processes.get_mut(&id) {
|
|
Ok(Some(process.child.try_wait()?))
|
|
} else {
|
|
Ok(None)
|
|
}
|
|
}
|
|
|
|
pub async fn wait_for(&self, id: Uuid) -> crate::Result<()> {
|
|
if let Some(mut process) = self.processes.get_mut(&id) {
|
|
process.child.wait().await?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
pub async fn kill(&self, id: Uuid) -> crate::Result<()> {
|
|
if let Some(mut process) = self.processes.get_mut(&id) {
|
|
process.child.kill().await?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn remove(&self, id: Uuid) {
|
|
self.processes.remove(&id);
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Deserialize, Serialize, Clone)]
|
|
pub struct ProcessMetadata {
|
|
pub uuid: Uuid,
|
|
pub profile_path: String,
|
|
pub start_time: DateTime<Utc>,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
struct Process {
|
|
metadata: ProcessMetadata,
|
|
child: Child,
|
|
_main_class_keep_alive: TempDir,
|
|
rpc_server: RpcServer,
|
|
}
|
|
|
|
#[derive(Debug, Default, Serialize, Clone)]
|
|
pub struct Log4jEvent {
|
|
pub timestamp_millis: Option<i64>,
|
|
pub logger_name: Option<String>,
|
|
pub level: Option<String>,
|
|
pub thread_name: Option<String>,
|
|
pub message: Option<String>,
|
|
pub throwable: Option<String>,
|
|
}
|
|
|
|
impl Process {
|
|
async fn process_output<R>(
|
|
profile_path: &str,
|
|
reader: R,
|
|
log_path: impl AsRef<Path>,
|
|
xml_logging: bool,
|
|
) where
|
|
R: tokio::io::AsyncRead + Unpin,
|
|
{
|
|
let mut buf_reader = BufReader::new(reader);
|
|
|
|
if xml_logging {
|
|
let mut reader = Reader::from_reader(buf_reader);
|
|
reader.config_mut().enable_all_checks(false);
|
|
|
|
let mut buf = Vec::new();
|
|
let mut current_event = Log4jEvent::default();
|
|
let mut in_event = false;
|
|
let mut in_message = false;
|
|
let mut in_throwable = false;
|
|
let mut current_content = String::new();
|
|
|
|
loop {
|
|
match reader.read_event_into_async(&mut buf).await {
|
|
Err(e) => {
|
|
tracing::error!(
|
|
"Error at position {}: {:?}",
|
|
reader.buffer_position(),
|
|
e
|
|
);
|
|
break;
|
|
}
|
|
// exits the loop when reaching end of file
|
|
Ok(Event::Eof) => break,
|
|
|
|
Ok(Event::Start(e)) => {
|
|
match e.name().as_ref() {
|
|
b"log4j:Event" => {
|
|
// Reset for new event
|
|
current_event = Log4jEvent::default();
|
|
in_event = true;
|
|
|
|
// Extract attributes
|
|
for attr in e.attributes().flatten() {
|
|
let key = String::from_utf8_lossy(
|
|
attr.key.into_inner(),
|
|
)
|
|
.to_string();
|
|
let value =
|
|
String::from_utf8_lossy(&attr.value)
|
|
.to_string();
|
|
|
|
match key.as_str() {
|
|
"logger" => {
|
|
current_event.logger_name =
|
|
Some(value)
|
|
}
|
|
"level" => {
|
|
current_event.level = Some(value)
|
|
}
|
|
"thread" => {
|
|
current_event.thread_name =
|
|
Some(value)
|
|
}
|
|
"timestamp" => {
|
|
current_event.timestamp_millis =
|
|
value.parse::<i64>().ok()
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
}
|
|
b"log4j:Message" => {
|
|
in_message = true;
|
|
current_content = String::new();
|
|
}
|
|
b"log4j:Throwable" => {
|
|
in_throwable = true;
|
|
current_content = String::new();
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
Ok(Event::End(e)) => {
|
|
match e.name().as_ref() {
|
|
b"log4j:Message" => {
|
|
in_message = false;
|
|
current_event.message =
|
|
Some(current_content.clone());
|
|
}
|
|
b"log4j:Throwable" => {
|
|
in_throwable = false;
|
|
current_event.throwable =
|
|
if current_content.is_empty() {
|
|
None
|
|
} else {
|
|
Some(current_content.clone())
|
|
};
|
|
|
|
// Write log entry + throwable to file
|
|
if let Some(formatted_log) =
|
|
Self::format_log4j_entry(¤t_event)
|
|
{
|
|
if let Err(e) = Process::append_to_log_file(
|
|
&log_path,
|
|
&formatted_log,
|
|
) {
|
|
tracing::error!(
|
|
"Failed to write to log file: {}",
|
|
e
|
|
);
|
|
}
|
|
|
|
if let Some(ref throwable) =
|
|
current_event.throwable
|
|
&& let Err(e) =
|
|
Process::append_to_log_file(
|
|
&log_path, throwable,
|
|
)
|
|
{
|
|
tracing::error!(
|
|
"Failed to write throwable to log file: {}",
|
|
e
|
|
);
|
|
}
|
|
}
|
|
|
|
Self::emit_log4j_event(
|
|
profile_path,
|
|
¤t_event,
|
|
);
|
|
}
|
|
b"log4j:Event" => {
|
|
in_event = false;
|
|
// If no throwable was present, write the log entry at the end of the event
|
|
if current_event.message.is_some()
|
|
&& current_event.throwable.is_none()
|
|
{
|
|
if let Some(formatted_log) =
|
|
Self::format_log4j_entry(¤t_event)
|
|
&& let Err(e) =
|
|
Process::append_to_log_file(
|
|
&log_path,
|
|
&formatted_log,
|
|
)
|
|
{
|
|
tracing::error!(
|
|
"Failed to write to log file: {}",
|
|
e
|
|
);
|
|
}
|
|
|
|
if let Some(timestamp_millis) =
|
|
current_event.timestamp_millis
|
|
{
|
|
let timestamp =
|
|
timestamp_millis.to_string();
|
|
let message = current_event
|
|
.message
|
|
.as_deref()
|
|
.unwrap_or("")
|
|
.trim();
|
|
if let Err(e) = Self::maybe_handle_server_join_logging(
|
|
profile_path,
|
|
×tamp,
|
|
message,
|
|
).await {
|
|
tracing::error!("Failed to handle server join logging: {e}");
|
|
}
|
|
}
|
|
|
|
Self::emit_log4j_event(
|
|
profile_path,
|
|
¤t_event,
|
|
);
|
|
}
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
Ok(Event::Text(mut e)) => {
|
|
if in_message || in_throwable {
|
|
if let Ok(text) = e.xml_content() {
|
|
current_content.push_str(&text);
|
|
}
|
|
} else if !in_event
|
|
&& !e.inplace_trim_end()
|
|
&& !e.inplace_trim_start()
|
|
&& let Ok(text) = e.xml_content()
|
|
{
|
|
if let Err(e) = Process::append_to_log_file(
|
|
&log_path,
|
|
&format!("{text}\n"),
|
|
) {
|
|
tracing::error!(
|
|
"Failed to write to log file: {}",
|
|
e
|
|
);
|
|
}
|
|
Self::emit_legacy_log(profile_path, &text);
|
|
}
|
|
}
|
|
Ok(Event::CData(e)) => {
|
|
if (in_message || in_throwable)
|
|
&& let Ok(text) = e.xml_content()
|
|
{
|
|
current_content.push_str(&text);
|
|
}
|
|
}
|
|
_ => (),
|
|
}
|
|
|
|
buf.clear();
|
|
}
|
|
} else {
|
|
let mut line = String::new();
|
|
|
|
while let Ok(bytes_read) = buf_reader.read_line(&mut line).await {
|
|
if bytes_read == 0 {
|
|
break; // End of stream
|
|
}
|
|
|
|
if !line.is_empty() {
|
|
if let Err(e) = Self::append_to_log_file(&log_path, &line) {
|
|
tracing::warn!("Failed to write to log file: {}", e);
|
|
}
|
|
Self::emit_legacy_log(profile_path, line.trim_ascii_end());
|
|
if let Err(e) = Self::maybe_handle_old_server_join_logging(
|
|
profile_path,
|
|
line.trim_ascii_end(),
|
|
)
|
|
.await
|
|
{
|
|
tracing::error!(
|
|
"Failed to handle old server join logging: {e}"
|
|
);
|
|
}
|
|
}
|
|
|
|
line.clear();
|
|
}
|
|
}
|
|
}
|
|
|
|
fn format_timestamp(timestamp_millis: Option<i64>) -> String {
|
|
if let Some(timestamp_val) = timestamp_millis {
|
|
let datetime_utc = if timestamp_val > i32::MAX as i64 {
|
|
let secs = timestamp_val / 1000;
|
|
let nsecs = ((timestamp_val % 1000) * 1_000_000) as u32;
|
|
|
|
chrono::DateTime::<Utc>::from_timestamp(secs, nsecs)
|
|
.unwrap_or_default()
|
|
} else {
|
|
chrono::DateTime::<Utc>::from_timestamp_secs(timestamp_val)
|
|
.unwrap_or_default()
|
|
};
|
|
|
|
let datetime_local = datetime_utc.with_timezone(&chrono::Local);
|
|
format!("[{}]", datetime_local.format("%H:%M:%S"))
|
|
} else {
|
|
"[??:??:??]".to_string()
|
|
}
|
|
}
|
|
|
|
fn format_log4j_entry(event: &Log4jEvent) -> Option<String> {
|
|
let message = event.message.as_ref()?;
|
|
let thread = event.thread_name.as_deref().unwrap_or("");
|
|
let level = event.level.as_deref().unwrap_or("");
|
|
let logger = event.logger_name.as_deref().unwrap_or("");
|
|
let formatted_time = Self::format_timestamp(event.timestamp_millis);
|
|
|
|
Some(format!(
|
|
"{} [{}] [{}{}]: {}\n",
|
|
formatted_time,
|
|
thread,
|
|
if !logger.is_empty() {
|
|
format!("{logger}/")
|
|
} else {
|
|
String::new()
|
|
},
|
|
level,
|
|
message.trim()
|
|
))
|
|
}
|
|
|
|
fn emit_log4j_event(profile_path: &str, event: &Log4jEvent) {
|
|
if let Some(formatted) = Self::format_log4j_entry(event) {
|
|
push_log_line(profile_path, formatted.trim_end().to_string());
|
|
}
|
|
if let Some(ref throwable) = event.throwable {
|
|
for line in throwable.lines().filter(|l| !l.is_empty()) {
|
|
push_log_line(profile_path, line.to_string());
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "tauri")]
|
|
{
|
|
if let Ok(event_state) = crate::EventState::get() {
|
|
let _ = event_state.app.emit(
|
|
"log",
|
|
LogPayload {
|
|
profile_path_id: profile_path.to_string(),
|
|
event: LogEvent::Log4j(event.clone()),
|
|
},
|
|
);
|
|
}
|
|
}
|
|
#[cfg(not(feature = "tauri"))]
|
|
{
|
|
let _ = (profile_path, event);
|
|
}
|
|
}
|
|
|
|
fn emit_legacy_log(profile_path: &str, message: &str) {
|
|
push_log_line(profile_path, message.to_string());
|
|
|
|
#[cfg(feature = "tauri")]
|
|
{
|
|
if let Ok(event_state) = crate::EventState::get() {
|
|
let _ = event_state.app.emit(
|
|
"log",
|
|
LogPayload {
|
|
profile_path_id: profile_path.to_string(),
|
|
event: LogEvent::Legacy {
|
|
message: message.to_string(),
|
|
},
|
|
},
|
|
);
|
|
}
|
|
}
|
|
#[cfg(not(feature = "tauri"))]
|
|
{
|
|
let _ = (profile_path, message);
|
|
}
|
|
}
|
|
|
|
fn append_to_log_file(
|
|
path: impl AsRef<Path>,
|
|
line: &str,
|
|
) -> std::io::Result<()> {
|
|
let mut file =
|
|
OpenOptions::new().append(true).create(true).open(path)?;
|
|
|
|
file.write_all(line.as_bytes())?;
|
|
Ok(())
|
|
}
|
|
|
|
async fn maybe_handle_server_join_logging(
|
|
profile_path: &str,
|
|
timestamp: &str,
|
|
message: &str,
|
|
) -> crate::Result<()> {
|
|
let timestamp = timestamp
|
|
.parse::<i64>()
|
|
.map(|x| x / 1000)
|
|
.map_err(|x| {
|
|
crate::ErrorKind::OtherError(format!(
|
|
"Failed to parse timestamp: {x}"
|
|
))
|
|
})
|
|
.and_then(|x| {
|
|
Utc.timestamp_opt(x, 0).single().ok_or_else(|| {
|
|
crate::ErrorKind::OtherError(
|
|
"Failed to convert timestamp to DateTime".to_string(),
|
|
)
|
|
})
|
|
})?;
|
|
Self::parse_and_insert_server_join(profile_path, message, timestamp)
|
|
.await
|
|
}
|
|
|
|
async fn maybe_handle_old_server_join_logging(
|
|
profile_path: &str,
|
|
line: &str,
|
|
) -> crate::Result<()> {
|
|
if let Some((timestamp, message)) = line.split_once(" [CLIENT] [INFO] ")
|
|
{
|
|
let timestamp =
|
|
NaiveDateTime::parse_from_str(timestamp, "%Y-%m-%d %H:%M:%S")?
|
|
.and_local_timezone(chrono::Local)
|
|
.map(|x| x.to_utc())
|
|
.single()
|
|
.unwrap_or_else(Utc::now);
|
|
Self::parse_and_insert_server_join(profile_path, message, timestamp)
|
|
.await
|
|
} else {
|
|
Self::parse_and_insert_server_join(profile_path, line, Utc::now())
|
|
.await
|
|
}
|
|
}
|
|
|
|
async fn parse_and_insert_server_join(
|
|
profile_path: &str,
|
|
message: &str,
|
|
timestamp: DateTime<Utc>,
|
|
) -> crate::Result<()> {
|
|
let Some(host_port_string) = message.strip_prefix("Connecting to ")
|
|
else {
|
|
return Ok(());
|
|
};
|
|
let Some((host, port_string)) = host_port_string.rsplit_once(", ")
|
|
else {
|
|
return Ok(());
|
|
};
|
|
let Some(port) = port_string.parse::<u16>().ok() else {
|
|
return Ok(());
|
|
};
|
|
|
|
let state = crate::State::get().await?;
|
|
crate::state::server_join_log::JoinLogEntry {
|
|
profile_path: profile_path.to_owned(),
|
|
host: host.to_string(),
|
|
port,
|
|
join_time: timestamp,
|
|
}
|
|
.upsert(&state.pool)
|
|
.await?;
|
|
{
|
|
let profile_path = profile_path.to_owned();
|
|
let host = host.to_owned();
|
|
tokio::spawn(async move {
|
|
let _ = emit_profile(
|
|
&profile_path,
|
|
ProfilePayloadType::ServerJoined {
|
|
host,
|
|
port,
|
|
timestamp,
|
|
},
|
|
)
|
|
.await;
|
|
});
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
// Spawns a new child process and inserts it into the hashmap
|
|
// Also, as the process ends, it spawns the follow-up process if it exists
|
|
// By convention, ExitStatus is last command's exit status, and we exit on the first non-zero exit status
|
|
async fn sequential_process_manager(
|
|
profile_path: String,
|
|
post_exit_command: Option<String>,
|
|
uuid: Uuid,
|
|
) -> crate::Result<()> {
|
|
async fn update_playtime(
|
|
last_updated_playtime: &mut DateTime<Utc>,
|
|
profile_path: &str,
|
|
force_update: bool,
|
|
) {
|
|
let diff = Utc::now()
|
|
.signed_duration_since(*last_updated_playtime)
|
|
.num_seconds();
|
|
if diff >= 60 || force_update {
|
|
if let Err(e) = profile::edit(profile_path, |prof| {
|
|
prof.recent_time_played += diff as u64;
|
|
async { Ok(()) }
|
|
})
|
|
.await
|
|
{
|
|
tracing::warn!(
|
|
"Failed to update playtime for profile {}: {}",
|
|
&profile_path,
|
|
e
|
|
);
|
|
}
|
|
*last_updated_playtime = Utc::now();
|
|
}
|
|
}
|
|
|
|
// Wait on current Minecraft Child
|
|
let mc_exit_status;
|
|
let mut last_updated_playtime = Utc::now();
|
|
|
|
let state = crate::State::get().await?;
|
|
loop {
|
|
if let Some(process) = state.process_manager.try_wait(uuid)? {
|
|
if let Some(t) = process {
|
|
mc_exit_status = t;
|
|
break;
|
|
}
|
|
} else {
|
|
mc_exit_status = ExitStatus::default();
|
|
break;
|
|
}
|
|
|
|
// sleep for 10ms
|
|
tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;
|
|
|
|
// Auto-update playtime every minute
|
|
update_playtime(&mut last_updated_playtime, &profile_path, false)
|
|
.await;
|
|
}
|
|
|
|
state.process_manager.remove(uuid);
|
|
emit_process(
|
|
&profile_path,
|
|
uuid,
|
|
ProcessPayloadType::Finished,
|
|
"Exited process",
|
|
)
|
|
.await?;
|
|
|
|
// Now fully complete- update playtime one last time
|
|
update_playtime(&mut last_updated_playtime, &profile_path, true).await;
|
|
|
|
// Publish play time update
|
|
// Allow failure, it will be stored locally and sent next time
|
|
// Sent in another thread as first call may take a couple seconds and hold up process ending
|
|
let profile = profile_path.clone();
|
|
tokio::spawn(async move {
|
|
if let Err(e) = profile::try_update_playtime(&profile).await {
|
|
tracing::warn!(
|
|
"Failed to update playtime for profile {}: {}",
|
|
profile,
|
|
e
|
|
);
|
|
}
|
|
});
|
|
|
|
let logs_folder = state.directories.profile_logs_dir(&profile_path);
|
|
let log_path = logs_folder.join(LAUNCHER_LOG_PATH);
|
|
|
|
if log_path.exists()
|
|
&& let Err(e) = Process::append_to_log_file(
|
|
&log_path,
|
|
&format!("\n# Process exited with status: {mc_exit_status}\n"),
|
|
)
|
|
{
|
|
tracing::warn!("Failed to write exit status to log file: {}", e);
|
|
}
|
|
|
|
let _ = state.discord_rpc.clear_to_default(true).await;
|
|
|
|
let _ = state.friends_socket.update_status(None).await;
|
|
|
|
// If in tauri, window should show itself again after process exists if it was hidden
|
|
#[cfg(feature = "tauri")]
|
|
{
|
|
let window = crate::EventState::get_main_window().await?;
|
|
if let Some(window) = window {
|
|
window.unminimize()?;
|
|
window.set_focus()?;
|
|
}
|
|
}
|
|
|
|
if mc_exit_status.success() {
|
|
// We do not wait on the post exist command to finish running! We let it spawn + run on its own.
|
|
// This behaviour may be changed in the future
|
|
if let Some(hook) = post_exit_command {
|
|
let mut cmd = shlex::split(&hook)
|
|
.ok_or_else(|| {
|
|
crate::ErrorKind::LauncherError(format!(
|
|
"Invalid post-exit command: {hook}",
|
|
))
|
|
})?
|
|
.into_iter();
|
|
|
|
if let Some(command) = cmd.next() {
|
|
let mut command = Command::new(command);
|
|
command.args(cmd).current_dir(
|
|
profile::get_full_path(&profile_path).await?,
|
|
);
|
|
command.spawn().map_err(IOError::from)?;
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|