@dshtrading/client-ui-updater 0.6.3 → 0.7.1

package/lib/client.js

@@ -140,35 +140,35 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var updater_panel_module_css_default = {
-			"notes": "SgPada_notes",
-			"availableMeta": "SgPada_availableMeta",
-			"availableCard": "SgPada_availableCard",
-			"doneTitle": "SgPada_doneTitle",
-			"lead": "SgPada_lead",
 			"doneMeta": "SgPada_doneMeta",
+			"doneTitle": "SgPada_doneTitle",
+			"availableCard": "SgPada_availableCard",
+			"errorText": "SgPada_errorText",
+			"statusRow": "SgPada_statusRow",
 			"versions": "SgPada_versions",
-			"progressLabel": "SgPada_progressLabel",
-			"link": "SgPada_link",
-			"availableTitle": "SgPada_availableTitle",
-			"progressTrack": "SgPada_progressTrack",
-			"actions": "SgPada_actions",
+			"upd-slide": "SgPada_upd-slide",
 			"root": "SgPada_root",
-			"statusRow": "SgPada_statusRow",
+			"statusTextError": "SgPada_statusTextError",
+			"versionValue": "SgPada_versionValue",
+			"progressWrap": "SgPada_progressWrap",
 			"progressFill": "SgPada_progressFill",
-			"versionLabel": "SgPada_versionLabel",
+			"progressTrack": "SgPada_progressTrack",
+			"lead": "SgPada_lead",
+			"availableMeta": "SgPada_availableMeta",
+			"progressIndeterminate": "SgPada_progressIndeterminate",
 			"notesTitle": "SgPada_notesTitle",
-			"progressWrap": "SgPada_progressWrap",
-			"statusTextError": "SgPada_statusTextError",
-			"statusTextOk": "SgPada_statusTextOk",
 			"doneCard": "SgPada_doneCard",
+			"availableTitle": "SgPada_availableTitle",
+			"link": "SgPada_link",
 			"statusText": "SgPada_statusText",
-			"errorText": "SgPada_errorText",
+			"notes": "SgPada_notes",
 			"primaryButton": "SgPada_primaryButton",
-			"versionValue": "SgPada_versionValue",
-			"versionItem": "SgPada_versionItem",
+			"versionLabel": "SgPada_versionLabel",
+			"actions": "SgPada_actions",
+			"statusTextOk": "SgPada_statusTextOk",
 			"secondaryButton": "SgPada_secondaryButton",
-			"upd-slide": "SgPada_upd-slide",
-			"progressIndeterminate": "SgPada_progressIndeterminate"
+			"progressLabel": "SgPada_progressLabel",
+			"versionItem": "SgPada_versionItem"
 		};
 		//#endregion
 		//#region src/client/UpdaterPanel.tsx
@@ -452,11 +452,11 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var updater_dialog_module_css_default = {
-			"header": "Sd___q_header",
 			"title": "Sd___q_title",
+			"mask": "Sd___q_mask",
 			"body": "Sd___q_body",
 			"close": "Sd___q_close",
-			"mask": "Sd___q_mask",
+			"header": "Sd___q_header",
 			"panel": "Sd___q_panel",
 			"overlay": "Sd___q_overlay"
 		};

package/lib/updater-service.d.ts

