From 1cf906d0db38d0044a471b3135c90c7168e3ae61 Mon Sep 17 00:00:00 2001 From: dream_pep Date: Sun, 16 Aug 2026 14:32:27 +0800 Subject: [PATCH] Integrate @xmcl/task, import instances & UI updates Add a new xmcl task system and instance-import workflow. Introduces electron/core/task.ts with @xmcl/task executors (install, sims), task lifecycle IPC (start/pause/resume/cancel) and stage mapping. Detect mod loaders in instance scanner and add importExistingInstance with IPC. Update front-end task store, types and UI (TaskButton, TaskCard, TaskQueue, TaskDebug) to support paused state, xmcl path/state and pause/resume actions. Improve game-dir UI with loader badges and bulk import. Small UX/dialog tweaks (alert-dialog, About) and dependency/pnpm workspace updates. Adds Koring.yml theme default. --- Koring.yml | 2 + electron/core/instance.ts | 148 ++++++++++- electron/core/task.ts | 324 +++++++++++++++++++++++ electron/handlers/instance.ts | 29 ++ electron/handlers/task.ts | 152 ++++++----- package.json | 10 +- pnpm-lock.yaml | 394 +++++++++++++++------------- pnpm-workspace.yaml | 18 +- src/api/instance.ts | 24 ++ src/components/task/TaskButton.tsx | 19 +- src/components/task/TaskCard.tsx | 67 ++++- src/components/ui/alert-dialog.tsx | 9 +- src/pages/debug/crash-debug.tsx | 186 ++++++++----- src/pages/debug/task-debug.tsx | 40 ++- src/pages/setting/game/game-dir.tsx | 220 ++++++++++++---- src/pages/setting/general/about.tsx | 73 ++++-- src/pages/task-queue.tsx | 19 +- src/stores/taskStore.ts | 54 ++++ src/types/task.ts | 40 ++- 19 files changed, 1420 insertions(+), 408 deletions(-) create mode 100644 electron/core/task.ts diff --git a/Koring.yml b/Koring.yml index 0b64fb0..5d0649e 100644 --- a/Koring.yml +++ b/Koring.yml @@ -1,3 +1,5 @@ oobe: false +theme: + darkMode: light game: gameDirs: [] diff --git a/electron/core/instance.ts b/electron/core/instance.ts index e7be36a..717363d 100644 --- a/electron/core/instance.ts +++ b/electron/core/instance.ts @@ -18,14 +18,14 @@ import { rewriteToMirror } from './installer'; // ==================== BMCLAPI 镜像源配置 ==================== // 版本清单（@xmcl/installer 的 getVersionList 通过 remote 参数覆盖） -const BMCLAPI_VERSION_MANIFEST = 'https://bmclapi2.bangbang93.com/mc/game/version_manifest.json'; +export const BMCLAPI_VERSION_MANIFEST = 'https://bmclapi2.bangbang93.com/mc/game/version_manifest.json'; // Maven 仓库镜像（Libraries / Forge / NeoForge / Fabric 构件） -const BMCLAPI_MAVEN = 'https://bmclapi2.bangbang93.com/maven'; +export const BMCLAPI_MAVEN = 'https://bmclapi2.bangbang93.com/maven'; // 资源文件镜像（assets） -const BMCLAPI_ASSETS = 'https://bmclapi2.bangbang93.com/assets'; +export const BMCLAPI_ASSETS = 'https://bmclapi2.bangbang93.com/assets'; // 供 @xmcl/installer FetchOptions 使用的镜像 fetch（meta.fabricmc.net 等元数据接口走镜像） -const mirrorFetch: typeof fetch = (url, init) => fetch(rewriteToMirror(String(url)), init); +export const mirrorFetch: typeof fetch = (url, init) => fetch(rewriteToMirror(String(url)), init); export interface InstanceRuntime { minecraft: string; @@ -427,6 +427,33 @@ export interface ScannedVersion { hasJar: boolean; /** JSON 文件是否存在 */ hasJson: boolean; + /** 检测到的 mod 加载器 */ + loaders: string[]; + /** 是否健康（JSON + JAR 都存在） */ + healthy: boolean; +} + +// 从版本 JSON 中检测 mod 加载器 +function detectLoaders(jsonPath: string): string[] { + const loaders: string[] = []; + try { + const raw = fs.readFileSync(jsonPath, 'utf-8'); + const json = JSON.parse(raw); + const libs: { name?: string }[] = json.libraries || []; + for (const lib of libs) { + const name = lib.name || ""; + if (name.startsWith("net.minecraftforge:forge:") || name.startsWith("net.neoforged:")) { + if (!loaders.includes("forge")) loaders.push("forge"); + } else if (name.startsWith("net.fabricmc:yarn:") || name.startsWith("net.fabricmc:fabric-loader:")) { + if (!loaders.includes("fabric")) loaders.push("fabric"); + } else if (name.startsWith("org.quiltmc:quilt-loader:")) { + if (!loaders.includes("quilt")) loaders.push("quilt"); + } else if (name.startsWith("optifine:OptiFine:")) { + if (!loaders.includes("optifine")) loaders.push("optifine"); + } + } + } catch {} + return loaders; } // 扫描指定目录，返回 versions 子目录中所有已安装版本的详细信息 @@ -447,7 +474,6 @@ export function scanGameDirectories(gamePath: string): ScannedVersion[] { let type = "unknown"; let releaseTime: string | undefined; - // 尝试读取 version JSON 获取类型和时间 if (hasJson) { try { const raw = fs.readFileSync(jsonPath, 'utf-8'); @@ -457,9 +483,119 @@ export function scanGameDirectories(gamePath: string): ScannedVersion[] { } catch {} } - return { id, type, releaseTime, hasJar, hasJson }; + const loaders = hasJson ? detectLoaders(jsonPath) : []; + const healthy = hasJson && hasJar; + + return { id, type, releaseTime, hasJar, hasJson, loaders, healthy }; }); } catch { return []; } } + +// 从已安装版本导入实例（不下载，直接复制版本文件） +export async function importExistingInstance( + name: string, + gamePath: string, + versionId: string, + options?: { + description?: string; + java?: string; + minMemory?: number; + maxMemory?: number; + } +): Promise { + const instancePath = path.join(gamePath, 'instances', name); + if (fs.existsSync(instancePath)) { + throw new Error(`Instance already exists: ${name}`); + } + + // 检查源版本目录是否存在 + const srcVersionDir = path.join(gamePath, 'versions', versionId); + if (!fs.existsSync(srcVersionDir)) { + throw new Error(`Version directory not found: ${versionId}`); + } + + // 读取源版本 JSON 获取类型信息 + const srcJsonPath = path.join(srcVersionDir, `${versionId}.json`); + if (!fs.existsSync(srcJsonPath)) { + throw new Error(`Version JSON not found: ${versionId}`); + } + + let type = "release"; + let releaseTime: string | undefined; + try { + const raw = fs.readFileSync(srcJsonPath, 'utf-8'); + const json = JSON.parse(raw); + type = json.type || "release"; + releaseTime = json.releaseTime; + } catch {} + + // 构建 InstanceRuntime + const runtime: InstanceRuntime = { + minecraft: versionId, + }; + + // 从 JSON 中检测加载器并填充 runtime + try { + const raw = fs.readFileSync(srcJsonPath, 'utf-8'); + const json = JSON.parse(raw); + const libs: { name?: string }[] = json.libraries || []; + for (const lib of libs) { + const name = lib.name || ""; + // Forge: net.minecraftforge:forge:1.20.1-47.2.0 + const forgeMatch = name.match(/^net\.minecraftforge:forge:([\d.]+(?:-\d+(?:\.\d+)*)?)/); + if (forgeMatch) { runtime.forge = forgeMatch[1]; continue; } + // NeoForge: net.neoforged:neoforge:21.0.0 + const neoMatch = name.match(/^net\.neoforged:neoforge:([\d.]+)/); + if (neoMatch) { runtime.neoForged = neoMatch[1]; continue; } + // Fabric: net.fabricmc:fabric-loader:0.15.11 + const fabricMatch = name.match(/^net\.fabricmc:fabric-loader:([\d.]+)/); + if (fabricMatch) { runtime.fabricLoader = fabricMatch[1]; continue; } + // Quilt: org.quiltmc:quilt-loader:0.26.0 + const quiltMatch = name.match(/^org\.quiltmc:quilt-loader:([\d.]+)/); + if (quiltMatch) { runtime.quiltLoader = quiltMatch[1]; continue; } + } + } catch {} + + // 创建实例目录结构 + fs.mkdirSync(instancePath, { recursive: true }); + + const now = Date.now(); + const config: InstanceConfig = { + name, + author: '', + description: options?.description || `Imported from version ${versionId}`, + runtime, + java: options?.java, + minMemory: options?.minMemory, + maxMemory: options?.maxMemory, + creationDate: now, + lastAccessDate: now, + lastPlayedDate: 0, + playtime: 0, + }; + + fs.writeFileSync(getInstanceConfigPath(instancePath), JSON.stringify(config, null, 2), 'utf-8'); + + // 创建标准子目录 + for (const dir of ['mods', 'config', 'resourcepacks', 'shaderpacks', 'saves', 'screenshots', 'logs']) { + fs.mkdirSync(path.join(instancePath, dir), { recursive: true }); + } + + // 复制版本文件到实例目录 + const destVersionDir = path.join(instancePath, 'versions', versionId); + fs.mkdirSync(destVersionDir, { recursive: true }); + + // 复制所有版本文件 + const files = fs.readdirSync(srcVersionDir); + for (const file of files) { + const srcFile = path.join(srcVersionDir, file); + const destFile = path.join(destVersionDir, file); + if (fs.statSync(srcFile).isFile()) { + fs.copyFileSync(srcFile, destFile); + } + } + + return getInstanceInfo(name, gamePath); +} diff --git a/electron/core/task.ts b/electron/core/task.ts new file mode 100644 index 0000000..4e3e375 --- /dev/null +++ b/electron/core/task.ts @@ -0,0 +1,324 @@ +// __ __ __ __ ______ __ __ ______ __ __ ______ ______ +// /\ \ /\ \ /\ "-.\ \ /\ ___\ /\ \/ / /\ ___\ /\ "-.\ \ /\ ___\ /\__ _\ +// \ \ \____ \ \ \ \ \ \-. \ \ \ \__ \ \ \ _"-. \ \ __\ \ \ \-. \ \ \ __\ \/_/\ \/ +// \ \_____\ \ \_\ \ \_\\"\_\ \ \_____\ \ \_\ \_\ \ \_____\ \ \_\\"\_\ \ \_____\ \ \_\ +// \/_____/ \/_/ \/_/ \/_/ \/_____/ \/_/\/_/ \/_____/ \/_/ \/_/ \/_____/ \/_/ +// +// 所有权利归Lingke Network (china)所有 | dream_pep拥有其艺术改变权力 +// 未经允许的情况下删除此版权头可能会受到民事指控 +// 请勿在未经Lingke Network (china)允许的范围内修改代码并分发 + +import * as path from 'path'; +import { AbortableTask, CancelledError, task, type Task } from '@xmcl/task'; +import { + installTask, + installDependenciesTask, + installForgeTask, + installNeoForgedTask, + installFabric, + installQuiltVersion, + getVersionList, +} from '@xmcl/installer'; +import { Version } from '@xmcl/core'; +import { rewriteToMirror } from './installer'; +import { + createInstance, + updateInstance, + BMCLAPI_VERSION_MANIFEST, + BMCLAPI_MAVEN, + BMCLAPI_ASSETS, + mirrorFetch, + type InstanceRuntime, +} from './instance'; + +// 任务执行钩子：主进程用它向渲染进程广播日志 +export interface TaskHooks { + log: (level: 'info' | 'warn' | 'error', message: string) => void; +} + +// 实例安装任务参数（与前端 addSidecarTask 的 params 对齐） +export interface InstallTaskParams { + name: string; + gamePath: string; + runtime: InstanceRuntime; + description?: string; +} + +// 模拟任务参数（调试页使用） +export interface SimTaskParams { + duration?: number; + failAt?: number; + failMessage?: string; + total?: number; + threads?: number; + steps?: number; +} + +// 执行器工厂：根据参数与钩子创建 @xmcl/task 任务 +type ExecutorFactory = (params: Record, hooks: TaskHooks) => Task; + +// 执行器注册表：executorName → 工厂 +const executorRegistry = new Map(); + +// ==================== 模拟执行器（调试用）==================== + +// 模拟任务基类：AbortableTask 子类，支持取消 / 暂停 / 进度 +abstract class SimTask extends AbortableTask { + protected aborted = false; + protected stepIndex = 0; + protected stepTotal = 20; + + // 进度展示：已推进的步数 / 总步数 + override get progress(): number { + return this.stepIndex; + } + override get total(): number { + return this.stepTotal; + } + + // 每个步骤推进一次进度并抛出日志 + protected step(hooks: TaskHooks, message?: string): void { + this.stepIndex += 1; + if (message) hooks.log('info', message); + } + + // 等待恢复：暂停期间每 50ms 轮询一次，直到恢复或取消 + protected async waitResume(): Promise { + while (this.isPaused && !this.aborted) { + await new Promise((r) => setTimeout(r, 50)); + } + if (this.aborted) throw new CancelledError(); + } + + // 取消回调：标记中止标志 + protected abort(): void { + this.aborted = true; + } + + // 判断错误是否为取消导致 + protected isAbortedError(e: unknown): boolean { + return e instanceof CancelledError || this.aborted; + } +} + +// sleep：按毫秒数模拟耗时任务 +class SleepTask extends SimTask { + constructor( + private readonly durationMs: number, + private readonly failAt: number, + private readonly failMessage: string | undefined, + private readonly hooks: TaskHooks, + ) { + super(); + } + + override async process(): Promise { + const interval = this.durationMs / this.stepTotal; + for (let i = 0; i < this.stepTotal; i++) { + await this.waitResume(); + this.step(this.hooks, `进度 ${Math.round(((i + 1) / this.stepTotal) * 100)}%`); + if (i + 1 === this.failAt) { + this.hooks.log('error', this.failMessage ?? '模拟失败：网络连接超时'); + throw new Error(this.failMessage ?? '网络连接超时'); + } + await new Promise((r) => setTimeout(r, interval)); + } + this.hooks.log('info', '任务完成'); + return this.stepIndex; + } +} + +// download：模拟分段下载（total 单位，threads 并发） +class DownloadSimTask extends SimTask { + private done = 0; + + constructor( + private readonly totalUnits: number, + private readonly threads: number, + private readonly hooks: TaskHooks, + ) { + super(); + this.stepTotal = totalUnits; + } + + override get progress(): number { + return this.done; + } + override get total(): number { + return this.totalUnits; + } + + override async process(): Promise { + const chunk = Math.max(1, Math.round(this.totalUnits / this.threads)); + while (this.done < this.totalUnits) { + await this.waitResume(); + this.done = Math.min(this.totalUnits, this.done + chunk); + this.hooks.log('info', `已下载 ${this.done}/${this.totalUnits}`); + await new Promise((r) => setTimeout(r, 120)); + } + this.hooks.log('info', '下载完成'); + return this.done; + } +} + +// install-sim：模拟多步骤安装（steps 步） +class InstallSimTask extends SimTask { + constructor( + private readonly installSteps: number, + private readonly hooks: TaskHooks, + ) { + super(); + this.stepTotal = installSteps; + } + + override async process(): Promise { + for (let i = 1; i <= this.installSteps; i++) { + await this.waitResume(); + this.step(this.hooks, `安装步骤 ${i}/${this.installSteps}`); + await new Promise((r) => setTimeout(r, 150)); + } + this.hooks.log('info', '安装完成'); + return this.stepIndex; + } +} + +// 注册模拟执行器 +executorRegistry.set('sleep', (raw, hooks) => { + const p = raw as unknown as SimTaskParams; + return new SleepTask(p.duration ?? 3000, p.failAt ?? -1, p.failMessage, hooks); +}); + +executorRegistry.set('download', (raw, hooks) => { + const p = raw as unknown as SimTaskParams; + return new DownloadSimTask(p.total ?? 100, p.threads ?? 4, hooks); +}); + +executorRegistry.set('install-sim', (raw, hooks) => { + const p = raw as unknown as SimTaskParams; + return new InstallSimTask(p.steps ?? 10, hooks); +}); + +// ==================== 真实执行器（实例安装）==================== + +// install：使用 @xmcl/installer 的 Task 版本函数安装 Minecraft 实例 +// 任务树：install.create → install.minecraft → (forge|neoforge|fabric|quilt) → install.dependencies +executorRegistry.set('install', (rawParams, hooks) => { + const p = rawParams as unknown as InstallTaskParams; + const { name, gamePath, runtime } = p; + const instancePath = path.join(gamePath, 'instances', name); + + return task('install', async function () { + // 子任务 1：创建实例目录 + hooks.log('info', `创建实例: ${name}`); + await this.yield( + task('create', async () => { + await createInstance(name, gamePath, runtime, { description: p.description }); + }), + ); + + // 预步骤：获取版本清单，定位 Minecraft 版本元数据（走 BMCLAPI 镜像） + const versionList = await getVersionList({ remote: BMCLAPI_VERSION_MANIFEST, fetch: mirrorFetch }); + const versionInfo = versionList.versions.find((v) => v.id === runtime.minecraft); + if (!versionInfo) { + throw new Error(`Minecraft 版本 ${runtime.minecraft} 不存在`); + } + + // 子任务 2：安装 Minecraft 本体（版本 JSON / 客户端 JAR） + hooks.log('info', `下载 Minecraft ${runtime.minecraft}...`); + await this.yield( + installTask( + { id: versionInfo.id, url: versionInfo.url }, + instancePath, + { + // 版本 JSON / 客户端 JAR 走 BMCLAPI 镜像 + json: (v) => rewriteToMirror(v.url), + client: (v) => (v.downloads?.client ? rewriteToMirror(v.downloads.client.url) : []), + mavenHost: BMCLAPI_MAVEN, + assetsHost: BMCLAPI_ASSETS, + }, + ).setName('minecraft'), + ); + + // 子任务 3：模组加载器（Forge / NeoForge 有 Task 版本；Fabric / Quilt 为 Promise） + if (runtime.forge) { + hooks.log('info', `安装 Forge ${runtime.forge}...`); + await this.yield( + installForgeTask( + { version: runtime.forge, mcversion: runtime.minecraft }, + instancePath, + { mavenHost: BMCLAPI_MAVEN }, + ).setName('forge'), + ); + } + + if (runtime.fabricLoader) { + hooks.log('info', `安装 Fabric ${runtime.fabricLoader}...`); + await installFabric({ + minecraftVersion: runtime.minecraft, + version: runtime.fabricLoader, + minecraft: instancePath, + fetch: mirrorFetch, + }); + } + + if (runtime.quiltLoader) { + hooks.log('info', `安装 Quilt ${runtime.quiltLoader}...`); + await installQuiltVersion({ + minecraftVersion: runtime.minecraft, + version: runtime.quiltLoader, + minecraft: instancePath, + }); + } + + if (runtime.neoForged) { + hooks.log('info', `安装 NeoForge ${runtime.neoForged}...`); + await this.yield( + installNeoForgedTask('neoforge', runtime.neoForged, instancePath, { mavenHost: BMCLAPI_MAVEN }).setName('neoforge'), + ); + } + + // 子任务 4：安装依赖（libraries + assets） + hooks.log('info', '安装依赖...'); + const resolved = await Version.parse(instancePath, runtime.minecraft); + await this.yield( + installDependenciesTask(resolved, { mavenHost: BMCLAPI_MAVEN, assetsHost: BMCLAPI_ASSETS }).setName('dependencies'), + ); + + // 收尾：更新实例最近访问时间 + await updateInstance(name, gamePath, { lastAccessDate: Date.now() }); + hooks.log('info', `实例「${name}」创建完成`); + }); +}); + +// ==================== 对外接口 ==================== + +// 根据执行器名称创建 @xmcl/task 任务；未知执行器返回 undefined +export function createXmclTask( + executorName: string, + params: Record, + hooks: TaskHooks, +): Task | undefined { + const factory = executorRegistry.get(executorName); + return factory ? factory(params, hooks) : undefined; +} + +// 将 @xmcl/task 的 path 映射为前端展示的阶段文案 +const STAGE_MAP: [RegExp, string][] = [ + [/^install\.create/, '创建实例'], + [/^install\.minecraft/, '下载 Minecraft'], + [/^install\.forge/, '安装 Forge'], + [/^install\.neoforge/, '安装 NeoForge'], + [/^install\.fabric/, '安装 Fabric'], + [/^install\.quilt/, '安装 Quilt'], + [/^install\.dependencies/, '安装依赖'], + [/^sleep/, '模拟计时'], + [/^download/, '模拟下载'], + [/^install-sim/, '模拟安装'], +]; + +export function stageFromPath(taskPath: string): string { + for (const [pattern, label] of STAGE_MAP) { + if (pattern.test(taskPath)) return label; + } + return taskPath || '执行中'; +} diff --git a/electron/handlers/instance.ts b/electron/handlers/instance.ts index 88e65e4..f6e66ca 100644 --- a/electron/handlers/instance.ts +++ b/electron/handlers/instance.ts @@ -13,6 +13,7 @@ import { getFabricVersionList, getQuiltVersionList, scanGameDirectories, + importExistingInstance, type InstanceRuntime, type InstanceConfig, } from '../core/instance'; @@ -205,4 +206,32 @@ export function registerInstanceHandlers(win: WinRef) { return { success: false, data: null, error: String(e) }; } }); + + // 从已安装版本导入实例 + ipcMain.handle('instance:import', async (_event, payload: { + name: string; + gamePath: string; + versionId: string; + description?: string; + java?: string; + minMemory?: number; + maxMemory?: number; + }) => { + try { + const data = await importExistingInstance( + payload.name, + payload.gamePath, + payload.versionId, + { + description: payload.description, + java: payload.java, + minMemory: payload.minMemory, + maxMemory: payload.maxMemory, + } + ); + return { success: true, data, error: null }; + } catch (e: unknown) { + return { success: false, data: null, error: String(e) }; + } + }); } diff --git a/electron/handlers/task.ts b/electron/handlers/task.ts index b425973..9a50b3f 100644 --- a/electron/handlers/task.ts +++ b/electron/handlers/task.ts @@ -1,23 +1,33 @@ +// __ __ __ __ ______ __ __ ______ __ __ ______ ______ +// /\ \ /\ \ /\ "-.\ \ /\ ___\ /\ \/ / /\ ___\ /\ "-.\ \ /\ ___\ /\__ _\ +// \ \ \____ \ \ \ \ \ \-. \ \ \ \__ \ \ \ _"-. \ \ __\ \ \ \-. \ \ \ __\ \/_/\ \/ +// \ \_____\ \ \_\ \ \_\\"\_\ \ \_____\ \ \_\ \_\ \ \_____\ \ \_\\"\_\ \ \_____\ \ \_\ +// \/_____/ \/_/ \/_/ \/_/ \/_____/ \/_/\/_/ \/_____/ \/_/ \/_/ \/_____/ \/_/ +// +// 所有权利归Lingke Network (china)所有 | dream_pep拥有其艺术改变权力 +// 未经允许的情况下删除此版权头可能会受到民事指控 +// 请勿在未经Lingke Network (china)允许的范围内修改代码并分发 + import electron from 'electron'; -import { createInstance, installInstanceGame, type InstanceRuntime } from '../core/instance'; +import { CancelledError, type Task } from '@xmcl/task'; +import { createXmclTask, stageFromPath, type TaskHooks } from '../core/task'; const { ipcMain } = electron; -const runningTasks = new Map(); +// 运行中的任务映射：taskId → @xmcl/task 实例 +const runningTasks = new Map>(); interface WinRef { mainWindow: electron.BrowserWindow | null; } -// 在任务中发送进度事件到渲染进程 -function emitProgress(win: WinRef, taskId: string, current: number, total: number, stage: string) { - win.mainWindow?.webContents.send('task:progress', { taskId, current, total, stage, event: 'task:progress' }); -} -function emitLog(win: WinRef, taskId: string, level: string, message: string) { - win.mainWindow?.webContents.send('task:progress', { taskId, event: 'task:log', level, message }); +// 向渲染进程广播任务事件（统一走 task:progress 通道） +function emit(win: WinRef, taskId: string, payload: Record) { + win.mainWindow?.webContents.send('task:progress', { taskId, ...payload }); } export function registerTaskHandlers(win: WinRef) { + // 启动任务：创建 @xmcl/task 任务并通过 startAndWait 回调广播事件 ipcMain.handle('task:start', async (_event, payload: { taskId: string; type: string; @@ -26,80 +36,80 @@ export function registerTaskHandlers(win: WinRef) { executorName: string; params?: Record; }) => { + // 任务钩子：日志广播到渲染进程 + const hooks: TaskHooks = { + log: (level, message) => emit(win, payload.taskId, { event: 'task:log', level, message }), + }; + + // 从执行器注册表创建 @xmcl/task 任务 + const xmclTask = createXmclTask(payload.executorName, payload.params ?? {}, hooks); + if (!xmclTask) { + return { success: false, data: null, error: `未知执行器: ${payload.executorName}` }; + } + + runningTasks.set(payload.taskId, xmclTask); + try { - const controller = new AbortController(); - runningTasks.set(payload.taskId, controller); - - win.mainWindow?.webContents.send('task:progress', { - taskId: payload.taskId, - event: 'task:started', - xmclPath: payload.executorName, + // 使用 @xmcl/task 的任务上下文回调驱动事件广播 + await xmclTask.startAndWait({ + onStart: (t) => emit(win, payload.taskId, { event: 'task:started', xmclPath: t.path }), + onUpdate: (t) => emit(win, payload.taskId, { + event: 'task:progress', + current: t.progress, + total: t.total, + stage: stageFromPath(t.path), + xmclPath: t.path, + }), + onPaused: () => emit(win, payload.taskId, { event: 'task:paused' }), + onResumed: () => emit(win, payload.taskId, { event: 'task:resumed' }), + onCancelled: () => emit(win, payload.taskId, { event: 'task:cancelled' }), + onSucceed: () => emit(win, payload.taskId, { event: 'task:completed' }), + onFailed: (t, error) => emit(win, payload.taskId, { event: 'task:failed', error: String(error) }), }); - - // 根据 executorName 选择处理逻辑 - if (payload.executorName === 'install') { - // 使用 @xmcl/core + @xmcl/installer 安装 Minecraft 实例 - const params = payload.params ?? {}; - const name = String(params.name ?? `mc-${Date.now()}`); - const gamePath = String(params.gamePath ?? '.minecraft'); - const runtime = (params.runtime ?? { minecraft: '1.21.4' }) as InstanceRuntime; - const description = String(params.description ?? ''); - - emitProgress(win, payload.taskId, 0, 100, '创建实例目录'); - emitLog(win, payload.taskId, 'info', `正在创建实例: ${name}`); - - // Step 1: 创建实例（写入 instance.json） - await createInstance(name, gamePath, runtime, { description }); - emitProgress(win, payload.taskId, 10, 100, '实例目录已创建'); - - // Step 2: 安装游戏文件（@xmcl/installer） - emitLog(win, payload.taskId, 'info', `正在下载 Minecraft ${runtime.minecraft}...`); - await installInstanceGame(name, gamePath, { - onProgress: (progress) => { - if (controller.signal.aborted) return; - const mapped = Math.round(10 + (progress.current / Math.max(progress.total, 1)) * 80); - emitProgress(win, payload.taskId, mapped, 100, progress.stage || '安装中'); - if (progress.message) emitLog(win, payload.taskId, 'info', progress.message); - }, - }); - - emitProgress(win, payload.taskId, 100, 100, '安装完成'); - emitLog(win, payload.taskId, 'info', `实例「${name}」创建完成`); - } else { - // 默认模拟执行 - const steps = 20; - for (let i = 0; i <= steps; i++) { - if (controller.signal.aborted) throw new Error('已取消'); - emitProgress(win, payload.taskId, i, steps, `步骤 ${i}/${steps}`); - await new Promise((r) => setTimeout(r, 150)); - } - emitLog(win, payload.taskId, 'info', '任务完成'); - } - runningTasks.delete(payload.taskId); - win.mainWindow?.webContents.send('task:progress', { - taskId: payload.taskId, - event: 'task:completed', - }); - return { success: true, data: null, error: null }; } catch (e: unknown) { runningTasks.delete(payload.taskId); - const errMsg = e instanceof Error ? e.message : String(e); - win.mainWindow?.webContents.send('task:progress', { - taskId: payload.taskId, - event: 'task:failed', - error: errMsg, - }); - return { success: false, data: null, error: errMsg }; + // 取消不是错误：状态已通过 task:cancelled 事件广播 + if (e instanceof CancelledError) { + return { success: true, data: null, error: null }; + } + return { success: false, data: null, error: e instanceof Error ? e.message : String(e) }; } }); + // 取消任务：调用 @xmcl/task 的 cancel()，取消信号沿任务树向下传播 ipcMain.handle('task:cancel', async (_event, payload: { taskId: string }) => { try { - const controller = runningTasks.get(payload.taskId); - if (controller) { - controller.abort(); + const xmclTask = runningTasks.get(payload.taskId); + if (xmclTask) { + await xmclTask.cancel(); + } + return { success: true, data: null, error: null }; + } catch (e: unknown) { + return { success: false, data: null, error: String(e) }; + } + }); + + // 暂停任务：@xmcl/task 原生 Paused 状态 + ipcMain.handle('task:pause', async (_event, payload: { taskId: string }) => { + try { + const xmclTask = runningTasks.get(payload.taskId); + if (xmclTask) { + await xmclTask.pause(); + } + return { success: true, data: null, error: null }; + } catch (e: unknown) { + return { success: false, data: null, error: String(e) }; + } + }); + + // 恢复任务：从 Paused 状态恢复 + ipcMain.handle('task:resume', async (_event, payload: { taskId: string }) => { + try { + const xmclTask = runningTasks.get(payload.taskId); + if (xmclTask) { + await xmclTask.resume(); } return { success: true, data: null, error: null }; } catch (e: unknown) { diff --git a/package.json b/package.json index 9a07fe4..8b41e16 100644 --- a/package.json +++ b/package.json @@ -33,14 +33,20 @@ }, "dependencies": { "@base-ui/react": "^1.6.0", + "@floating-ui/react-dom": "^2.1.8", + "@floating-ui/utils": "^0.2.11", "@fontsource-variable/geist": "^5.2.9", "@fontsource-variable/inter": "^5.2.8", "@heroui/react": "^3.2.2", "@heroui/styles": "^3.2.2", + "@internationalized/date": "^3.12.3", + "@internationalized/number": "^3.6.7", + "@internationalized/string": "^3.2.10", "@react-three/fiber": "^9.6.1", "@types/three": "^0.184.1", - "@xmcl/core": "^2.15.1", - "@xmcl/installer": "^6.1.2", + "@xmcl/core": "~2.15.1", + "@xmcl/installer": "~6.1.2", + "@xmcl/task": "4.1.1", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "js-yaml": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 202bd69..64f7d32 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,12 @@ importers: '@base-ui/react': specifier: ^1.6.0 version: 1.6.0(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7) + '@floating-ui/react-dom': + specifier: ^2.1.8 + version: 2.1.8(react-dom@19.2.7(react@19.2.7))(react@19.2.7) + '@floating-ui/utils': + specifier: ^0.2.11 + version: 0.2.11 '@fontsource-variable/geist': specifier: ^5.2.9 version: 5.2.9 @@ -23,6 +29,15 @@ importers: '@heroui/styles': specifier: ^3.2.2 version: 3.2.2(tailwind-merge@3.6.0)(tailwindcss@4.3.1) + '@internationalized/date': + specifier: ^3.12.3 + version: 3.12.3 + '@internationalized/number': + specifier: ^3.6.7 + version: 3.6.7 + '@internationalized/string': + specifier: ^3.2.10 + version: 3.2.10 '@react-three/fiber': specifier: ^9.6.1 version: 9.6.1(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)(three@0.184.0) @@ -30,11 +45,14 @@ importers: specifier: ^0.184.1 version: 0.184.1 '@xmcl/core': - specifier: ^2.15.1 + specifier: ~2.15.1 version: 2.15.1(yauzl@2.10.0) '@xmcl/installer': - specifier: ^6.1.2 + specifier: ~6.1.2 version: 6.1.2 + '@xmcl/task': + specifier: 4.1.1 + version: 4.1.1 class-variance-authority: specifier: ^0.7.1 version: 0.7.1 @@ -92,19 +110,19 @@ importers: version: 19.2.3(@types/react@19.2.17) '@vitejs/plugin-react': specifier: ^4.6.0 - version: 4.7.0(vite@7.3.5(@types/node@26.0.1)(jiti@2.7.0)(lightningcss@1.32.0)(tsx@4.22.4)) + version: 4.7.0(supports-color@8.1.1)(vite@7.3.5(@types/node@26.0.1)(jiti@2.7.0)(lightningcss@1.32.0)(tsx@4.22.4)) concurrently: specifier: ^9.1.0 version: 9.2.3 electron: specifier: ^33.0.0 - version: 33.4.11 + version: 33.4.11(supports-color@8.1.1) electron-builder: specifier: ^25.1.8 - version: 25.1.8(electron-builder-squirrel-windows@25.1.8) + version: 25.1.8(bluebird@3.7.2)(electron-builder-squirrel-windows@25.1.8)(supports-color@8.1.1) shadcn: specifier: ^4.11.0 - version: 4.11.0(typescript@5.8.3) + version: 4.11.0(supports-color@8.1.1)(typescript@5.8.3) tailwindcss: specifier: ^4.3.1 version: 4.3.1 @@ -729,14 +747,17 @@ packages: '@internationalized/date@3.12.2': resolution: {integrity: sha512-FY1Y+H64NDs+HAF6omlnWxm3mEpfgaCSWtL5l551ZZfImA+kGjPFgrnJrGjH6lfmLL0g8Z/mBu1R3kufeCp6Jw==} + '@internationalized/date@3.12.3': + resolution: {integrity: sha512-fuLX+3ZKLsxI73y8b01EG/WjHb6gE6weCqlfawPO27kBWGMh9G1yH6Csv1uU7/cac9H2GHmOMt6CjmuQ1aia4Q==} + '@internationalized/message@3.1.10': resolution: {integrity: sha512-nc0Or6EdWHqZRcsXb6P9hBIpLsfSl/ILh0rk5h/OVBpzmhdExXtPy2cQtWsq8XKRBpRHwDNnAHt4OpolcB7dog==} '@internationalized/number@3.6.7': resolution: {integrity: sha512-3ji1fcrT+FPAK86UqEhB/psHixYo6niWPJtt7+qRaYFynt/BaJG8GhAPimtWUpEiVSTq8ZM8L5psMxGquiB/Vg==} - '@internationalized/string@3.2.9': - resolution: {integrity: sha512-kzP/M/mbQxODlmOt4bIQZ2SBVUWUSqMLXooXixnX7noche8WHaQcA+nwFN1K2KCF/cp+LDUhcJsCicwkvhD1pg==} + '@internationalized/string@3.2.10': + resolution: {integrity: sha512-PDx6//vHSpRnHfxqMqto11zQvhsaU74O3mKv2F/0eicGZcl9NLjQmGlbHz/LsJh5tLKp4A4L7ZVTzN1/MmMTvA==} '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} @@ -1373,6 +1394,7 @@ packages: '@xmldom/xmldom@0.9.10': resolution: {integrity: sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==} engines: {node: '>=14.6'} + deprecated: this version has critical issues, please update to the latest version abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} @@ -2279,16 +2301,17 @@ packages: glob@10.4.5: resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} - deprecated: Glob versions prior to v9 are no longer supported + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me glob@8.1.0: resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} engines: {node: '>=12'} - deprecated: Glob versions prior to v9 are no longer supported + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me global-agent@3.0.0: resolution: {integrity: sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==} @@ -3613,6 +3636,7 @@ packages: tar@6.2.1: resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} engines: {node: '>=10'} + deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me temp-file@3.4.0: resolution: {integrity: sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==} @@ -3938,20 +3962,20 @@ snapshots: '@babel/compat-data@7.29.7': {} - '@babel/core@7.29.7': + '@babel/core@7.29.7(supports-color@8.1.1)': dependencies: '@babel/code-frame': 7.29.7 '@babel/generator': 7.29.7 '@babel/helper-compilation-targets': 7.29.7 - '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7) + '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) '@babel/helpers': 7.29.7 '@babel/parser': 7.29.7 '@babel/template': 7.29.7 - '@babel/traverse': 7.29.7 + '@babel/traverse': 7.29.7(supports-color@8.1.1) '@babel/types': 7.29.7 '@jridgewell/remapping': 2.3.5 convert-source-map: 2.0.0 - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -3978,41 +4002,41 @@ snapshots: lru-cache: 5.1.1 semver: 6.3.1 - '@babel/helper-create-class-features-plugin@7.29.7(@babel/core@7.29.7)': + '@babel/helper-create-class-features-plugin@7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1)': dependencies: - '@babel/core': 7.29.7 + '@babel/core': 7.29.7(supports-color@8.1.1) '@babel/helper-annotate-as-pure': 7.29.7 - '@babel/helper-member-expression-to-functions': 7.29.7 + '@babel/helper-member-expression-to-functions': 7.29.7(supports-color@8.1.1) '@babel/helper-optimise-call-expression': 7.29.7 - '@babel/helper-replace-supers': 7.29.7(@babel/core@7.29.7) - '@babel/helper-skip-transparent-expression-wrappers': 7.29.7 - '@babel/traverse': 7.29.7 + '@babel/helper-replace-supers': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) + '@babel/helper-skip-transparent-expression-wrappers': 7.29.7(supports-color@8.1.1) + '@babel/traverse': 7.29.7(supports-color@8.1.1) semver: 6.3.1 transitivePeerDependencies: - supports-color '@babel/helper-globals@7.29.7': {} - '@babel/helper-member-expression-to-functions@7.29.7': + '@babel/helper-member-expression-to-functions@7.29.7(supports-color@8.1.1)': dependencies: - '@babel/traverse': 7.29.7 + '@babel/traverse': 7.29.7(supports-color@8.1.1) '@babel/types': 7.29.7 transitivePeerDependencies: - supports-color - '@babel/helper-module-imports@7.29.7': + '@babel/helper-module-imports@7.29.7(supports-color@8.1.1)': dependencies: - '@babel/traverse': 7.29.7 + '@babel/traverse': 7.29.7(supports-color@8.1.1) '@babel/types': 7.29.7 transitivePeerDependencies: - supports-color - '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7)': + '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1)': dependencies: - '@babel/core': 7.29.7 - '@babel/helper-module-imports': 7.29.7 + '@babel/core': 7.29.7(supports-color@8.1.1) + '@babel/helper-module-imports': 7.29.7(supports-color@8.1.1) '@babel/helper-validator-identifier': 7.29.7 - '@babel/traverse': 7.29.7 + '@babel/traverse': 7.29.7(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -4022,18 +4046,18 @@ snapshots: '@babel/helper-plugin-utils@7.29.7': {} - '@babel/helper-replace-supers@7.29.7(@babel/core@7.29.7)': + '@babel/helper-replace-supers@7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1)': dependencies: - '@babel/core': 7.29.7 - '@babel/helper-member-expression-to-functions': 7.29.7 + '@babel/core': 7.29.7(supports-color@8.1.1) + '@babel/helper-member-expression-to-functions': 7.29.7(supports-color@8.1.1) '@babel/helper-optimise-call-expression': 7.29.7 - '@babel/traverse': 7.29.7 + '@babel/traverse': 7.29.7(supports-color@8.1.1) transitivePeerDependencies: - supports-color - '@babel/helper-skip-transparent-expression-wrappers@7.29.7': + '@babel/helper-skip-transparent-expression-wrappers@7.29.7(supports-color@8.1.1)': dependencies: - '@babel/traverse': 7.29.7 + '@babel/traverse': 7.29.7(supports-color@8.1.1) '@babel/types': 7.29.7 transitivePeerDependencies: - supports-color @@ -4053,53 +4077,53 @@ snapshots: dependencies: '@babel/types': 7.29.7 - '@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.7)': + '@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.7(supports-color@8.1.1))': dependencies: - '@babel/core': 7.29.7 + '@babel/core': 7.29.7(supports-color@8.1.1) '@babel/helper-plugin-utils': 7.29.7 - '@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7)': + '@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1))': dependencies: - '@babel/core': 7.29.7 + '@babel/core': 7.29.7(supports-color@8.1.1) '@babel/helper-plugin-utils': 7.29.7 - '@babel/plugin-transform-modules-commonjs@7.29.7(@babel/core@7.29.7)': + '@babel/plugin-transform-modules-commonjs@7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1)': dependencies: - '@babel/core': 7.29.7 - '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7) + '@babel/core': 7.29.7(supports-color@8.1.1) + '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) '@babel/helper-plugin-utils': 7.29.7 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-react-jsx-self@7.29.7(@babel/core@7.29.7)': + '@babel/plugin-transform-react-jsx-self@7.29.7(@babel/core@7.29.7(supports-color@8.1.1))': dependencies: - '@babel/core': 7.29.7 + '@babel/core': 7.29.7(supports-color@8.1.1) '@babel/helper-plugin-utils': 7.29.7 - '@babel/plugin-transform-react-jsx-source@7.29.7(@babel/core@7.29.7)': + '@babel/plugin-transform-react-jsx-source@7.29.7(@babel/core@7.29.7(supports-color@8.1.1))': dependencies: - '@babel/core': 7.29.7 + '@babel/core': 7.29.7(supports-color@8.1.1) '@babel/helper-plugin-utils': 7.29.7 - '@babel/plugin-transform-typescript@7.29.7(@babel/core@7.29.7)': + '@babel/plugin-transform-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1)': dependencies: - '@babel/core': 7.29.7 + '@babel/core': 7.29.7(supports-color@8.1.1) '@babel/helper-annotate-as-pure': 7.29.7 - '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7) + '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) '@babel/helper-plugin-utils': 7.29.7 - '@babel/helper-skip-transparent-expression-wrappers': 7.29.7 - '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7) + '@babel/helper-skip-transparent-expression-wrappers': 7.29.7(supports-color@8.1.1) + '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1)) transitivePeerDependencies: - supports-color - '@babel/preset-typescript@7.29.7(@babel/core@7.29.7)': + '@babel/preset-typescript@7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1)': dependencies: - '@babel/core': 7.29.7 + '@babel/core': 7.29.7(supports-color@8.1.1) '@babel/helper-plugin-utils': 7.29.7 '@babel/helper-validator-option': 7.29.7 - '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7) - '@babel/plugin-transform-modules-commonjs': 7.29.7(@babel/core@7.29.7) - '@babel/plugin-transform-typescript': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1)) + '@babel/plugin-transform-modules-commonjs': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) + '@babel/plugin-transform-typescript': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -4111,7 +4135,7 @@ snapshots: '@babel/parser': 7.29.7 '@babel/types': 7.29.7 - '@babel/traverse@7.29.7': + '@babel/traverse@7.29.7(supports-color@8.1.1)': dependencies: '@babel/code-frame': 7.29.7 '@babel/generator': 7.29.7 @@ -4119,7 +4143,7 @@ snapshots: '@babel/parser': 7.29.7 '@babel/template': 7.29.7 '@babel/types': 7.29.7 - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -4187,32 +4211,32 @@ snapshots: glob: 7.2.3 minimatch: 3.1.5 - '@electron/get@2.0.3': + '@electron/get@2.0.3(supports-color@8.1.1)': dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) env-paths: 2.2.1 fs-extra: 8.1.0 got: 11.8.6 progress: 2.0.3 semver: 6.3.1 - sumchecker: 3.0.1 + sumchecker: 3.0.1(supports-color@8.1.1) optionalDependencies: global-agent: 3.0.0 transitivePeerDependencies: - supports-color - '@electron/notarize@2.5.0': + '@electron/notarize@2.5.0(supports-color@8.1.1)': dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) fs-extra: 9.1.0 promise-retry: 2.0.1 transitivePeerDependencies: - supports-color - '@electron/osx-sign@1.3.1': + '@electron/osx-sign@1.3.1(supports-color@8.1.1)': dependencies: compare-version: 0.1.2 - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) fs-extra: 10.1.0 isbinaryfile: 4.0.10 minimist: 1.2.8 @@ -4220,19 +4244,19 @@ snapshots: transitivePeerDependencies: - supports-color - '@electron/rebuild@3.6.1': + '@electron/rebuild@3.6.1(bluebird@3.7.2)(supports-color@8.1.1)': dependencies: '@malept/cross-spawn-promise': 2.0.0 chalk: 4.1.2 - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) detect-libc: 2.1.2 fs-extra: 10.1.0 got: 11.8.6 node-abi: 3.92.0 node-api-version: 0.2.1 - node-gyp: 9.4.1 + node-gyp: 9.4.1(bluebird@3.7.2)(supports-color@8.1.1) ora: 5.4.1 - read-binary-file-arch: 1.0.6 + read-binary-file-arch: 1.0.6(supports-color@8.1.1) semver: 7.8.4 tar: 6.2.1 yargs: 17.7.3 @@ -4240,11 +4264,11 @@ snapshots: - bluebird - supports-color - '@electron/universal@2.0.1': + '@electron/universal@2.0.1(supports-color@8.1.1)': dependencies: '@electron/asar': 3.4.1 '@malept/cross-spawn-promise': 2.0.0 - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) dir-compare: 4.2.0 fs-extra: 11.3.5 minimatch: 9.0.9 @@ -4504,6 +4528,10 @@ snapshots: dependencies: '@swc/helpers': 0.5.23 + '@internationalized/date@3.12.3': + dependencies: + '@swc/helpers': 0.5.23 + '@internationalized/message@3.1.10': dependencies: '@swc/helpers': 0.5.23 @@ -4513,7 +4541,7 @@ snapshots: dependencies: '@swc/helpers': 0.5.23 - '@internationalized/string@3.2.9': + '@internationalized/string@3.2.10': dependencies: '@swc/helpers': 0.5.23 @@ -4549,16 +4577,16 @@ snapshots: dependencies: cross-spawn: 7.0.6 - '@malept/flatpak-bundler@0.4.0': + '@malept/flatpak-bundler@0.4.0(supports-color@8.1.1)': dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) fs-extra: 9.1.0 lodash: 4.18.1 tmp-promise: 3.0.3 transitivePeerDependencies: - supports-color - '@modelcontextprotocol/sdk@1.29.0(zod@3.25.76)': + '@modelcontextprotocol/sdk@1.29.0(supports-color@8.1.1)(zod@3.25.76)': dependencies: '@hono/node-server': 1.19.14(hono@4.12.26) ajv: 8.20.0 @@ -4568,8 +4596,8 @@ snapshots: cross-spawn: 7.0.6 eventsource: 3.0.7 eventsource-parser: 3.1.0 - express: 5.2.1 - express-rate-limit: 8.5.2(express@5.2.1) + express: 5.2.1(supports-color@8.1.1) + express-rate-limit: 8.5.2(express@5.2.1(supports-color@8.1.1)) hono: 4.12.26 jose: 6.2.3 json-schema-typed: 8.0.2 @@ -4682,9 +4710,9 @@ snapshots: '@react-aria/i18n@3.13.1(react-dom@19.2.7(react@19.2.7))(react@19.2.7)': dependencies: - '@internationalized/date': 3.12.2 + '@internationalized/date': 3.12.3 '@internationalized/message': 3.1.10 - '@internationalized/string': 3.2.9 + '@internationalized/string': 3.2.10 '@swc/helpers': 0.5.23 react: 19.2.7 react-aria: 3.50.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7) @@ -5053,11 +5081,11 @@ snapshots: dependencies: '@types/node': 26.0.1 - '@vitejs/plugin-react@4.7.0(vite@7.3.5(@types/node@26.0.1)(jiti@2.7.0)(lightningcss@1.32.0)(tsx@4.22.4))': + '@vitejs/plugin-react@4.7.0(supports-color@8.1.1)(vite@7.3.5(@types/node@26.0.1)(jiti@2.7.0)(lightningcss@1.32.0)(tsx@4.22.4))': dependencies: - '@babel/core': 7.29.7 - '@babel/plugin-transform-react-jsx-self': 7.29.7(@babel/core@7.29.7) - '@babel/plugin-transform-react-jsx-source': 7.29.7(@babel/core@7.29.7) + '@babel/core': 7.29.7(supports-color@8.1.1) + '@babel/plugin-transform-react-jsx-self': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1)) + '@babel/plugin-transform-react-jsx-source': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1)) '@rolldown/pluginutils': 1.0.0-beta.27 '@types/babel__core': 7.20.5 react-refresh: 0.17.0 @@ -5111,9 +5139,9 @@ snapshots: mime-types: 3.0.2 negotiator: 1.0.0 - agent-base@6.0.2: + agent-base@6.0.2(supports-color@8.1.1): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -5168,28 +5196,28 @@ snapshots: app-builder-bin@5.0.0-alpha.10: {} - app-builder-lib@25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8): + app-builder-lib@25.1.8(bluebird@3.7.2)(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8)(supports-color@8.1.1): dependencies: '@develar/schema-utils': 2.6.5 - '@electron/notarize': 2.5.0 - '@electron/osx-sign': 1.3.1 - '@electron/rebuild': 3.6.1 - '@electron/universal': 2.0.1 - '@malept/flatpak-bundler': 0.4.0 + '@electron/notarize': 2.5.0(supports-color@8.1.1) + '@electron/osx-sign': 1.3.1(supports-color@8.1.1) + '@electron/rebuild': 3.6.1(bluebird@3.7.2)(supports-color@8.1.1) + '@electron/universal': 2.0.1(supports-color@8.1.1) + '@malept/flatpak-bundler': 0.4.0(supports-color@8.1.1) '@types/fs-extra': 9.0.13 async-exit-hook: 2.0.1 bluebird-lst: 1.0.9 - builder-util: 25.1.7 - builder-util-runtime: 9.2.10 + builder-util: 25.1.7(supports-color@8.1.1) + builder-util-runtime: 9.2.10(supports-color@8.1.1) chromium-pickle-js: 0.2.0 config-file-ts: 0.2.8-rc1 - debug: 4.4.3 - dmg-builder: 25.1.8(electron-builder-squirrel-windows@25.1.8) + debug: 4.4.3(supports-color@8.1.1) + dmg-builder: 25.1.8(bluebird@3.7.2)(electron-builder-squirrel-windows@25.1.8)(supports-color@8.1.1) dotenv: 16.6.1 dotenv-expand: 11.0.7 ejs: 3.1.10 - electron-builder-squirrel-windows: 25.1.8(dmg-builder@25.1.8) - electron-publish: 25.1.7 + electron-builder-squirrel-windows: 25.1.8(bluebird@3.7.2)(dmg-builder@25.1.8)(supports-color@8.1.1) + electron-publish: 25.1.7(supports-color@8.1.1) form-data: 4.0.6 fs-extra: 10.1.0 hosted-git-info: 4.1.0 @@ -5297,11 +5325,11 @@ snapshots: bluebird@3.7.2: {} - body-parser@2.3.0: + body-parser@2.3.0(supports-color@8.1.1): dependencies: bytes: 3.1.2 content-type: 2.0.0 - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) http-errors: 2.0.1 iconv-lite: 0.7.2 on-finished: 2.4.1 @@ -5355,26 +5383,26 @@ snapshots: base64-js: 1.5.1 ieee754: 1.2.1 - builder-util-runtime@9.2.10: + builder-util-runtime@9.2.10(supports-color@8.1.1): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) sax: 1.6.0 transitivePeerDependencies: - supports-color - builder-util@25.1.7: + builder-util@25.1.7(supports-color@8.1.1): dependencies: 7zip-bin: 5.2.0 '@types/debug': 4.1.13 app-builder-bin: 5.0.0-alpha.10 bluebird-lst: 1.0.9 - builder-util-runtime: 9.2.10 + builder-util-runtime: 9.2.10(supports-color@8.1.1) chalk: 4.1.2 cross-spawn: 7.0.6 - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) fs-extra: 10.1.0 - http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.6 + http-proxy-agent: 7.0.2(supports-color@8.1.1) + https-proxy-agent: 7.0.6(supports-color@8.1.1) is-ci: 3.0.1 js-yaml: 4.2.0 source-map-support: 0.5.21 @@ -5389,7 +5417,7 @@ snapshots: bytes@3.1.2: {} - cacache@16.1.3: + cacache@16.1.3(bluebird@3.7.2): dependencies: '@npmcli/fs': 2.1.2 '@npmcli/move-file': 2.0.1 @@ -5404,7 +5432,7 @@ snapshots: minipass-pipeline: 1.2.4 mkdirp: 1.0.4 p-map: 4.0.0 - promise-inflight: 1.0.1 + promise-inflight: 1.0.1(bluebird@3.7.2) rimraf: 3.0.2 ssri: 9.0.1 tar: 6.2.1 @@ -5618,9 +5646,11 @@ snapshots: dependencies: mimic-fn: 3.1.0 - debug@4.4.3: + debug@4.4.3(supports-color@8.1.1): dependencies: ms: 2.1.3 + optionalDependencies: + supports-color: 8.1.1 decimal.js@10.6.0: {} @@ -5681,11 +5711,11 @@ snapshots: minimatch: 3.1.5 p-limit: 3.1.0 - dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8): + dmg-builder@25.1.8(bluebird@3.7.2)(electron-builder-squirrel-windows@25.1.8)(supports-color@8.1.1): dependencies: - app-builder-lib: 25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8) - builder-util: 25.1.7 - builder-util-runtime: 9.2.10 + app-builder-lib: 25.1.8(bluebird@3.7.2)(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8)(supports-color@8.1.1) + builder-util: 25.1.7(supports-color@8.1.1) + builder-util-runtime: 9.2.10(supports-color@8.1.1) fs-extra: 10.1.0 iconv-lite: 0.6.3 js-yaml: 4.2.0 @@ -5764,24 +5794,24 @@ snapshots: dependencies: jake: 10.9.4 - electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8): + electron-builder-squirrel-windows@25.1.8(bluebird@3.7.2)(dmg-builder@25.1.8)(supports-color@8.1.1): dependencies: - app-builder-lib: 25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8) + app-builder-lib: 25.1.8(bluebird@3.7.2)(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8)(supports-color@8.1.1) archiver: 5.3.2 - builder-util: 25.1.7 + builder-util: 25.1.7(supports-color@8.1.1) fs-extra: 10.1.0 transitivePeerDependencies: - bluebird - dmg-builder - supports-color - electron-builder@25.1.8(electron-builder-squirrel-windows@25.1.8): + electron-builder@25.1.8(bluebird@3.7.2)(electron-builder-squirrel-windows@25.1.8)(supports-color@8.1.1): dependencies: - app-builder-lib: 25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8) - builder-util: 25.1.7 - builder-util-runtime: 9.2.10 + app-builder-lib: 25.1.8(bluebird@3.7.2)(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8)(supports-color@8.1.1) + builder-util: 25.1.7(supports-color@8.1.1) + builder-util-runtime: 9.2.10(supports-color@8.1.1) chalk: 4.1.2 - dmg-builder: 25.1.8(electron-builder-squirrel-windows@25.1.8) + dmg-builder: 25.1.8(bluebird@3.7.2)(electron-builder-squirrel-windows@25.1.8)(supports-color@8.1.1) fs-extra: 10.1.0 is-ci: 3.0.1 lazy-val: 1.0.5 @@ -5792,11 +5822,11 @@ snapshots: - electron-builder-squirrel-windows - supports-color - electron-publish@25.1.7: + electron-publish@25.1.7(supports-color@8.1.1): dependencies: '@types/fs-extra': 9.0.13 - builder-util: 25.1.7 - builder-util-runtime: 9.2.10 + builder-util: 25.1.7(supports-color@8.1.1) + builder-util-runtime: 9.2.10(supports-color@8.1.1) chalk: 4.1.2 fs-extra: 10.1.0 lazy-val: 1.0.5 @@ -5806,11 +5836,11 @@ snapshots: electron-to-chromium@1.5.376: {} - electron@33.4.11: + electron@33.4.11(supports-color@8.1.1): dependencies: - '@electron/get': 2.0.3 + '@electron/get': 2.0.3(supports-color@8.1.1) '@types/node': 20.19.43 - extract-zip: 2.0.1 + extract-zip: 2.0.1(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -5973,25 +6003,25 @@ snapshots: exponential-backoff@3.1.3: {} - express-rate-limit@8.5.2(express@5.2.1): + express-rate-limit@8.5.2(express@5.2.1(supports-color@8.1.1)): dependencies: - express: 5.2.1 + express: 5.2.1(supports-color@8.1.1) ip-address: 10.2.0 - express@5.2.1: + express@5.2.1(supports-color@8.1.1): dependencies: accepts: 2.0.0 - body-parser: 2.3.0 + body-parser: 2.3.0(supports-color@8.1.1) content-disposition: 1.1.0 content-type: 1.0.5 cookie: 0.7.2 cookie-signature: 1.2.2 - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) depd: 2.0.0 encodeurl: 2.0.0 escape-html: 1.0.3 etag: 1.8.1 - finalhandler: 2.1.1 + finalhandler: 2.1.1(supports-color@8.1.1) fresh: 2.0.0 http-errors: 2.0.1 merge-descriptors: 2.0.0 @@ -6002,18 +6032,18 @@ snapshots: proxy-addr: 2.0.7 qs: 6.15.2 range-parser: 1.2.1 - router: 2.2.0 - send: 1.2.1 - serve-static: 2.2.1 + router: 2.2.0(supports-color@8.1.1) + send: 1.2.1(supports-color@8.1.1) + serve-static: 2.2.1(supports-color@8.1.1) statuses: 2.0.2 type-is: 2.1.0 vary: 1.1.2 transitivePeerDependencies: - supports-color - extract-zip@2.0.1: + extract-zip@2.0.1(supports-color@8.1.1): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) get-stream: 5.2.0 yauzl: 2.10.0 optionalDependencies: @@ -6069,9 +6099,9 @@ snapshots: dependencies: to-regex-range: 5.0.1 - finalhandler@2.1.1: + finalhandler@2.1.1(supports-color@8.1.1): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) encodeurl: 2.0.0 escape-html: 1.0.3 on-finished: 2.4.1 @@ -6303,18 +6333,18 @@ snapshots: statuses: 2.0.2 toidentifier: 1.0.1 - http-proxy-agent@5.0.0: + http-proxy-agent@5.0.0(supports-color@8.1.1): dependencies: '@tootallnate/once': 2.0.1 - agent-base: 6.0.2 - debug: 4.4.3 + agent-base: 6.0.2(supports-color@8.1.1) + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color - http-proxy-agent@7.0.2: + http-proxy-agent@7.0.2(supports-color@8.1.1): dependencies: agent-base: 7.1.4 - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -6323,17 +6353,17 @@ snapshots: quick-lru: 5.1.1 resolve-alpn: 1.2.1 - https-proxy-agent@5.0.1: + https-proxy-agent@5.0.1(supports-color@8.1.1): dependencies: - agent-base: 6.0.2 - debug: 4.4.3 + agent-base: 6.0.2(supports-color@8.1.1) + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color - https-proxy-agent@7.0.6: + https-proxy-agent@7.0.6(supports-color@8.1.1): dependencies: agent-base: 7.1.4 - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -6643,13 +6673,13 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.5.5 - make-fetch-happen@10.2.1: + make-fetch-happen@10.2.1(bluebird@3.7.2)(supports-color@8.1.1): dependencies: agentkeepalive: 4.6.0 - cacache: 16.1.3 + cacache: 16.1.3(bluebird@3.7.2) http-cache-semantics: 4.2.0 - http-proxy-agent: 5.0.0 - https-proxy-agent: 5.0.1 + http-proxy-agent: 5.0.0(supports-color@8.1.1) + https-proxy-agent: 5.0.1(supports-color@8.1.1) is-lambda: 1.0.1 lru-cache: 7.18.3 minipass: 3.3.6 @@ -6659,7 +6689,7 @@ snapshots: minipass-pipeline: 1.2.4 negotiator: 0.6.4 promise-retry: 2.0.1 - socks-proxy-agent: 7.0.0 + socks-proxy-agent: 7.0.0(supports-color@8.1.1) ssri: 9.0.1 transitivePeerDependencies: - bluebird @@ -6814,13 +6844,13 @@ snapshots: fetch-blob: 3.2.0 formdata-polyfill: 4.0.10 - node-gyp@9.4.1: + node-gyp@9.4.1(bluebird@3.7.2)(supports-color@8.1.1): dependencies: env-paths: 2.2.1 exponential-backoff: 3.1.3 glob: 7.2.3 graceful-fs: 4.2.11 - make-fetch-happen: 10.2.1 + make-fetch-happen: 10.2.1(bluebird@3.7.2)(supports-color@8.1.1) nopt: 6.0.0 npmlog: 6.0.2 rimraf: 3.0.2 @@ -7027,7 +7057,9 @@ snapshots: progress@2.0.3: {} - promise-inflight@1.0.1: {} + promise-inflight@1.0.1(bluebird@3.7.2): + optionalDependencies: + bluebird: 3.7.2 promise-retry@2.0.1: dependencies: @@ -7080,7 +7112,7 @@ snapshots: react-aria-components@1.19.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7): dependencies: - '@internationalized/date': 3.12.2 + '@internationalized/date': 3.12.3 '@react-types/shared': 3.36.0(react@19.2.7) '@swc/helpers': 0.5.23 client-only: 0.0.1 @@ -7091,9 +7123,9 @@ snapshots: react-aria@3.50.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7): dependencies: - '@internationalized/date': 3.12.2 + '@internationalized/date': 3.12.3 '@internationalized/number': 3.6.7 - '@internationalized/string': 3.2.9 + '@internationalized/string': 3.2.10 '@react-types/shared': 3.36.0(react@19.2.7) '@swc/helpers': 0.5.23 aria-hidden: 1.2.6 @@ -7114,9 +7146,9 @@ snapshots: react-stately@3.48.0(react@19.2.7): dependencies: - '@internationalized/date': 3.12.2 + '@internationalized/date': 3.12.3 '@internationalized/number': 3.6.7 - '@internationalized/string': 3.2.9 + '@internationalized/string': 3.2.10 '@react-types/shared': 3.36.0(react@19.2.7) '@swc/helpers': 0.5.23 react: 19.2.7 @@ -7139,9 +7171,9 @@ snapshots: react@19.2.7: {} - read-binary-file-arch@1.0.6: + read-binary-file-arch@1.0.6(supports-color@8.1.1): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -7250,9 +7282,9 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.62.0 fsevents: 2.3.3 - router@2.2.0: + router@2.2.0(supports-color@8.1.1): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) depd: 2.0.0 is-promise: 4.0.0 parseurl: 1.3.3 @@ -7291,9 +7323,9 @@ snapshots: semver@7.8.4: {} - send@1.2.1: + send@1.2.1(supports-color@8.1.1): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) encodeurl: 2.0.0 escape-html: 1.0.3 etag: 1.8.1 @@ -7312,12 +7344,12 @@ snapshots: type-fest: 0.13.1 optional: true - serve-static@2.2.1: + serve-static@2.2.1(supports-color@8.1.1): dependencies: encodeurl: 2.0.0 escape-html: 1.0.3 parseurl: 1.3.3 - send: 1.2.1 + send: 1.2.1(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -7325,14 +7357,14 @@ snapshots: setprototypeof@1.2.0: {} - shadcn@4.11.0(typescript@5.8.3): + shadcn@4.11.0(supports-color@8.1.1)(typescript@5.8.3): dependencies: - '@babel/core': 7.29.7 + '@babel/core': 7.29.7(supports-color@8.1.1) '@babel/parser': 7.29.7 - '@babel/plugin-transform-typescript': 7.29.7(@babel/core@7.29.7) - '@babel/preset-typescript': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-transform-typescript': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) + '@babel/preset-typescript': 7.29.7(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1) '@dotenvx/dotenvx': 1.74.2 - '@modelcontextprotocol/sdk': 1.29.0(zod@3.25.76) + '@modelcontextprotocol/sdk': 1.29.0(supports-color@8.1.1)(zod@3.25.76) '@types/validate-npm-package-name': 4.0.2 browserslist: 4.28.2 commander: 14.0.3 @@ -7344,7 +7376,7 @@ snapshots: fast-glob: 3.3.3 fs-extra: 11.3.5 fuzzysort: 3.1.0 - https-proxy-agent: 7.0.6 + https-proxy-agent: 7.0.6(supports-color@8.1.1) kleur: 4.1.5 node-fetch: 3.3.2 open: 11.0.0 @@ -7421,10 +7453,10 @@ snapshots: smart-buffer@4.2.0: {} - socks-proxy-agent@7.0.0: + socks-proxy-agent@7.0.0(supports-color@8.1.1): dependencies: - agent-base: 6.0.2 - debug: 4.4.3 + agent-base: 6.0.2(supports-color@8.1.1) + debug: 4.4.3(supports-color@8.1.1) socks: 2.8.9 transitivePeerDependencies: - supports-color @@ -7507,9 +7539,9 @@ snapshots: strip-final-newline@4.0.0: {} - sumchecker@3.0.1: + sumchecker@3.0.1(supports-color@8.1.1): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 604c40b..31cace8 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,20 @@ -# 允许执行构建脚本的依赖（pnpm 10+ 默认禁止依赖运行 postinstall） +# // __ __ __ __ ______ __ __ ______ __ __ ______ ______ +# // /\ \ /\ \ /\ "-.\ \ /\ ___\ /\ \/ / /\ ___\ /\ "-.\ \ /\ ___\ /\__ _\ +# // \ \ \____ \ \ \ \ \ \-. \ \ \ \__ \ \ \ _"-. \ \ __\ \ \ \-. \ \ \ __\ \/_/\ \/ +# // \ \_____\ \ \_\ \ \_\\"\_\ \ \_____\ \ \_\ \_\ \ \_____\ \ \_\\"\_\ \ \_____\ \ \_\ +# // \/_____/ \/_/ \/_/ \/_/ \/_____/ \/_/\/_/ \/_____/ \/_/ \/_/ \/_____/ \/_/ +# // +# // 所有权利归Lingke Network (china)所有 | dream_pep拥有其艺术改变权力 +# // 未经允许的情况下删除此版权头可能会受到民事指控 +# // 请勿在未经Lingke Network (china)允许的范围内修改代码并分发 + +# pnpm 10+ 工作区配置 +# onlyBuiltDependencies：pnpm 10 早期版本的构建脚本允许列表 +onlyBuiltDependencies: + - electron + - esbuild + +# allowBuilds：pnpm 10.29+ / 11 的构建脚本最终授权（包名 → 是否允许执行 postinstall） allowBuilds: electron: true esbuild: true diff --git a/src/api/instance.ts b/src/api/instance.ts index b2849e3..baa2e3f 100644 --- a/src/api/instance.ts +++ b/src/api/instance.ts @@ -142,12 +142,36 @@ export interface ScannedVersion { releaseTime?: string; hasJar: boolean; hasJson: boolean; + /** 检测到的 mod 加载器 */ + loaders: string[]; + /** 是否健康（JSON + JAR 都存在） */ + healthy: boolean; } export async function scanGameDir(gamePath: string): Promise<{ versions: ScannedVersion[] }> { return ipcInvoke<{ versions: ScannedVersion[] }>('instance:scan-dir', { gamePath }); } +// 从已安装版本导入实例 +export async function importExistingInstance( + name: string, + gamePath: string, + versionId: string, + options?: { + description?: string; + java?: string; + minMemory?: number; + maxMemory?: number; + } +): Promise { + return ipcInvoke('instance:import', { + name, + gamePath, + versionId, + ...options, + }); +} + // 通过系统对话框选择文件夹 export async function selectFolder(): Promise<{ folderPath: string } | null> { return ipcInvoke<{ folderPath: string } | null>('dialog:openFolder'); diff --git a/src/components/task/TaskButton.tsx b/src/components/task/TaskButton.tsx index c18754f..f08c596 100644 --- a/src/components/task/TaskButton.tsx +++ b/src/components/task/TaskButton.tsx @@ -1,12 +1,23 @@ +// __ __ __ __ ______ __ __ ______ __ __ ______ ______ +// /\ \ /\ \ /\ "-.\ \ /\ ___\ /\ \/ / /\ ___\ /\ "-.\ \ /\ ___\ /\__ _\ +// \ \ \____ \ \ \ \ \ \-. \ \ \ \__ \ \ \ _"-. \ \ __\ \ \ \-. \ \ \ __\ \/_/\ \/ +// \ \_____\ \ \_\ \ \_\\"\_\ \ \_____\ \ \_\ \_\ \ \_____\ \ \_\\"\_\ \ \_____\ \ \_\ +// \/_____/ \/_/ \/_/ \/_/ \/_____/ \/_/\/_/ \/_____/ \/_/ \/_/ \/_____/ \/_/ +// +// 所有权利归Lingke Network (china)所有 | dream_pep拥有其艺术改变权力 +// 未经允许的情况下删除此版权头可能会受到民事指控 +// 请勿在未经Lingke Network (china)允许的范围内修改代码并分发 + import { useTaskStore } from "@/stores/taskStore"; import { useRouteStore } from "@/stores/routeStore"; -import { ListTodo } from "lucide-react"; +import { ListTodo, Pause } from "lucide-react"; export function TaskButton() { const navigate = useRouteStore((s) => s.navigate); - const isRunning = useTaskStore((s) => s.isRunning); + const tasks = useTaskStore((s) => s.tasks); - const running = isRunning(); + const running = tasks.some((t) => t.status === "running" || t.status === "pending"); + const paused = tasks.some((t) => t.status === "paused"); return ( + )} + {isPaused && ( + + )} {canCancel && ( @@ -115,6 +176,7 @@ export function TaskCard({ task }: TaskCardProps) { size="icon-sm" onClick={() => retryTask(task.id)} className="h-6 w-6 text-muted-foreground hover:text-foreground" + title="重试" > @@ -125,6 +187,7 @@ export function TaskCard({ task }: TaskCardProps) { size="icon-sm" onClick={() => removeTask(task.id)} className="h-6 w-6 text-muted-foreground hover:text-foreground" + title="移除" > diff --git a/src/components/ui/alert-dialog.tsx b/src/components/ui/alert-dialog.tsx index fe0ad56..8f8b777 100644 --- a/src/components/ui/alert-dialog.tsx +++ b/src/components/ui/alert-dialog.tsx @@ -141,12 +141,15 @@ function AlertDialogDescription({ function AlertDialogAction({ className, + variant = "default", + size = "default", ...props -}: React.ComponentProps) { +}: AlertDialogPrimitive.Close.Props & + Pick, "variant" | "size">) { return ( - - + + + + + + + {/* 测试崩溃弹窗 */} -
-
- -

