Skip to content

refactor(tasks): refactor task_scheduling #849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UNIkeEN wants to merge 12 commits into
base: main
Choose a base branch
from
Open

refactor(tasks): refactor task_scheduling #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d5fc2d9
refactor(tasks): refactor task_scheduling
ToolmanP Aug 17, 2025
f9ee737
fix(tasks): update state judgement and fix other problems
Reqwey Aug 23, 2025
9c7b46a
chore(frontend): update tauri dependencies in package.json
UNIkeEN Aug 23, 2025
a5e5095
Merge branch 'main' into refactor/task_schedule
UNIkeEN Aug 23, 2025
b7f5ac1
fix(web): fix wrong timeout setting; use read/connect
ToolmanP Sep 5, 2025
fe14b69
fix(download): remove workaround for timeout
ToolmanP Sep 5, 2025
e9fa734
fix(download): change total_progress semantics
ToolmanP Sep 5, 2025
1d47cbb
fix(monitor): fix autoconcurrent/deadlock
ToolmanP Sep 5, 2025
2df5f7e
Merge remote-tracking branch 'origin/main' into refactor/task_schedule
ToolmanP Sep 5, 2025
58beeae
fix(instance): fix param name
ToolmanP Sep 5, 2025
459c4b2
fix(task): improve mis-listen handling
Reqwey Sep 5, 2025
e37b742
fix(task): update frontend Pending state & add reporting to cmd apply fn
Reqwey Sep 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@
"@chakra-ui/theme-tools": "^2.2.6",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@tauri-apps/api": "^2.7.0",
"@tauri-apps/api": "^2.8.0",
"@tauri-apps/plugin-clipboard-manager": "^2.3.0",
"@tauri-apps/plugin-deep-link": "^2.4.0",
"@tauri-apps/plugin-dialog": "^2.3.0",
"@tauri-apps/plugin-fs": "^2.4.0",
"@tauri-apps/plugin-http": "^2.5.0",
"@tauri-apps/plugin-deep-link": "^2.4.1",
"@tauri-apps/plugin-dialog": "^2.3.3",
"@tauri-apps/plugin-fs": "^2.4.2",
"@tauri-apps/plugin-http": "^2.5.2",
"@tauri-apps/plugin-log": "^2.6.0",
"@tauri-apps/plugin-opener": "^2.4.0",
"@tauri-apps/plugin-os": "^2.3.0",
"@tauri-apps/plugin-opener": "^2.5.0",
"@tauri-apps/plugin-os": "^2.3.1",
"@tauri-apps/plugin-process": "^2.3.0",
"@tauri-apps/plugin-window-state": "^2.3.0",
"@tauri-apps/plugin-window-state": "^2.4.0",
"i18next": "^24.0.0",
"lodash": "^4.17.21",
"masonic": "^4.0.1",
Expand All @@ -61,7 +61,7 @@
},
"devDependencies": {
"@next/bundle-analyzer": "^15.1.2",
"@tauri-apps/cli": "^2.7.0",
"@tauri-apps/cli": "^2.8.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/lodash": "^4.17.15",
"@types/micromatch": "^4.0.9",
Expand Down
1 change: 1 addition & 0 deletions src-tauri/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ font-loader = "0.11.0"
async-speed-limit = "0.4.2"
reqwest-middleware = "0.4.2"
reqwest-retry = "0.7.0"
thiserror = "1.0"
murmur2 = "0.1"
csv = "1.3"

Expand Down
6 changes: 3 additions & 3 deletions src-tauri/src/instance/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ use crate::{
models::{GameClientResourceInfo, ModLoaderResourceInfo},
},
storage::{load_json_async, save_json_async, Storage},
tasks::{commands::schedule_progressive_task_group, download::DownloadParam, PTaskParam},
tasks::{commands::schedule_progressive_task_group, download::DownloadParam, RuntimeTaskParam},
utils::{fs::create_url_shortcut, image::ImageWrapper},
};
use lazy_static::lazy_static;
Expand Down Expand Up @@ -883,15 +883,15 @@ pub async fn create_instance(
minimum_launcher_version: version_info.minimum_launcher_version,
});

let mut task_params = Vec::<PTaskParam>::new();
let mut task_params = Vec::<RuntimeTaskParam>::new();

// Download client (use task)
let client_download_info = version_info
.downloads
.get("client")
.ok_or(InstanceError::ClientJsonParseError)?;

task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src: Url::parse(&client_download_info.url.clone())
.map_err(|_| InstanceError::ClientJsonParseError)?,
dest: instance.version_path.join(format!("{}.jar", name)),
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/src/instance/helpers/loader/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use crate::{
error::SJMCLResult,
instance::models::misc::{ModLoader, ModLoaderType},
resource::models::SourceType,
tasks::PTaskParam,
tasks::RuntimeTaskParam,
};