@@ -97,6 +97,12 @@ declare class UpdaterService {
   constructor(options: UpdaterServiceOptions);
   /** Load persisted check state + schedule auto checks. Idempotent. */
   start(): void;
+  /**
+   * 启动对账：state.json 里的 available 是上次检查那一刻的结论，装着的版本一变就不再
+   * 成立（增量更新、手动换包、完整安装包 reseed 都会）。不写回去，state.json 与右缘
+   * 红点会一直声称「有新版本」，直到下一次检查。
+   */
+  private reconcilePersistedAvailability;
   dispose(): void;
   /**
    * Check GitHub for a newer stable release. Non-forced calls honor the TTL
@@ -119,6 +125,15 @@ declare class UpdaterService {
   /** The full pipeline; only called via apply() (single-flight owner). */
   private runApply;
   private installedVersionOf;
+  /**
+   * 磁盘上真正装着的家族版本（本包自己的 manifest）：env.familyVersion 只是宿主启动
+   * 那一刻的快照，增量 apply 之后进程里仍是旧值，拿它比版本会把刚装好的那一版继续
+   * 报成「有新版本」。非 profile 环境（dev checkout / 手装 headless）没有 packagesRoot，
+   * 回落启动快照——那里也没有增量通道。
+   */
+  private installedFamilyVersion;
+  /** 「发布版比磁盘上的家族版本新」——available 的唯一判据（检查、快照、apply 三处共用）。 */
+  private availabilityOf;
   /** Unzip into a staging dir under the profile and cross-check the manifest. */
   private stagePackages;
   /** Stream the payload zip with progress; verify sha256 + byte length. */

package/lib/updater-service.js

@@ -120,6 +120,7 @@ var UpdaterService = class {
 	/** Load persisted check state + schedule auto checks. Idempotent. */
 	start() {
 		if (this.disposed || this.timers.length > 0) return;
+		this.reconcilePersistedAvailability();
 		if (this.env.supported) {
 			const initialTimer = setTimeout(() => {
 				this.check(false).catch(() => void 0);
@@ -132,6 +133,21 @@ var UpdaterService = class {
 			this.timers.push(initialTimer, intervalTimer);
 		}
 	}
+	/**
+	* 启动对账：state.json 里的 available 是上次检查那一刻的结论，装着的版本一变就不再
+	* 成立（增量更新、手动换包、完整安装包 reseed 都会）。不写回去，state.json 与右缘
+	* 红点会一直声称「有新版本」，直到下一次检查。
+	*/
+	reconcilePersistedAvailability() {
+		if (this.checkState.latest === void 0) return;
+		const derived = this.availabilityOf(this.checkState.latest);
+		if (derived === this.checkState.available) return;
+		this.checkState = {
+			...this.checkState,
+			available: derived
+		};
+		this.persistCheck();
+	}
 	dispose() {
 		this.disposed = true;
 		for (const timer of this.timers.splice(0)) {
@@ -155,7 +171,7 @@ var UpdaterService = class {
 				...this.options.github?.timeoutMs === void 0 ? {} : { timeoutMs: this.options.github.timeoutMs }
 			});
 			const latest = release === void 0 ? void 0 : this.latestOf(release);
-			const available = latest?.version !== void 0 && isNewerVersion(latest.version, this.env.familyVersion);
+			const available = this.availabilityOf(latest);
 			this.rateLimitedUntil = 0;
 			this.checkState = {
 				at: new Date(this.now()).toISOString(),
@@ -219,7 +235,7 @@ var UpdaterService = class {
 	async apply() {
 		if (this.applyInFlight || this.applyState.phase === "running") throw new UpdaterError("UPDATER_BUSY", "an update is already in progress");
 		if (!this.env.supported || this.env.profileRoot === void 0 || this.env.packagesRoot === void 0) throw new UpdaterError("UPDATER_UNSUPPORTED", "incremental update requires a desktop-seeded profile");
-		if (this.checkState.status !== "ok" || this.checkState.available !== true || this.checkState.latest === void 0) throw new UpdaterError("UPDATER_NO_UPDATE", "no newer release is available");
+		if (this.checkState.status !== "ok" || this.checkState.latest === void 0 || !this.availabilityOf(this.checkState.latest)) throw new UpdaterError("UPDATER_NO_UPDATE", "no newer release is available");
 		if (this.checkState.latest.payloadAvailable !== true) throw new UpdaterError("UPDATER_PAYLOAD_UNAVAILABLE", "this release does not carry the incremental payload");
 		this.applyInFlight = true;
 		const target = this.checkState.latest;
@@ -354,6 +370,22 @@ var UpdaterService = class {
 			return "missing";
 		}
 	}
+	/**
+	* 磁盘上真正装着的家族版本（本包自己的 manifest）：env.familyVersion 只是宿主启动
+	* 那一刻的快照，增量 apply 之后进程里仍是旧值，拿它比版本会把刚装好的那一版继续
+	* 报成「有新版本」。非 profile 环境（dev checkout / 手装 headless）没有 packagesRoot，
+	* 回落启动快照——那里也没有增量通道。
+	*/
+	installedFamilyVersion() {
+		const packagesRoot = this.env.packagesRoot;
+		if (packagesRoot === void 0) return this.env.familyVersion;
+		const installed = this.installedVersionOf(path.join(packagesRoot, "client-ui-updater"));
+		return installed === "unknown" || installed === "missing" ? this.env.familyVersion : installed;
+	}
+	/** 「发布版比磁盘上的家族版本新」——available 的唯一判据（检查、快照、apply 三处共用）。 */
+	availabilityOf(latest) {
+		return latest?.version !== void 0 && isNewerVersion(latest.version, this.installedFamilyVersion());
+	}
 	/** Unzip into a staging dir under the profile and cross-check the manifest. */
 	stagePackages(zipBytes, manifest, profileRoot) {
 		let entries;
@@ -468,7 +500,10 @@ var UpdaterService = class {
 				profileRoot: this.env.profileRoot,
 				supported: this.env.supported
 			},
-			check: this.checkState,
+			check: {
+				...this.checkState,
+				available: this.availabilityOf(this.checkState.latest)
+			},
 			apply: this.applyState,
 			progress: this.applyState.phase === "running" ? this.progress : void 0
 		};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dshtrading/client-ui-updater",
   "description": "dsh-trading auto-update plugin: GitHub Releases version check with release notes, incremental update of the @dshtrading/* plugin family inside a desktop-seeded profile (vendor payload zip, per-package swap), and the software-update dialog opened from the trading sidebar's update entry. Browser half registers the shell.overlay dialog; node half registers the /dshtrading/api/updater routes and the update engine.",
-  "version": "0.6.3",
+  "version": "0.7.1",
   "type": "module",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -25,13 +25,13 @@
   "license": "PolyForm-Noncommercial-1.0.0",
   "dependencies": {
     "fflate": "^0.8.2",
-    "@dshtrading/dsh-home": "^0.6.3"
+    "@dshtrading/dsh-home": "^0.7.1"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": ">=4.0.0",
-    "@deepseek-ai/dsh-client-locale": ">=0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-layout": ">=0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": ">=0.2.1-rc.2",
+    "@deepseek-ai/cordis": ">=4.1.0",
+    "@deepseek-ai/dsh-client-locale": ">=0.2.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-layout": ">=0.2.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.2.2-rc.1",
     "react": "^18.2.0",
     "@types/react": "~18.3.1"
   },
@@ -45,10 +45,10 @@
     }
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.5",
-    "@deepseek-ai/dsh-client-locale": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-layout": "0.2.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-rc.2",
+    "@deepseek-ai/cordis": "^4.1.0",
+    "@deepseek-ai/dsh-client-locale": "0.2.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-layout": "0.2.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.2-rc.1",
     "@types/node": "^24.0.0",
     "@types/react": "~18.3.1",
     "lightningcss": "^1.0.0",