测试崩溃弹窗

-
-

- 不会真正崩溃，直接弹出崩溃弹窗 UI，用于验证窗口样式、按钮功能是否正常。 -

- -
+
+

+ 崩溃弹窗 +

+ + + + + +
{/* 崩溃日志 */} -
-
- -

崩溃日志

-
-

- 读取 koring-crash.log 文件内容，可复制发送给开发人员。 -

-
- - -
- {log && ( - 
-              {log}
-
- )} -
+
+

+ 崩溃日志 +

+ +
+
+

+ 读取崩溃日志 +

+

+ 读取 koring-crash.log 文件内容，可复制发送给开发人员。 +

+
+
+ + +
+
+ {log && ( + 
+                {log}
+
+ )} + +
{/* 强还原配置 */} -
-
- -

强还原配置

-
-

- 删除 Koring.yml、 - koring-auth.json 和背景缓存。 - 不会影响实例数据。 -

- -
+ + + + + + + - {/* 状态 */} + {/* 操作状态提示 */} {status && (

{status}

)} diff --git a/src/pages/debug/task-debug.tsx b/src/pages/debug/task-debug.tsx index 56e087d..636cf87 100644 --- a/src/pages/debug/task-debug.tsx +++ b/src/pages/debug/task-debug.tsx @@ -15,6 +15,7 @@ import { Check, Ban, Server, + Pause, } from "lucide-react"; const taskTypes: { type: TaskType; label: string; icon: typeof Download; color: string; bg: string }[] = [ @@ -68,6 +69,7 @@ function simulateSidecarTask( const statusIcons = { pending: RefreshCw, running: RefreshCw, + paused: Pause, completed: Check, failed: AlertCircle, cancelled: Ban, @@ -139,6 +141,37 @@ export function TaskDebug() { + +
+
+

暂停 / 恢复测试

+

运行 5s 计时任务，3 秒后自动暂停，验证 @xmcl/task 的 Paused 状态

+
+
+ + +
+
+ @@ -203,7 +236,7 @@ export function TaskDebug() {
- {/* 扫描中骨架屏 */} - {scanning && scanTarget === (game.gameDir || ".minecraft") && ( + {scanning && scanTarget === gameDir && (
{Array.from({ length: 3 }).map((_, i) => ( @@ -156,42 +227,95 @@ export function GameDirSetting() { )} {/* 扫描结果 */} - {scanResults !== null && scanTarget === (game.gameDir || ".minecraft") && ( + {scanResults !== null && scanTarget === gameDir && (
{scanResults.length === 0 ? (

未在 versions 目录下发现版本，请确认 Minecraft 已下载到该目录

) : ( -
- {scanResults.map((v) => { - const badge = getBadge(v.type); - return ( -
- {/* 版本图标 */} -
- -
-
-
-

{v.id}

- - {badge.label} - - {formatTime(v.releaseTime)} + <> + {/* 批量操作栏 */} +
+

+ 发现 {scanResults.length} 个版本，{importableCount} 个可导入 +

+ +
+ + {/* 版本列表 */} +
+ {scanResults.map((v) => { + const badge = getBadge(v.type); + const isImporting = importing === v.id; + return ( +
+ {/* 版本图标 */} +
+
-
- - +
+
+

{v.id}

+ + {badge.label} + + {/* 加载器标签 */} + {v.loaders.map((loader) => ( + + {LOADER_BADGE[loader]?.label ?? loader} + + ))} + {formatTime(v.releaseTime)} +
+
+ + + {v.loaders.length > 0 && ( + + {v.loaders.length} 个加载器 + + )} +
+ {/* 导入按钮 */} +
-
- ); - })} -
+ ); + })} +
+ )}
)} @@ -225,7 +349,7 @@ export function GameDirSetting() {

{dir}

- {dir === (game.gameDir || ".minecraft") && ( + {dir === gameDir && ( 当前 @@ -235,7 +359,7 @@ export function GameDirSetting() {

已连接的游戏目录

- {dir !== (game.gameDir || ".minecraft") && ( + {dir !== gameDir && ( @@ -257,7 +381,7 @@ export function GameDirSetting() { ))}
)} - {scanResults !== null && scanTarget === dir && scanTarget !== (game.gameDir || ".minecraft") && ( + {scanResults !== null && scanTarget === dir && scanTarget !== gameDir && (
{scanResults.length === 0 ? (

未发现版本文件

diff --git a/src/pages/setting/general/about.tsx b/src/pages/setting/general/about.tsx index 365b247..5f9bb23 100644 --- a/src/pages/setting/general/about.tsx +++ b/src/pages/setting/general/about.tsx @@ -1,9 +1,21 @@ +import { useState, useEffect } from "react"; import { VersionCard } from "@/components/VersionCard"; import { BUILD_MODE } from "@/lib/mode"; import { ExternalLink, GitFork, RotateCcw } from "lucide-react"; -import { useConfirmDialogStore } from "@/stores/confirmDialogStore"; -import { Button, Link } from "@heroui/react"; +import { Link } from "@heroui/react"; import { SettingCard, SettingRow, PageHeader, SectionTitle } from "@/components/setting"; +import { Button } from "@/components/ui/button"; +import { + AlertDialog, + AlertDialogTrigger, + AlertDialogContent, + AlertDialogHeader, + AlertDialogTitle, + AlertDialogDescription, + AlertDialogFooter, + AlertDialogCancel, + AlertDialogAction, +} from "@/components/ui/alert-dialog"; const modeLabels: Record = { dev: "开发版", @@ -15,20 +27,27 @@ const GITHUB_URL = "https://github.com/lingke-net/koring-launcher"; const OFFICIAL_URL = "https://koring.space"; export function AboutSetting() { - const openDialog = useConfirmDialogStore((s) => s.openDialog); + const [open, setOpen] = useState(false); + const [countdown, setCountdown] = useState(5); + const canConfirm = countdown <= 0; + + useEffect(() => { + if (!open) return; + setCountdown(5); + }, [open]); + + useEffect(() => { + if (!open || countdown <= 0) return; + const timer = setTimeout(() => setCountdown((c) => c - 1), 1000); + return () => clearTimeout(timer); + }, [open, countdown]); const openLink = (url: string) => { window.electronAPI?.openExternal(url); }; - const handleResetClick = () => { - openDialog({ - title: "您确定要还原所有配置吗？", - description: "您还原后，您的实例将会保留，但是所有个性化配置将全部丢失，并且需要重新进行激活", - confirmLabel: "确认还原", - countdown: 5, - onConfirm: () => window.electronAPI?.resetConfig(), - }); + const handleConfirm = () => { + window.electronAPI?.resetConfig(); }; return ( @@ -86,10 +105,34 @@ export function AboutSetting() { 危险操作 - + + + + 还原 + + } + /> + + + 您确定要还原所有配置吗？ + + 您还原后，您的实例将会保留，但是所有个性化配置将全部丢失，并且需要重新进行激活 + + + + 取消 + + {countdown > 0 ? `确认还原 (${countdown}s)` : "确认还原"} + + + +
diff --git a/src/pages/task-queue.tsx b/src/pages/task-queue.tsx index 87c3da8..fc80d93 100644 --- a/src/pages/task-queue.tsx +++ b/src/pages/task-queue.tsx @@ -10,6 +10,7 @@ export function TaskQueue() { const activeTasks = tasks.filter( (t) => t.status === "pending" || t.status === "running", ); + const pausedTasks = tasks.filter((t) => t.status === "paused"); const completedTasks = tasks.filter( (t) => t.status === "completed" || @@ -17,6 +18,7 @@ export function TaskQueue() { t.status === "cancelled", ); const hasCompleted = completedTasks.length > 0; + const activeCount = activeTasks.length + pausedTasks.length; return (
@@ -27,9 +29,9 @@ export function TaskQueue() {

任务队列

- {activeTasks.length > 0 && ( + {activeCount > 0 && ( - {activeTasks.length} 进行中 + {activeCount} 进行中 )}
@@ -68,6 +70,19 @@ export function TaskQueue() {
)} + {pausedTasks.length > 0 && ( +
+

+ 已暂停 +

+
+ {pausedTasks.map((t) => ( + + ))} +
+
+ )} + {completedTasks.length > 0 && (

diff --git a/src/stores/taskStore.ts b/src/stores/taskStore.ts index 346f177..1e18330 100644 --- a/src/stores/taskStore.ts +++ b/src/stores/taskStore.ts @@ -62,6 +62,7 @@ function listenToSidecarEvents(taskId: string) { status: "running", startedAt: Date.now(), xmclPath: data.xmclPath as string, + xmclState: "running", }); break; @@ -72,6 +73,7 @@ function listenToSidecarEvents(taskId: string) { total: data.total as number, stage: data.stage as string, }, + xmclPath: (data.xmclPath as string) || undefined, }); break; @@ -84,9 +86,38 @@ function listenToSidecarEvents(taskId: string) { break; } + case "task:paused": + updateTask(taskId, { + status: "paused", + xmclState: "paused", + }); + break; + + case "task:resumed": + updateTask(taskId, { + status: "running", + xmclState: "running", + }); + break; + + case "task:cancelled": + updateTask(taskId, { + status: "cancelled", + xmclState: "cancelled", + finishedAt: Date.now(), + }); + eventListeners.get(taskId)?.(); + eventListeners.delete(taskId); + setTimeout(() => { + const state = useTaskStore.getState(); + saveHistory(state.tasks); + }, 0); + break; + case "task:completed": updateTask(taskId, { status: "completed", + xmclState: "succeed", finishedAt: Date.now(), }); eventListeners.get(taskId)?.(); @@ -102,6 +133,7 @@ function listenToSidecarEvents(taskId: string) { const cur = useTaskStore.getState().tasks.find((t) => t.id === taskId); updateTask(taskId, { status: "failed", + xmclState: "failed", finishedAt: Date.now(), logs: cur ? [...cur.logs, errLog] : [errLog], }); @@ -140,6 +172,9 @@ interface TaskState { // Common actions cancelTask: (id: string) => void; + // @xmcl/task 原生暂停 / 恢复 + pauseTask: (id: string) => void; + resumeTask: (id: string) => void; removeTask: (id: string) => void; clearHistory: () => void; retryTask: (id: string) => void; @@ -280,6 +315,25 @@ export const useTaskStore = create((set, get) => ({ eventListeners.delete(id); }, + // 暂停任务：主进程调用 @xmcl/task 的 pause() + pauseTask: (id) => { + const { tasks } = get(); + const task = tasks.find((t) => t.id === id); + // 仅允许暂停运行中的 IPC 任务（本地任务不支持暂停） + if (task && task.status === "running" && !get().abortControllers.has(id)) { + ipcInvoke("task:pause", { taskId: id }).catch(() => {}); + } + }, + + // 恢复任务：主进程调用 @xmcl/task 的 resume() + resumeTask: (id) => { + const { tasks } = get(); + const task = tasks.find((t) => t.id === id); + if (task && task.status === "paused") { + ipcInvoke("task:resume", { taskId: id }).catch(() => {}); + } + }, + removeTask: (id) => { eventListeners.get(id)?.(); eventListeners.delete(id); diff --git a/src/types/task.ts b/src/types/task.ts index eff4e03..c7af462 100644 --- a/src/types/task.ts +++ b/src/types/task.ts @@ -1,22 +1,37 @@ +// __ __ __ __ ______ __ __ ______ __ __ ______ ______ +// /\ \ /\ \ /\ "-.\ \ /\ ___\ /\ \/ / /\ ___\ /\ "-.\ \ /\ ___\ /\__ _\ +// \ \ \____ \ \ \ \ \ \-. \ \ \ \__ \ \ \ _"-. \ \ __\ \ \ \-. \ \ \ __\ \/_/\ \/ +// \ \_____\ \ \_\ \ \_\\"\_\ \ \_____\ \ \_\ \_\ \ \_____\ \ \_\\"\_\ \ \_____\ \ \_\ +// \/_____/ \/_/ \/_/ \/_/ \/_____/ \/_/\/_/ \/_____/ \/_/ \/_/ \/_____/ \/_/ +// +// 所有权利归Lingke Network (china)所有 | dream_pep拥有其艺术改变权力 +// 未经允许的情况下删除此版权头可能会受到民事指控 +// 请勿在未经Lingke Network (china)允许的范围内修改代码并分发 + +// 任务类型：install 安装 / download 下载 / update 更新 / launch 启动 / auth 认证 / sync 同步 / custom 自定义 export type TaskType = "install" | "download" | "update" | "launch" | "auth" | "sync" | "custom"; -export type TaskStatus = "pending" | "running" | "completed" | "failed" | "cancelled"; +// 前端任务状态：包含 @xmcl/task 的 Paused 状态 +export type TaskStatus = "pending" | "running" | "paused" | "completed" | "failed" | "cancelled"; -/** Mirrors @xmcl/task TaskState enum */ +// @xmcl/task 的 TaskState 枚举映射（Idle/Running/Cancelled/Paused/Succeed/Failed） export type XmclTaskState = "idle" | "running" | "cancelled" | "paused" | "succeed" | "failed"; +// 任务日志条目 export interface TaskLog { time: number; level: "info" | "warn" | "error"; message: string; } +// 任务进度 export interface TaskProgress { current: number; total: number; stage?: string; } +// 任务实体 export interface Task { id: string; type: TaskType; @@ -30,6 +45,8 @@ export interface Task { finishedAt?: number; /** Sidecar @xmcl/task routine name (dot-separated path) */ xmclPath?: string; + /** @xmcl/task 原始状态（Idle/Running/Paused/Succeed/Failed/Cancelled） */ + xmclState?: XmclTaskState; } /** @@ -74,6 +91,7 @@ export interface XmclTaskProgressEvent { current: number; total: number; stage?: string; + xmclPath?: string; } export interface XmclTaskLogEvent { @@ -83,6 +101,21 @@ export interface XmclTaskLogEvent { message: string; } +export interface XmclTaskPausedEvent { + event: "task:paused"; + taskId: string; +} + +export interface XmclTaskResumedEvent { + event: "task:resumed"; + taskId: string; +} + +export interface XmclTaskCancelledEvent { + event: "task:cancelled"; + taskId: string; +} + export interface XmclTaskCompletedEvent { event: "task:completed"; taskId: string; @@ -98,5 +131,8 @@ export type XmclTaskEvent = | XmclTaskStartedEvent | XmclTaskProgressEvent | XmclTaskLogEvent + | XmclTaskPausedEvent + | XmclTaskResumedEvent + | XmclTaskCancelledEvent | XmclTaskCompletedEvent | XmclTaskFailedEvent;