@dsh-workbench/core 1.1.14-beta.1 → 1.1.14

package/dist/client/index.js

@@ -3591,9 +3591,8 @@ var en = {
 	"env.title": "Preparing the workbench",
 	"env.checking": "Getting the runtime ready…",
 	"env.installing": "Installing background tools — the first run takes a moment…",
-	"env.installingToolchain": "Installing the workbench’s own npm / pnpm — the first run downloads them, so it can take a while.",
+	"env.installingToolchain": "Installing the workbench’s own pnpm — the first run downloads it, so it can take a while.",
 	"env.failed": "One step away",
-	"env.elapsed": "Waiting {seconds}s",
 	"env.stepFailed.install": "install failed",
 	"env.stepFailed.path": "installed but not found",
 	"env.stepFailed.shell": "cannot reach the command line",
@@ -3612,14 +3611,15 @@ var en = {
 	"env.fix.whyShell": "The workbench cannot reach the command line on this machine, so it cannot fetch data — you cannot install this from here; someone needs to fix the background environment.",
 	"env.fix.whyHost": "The workbench runs a few checks on the command line and collects what they return; this time the command went out and nothing came back. The tools themselves are most likely fine — reinstalling Node / npm / pnpm will not help.",
 	"env.fix.step": "Run this in a terminal, then hit Retry:",
+	"env.fix.stepRetry": "Hit Retry to try again; if it still fails you can enter the workbench anyway and restart it once the install succeeds.",
 	"env.fix.stepPath": "Open a new terminal window (or make sure npm’s global bin directory is on PATH), then hit Retry.",
 	"env.fix.stepShell": "Restart the workbench (or dsh); if it keeps happening, the workbench still cannot reach the command line.",
 	"env.fix.stepHost": "Quit the workbench completely (including the tray icon), clear the dsh-* leftovers in the system temp folder, then open it again. If it keeps happening, update dsh.",
 	"env.fix.permission": "Permission denied: rerun with sudo, or point npm’s global directory at your home.",
 	"env.fix.network": "Network unreachable: check your network or proxy, then retry.",
 	"env.fix.details": "Details (for troubleshooting)",
-	"env.log": "Detailed output",
 	"env.retry": "Retry",
+	"env.failed.continue": "Enter workbench anyway",
 	"env.wake": "Open browser",
 	"env.wake.opening": "Opening the browser…",
 	"env.wake.browserOpen": "The browser is already running but the extension is not connected — check that it is enabled.",
@@ -4361,9 +4361,8 @@ var dictionaries = {
 		"env.title": "准备工作台",
 		"env.checking": "正在准备运行环境…",
 		"env.installing": "正在安装后台工具，第一次会慢一点…",
-		"env.installingToolchain": "正在装工作台自己那份 npm / pnpm —— 第一次要下载，慢一点正常。",
+		"env.installingToolchain": "正在装工作台自己那份 pnpm —— 第一次要下载，慢一点正常。",
 		"env.failed": "还差一步就能用了",
-		"env.elapsed": "已等待 {seconds} 秒",
 		"env.stepFailed.install": "装不上",
 		"env.stepFailed.path": "装了但还找不到",
 		"env.stepFailed.shell": "连不上命令行",
@@ -4382,14 +4381,15 @@ var dictionaries = {
 		"env.fix.whyShell": "工作台拿不到这台机器的命令行，所以取不了数据 —— 这一步你装不了，需要有人处理后台环境。",
 		"env.fix.whyHost": "工作台要靠命令行跑几条检查，再把结果收回来；这次命令发出去了，结果一直没回来。工具本身多半是好的 —— 重装 Node / npm / pnpm 不会有帮助。",
 		"env.fix.step": "在终端里运行下面这条命令，装好之后点「重试」：",
+		"env.fix.stepRetry": "点「重试」再装一次；还装不上也可以先进入工作台 —— 装好之后重启工作台就会用上。",
 		"env.fix.stepPath": "新开一个终端窗口（或确认 npm 的全局 bin 目录在 PATH 里），然后点「重试」。",
 		"env.fix.stepShell": "重启一次工作台（或 dsh）；如果反复出现，说明工作台还是拿不到命令行。",
 		"env.fix.stepHost": "完全退出工作台（托盘图标也要退），清掉系统临时目录里 dsh- 开头的残留，再重新打开；反复出现就升级 dsh。",
 		"env.fix.permission": "权限不够：在命令前加 sudo 重跑，或先把 npm 的全局目录配到你的用户目录。",
 		"env.fix.network": "网络不通：检查网络或代理设置后重试。",
 		"env.fix.details": "详细输出（排障用）",
-		"env.log": "详细输出",
 		"env.retry": "重试",
+		"env.failed.continue": "先进入工作台",
 		"env.wake": "打开浏览器",
 		"env.wake.opening": "正在打开浏览器…",
 		"env.wake.browserOpen": "浏览器已经开着，但扩展没连上 —— 检查扩展是否启用。",
@@ -13014,10 +13014,16 @@ function createClientUnitRegistry(options = {}) {
 }
 //#endregion
 //#region src/app/units/manifests.ts
+var DEFAULT_RETRY_DELAY_MS = 1e3;
+var DEFAULT_MAX_RETRIES = 30;
 function createUnitManifestLoader(options = {}) {
 	let inFlight = false;
 	let queued = false;
 	let watching = false;
+	let retries = 0;
+	let timer = null;
+	const retryDelayMs = options.retryDelayMs ?? DEFAULT_RETRY_DELAY_MS;
+	const maxRetries = options.maxRetries ?? DEFAULT_MAX_RETRIES;
 	const subscribeFacts = options.subscribeFacts ?? subscribeFactRevision;
 	const load = async (registry) => {
 		if (inFlight) {
@@ -13025,11 +13031,23 @@ function createUnitManifestLoader(options = {}) {
 			return;
 		}
 		inFlight = true;
+		let settled = false;
 		try {
 			const response = await apiGet(UNIT_MANIFESTS_ROUTE).catch(() => null);
-			if (response?.ok === true && Array.isArray(response.manifests)) registry.setManifests(response.manifests, Array.isArray(response.installable) ? response.installable : void 0);
+			if (response?.ok === true && Array.isArray(response.manifests)) {
+				registry.setManifests(response.manifests, Array.isArray(response.installable) ? response.installable : void 0);
+				settled = !registry.refusals().some((item) => item.kind === "no-manifest");
+			}
 		} finally {
 			inFlight = false;
+			if (settled) retries = 0;
+			else if (retries < maxRetries && timer === null) {
+				retries += 1;
+				timer = setTimeout(() => {
+					timer = null;
+					load(registry);
+				}, retryDelayMs);
+			}
 			if (queued) {
 				queued = false;
 				load(registry);
@@ -13039,7 +13057,10 @@ function createUnitManifestLoader(options = {}) {
 	return (registry) => {
 		if (!watching) {
 			watching = true;
-			subscribeFacts(factOfRoute(UNIT_MANIFESTS_ROUTE), () => void load(registry));
+			subscribeFacts(factOfRoute(UNIT_MANIFESTS_ROUTE), () => {
+				retries = 0;
+				load(registry);
+			});
 		}
 		load(registry);
 	};
@@ -13084,7 +13105,7 @@ function failedStepText(guidance, t) {
 	if (guidance === "host") return t("env.stepFailed.host");
 	return t("env.stepFailed.install");
 }
-function guidanceTextOf(guidance, t) {
+function guidanceTextOf(guidance, t, hasCommand = true) {
 	if (guidance === "path") return {
 		why: t("env.fix.whyPath"),
 		step: t("env.fix.stepPath")
@@ -13099,7 +13120,7 @@ function guidanceTextOf(guidance, t) {
 	};
 	return {
 		why: t("env.fix.why"),
-		step: t("env.fix.step")
+		step: hasCommand ? t("env.fix.step") : t("env.fix.stepRetry")
 	};
 }
 function stepDetailText(step, snapshot, t) {
@@ -13124,6 +13145,19 @@ function bridgeAdvice(issue, t, fixes) {
 	};
 	return { text: t("env.bridge.unknown") };
 }
+function bridgeAdviceLines(issues, t, fixes) {
+	const listed = issues.length === 0 ? ["unknown"] : issues;
+	const seen = /* @__PURE__ */ new Set();
+	const out = [];
+	for (const issue of listed) {
+		const advice = bridgeAdvice(issue, t, fixes);
+		const key = `${advice.text}|${advice.link?.href ?? ""}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		out.push(advice);
+	}
+	return out;
+}
 //#endregion
 //#region src/app/layouts/env-gate/gate-deadline.ts
 function createGateDeadline(giveUpMs, expire) {
@@ -13284,8 +13318,10 @@ function createBootGate(ctx, options = {}) {
 	const buttons = el("div", BootGate_module_default.buttons);
 	const retry = el("button", BootGate_module_default.button, t("env.retry"));
 	retry.setAttribute("type", "button");
+	const failedSkip = el("button", BootGate_module_default.button, t("env.failed.continue"));
+	failedSkip.setAttribute("type", "button");
 	const fixCommand = commandRow(t);
-	buttons.append(retry);
+	buttons.append(retry, failedSkip);
 	actions.append(fixTitle, fixWhy, fixStep, fixCommand.row, fixAdvice, buttons);
 	const bridge = el("div", BootGate_module_default.bridge);
 	bridge.hidden = true;
@@ -13329,6 +13365,8 @@ function createBootGate(ctx, options = {}) {
 	let cancelled = false;
 	const forcePlan = createForcePlan();
 	let pinned = null;
+	let lastSnapshot = null;
+	let runtimeProfile;
 	function close() {
 		if (closed) return;
 		closed = true;
@@ -13385,6 +13423,7 @@ function createBootGate(ctx, options = {}) {
 		return row;
 	}
 	function render(snapshot) {
+		lastSnapshot = snapshot;
 		wakeNote.hidden = true;
 		if (bootHintShown && (snapshot.phase !== "idle" || snapshot.steps.length > 0)) {
 			bootHintShown = false;
@@ -13425,10 +13464,10 @@ function createBootGate(ctx, options = {}) {
 		bridgeRetry.removeAttribute("disabled");
 		const commandText = snapshot.steps.find((step) => step.status === "failed" && step.command !== void 0)?.command;
 		const guidance = snapshot.guidance ?? "install";
-		const advice = guidanceTextOf(guidance, t);
+		const showCommand = guidance === "install" && commandText !== void 0;
+		const advice = guidanceTextOf(guidance, t, showCommand);
 		fixWhy.textContent = advice.why;
 		fixStep.textContent = advice.step;
-		const showCommand = guidance === "install" && commandText !== void 0;
 		fixCommand.set(showCommand ? commandText : void 0);
 		fixAdvice.textContent = !showCommand ? "" : snapshot.failure === "permission" ? t("env.fix.permission") : snapshot.failure === "network" ? t("env.fix.network") : "";
 		const bridgeStep = snapshot.steps.find((step) => step.id === "bridge");
@@ -13436,9 +13475,7 @@ function createBootGate(ctx, options = {}) {
 		const bridgeBroken = bridgeIssues.length > 0 || bridgeStep !== void 0 && (bridgeStep.status === "warn" || bridgeStep.status === "failed");
 		bridge.hidden = !bridgeBroken;
 		if (bridgeBroken) {
-			const listed = bridgeIssues.length === 0 ? ["unknown"] : bridgeIssues;
-			bridgeLines.replaceChildren(...listed.map((issue) => {
-				const advice = bridgeAdvice(issue, t, runtimeProfileValue()?.bridge);
+			bridgeLines.replaceChildren(...bridgeAdviceLines(bridgeIssues, t, runtimeProfile?.bridge ?? runtimeProfileValue()?.bridge).map((advice) => {
 				const item = el("li", BootGate_module_default.bridgeLine, advice.text);
 				if (advice.link !== void 0) {
 					const link = document.createElement("a");
@@ -13520,6 +13557,7 @@ function createBootGate(ctx, options = {}) {
 		wakeNote.hidden = false;
 	}
 	retry.addEventListener("click", retryNow);
+	failedSkip.addEventListener("click", close);
 	bridgeWake.addEventListener("click", () => void wakeBrowserNow());
 	bridgeRetry.addEventListener("click", retryNow);
 	bridgeSkip.addEventListener("click", close);
@@ -13537,6 +13575,11 @@ function createBootGate(ctx, options = {}) {
 		} });
 		if (strip !== null) overlay.append(strip);
 	}
+	readRuntimeCapabilities().then((answer) => {
+		runtimeProfile = answer.ok ? answer.runtimeProfile ?? void 0 : void 0;
+		if (pinned !== null) render(pinned);
+		else if (lastSnapshot !== null) render(lastSnapshot);
+	}).catch(() => void 0);
 	poll();
 	return { close };
 }