@huaqiu/dsh-tool-plugin-update 0.6.17 → 0.6.18

package/lib/client.js

@@ -639,6 +639,37 @@ window.__ModuleLoader__.load({
 		function fetchJobStatus() {
 			return request("/status").then(normalizeJobStatus);
 		}
+		/**
+		* Normalize `GET /activity`. Unknown/missing fields degrade to a usable
+		* snapshot: a `bootId` empty string simply never triggers a re-attach, and an
+		* unparseable age reads as 0 rather than "stalled".
+		*/
+		function normalizeActivity(raw) {
+			const r = raw !== null && typeof raw === "object" ? raw : {};
+			const str = (v) => typeof v === "string" ? v : "";
+			const num = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
+			return {
+				bootId: str(r.bootId),
+				startedAt: str(r.startedAt),
+				now: str(r.now),
+				activeJob: normalizeJob(r.activeJob),
+				job: normalizeJob(r.job),
+				phaseAgeMs: Math.max(0, num(r.phaseAgeMs)),
+				stalled: r.stalled === true,
+				setVersion: typeof r.setVersion === "string" && r.setVersion.length > 0 ? r.setVersion : null,
+				actionableCount: num(r.actionableCount)
+			};
+		}
+		/**
+		* GET the re-attach snapshot, optionally naming the job being watched.
+		*
+		* Used instead of `/status` whenever the panel is following a job it started:
+		* it answers "what happened to MY job" across a DSH restart, and each read lets
+		* hq-edge settle a job that its own process could not finish.
+		*/
+		function fetchActivity(jobId) {
+			return request(`/activity${jobId ? `?job=${encodeURIComponent(jobId)}` : ""}`).then(normalizeActivity);
+		}
 		//#endregion
 		//#region src/client/copy.ts
 		/**
@@ -812,6 +843,7 @@ window.__ModuleLoader__.load({
 				ctaNoSet: "暂无可安装的更新",
 				footerCount: (n) => `准备安装 ${n} 项兼容插件`,
 				footerBusy: "后台处理中，请勿关闭 DSH",
+				footerConfirming: "正在确认安装结果…",
 				footerFailed: "无法确认插件版本兼容性",
 				footerAllGood: "所有插件与运行时均正常",
 				footerRuntimeOnly: "运行时更新需在上方单独确认",
@@ -847,6 +879,8 @@ window.__ModuleLoader__.load({
 					"重启"
 				],
 				activeCloseNote: "关闭此面板不会取消更新，完成后将自动重启。",
+				stalledNote: "进度已停止回执，正在向 HQ Edge 确认安装结果…",
+				stalledAction: "立即确认",
 				rollbackTitle: "上次 HQ Edge 运行时更新已自动回滚",
 				failedTitle: "上次 HQ Edge 运行时更新失败",
 				rollbackBody: (oldVer, code) => `系统已安全恢复至旧版本 (v${oldVer})。代码: ${code}`,
@@ -1023,6 +1057,7 @@ window.__ModuleLoader__.load({
 					ctaNoSet: "Nothing to install yet",
 					footerCount: (n) => `Ready to install ${n} compatible plugin${n === 1 ? "" : "s"}`,
 					footerBusy: "Running in the background — keep DSH open",
+					footerConfirming: "Confirming the install result…",
 					footerFailed: "Cannot confirm plugin compatibility",
 					footerAllGood: "All plugins and the runtime are current",
 					footerRuntimeOnly: "Confirm the runtime upgrade on its card",
@@ -1058,6 +1093,8 @@ window.__ModuleLoader__.load({
 						"Restart"
 					],
 					activeCloseNote: "Closing this panel does not cancel the update; DSH restarts when it finishes.",
+					stalledNote: "Progress has stopped reporting — confirming the result with HQ Edge…",
+					stalledAction: "Check now",
 					rollbackTitle: "Last HQ Edge runtime update rolled back automatically",
 					failedTitle: "Last HQ Edge runtime update failed",
 					rollbackBody: (oldVer, code) => `Safely restored to the previous version (v${oldVer}). Code: ${code}`,
@@ -1450,11 +1487,19 @@ window.__ModuleLoader__.load({
 		* The active job card: title (with the target version) + percent, a
 		* determinate bar when the server publishes one, phase + telemetry, the honest
 		* "closing does not cancel" note, and the 4-step pipeline.
+		*
+		* `stalled` marks a job the server has stopped advancing. That is the normal
+		* shape of "the set being installed contains this very plugin": activating it
+		* restarts DSH, so the process that owned the job is gone and the last thing
+		* the page saw was 100 % on the final step. Instead of animating a bar that
+		* will never move, the card says it is confirming the outcome and offers a
+		* retry — and the next `/activity` read settles it from the installed set.
 		*/
-		function activeJobView(job, copy) {
+		function activeJobView(job, copy, opts = {}) {
 			const section = el("section", "hqpu-group");
 			section.dataset.group = "active-job";
 			const card = el("div", "hqpu-active");
+			if (opts.stalled === true) card.dataset.stalled = "1";
 			const top = el("div", "hqpu-active-top");
 			const titleWrap = el("div", "hqpu-active-title");
 			const pulse = el("span", "hqpu-pulse-dot");
@@ -1487,6 +1532,14 @@ window.__ModuleLoader__.load({
 			card.append(meta);
 			card.append(el("div", "hqpu-active-versions", job.previousVersion !== null && job.previousVersion.length > 0 ? `${job.previousVersion} → ${job.targetVersion}` : job.targetVersion));
 			card.append(el("p", "hqpu-active-note", job.kind === "runtime" ? copy.job.willSwapRuntime : copy.ui.activeCloseNote));
+			if (opts.stalled === true) {
+				const stalled = el("div", "hqpu-active-stalled");
+				stalled.append(el("span", "", copy.ui.stalledNote));
+				const recheck = linkButton("hqpu-link", copy.ui.stalledAction, () => opts.onRecheck?.());
+				recheck.setAttribute("data-stalled-recheck", "");
+				stalled.append(recheck);
+				card.append(stalled);
+			}
 			const current = stepIndex(job.phase);
 			const stepsRow = el("div", "hqpu-job-steps4");
 			copy.ui.jobSteps.forEach((label, index) => {
@@ -2024,6 +2077,7 @@ window.__ModuleLoader__.load({
 						return;
 					}
 					runtimeAccepted = true;
+					store.watchJob?.(result.jobId ?? null);
 					showToast(copy.runtime.updateAccepted, "success");
 					store.fetchStatus();
 				} catch (err) {
@@ -2152,7 +2206,12 @@ window.__ModuleLoader__.load({
 			function renderJobSection() {
 				jobSection.textContent = "";
 				const active = store.activeJob();
-				if (active !== null && !TERMINAL_PHASES.has(active.phase)) jobSection.append(activeJobView(active, copy));
+				if (active !== null && !TERMINAL_PHASES.has(active.phase)) jobSection.append(activeJobView(active, copy, {
+					stalled: store.stalled?.() === true,
+					onRecheck: () => {
+						store.fetchStatus();
+					}
+				}));
 			}
 			function renderBanners(report, jobActive) {
 				bannerSection.textContent = "";
@@ -2285,7 +2344,7 @@ window.__ModuleLoader__.load({
 				if (busy) {
 					ctaLabel.textContent = copy.ui.ctaInstalling;
 					cta.disabled = true;
-					footCount.textContent = copy.ui.footerBusy;
+					footCount.textContent = store.stalled?.() === true ? copy.ui.footerConfirming : copy.ui.footerBusy;
 				} else if (report === null) {
 					ctaLabel.textContent = copy.ui.ctaNoSet;
 					cta.disabled = true;
@@ -2453,6 +2512,7 @@ window.__ModuleLoader__.load({
 					showToast(`${copy.installError}: ${result.error}`, "error");
 					return;
 				}
+				store.watchJob?.(result.jobId ?? null);
 				showToast(copy.installSuccess, "success");
 				store.fetchStatus();
 			} catch (err) {
@@ -3739,6 +3799,45 @@ window.__ModuleLoader__.load({
   line-height: 14px;
   color: var(--hq-faint);
 }
+/* A stalled job: the card keeps its shape but stops claiming progress. The
+ * pulse stops, the bar dims, and the note line carries the retry. */
+.hqpu-active[data-stalled='1'] .hqpu-pulse-ring {
+  animation: none;
+  opacity: 0;
+}
+.hqpu-active[data-stalled='1'] .hqpu-pulse-dot::before {
+  background: var(--hq-amber);
+}
+.hqpu-active[data-stalled='1'] .hqpu-active-percent {
+  color: var(--hq-amber-ink);
+}
+.hqpu-active[data-stalled='1'] .hqpu-progress-fill {
+  background: color-mix(in srgb, var(--hq-amber) 55%, var(--hq-border));
+  transition: none;
+}
+/* The active step stops blinking too: nothing is advancing. */
+.hqpu-active[data-stalled='1'] .hqpu-job-step--active {
+  color: var(--hq-amber-ink);
+  animation: none;
+}
+.hqpu-active-stalled {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 8px;
+  padding: 6px 8px;
+  border-radius: 6px;
+  background: color-mix(in srgb, var(--hq-amber) 10%, transparent);
+  font-size: var(--hq-fs-micro);
+  line-height: 14px;
+  color: var(--hq-amber-ink);
+}
+.hqpu-active-stalled .hqpu-link {
+  flex: none;
+  font-size: var(--hq-fs-micro);
+  color: var(--hq-amber-ink);
+  text-decoration: underline;
+}
 .hqpu-job-steps4 {
   display: grid;
   grid-template-columns: repeat(4, 1fr);
@@ -4343,7 +4442,13 @@ window.__ModuleLoader__.load({
 			tag.textContent = `${ENTRY_CSS_TEXT}\n${VIEW_CSS_TEXT}`;
 			document.head.appendChild(tag);
 		}
-		/** In-memory update-report store shared by the badge and the modal. */
+		/**
+		* In-memory update-report store shared by the badge and the modal.
+		*
+		* Exported for tests: the re-attach logic (watch a job by id, notice that the
+		* server was replaced, stop claiming progress) is the part that cannot be
+		* exercised through the view alone.
+		*/
 		var UpdateStore = class {
 			current = null;
 			installingFlag = false;
@@ -4356,6 +4461,12 @@ window.__ModuleLoader__.load({
 			pollTimer = null;
 			pollBackoffMs = 1e3;
 			pollInFlight = false;
+			/** The job this panel started (or adopted) and is following by id. */
+			watchedJobId = null;
+			/** hq-edge process identity from the last `/activity` read. */
+			activityBootId = null;
+			stalledFlag = false;
+			phaseAgeMsValue = 0;
 			report() {
 				return this.current;
 			}
@@ -4368,6 +4479,24 @@ window.__ModuleLoader__.load({
 			recentJobs() {
 				return [...this.recent];
 			}
+			/** True when the server says the active job stopped advancing. */
+			stalled() {
+				return this.stalledFlag;
+			}
+			/** Milliseconds since the active job last advanced (server clock). */
+			phaseAgeMs() {
+				return this.phaseAgeMsValue;
+			}
+			/**
+			* Follow a job by id. The panel calls this with the `jobId` an accept
+			* response handed back, so every later read asks about THAT job — the only
+			* way to learn its outcome when the install replaced this very plugin (the
+			* page comes back to a server that has no "active job" left to report).
+			*/
+			watchJob(id) {
+				this.watchedJobId = id;
+				if (id !== null) this.schedulePoll();
+			}
 			subscribe(listener) {
 				this.listeners.add(listener);
 				return () => {
@@ -4394,28 +4523,86 @@ window.__ModuleLoader__.load({
 				const wasActive = this.active !== null;
 				this.active = status.activeJob;
 				this.recent = status.recentJobs;
-				if (wasActive && this.active === null) {
+				if (this.active !== null) this.watchedJobId = this.active.id;
+				if (wasActive && this.active === null) this.observeSettled();
+				this.emit();
+				this.schedulePoll();
+			}
+			/**
+			* Adopt a `/activity` snapshot.
+			*
+			* Two things only this read can tell us:
+			*
+			*   - `bootId` changed → hq-edge was recreated underneath the page. That is
+			*     what an install of this plugin's own package looks like from here: the
+			*     DSH process serving this route was replaced. Nothing in memory can be
+			*     trusted, so the installing flag is cleared and the report re-read.
+			*   - `stalled` → the active job has stopped advancing. The progress bar must
+			*     stop pretending; the panel shows a "confirming" note with a retry.
+			*/
+			applyActivity(activity) {
+				const rebooted = this.activityBootId !== null && this.activityBootId !== activity.bootId;
+				this.activityBootId = activity.bootId;
+				this.stalledFlag = activity.stalled;
+				this.phaseAgeMsValue = activity.phaseAgeMs;
+				const wasActive = this.active !== null;
+				this.active = activity.activeJob;
+				if (activity.job !== null) this.upsertRecent(activity.job);
+				if (rebooted) {
 					this.installingFlag = false;
+					this.stalledFlag = false;
+					this.phaseAgeMsValue = 0;
 					this.refresh();
 				}
+				if (wasActive && this.active === null) this.observeSettled();
 				this.emit();
 				this.schedulePoll();
 			}
 			/**
-			* Fetch the durable job status. Called on mount, on panel open (BEFORE
+			* The job we were following reached a terminal phase (or vanished from the
+			* active slot). Clear the transient flags and re-read the report — it still
+			* names the versions that job installed.
+			*/
+			observeSettled() {
+				this.installingFlag = false;
+				this.stalledFlag = false;
+				this.phaseAgeMsValue = 0;
+				this.watchedJobId = null;
+				this.refresh();
+			}
+			/** Keep one job fresh in the local history without duplicating it. */
+			upsertRecent(job) {
+				const rest = this.recent.filter((entry) => entry.id !== job.id);
+				this.recent = [job, ...rest].slice(0, 20);
+			}
+			/**
+			* Fetch the durable job state. Called on mount, on panel open (BEFORE
 			* discovery) and by the poll loop. A failure (older hq-edge with no
 			* `/status`, or a transient HTTP error) is swallowed: the last known job is
 			* kept and the poller backs off and retries.
 			*/
 			async fetchStatus() {
 				try {
-					const status = await fetchJobStatus();
+					await this.pollOnce();
 					this.pollBackoffMs = 1e3;
-					this.applyStatus(status);
 				} catch {
 					this.schedulePoll();
 				}
 			}
+			/**
+			* One read. While a job is being followed, ask `/activity` about THAT job
+			* (survives the restart an update of this plugin causes); otherwise fall back
+			* to the plain `/status` list. An older hq-edge without `/activity` 404s and
+			* the status read still answers.
+			*/
+			async pollOnce() {
+				const watched = this.watchedJobId ?? this.active?.id ?? null;
+				if (watched !== null) try {
+					this.applyActivity(await fetchActivity(watched));
+					return;
+				} catch {}
+				this.applyStatus(await fetchJobStatus());
+			}
 			/** ~1 s poll while a job is active; stop on terminal; back off on error
 			*  without discarding the last known job; never overlap requests. */
 			schedulePoll() {
@@ -4439,9 +4626,8 @@ window.__ModuleLoader__.load({
 				}
 				this.pollInFlight = true;
 				try {
-					const status = await fetchJobStatus();
+					await this.pollOnce();
 					this.pollBackoffMs = 1e3;
-					this.applyStatus(status);
 				} catch {
 					this.pollBackoffMs = Math.min(5e3, Math.max(1e3, this.pollBackoffMs * 2));
 					this.schedulePoll();
@@ -4587,6 +4773,7 @@ window.__ModuleLoader__.load({
 		exports.UPDATE_ENTRY_ATTRIBUTE = UPDATE_ENTRY_ATTRIBUTE;
 		exports.UPDATE_ENTRY_SELECTOR = UPDATE_ENTRY_SELECTOR;
 		exports.UPDATE_ICON = UPDATE_ICON;
+		exports.UpdateStore = UpdateStore;
 		exports.apply = apply;
 		exports.ensureDesignTokens = ensureDesignTokens;
 		exports.inject = inject;