MrSphay/Modrinth-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: server management in app (#5628)

Browse Source 
* 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>
This commit is contained in:
Truman Gao
2026-04-12 15:38:08 -06:00
committed by GitHub
parent a2a97d1313
commit 693a371d61
278 changed files with 15974 additions and 12608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/app-lib/src/api/logs.rs
View File

@@ -299,6 +299,26 @@ pub async fn delete_logs_by_filename(
Ok(())
}
#[tracing::instrument]
pub async fn get_live_log_buffer(
profile_path: &str,
) -> crate::Result<CensoredString> {
let state = State::get().await?;
let lines = crate::state::get_log_buffer(profile_path);
let joined = lines.join("\n");
let credentials = Credentials::get_all(&state.pool)
.await?
.into_iter()
.map(|x| x.1)
.collect::<Vec<_>>();
Ok(CensoredString::censor(joined, &credentials))
}
pub fn clear_live_log_buffer(profile_path: &str) {
crate::state::remove_log_buffer(profile_path);
}
#[tracing::instrument]
pub async fn get_latest_log_cursor(
profile_path: &str,

23
packages/app-lib/src/event/mod.rs
View File

@@ -270,6 +270,29 @@ pub enum FriendPayload {
StatusSync,
}
#[cfg(feature = "tauri")]
pub use self::log_types::*;
#[cfg(feature = "tauri")]
mod log_types {
use crate::state::Log4jEvent;
use serde::Serialize;
#[derive(Serialize, Clone)]
#[serde(tag = "type", rename_all = "snake_case")]
pub enum LogEvent {
Log4j(Log4jEvent),
Legacy { message: String },
}
#[derive(Serialize, Clone)]
pub struct LogPayload {
pub profile_path_id: String,
#[serde(flatten)]
pub event: LogEvent,
}
}
#[derive(Debug, thiserror::Error)]
pub enum EventError {
#[error("Event state was not properly initialized")]

335
packages/app-lib/src/state/process.rs
View File

@@ -1,4 +1,6 @@
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;
@@ -9,17 +11,76 @@ 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>,
@@ -91,6 +152,8 @@ impl ProcessManager {
let log_path = logs_folder.join(LAUNCHER_LOG_PATH);
clear_log_buffer(profile_path);
{
let mut log_file = OpenOptions::new()
.write(true)
@@ -222,13 +285,14 @@ struct Process {
rpc_server: RpcServer,
}
#[derive(Debug, Default)]
struct Log4jEvent {
timestamp: Option<String>,
logger: Option<String>,
level: Option<String>,
thread: Option<String>,
message: Option<String>,
#[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 {
@@ -285,17 +349,19 @@ impl Process {
match key.as_str() {
"logger" => {
current_event.logger = Some(value)
current_event.logger_name =
Some(value)
}
"level" => {
current_event.level = Some(value)
}
"thread" => {
current_event.thread = Some(value)
current_event.thread_name =
Some(value)
}
"timestamp" => {
current_event.timestamp =
Some(value)
current_event.timestamp_millis =
value.parse::<i64>().ok()
}
_ => {}
}
@@ -321,39 +387,17 @@ impl Process {
}
b"log4j:Throwable" => {
in_throwable = false;
// Process and write the log entry
let thread = current_event
.thread
.as_deref()
.unwrap_or("");
let level = current_event
.level
.as_deref()
.unwrap_or("");
let logger = current_event
.logger
.as_deref()
.unwrap_or("");
current_event.throwable =
if current_content.is_empty() {
None
} else {
Some(current_content.clone())
};
if let Some(message) = &current_event.message {
let formatted_time =
Process::format_timestamp(
current_event.timestamp.as_deref(),
);
let formatted_log = format!(
"{} [{}] [{}{}]: {}\n",
formatted_time,
thread,
if !logger.is_empty() {
format!("{logger}/")
} else {
String::new()
},
level,
message.trim()
);
// Write the log message
// Write log entry + throwable to file
if let Some(formatted_log) =
Self::format_log4j_entry(&current_event)
{
if let Err(e) = Process::append_to_log_file(
&log_path,
&formatted_log,
@@ -364,12 +408,11 @@ impl Process {
);
}
// Write the throwable if present
if !current_content.is_empty()
if let Some(ref throwable) =
current_event.throwable
&& let Err(e) =
Process::append_to_log_file(
&log_path,
&current_content,
&log_path, throwable,
)
{
tracing::error!(
@@ -378,68 +421,55 @@ impl Process {
);
}
}
Self::emit_log4j_event(
profile_path,
&current_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()
&& !in_throwable
&& current_event.throwable.is_none()
{
let thread = current_event
.thread
.as_deref()
.unwrap_or("");
let level = current_event
.level
.as_deref()
.unwrap_or("");
let logger = current_event
.logger
.as_deref()
.unwrap_or("");
let message = current_event
.message
.as_deref()
.unwrap_or("")
.trim();
let formatted_time =
Process::format_timestamp(
current_event.timestamp.as_deref(),
);
let formatted_log = format!(
"{} [{}] [{}{}]: {}\n",
formatted_time,
thread,
if !logger.is_empty() {
format!("{logger}/")
} else {
String::new()
},
level,
message
);
// Write the log message
if let Err(e) = Process::append_to_log_file(
&log_path,
&formatted_log,
) {
if let Some(formatted_log) =
Self::format_log4j_entry(&current_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) =
current_event.timestamp.as_deref()
&& let Err(e) = Self::maybe_handle_server_join_logging(
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,
timestamp,
message
&timestamp,
message,
).await {
tracing::error!("Failed to handle server join logging: {e}");
}
}
Self::emit_log4j_event(
profile_path,
&current_event,
);
}
}
_ => {}
@@ -454,15 +484,17 @@ impl Process {
&& !e.inplace_trim_end()
&& !e.inplace_trim_start()
&& let Ok(text) = e.xml_content()
&& let Err(e) = Process::append_to_log_file(
{
if let Err(e) = Process::append_to_log_file(
&log_path,
&format!("{text}\n"),
)
{
tracing::error!(
"Failed to write to log file: {}",
e
);
) {
tracing::error!(
"Failed to write to log file: {}",
e
);
}
Self::emit_legacy_log(profile_path, &text);
}
}
Ok(Event::CData(e)) => {
@@ -489,6 +521,7 @@ impl Process {
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(),
@@ -506,30 +539,98 @@ impl Process {
}
}
fn format_timestamp(timestamp: Option<&str>) -> String {
if let Some(timestamp_str) = timestamp {
if let Ok(timestamp_val) = timestamp_str.parse::<i64>() {
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;
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"))
chrono::DateTime::<Utc>::from_timestamp(secs, nsecs)
.unwrap_or_default()
} else {
"[??:??:??]".to_string()
}
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,