Respect installed version update channel

- Derive desktop updater channel from the running app version - Keep stable builds on latest and prereleases on their own track - Add tests and release docs for channel matching

Julius Marminge committed 7 months ago

Commit b3291cf1 parent c9b07d64 files · +91 −5Browse files

Unified · Split

4 files

apps/desktop/src/main.ts +22 −5
apps/desktop/src/updateChannel.test.ts +40 −0
apps/desktop/src/updateChannel.ts +26 −0
docs/release.md +3 −0

apps/desktop/src/main.ts+22−5

 import { showDesktopConfirmDialog } from "./confirmDialog";
 import { resolveDesktopServerExposure } from "./serverExposure";
 import { syncShellEnvironment } from "./syncShellEnvironment";
+import {
+  resolveDesktopUpdateChannel,
+  shouldAcceptDesktopUpdateForCurrentVersion,
+  shouldAllowDesktopPrereleaseUpdates,
+} from "./updateChannel";
 import { getAutoUpdateDisabledReason, shouldBroadcastDownloadProgress } from "./updateState";
 import { ServerListeningDetector } from "./serverListeningDetector";
 import {
 const SERVER_SETTINGS_PATH = Path.join(STATE_DIR, "settings.json");
 const AUTO_UPDATE_STARTUP_DELAY_MS = 15_000;
 const AUTO_UPDATE_POLL_INTERVAL_MS = 4 * 60 * 60 * 1000;
-const DESKTOP_UPDATE_CHANNEL = "latest";
-const DESKTOP_UPDATE_ALLOW_PRERELEASE = false;
 const DESKTOP_LOOPBACK_HOST = "127.0.0.1";
 const DESKTOP_REQUIRED_PORT_PROBE_HOSTS = ["0.0.0.0", "::"] as const;
 const TITLEBAR_HEIGHT = 40;
 }
 function configureAutoUpdater(): void {
+  const currentVersion = app.getVersion();
+  const updateChannel = resolveDesktopUpdateChannel(currentVersion);
+  const allowPrerelease = shouldAllowDesktopPrereleaseUpdates(currentVersion);
   const githubToken =
     process.env.T3CODE_DESKTOP_UPDATE_GITHUB_TOKEN?.trim() || process.env.GH_TOKEN?.trim() || "";
   if (githubToken) {
   autoUpdater.autoDownload = false;
   autoUpdater.autoInstallOnAppQuit = false;
-  // Keep alpha branding, but force all installs onto the stable update track.
+  autoUpdater.channel = updateChannel;
-  autoUpdater.channel = DESKTOP_UPDATE_CHANNEL;
+  autoUpdater.allowPrerelease = allowPrerelease;
-  autoUpdater.allowPrerelease = DESKTOP_UPDATE_ALLOW_PRERELEASE;
   autoUpdater.allowDowngrade = false;
   autoUpdater.disableDifferentialDownload = isArm64HostRunningIntelBuild(desktopRuntimeInfo);
   let lastLoggedDownloadMilestone = -1;
+  console.info(
+    `[desktop-updater] Configured update channel=${updateChannel} currentVersion=${currentVersion} allowPrerelease=${allowPrerelease}.`,
+  );
   if (isArm64HostRunningIntelBuild(desktopRuntimeInfo)) {
     console.info(
     console.info("[desktop-updater] Looking for updates...");
   });
   autoUpdater.on("update-available", (info) => {
+    if (!shouldAcceptDesktopUpdateForCurrentVersion(currentVersion, info.version)) {
+      setUpdateState(reduceDesktopUpdateStateOnNoUpdate(updateState, new Date().toISOString()));
+      lastLoggedDownloadMilestone = -1;
+      console.info(
+        `[desktop-updater] Ignoring update ${info.version} on channel=${resolveDesktopUpdateChannel(info.version)} while currentVersion=${currentVersion} is on channel=${updateChannel}.`,
+      );
+      return;
+    }
     setUpdateState(
       reduceDesktopUpdateStateOnUpdateAvailable(
         updateState,

apps/desktop/src/updateChannel.test.ts+40−0

@@ -0,0 +1,40 @@
	1	import { describe, expect, it } from "vitest";
	2
	3	import {
	4	resolveDesktopUpdateChannel,
	5	shouldAcceptDesktopUpdateForCurrentVersion,
	6	shouldAllowDesktopPrereleaseUpdates,
	7	} from "./updateChannel";
	8
	9	describe("updateChannel", () => {
	10	it("uses the stable latest channel for plain versions", () => {
	11	expect(resolveDesktopUpdateChannel("0.0.17")).toBe("latest");
	12	expect(shouldAllowDesktopPrereleaseUpdates("0.0.17")).toBe(false);
	13	});
	14
	15	it("derives the prerelease channel from the installed version", () => {
	16	expect(resolveDesktopUpdateChannel("0.0.18-nightly.20260415")).toBe("nightly");
	17	expect(shouldAllowDesktopPrereleaseUpdates("0.0.18-nightly.20260415")).toBe(true);
	18	});
	19
	20	it("accepts updates that stay on the same prerelease track", () => {
	21	expect(
	22	shouldAcceptDesktopUpdateForCurrentVersion(
	23	"0.0.18-nightly.20260415",
	24	"0.0.18-nightly.20260416",
	25	),
	26	).toBe(true);
	27	});
	28
	29	it("rejects stable releases while running a nightly build", () => {
	30	expect(shouldAcceptDesktopUpdateForCurrentVersion("0.0.18-nightly.20260415", "0.0.17")).toBe(
	31	false,
	32	);
	33	});
	34
	35	it("rejects updates from a different prerelease track", () => {
	36	expect(
	37	shouldAcceptDesktopUpdateForCurrentVersion("0.0.18-nightly.20260415", "0.0.18-beta.1"),
	38	).toBe(false);
	39	});
	40	});

apps/desktop/src/updateChannel.ts+26−0

@@ -0,0 +1,26 @@
	1	const VERSION_PRERELEASE_CHANNEL_PATTERN =
	2	/^\d+\.\d+\.\d+(?:-([0-9A-Za-z-]+)(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z.-]+)?$/;
	3
	4	function resolvePrereleaseChannel(version: string): string \| null {
	5	const normalizedVersion = version.trim();
	6	const match = VERSION_PRERELEASE_CHANNEL_PATTERN.exec(normalizedVersion);
	7	const channel = match?.[1]?.trim().toLowerCase();
	8	return channel && channel.length > 0 ? channel : null;
	9	}
	10
	11	export function resolveDesktopUpdateChannel(version: string): string {
	12	return resolvePrereleaseChannel(version) ?? "latest";
	13	}
	14
	15	export function shouldAllowDesktopPrereleaseUpdates(version: string): boolean {
	16	return resolvePrereleaseChannel(version) !== null;
	17	}
	18
	19	export function shouldAcceptDesktopUpdateForCurrentVersion(
	20	currentVersion: string,
	21	candidateVersion: string,
	22	): boolean {
	23	return (
	24	resolveDesktopUpdateChannel(currentVersion) === resolveDesktopUpdateChannel(candidateVersion)
	25	);
	26	}

docs/release.md+3−0

   - Background checks run on startup delay + interval.
   - No automatic download or install.
   - The desktop UI shows a rocket update button when an update is available; click once to download, click again after download to restart/install.
+- Update channel selection:
+  - Stable builds (`X.Y.Z`) only accept stable updates.
+  - Prerelease builds (for example `X.Y.Z-nightly.N`) stay on that prerelease track and ignore stable or differently-tagged prerelease releases.
 - Provider: GitHub Releases (`provider: github`) configured at build time.
 - Repository slug source:
   - `T3CODE_DESKTOP_UPDATE_REPOSITORY` (format `owner/repo`), if set.

Respect installed version update channel

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code