dsh-config-manager 0.1.8 → 0.1.10

package/lib/client.d.ts

@@ -310,7 +310,7 @@ declare const zh: {
   readonly 'import.confirm.execute': "确认导入";
   readonly 'import.confirm.warning': "导入将修改当前 DSH 配置；执行前会自动创建安全快照，失败时整体回滚。";
   readonly 'import.rollbackOnError': "失败时整体回滚（推荐）";
-  readonly 'import.importing': "正在导入…";
+  readonly 'import.importing': "正在导入…（插件安装较多时可能需要几分钟，请勿关闭页面）";
   readonly 'import.secrets.title': "补录密钥";
   readonly 'import.secrets.hint': "以下凭据未随备份导出（安全设计）。如需在目标 DSH 使用，请手动补录；留空将跳过。";
   readonly 'import.secrets.optional': "（可选）";

package/lib/client.js

@@ -241,6 +241,16 @@ const IMPORT_STAGES = [
 	"rolling-back",
 	"done"
 ];
+/**
+* 真实执行阶段（不在 IMPORT_STAGES 序列里，因此 step/total 缺省 → 进度条渲染
+* 为不定态动画而非伪造百分比）。execute 是一个单次 HTTP 请求，Host 端串行
+* 跑完全部计划项（其中插件安装是 npm 串行，耗时最长）；请求期间没有中间
+* 进度事件可回传，旧实现把 restoring-settings / restoring-plugins /
+* restoring-mcp / validating-config 在请求前全部预发，导致进度条瞬间跳到
+* 78% 后长时间无变化——像卡死。现在统一在请求期间显示 'executing' 不定态，
+* 让用户明确知道「仍在执行，请等待」。
+*/
+const EXECUTING_STAGE = "executing";
 const STAGE_TEXTS = {
 	"analyzing": "Analyzing configuration...",
 	"exporting-settings": "Exporting settings...",
@@ -257,6 +267,7 @@ const STAGE_TEXTS = {
 	"restoring-mcp": "Restoring MCP...",
 	"validating-config": "Validating configuration...",
 	"rolling-back": "Rolling back...",
+	"executing": "Applying configuration (plugin installs may take a while)...",
 	"done": "Done"
 };
 /** 阶段 id → 用户可读文案（未知阶段回退 id） */
@@ -570,93 +581,93 @@ if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"
 	document.head.appendChild(tag);
 }
 var config_manager_module_css_default = {
-	"hiddenFile": "_367UGW_hiddenFile",
-	"badgeWarn": "_367UGW_badgeWarn",
-	"formError": "_367UGW_formError",
-	"groupItems": "_367UGW_groupItems",
-	"errorActionLabel": "_367UGW_errorActionLabel",
-	"categoryDesc": "_367UGW_categoryDesc",
-	"section": "_367UGW_section",
-	"errorReason": "_367UGW_errorReason",
-	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
+	"spinnerWrap": "_367UGW_spinnerWrap",
+	"conflictId": "_367UGW_conflictId",
+	"groupList": "_367UGW_groupList",
 	"dshCmSpin": "_367UGW_dshCmSpin",
+	"viewBody": "_367UGW_viewBody",
+	"input": "_367UGW_input",
+	"errorBanner": "_367UGW_errorBanner",
+	"pathRow": "_367UGW_pathRow",
+	"pathNew": "_367UGW_pathNew",
+	"errorAction": "_367UGW_errorAction",
+	"conflictOptions": "_367UGW_conflictOptions",
+	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
+	"conflictDetail": "_367UGW_conflictDetail",
+	"badgeError": "_367UGW_badgeError",
+	"spinner": "_367UGW_spinner",
+	"sectionBody": "_367UGW_sectionBody",
+	"radioLabel": "_367UGW_radioLabel",
+	"secretsList": "_367UGW_secretsList",
+	"dangerButton": "_367UGW_dangerButton",
+	"groupLabel": "_367UGW_groupLabel",
 	"spinnerLabel": "_367UGW_spinnerLabel",
+	"progressIndeterminate": "_367UGW_progressIndeterminate",
+	"sectionTitle": "_367UGW_sectionTitle",
 	"fieldLabel": "_367UGW_fieldLabel",
-	"sectionBody": "_367UGW_sectionBody",
-	"conflictOptions": "_367UGW_conflictOptions",
-	"optionsCard": "_367UGW_optionsCard",
+	"field": "_367UGW_field",
+	"formError": "_367UGW_formError",
+	"categoryDesc": "_367UGW_categoryDesc",
+	"reportFooter": "_367UGW_reportFooter",
+	"checkboxRow": "_367UGW_checkboxRow",
+	"pathMappingList": "_367UGW_pathMappingList",
+	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
+	"badgeWarn": "_367UGW_badgeWarn",
+	"categoryItem": "_367UGW_categoryItem",
+	"groupCard": "_367UGW_groupCard",
 	"severityError": "_367UGW_severityError",
-	"badgeOk": "_367UGW_badgeOk",
-	"groupNote": "_367UGW_groupNote",
-	"progressDetail": "_367UGW_progressDetail",
+	"badgeInfo": "_367UGW_badgeInfo",
+	"pathValue": "_367UGW_pathValue",
+	"viewTabs": "_367UGW_viewTabs",
+	"card": "_367UGW_card",
+	"groupHeader": "_367UGW_groupHeader",
+	"progressLabel": "_367UGW_progressLabel",
+	"progressTrack": "_367UGW_progressTrack",
 	"pathOld": "_367UGW_pathOld",
-	"reportText": "_367UGW_reportText",
-	"errorItem": "_367UGW_errorItem",
-	"empty": "_367UGW_empty",
-	"progressBar": "_367UGW_progressBar",
+	"pathIssueKind": "_367UGW_pathIssueKind",
 	"hint": "_367UGW_hint",
-	"sectionSubtitle": "_367UGW_sectionSubtitle",
-	"progressBarDone": "_367UGW_progressBarDone",
-	"dshCmIndeterminate": "_367UGW_dshCmIndeterminate",
 	"actionRow": "_367UGW_actionRow",
-	"errorFooter": "_367UGW_errorFooter",
-	"sectionTitle": "_367UGW_sectionTitle",
+	"ghostButton": "_367UGW_ghostButton",
+	"badge": "_367UGW_badge",
+	"modeTab": "_367UGW_modeTab",
+	"errorList": "_367UGW_errorList",
+	"modeTabs": "_367UGW_modeTabs",
+	"errorLine": "_367UGW_errorLine",
+	"iconButton": "_367UGW_iconButton",
 	"reportView": "_367UGW_reportView",
-	"pathIssueKind": "_367UGW_pathIssueKind",
-	"primaryButton": "_367UGW_primaryButton",
-	"field": "_367UGW_field",
-	"conflictHead": "_367UGW_conflictHead",
-	"conflictId": "_367UGW_conflictId",
-	"groupHeader": "_367UGW_groupHeader",
-	"conflictDetail": "_367UGW_conflictDetail",
-	"card": "_367UGW_card",
-	"progressMeta": "_367UGW_progressMeta",
-	"progressPercent": "_367UGW_progressPercent",
-	"conflictList": "_367UGW_conflictList",
+	"viewTab": "_367UGW_viewTab",
+	"groupItems": "_367UGW_groupItems",
+	"hiddenFile": "_367UGW_hiddenFile",
+	"errorTitle": "_367UGW_errorTitle",
 	"statRow": "_367UGW_statRow",
-	"groupCard": "_367UGW_groupCard",
-	"pathValue": "_367UGW_pathValue",
-	"modeTab": "_367UGW_modeTab",
-	"viewBody": "_367UGW_viewBody",
-	"rollbackBox": "_367UGW_rollbackBox",
-	"conflictItem": "_367UGW_conflictItem",
+	"section": "_367UGW_section",
+	"sectionSubtitle": "_367UGW_sectionSubtitle",
 	"secretFields": "_367UGW_secretFields",
-	"groupList": "_367UGW_groupList",
-	"spinner": "_367UGW_spinner",
-	"iconButton": "_367UGW_iconButton",
-	"badge": "_367UGW_badge",
-	"badgeInfo": "_367UGW_badgeInfo",
-	"modeHint": "_367UGW_modeHint",
-	"spinnerWrap": "_367UGW_spinnerWrap",
-	"errorAction": "_367UGW_errorAction",
-	"badgeError": "_367UGW_badgeError",
-	"warnList": "_367UGW_warnList",
-	"progressLabel": "_367UGW_progressLabel",
+	"progressBarDone": "_367UGW_progressBarDone",
+	"groupNote": "_367UGW_groupNote",
 	"banner": "_367UGW_banner",
 	"sectionHeader": "_367UGW_sectionHeader",
-	"input": "_367UGW_input",
-	"categoryName": "_367UGW_categoryName",
-	"viewTabs": "_367UGW_viewTabs",
-	"ghostButton": "_367UGW_ghostButton",
-	"radioLabel": "_367UGW_radioLabel",
-	"viewTab": "_367UGW_viewTab",
-	"reportFooter": "_367UGW_reportFooter",
-	"pathRow": "_367UGW_pathRow",
-	"errorList": "_367UGW_errorList",
-	"pathMappingList": "_367UGW_pathMappingList",
-	"progressIndeterminate": "_367UGW_progressIndeterminate",
-	"errorLine": "_367UGW_errorLine",
-	"dangerButton": "_367UGW_dangerButton",
-	"checkboxRow": "_367UGW_checkboxRow",
-	"modeTabs": "_367UGW_modeTabs",
-	"groupLabel": "_367UGW_groupLabel",
 	"progressBlock": "_367UGW_progressBlock",
-	"progressTrack": "_367UGW_progressTrack",
-	"pathNew": "_367UGW_pathNew",
-	"errorBanner": "_367UGW_errorBanner",
-	"errorTitle": "_367UGW_errorTitle",
-	"secretsList": "_367UGW_secretsList",
-	"categoryItem": "_367UGW_categoryItem"
+	"progressPercent": "_367UGW_progressPercent",
+	"progressBar": "_367UGW_progressBar",
+	"modeHint": "_367UGW_modeHint",
+	"progressMeta": "_367UGW_progressMeta",
+	"rollbackBox": "_367UGW_rollbackBox",
+	"errorFooter": "_367UGW_errorFooter",
+	"optionsCard": "_367UGW_optionsCard",
+	"categoryName": "_367UGW_categoryName",
+	"badgeOk": "_367UGW_badgeOk",
+	"progressDetail": "_367UGW_progressDetail",
+	"conflictItem": "_367UGW_conflictItem",
+	"primaryButton": "_367UGW_primaryButton",
+	"reportText": "_367UGW_reportText",
+	"errorActionLabel": "_367UGW_errorActionLabel",
+	"conflictHead": "_367UGW_conflictHead",
+	"empty": "_367UGW_empty",
+	"errorItem": "_367UGW_errorItem",
+	"warnList": "_367UGW_warnList",
+	"conflictList": "_367UGW_conflictList",
+	"errorReason": "_367UGW_errorReason"
 };
 //#endregion
 //#region src/client/common/ui.tsx
@@ -1561,10 +1572,7 @@ var ImportWizard = class {
 		this.tracker.emit("creating-snapshot");
 		try {
 			this.plan = await this.port.createImportPlan(this.zipPath, this.decisions);
-			this.tracker.emit("restoring-settings");
-			this.tracker.emit("restoring-plugins");
-			this.tracker.emit("restoring-mcp");
-			this.tracker.emit("validating-config");
+			this.tracker.emit(EXECUTING_STAGE);
 			this.result = await this.port.executeImportPlan(this.zipPath, this.plan, {
 				confirm: true,
 				secretInputs: this.secretInputs,
@@ -2475,7 +2483,7 @@ const zh = {
 	"import.confirm.execute": "确认导入",
 	"import.confirm.warning": "导入将修改当前 DSH 配置；执行前会自动创建安全快照，失败时整体回滚。",
 	"import.rollbackOnError": "失败时整体回滚（推荐）",
-	"import.importing": "正在导入…",
+	"import.importing": "正在导入…（插件安装较多时可能需要几分钟，请勿关闭页面）",
 	"import.secrets.title": "补录密钥",
 	"import.secrets.hint": "以下凭据未随备份导出（安全设计）。如需在目标 DSH 使用，请手动补录；留空将跳过。",
 	"import.secrets.optional": "（可选）",
@@ -2557,7 +2565,7 @@ const en = {
 	"import.confirm.execute": "Confirm Import",
 	"import.confirm.warning": "Import modifies the current DSH configuration; a safety snapshot is created first and everything rolls back on failure.",
 	"import.rollbackOnError": "Roll back everything on failure (recommended)",
-	"import.importing": "Importing…",
+	"import.importing": "Importing… (installing many plugins may take a few minutes; keep this page open)",
 	"import.secrets.title": "Re-enter Secrets",
 	"import.secrets.hint": "These credentials were not exported with the backup (security by design). Enter them manually to use them here; leave blank to skip.",
 	"import.secrets.optional": "(optional)",