pub fn add_library_entry(
Expand Down Expand Up @@ -69,7 +69,7 @@ pub async fn install_mod_loader(
lib_dir: PathBuf,
mods_dir: PathBuf,
client_info: &mut McClientInfo,
task_params: &mut Vec<PTaskParam>,
task_params: &mut Vec<RuntimeTaskParam>,
) -> SJMCLResult<()> {
match loader.loader_type {
ModLoaderType::Fabric => {
Expand Down
8 changes: 4 additions & 4 deletions src-tauri/src/instance/helpers/loader/fabric.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::{
helpers::misc::get_download_api,
models::{ResourceType, SourceType},
},
tasks::{download::DownloadParam, PTaskParam},
tasks::{download::DownloadParam, RuntimeTaskParam},
};

pub async fn install_fabric_loader(
Expand All @@ -26,7 +26,7 @@ pub async fn install_fabric_loader(
lib_dir: PathBuf,
mods_dir: PathBuf,
client_info: &mut McClientInfo,
task_params: &mut Vec<PTaskParam>,
task_params: &mut Vec<RuntimeTaskParam>,
) -> SJMCLResult<()> {
let client = app.state::<reqwest::Client>();
let loader_ver = &loader.version;
Expand Down Expand Up @@ -84,7 +84,7 @@ pub async fn install_fabric_loader(
&[ResourceType::FabricMaven, ResourceType::Libraries],
&priority[0],
)?;
task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src,
dest: lib_dir.join(&rel),
filename: None,
Expand Down Expand Up @@ -113,7 +113,7 @@ pub async fn install_fabric_loader(
if let Ok(Some(fabric_api_download)) =
get_latest_fabric_api_mod_download(&app, game_version, mods_dir).await
{
task_params.push(PTaskParam::Download(fabric_api_download));
task_params.push(RuntimeTaskParam::Download(fabric_api_download));
}

Ok(())
Expand Down
16 changes: 8 additions & 8 deletions src-tauri/src/instance/helpers/loader/forge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use crate::{
helpers::misc::get_download_api,
models::{ResourceType, SourceType},
},
tasks::{commands::schedule_progressive_task_group, download::DownloadParam, PTaskParam},
tasks::{commands::schedule_progressive_task_group, download::DownloadParam, RuntimeTaskParam},
};

async fn fetch_bmcl_forge_installer_url(
Expand Down Expand Up @@ -58,7 +58,7 @@ pub async fn install_forge_loader(
game_version: &str,
loader: &ModLoader,
lib_dir: PathBuf,
task_params: &mut Vec<PTaskParam>,
task_params: &mut Vec<RuntimeTaskParam>,
) -> SJMCLResult<()> {
let loader_ver = &loader.version;

Expand Down Expand Up @@ -88,7 +88,7 @@ pub async fn install_forge_loader(
let installer_rel = convert_library_name_to_path(&installer_coord, None)?;
let installer_path = lib_dir.join(&installer_rel);

task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src: installer_url,
dest: installer_path.clone(),
filename: None,
Expand Down Expand Up @@ -228,7 +228,7 @@ pub async fn download_forge_libraries(
if processor.args.contains(&"DOWNLOAD_MOJMAPS".to_string()) {
if let Some(mojmaps) = args_map.get("{MOJMAPS}") {
if let Some(client_mappings) = client_info.downloads.get("client_mappings") {
task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src: client_mappings.url.parse()?,
dest: lib_dir.join(mojmaps),
filename: None,
Expand Down Expand Up @@ -301,7 +301,7 @@ pub async fn download_forge_libraries(
continue;
}

task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src: convert_url_to_target_source(
&Url::parse(url)?,
&[
Expand Down Expand Up @@ -357,7 +357,7 @@ pub async fn download_forge_libraries(
}

let rel = convert_library_name_to_path(&name.to_string(), None)?;
task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src: convert_url_to_target_source(
&Url::parse(url)?,
&[
Expand Down Expand Up @@ -437,7 +437,7 @@ pub async fn download_forge_libraries(
],
&priority[0],
)?;
task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src,
dest: lib_dir.join(&rel),
filename: None,
Expand All @@ -449,7 +449,7 @@ pub async fn download_forge_libraries(

let mut seen = std::collections::HashSet::new();
task_params.retain(|param| match param {
PTaskParam::Download(dp) => seen.insert(dp.dest.clone()),
RuntimeTaskParam::Download(dp) => seen.insert(dp.dest.clone()),
});

schedule_progressive_task_group(
Expand Down
14 changes: 7 additions & 7 deletions src-tauri/src/instance/helpers/loader/neoforge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ use crate::{
helpers::misc::get_download_api,
models::{ResourceType, SourceType},
},
tasks::{commands::schedule_progressive_task_group, download::DownloadParam, PTaskParam},
tasks::{commands::schedule_progressive_task_group, download::DownloadParam, RuntimeTaskParam},
};

pub async fn install_neoforge_loader(
priority: &[SourceType],
loader: &ModLoader,
lib_dir: PathBuf,
task_params: &mut Vec<PTaskParam>,
task_params: &mut Vec<RuntimeTaskParam>,
) -> SJMCLResult<()> {
let loader_ver = &loader.version;

Expand Down Expand Up @@ -62,7 +62,7 @@ pub async fn install_neoforge_loader(
let installer_rel = convert_library_name_to_path(&installer_coord, None)?;
let installer_path = lib_dir.join(&installer_rel);

task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src: installer_url,
dest: installer_path.clone(),
filename: None,
Expand Down Expand Up @@ -205,7 +205,7 @@ pub async fn download_neoforge_libraries(
if processor.args.contains(&"DOWNLOAD_MOJMAPS".to_string()) {
if let Some(mojmaps) = args_map.get("{MOJMAPS}") {
if let Some(client_mappings) = client_info.downloads.get("client_mappings") {
task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src: client_mappings.url.parse()?,
dest: lib_dir.join(mojmaps),
filename: None,
Expand Down Expand Up @@ -278,7 +278,7 @@ pub async fn download_neoforge_libraries(
continue;
}

task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src: convert_url_to_target_source(
&Url::parse(url)?,
&[ResourceType::NeoforgeMaven, ResourceType::Libraries],
Expand Down Expand Up @@ -326,7 +326,7 @@ pub async fn download_neoforge_libraries(
}

let rel = convert_library_name_to_path(&name.to_string(), None)?;
task_params.push(PTaskParam::Download(DownloadParam {
task_params.push(RuntimeTaskParam::Download(DownloadParam {
src: convert_url_to_target_source(
&Url::parse(url)?,
&[ResourceType::NeoforgeMaven, ResourceType::Libraries],
Expand All @@ -340,7 +340,7 @@ pub async fn download_neoforge_libraries(

let mut seen = std::collections::HashSet::new();
task_params.retain(|param| match param {
PTaskParam::Download(dp) => seen.insert(dp.dest.clone()),
RuntimeTaskParam::Download(dp) => seen.insert(dp.dest.clone()),
});

schedule_progressive_task_group(
Expand Down
8 changes: 4 additions & 4 deletions src-tauri/src/instance/helpers/modpack/curseforge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use crate::{
error::{SJMCLError, SJMCLResult},
instance::models::misc::{InstanceError, ModLoaderType},
resource::helpers::curseforge::misc::CurseForgeProject,
tasks::{download::DownloadParam, PTaskParam},
tasks::{download::DownloadParam, RuntimeTaskParam},
};

#[derive(Deserialize, Serialize, Debug, Clone)]
Expand Down Expand Up @@ -141,7 +141,7 @@ impl CurseForgeManifest {
&self,
app: &AppHandle,
instance_path: &Path,
) -> SJMCLResult<Vec<PTaskParam>> {
) -> SJMCLResult<Vec<RuntimeTaskParam>> {
let client = app.state::<reqwest::Client>();
let instance_path = instance_path.to_path_buf();

Expand Down Expand Up @@ -198,7 +198,7 @@ impl CurseForgeManifest {
.and_then(|hs| hs.iter().find(|h| h.algo == 1))
.map(|h| h.value.clone());

let task_param = PTaskParam::Download(DownloadParam {
let task_param = RuntimeTaskParam::Download(DownloadParam {
src: url::Url::parse(&download_url).map_err(|_| InstanceError::InvalidSourcePath)?,
sha1,
dest: instance_path
Expand All @@ -211,7 +211,7 @@ impl CurseForgeManifest {
filename: Some(file_manifest.data.file_name.clone()),
});

Ok::<PTaskParam, SJMCLError>(task_param)
Ok::<RuntimeTaskParam, SJMCLError>(task_param)
}
});

Expand Down
6 changes: 3 additions & 3 deletions src-tauri/src/instance/helpers/modpack/modrinth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use zip::ZipArchive;
use crate::{
error::SJMCLResult,
instance::models::misc::{InstanceError, ModLoaderType},
tasks::{download::DownloadParam, PTaskParam},
tasks::{download::DownloadParam, RuntimeTaskParam},
};

structstruck::strike! {
Expand Down Expand Up @@ -110,7 +110,7 @@ impl ModrinthManifest {
Ok(())
}

pub fn get_download_params(&self, instance_path: &Path) -> SJMCLResult<Vec<PTaskParam>> {
pub fn get_download_params(&self, instance_path: &Path) -> SJMCLResult<Vec<RuntimeTaskParam>> {
self
.files
.iter()
Expand All @@ -119,7 +119,7 @@ impl ModrinthManifest {
.downloads
.first()
.ok_or(InstanceError::InvalidSourcePath)?;
Ok(PTaskParam::Download(DownloadParam {
Ok(RuntimeTaskParam::Download(DownloadParam {
src: url::Url::parse(download_url).map_err(|_| InstanceError::InvalidSourcePath)?,
sha1: Some(file.hashes.sha1.clone()),
dest: instance_path.join(&file.path),
Expand Down
Loading
Loading