mirror of
https://github.com/modrinth/code.git
synced 2026-08-27 01:54:47 +00:00
* 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 86e284c4bd.
* 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>
387 lines
11 KiB
Rust
387 lines
11 KiB
Rust
use std::io::{Read, SeekFrom};
|
|
use std::time::SystemTime;
|
|
|
|
use futures::TryFutureExt;
|
|
use serde::{Deserialize, Serialize};
|
|
use tokio::{
|
|
fs::File,
|
|
io::{AsyncReadExt, AsyncSeekExt},
|
|
};
|
|
|
|
use crate::{
|
|
State,
|
|
prelude::Credentials,
|
|
util::io::{self, IOError},
|
|
};
|
|
|
|
#[derive(Serialize, Debug)]
|
|
pub struct Logs {
|
|
pub log_type: LogType,
|
|
pub filename: String,
|
|
pub age: u64,
|
|
pub output: Option<CensoredString>,
|
|
}
|
|
|
|
#[derive(Serialize, Deserialize, Debug, Clone, Copy, Eq, PartialEq)]
|
|
pub enum LogType {
|
|
InfoLog,
|
|
CrashReport,
|
|
}
|
|
|
|
#[derive(Serialize, Debug)]
|
|
pub struct LatestLogCursor {
|
|
pub cursor: u64,
|
|
pub output: CensoredString,
|
|
pub new_file: bool,
|
|
}
|
|
|
|
#[derive(Serialize, Debug)] // Not deserialize
|
|
#[serde(transparent)]
|
|
pub struct CensoredString(String);
|
|
impl CensoredString {
|
|
pub fn censor(mut s: String, credentials_list: &[Credentials]) -> Self {
|
|
let username = whoami::username();
|
|
s = s
|
|
.replace(&format!("/{username}/"), "/{COMPUTER_USERNAME}/")
|
|
.replace(&format!("\\{username}\\"), "\\{COMPUTER_USERNAME}\\");
|
|
for credentials in credentials_list {
|
|
// Use the offline profile to guarantee that this function does not cause
|
|
// Mojang API request, and is never delayed by a network request. The offline
|
|
// profile is optimistically updated on upsert from time to time anyway
|
|
s = s
|
|
.replace(&credentials.access_token, "{MINECRAFT_ACCESS_TOKEN}")
|
|
.replace(
|
|
&credentials.offline_profile.name,
|
|
"{MINECRAFT_USERNAME}",
|
|
)
|
|
.replace(
|
|
&credentials.offline_profile.id.as_simple().to_string(),
|
|
"{MINECRAFT_UUID}",
|
|
)
|
|
.replace(
|
|
&credentials.offline_profile.id.as_hyphenated().to_string(),
|
|
"{MINECRAFT_UUID}",
|
|
);
|
|
}
|
|
|
|
Self(s)
|
|
}
|
|
}
|
|
|
|
impl Logs {
|
|
async fn build(
|
|
log_type: LogType,
|
|
age: SystemTime,
|
|
profile_subpath: &str,
|
|
filename: String,
|
|
clear_contents: Option<bool>,
|
|
) -> crate::Result<Self> {
|
|
Ok(Self {
|
|
log_type,
|
|
age: age
|
|
.duration_since(SystemTime::UNIX_EPOCH)
|
|
.unwrap_or_else(|_| std::time::Duration::from_secs(0))
|
|
.as_secs(),
|
|
output: if clear_contents.unwrap_or(false) {
|
|
None
|
|
} else {
|
|
Some(
|
|
get_output_by_filename(
|
|
profile_subpath,
|
|
log_type,
|
|
&filename,
|
|
)
|
|
.await?,
|
|
)
|
|
},
|
|
filename,
|
|
})
|
|
}
|
|
}
|
|
|
|
#[tracing::instrument]
|
|
pub async fn get_logs_from_type(
|
|
profile_path: &str,
|
|
log_type: LogType,
|
|
clear_contents: Option<bool>,
|
|
logs: &mut Vec<crate::Result<Logs>>,
|
|
) -> crate::Result<()> {
|
|
let state = State::get().await?;
|
|
|
|
let logs_folder = match log_type {
|
|
LogType::InfoLog => state.directories.profile_logs_dir(profile_path),
|
|
LogType::CrashReport => {
|
|
state.directories.crash_reports_dir(profile_path)
|
|
}
|
|
};
|
|
|
|
if logs_folder.exists() {
|
|
for entry in std::fs::read_dir(&logs_folder)
|
|
.map_err(|e| IOError::with_path(e, &logs_folder))?
|
|
{
|
|
let entry: std::fs::DirEntry =
|
|
entry.map_err(|e| IOError::with_path(e, &logs_folder))?;
|
|
let age = entry
|
|
.metadata()?
|
|
.created()
|
|
.unwrap_or(SystemTime::UNIX_EPOCH);
|
|
let path = entry.path();
|
|
if !path.is_file() {
|
|
continue;
|
|
}
|
|
if let Some(file_name) = path.file_name() {
|
|
let file_name = file_name.to_string_lossy().to_string();
|
|
logs.push(
|
|
Logs::build(
|
|
log_type,
|
|
age,
|
|
profile_path,
|
|
file_name,
|
|
clear_contents,
|
|
)
|
|
.await,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[tracing::instrument]
|
|
pub async fn get_logs(
|
|
profile_path_id: &str,
|
|
clear_contents: Option<bool>,
|
|
) -> crate::Result<Vec<Logs>> {
|
|
let mut logs = Vec::new();
|
|
get_logs_from_type(
|
|
profile_path_id,
|
|
LogType::InfoLog,
|
|
clear_contents,
|
|
&mut logs,
|
|
)
|
|
.await?;
|
|
get_logs_from_type(
|
|
profile_path_id,
|
|
LogType::CrashReport,
|
|
clear_contents,
|
|
&mut logs,
|
|
)
|
|
.await?;
|
|
|
|
let mut logs = logs.into_iter().collect::<crate::Result<Vec<Logs>>>()?;
|
|
logs.sort_by(|a, b| b.age.cmp(&a.age).then(b.filename.cmp(&a.filename)));
|
|
Ok(logs)
|
|
}
|
|
|
|
#[tracing::instrument]
|
|
pub async fn get_logs_by_filename(
|
|
profile_path: &str,
|
|
log_type: LogType,
|
|
filename: String,
|
|
) -> crate::Result<Logs> {
|
|
let state = State::get().await?;
|
|
|
|
let path = match log_type {
|
|
LogType::InfoLog => state.directories.profile_logs_dir(profile_path),
|
|
LogType::CrashReport => {
|
|
state.directories.crash_reports_dir(profile_path)
|
|
}
|
|
}
|
|
.join(&filename);
|
|
|
|
let metadata = std::fs::metadata(&path)?;
|
|
let age = metadata.created().unwrap_or(SystemTime::UNIX_EPOCH);
|
|
|
|
Logs::build(log_type, age, profile_path, filename, Some(true)).await
|
|
}
|
|
|
|
#[tracing::instrument]
|
|
pub async fn get_output_by_filename(
|
|
profile_subpath: &str,
|
|
log_type: LogType,
|
|
file_name: &str,
|
|
) -> crate::Result<CensoredString> {
|
|
let state = State::get().await?;
|
|
|
|
let logs_folder = match log_type {
|
|
LogType::InfoLog => state.directories.profile_logs_dir(profile_subpath),
|
|
LogType::CrashReport => {
|
|
state.directories.crash_reports_dir(profile_subpath)
|
|
}
|
|
};
|
|
|
|
let path = logs_folder.join(file_name);
|
|
|
|
let credentials = Credentials::get_all(&state.pool)
|
|
.await?
|
|
.into_iter()
|
|
.map(|x| x.1)
|
|
.collect::<Vec<_>>();
|
|
|
|
// Load .gz file into String
|
|
if let Some(ext) = path.extension() {
|
|
if ext == "gz" {
|
|
let file = std::fs::File::open(&path)
|
|
.map_err(|e| IOError::with_path(e, &path))?;
|
|
let mut contents = [0; 1024];
|
|
let mut result = String::new();
|
|
let mut gz =
|
|
flate2::read::GzDecoder::new(std::io::BufReader::new(file));
|
|
|
|
while gz
|
|
.read(&mut contents)
|
|
.map_err(|e| IOError::with_path(e, &path))?
|
|
> 0
|
|
{
|
|
result.push_str(&String::from_utf8_lossy(&contents));
|
|
contents = [0; 1024];
|
|
}
|
|
return Ok(CensoredString::censor(result, &credentials));
|
|
} else if ext == "log" || ext == "txt" {
|
|
let mut result = String::new();
|
|
let mut contents = [0; 1024];
|
|
let mut file = std::fs::File::open(&path)
|
|
.map_err(|e| IOError::with_path(e, &path))?;
|
|
// iteratively read the file to a String
|
|
while file
|
|
.read(&mut contents)
|
|
.map_err(|e| IOError::with_path(e, &path))?
|
|
> 0
|
|
{
|
|
result.push_str(&String::from_utf8_lossy(&contents));
|
|
contents = [0; 1024];
|
|
}
|
|
let result = CensoredString::censor(result, &credentials);
|
|
return Ok(result);
|
|
}
|
|
}
|
|
Err(crate::ErrorKind::OtherError(format!(
|
|
"File extension not supported: {}",
|
|
path.display()
|
|
))
|
|
.into())
|
|
}
|
|
|
|
#[tracing::instrument]
|
|
pub async fn delete_logs(profile_path_id: &str) -> crate::Result<()> {
|
|
let state = State::get().await?;
|
|
|
|
let logs_folder = state.directories.profile_logs_dir(profile_path_id);
|
|
for entry in std::fs::read_dir(&logs_folder)
|
|
.map_err(|e| IOError::with_path(e, &logs_folder))?
|
|
{
|
|
let entry = entry.map_err(|e| IOError::with_path(e, &logs_folder))?;
|
|
let path = entry.path();
|
|
if path.is_dir() {
|
|
io::remove_dir_all(&path).await?;
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[tracing::instrument]
|
|
pub async fn delete_logs_by_filename(
|
|
profile_path_id: &str,
|
|
log_type: LogType,
|
|
filename: &str,
|
|
) -> crate::Result<()> {
|
|
let state = State::get().await?;
|
|
|
|
let logs_folder = match log_type {
|
|
LogType::InfoLog => state.directories.profile_logs_dir(profile_path_id),
|
|
LogType::CrashReport => {
|
|
state.directories.crash_reports_dir(profile_path_id)
|
|
}
|
|
};
|
|
|
|
let path = logs_folder.join(filename);
|
|
io::remove_file(&path).await?;
|
|
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,
|
|
cursor: u64, // 0 to start at beginning of file
|
|
) -> crate::Result<LatestLogCursor> {
|
|
get_generic_live_log_cursor(profile_path, "launcher_log.txt", cursor).await
|
|
}
|
|
|
|
#[tracing::instrument]
|
|
pub async fn get_generic_live_log_cursor(
|
|
profile_path_id: &str,
|
|
log_file_name: &str,
|
|
mut cursor: u64, // 0 to start at beginning of file
|
|
) -> crate::Result<LatestLogCursor> {
|
|
let state = State::get().await?;
|
|
let logs_folder = state.directories.profile_logs_dir(profile_path_id);
|
|
let path = logs_folder.join(log_file_name);
|
|
if !path.exists() {
|
|
// Allow silent failure if latest.log doesn't exist (as the instance may have been launched, but not yet created the file)
|
|
return Ok(LatestLogCursor {
|
|
cursor: 0,
|
|
new_file: false,
|
|
output: CensoredString("".to_string()),
|
|
});
|
|
}
|
|
|
|
let mut file = File::open(&path)
|
|
.await
|
|
.map_err(|e| IOError::with_path(e, &path))?;
|
|
let metadata = file
|
|
.metadata()
|
|
.await
|
|
.map_err(|e| IOError::with_path(e, &path))?;
|
|
|
|
let mut new_file = false;
|
|
if cursor > metadata.len() {
|
|
// Cursor is greater than file length, reset cursor to 0
|
|
// Likely cause is that the file was rotated while the log was being read
|
|
cursor = 0;
|
|
new_file = true;
|
|
}
|
|
|
|
let mut buffer = Vec::new();
|
|
file.seek(SeekFrom::Start(cursor))
|
|
.map_err(|e| IOError::with_path(e, &path))
|
|
.await?; // Seek to cursor
|
|
let bytes_read = file
|
|
.read_to_end(&mut buffer)
|
|
.map_err(|e| IOError::with_path(e, &path))
|
|
.await?; // Read to end of file
|
|
let output = String::from_utf8_lossy(&buffer).to_string(); // Convert to String
|
|
let cursor = cursor + bytes_read as u64; // Update cursor
|
|
|
|
let credentials = Credentials::get_all(&state.pool)
|
|
.await?
|
|
.into_iter()
|
|
.map(|x| x.1)
|
|
.collect::<Vec<_>>();
|
|
let output = CensoredString::censor(output, &credentials);
|
|
Ok(LatestLogCursor {
|
|
cursor,
|
|
new_file,
|
|
output,
|
|
})
|
|
}
|