From 3ab020c1a38ce8bd3118ac5e8eb551cf93fba6b2 Mon Sep 17 00:00:00 2001 From: Saif Ahmed Date: Sun, 22 Nov 2026 12:12:49 +0000 Subject: [PATCH] fix(shared): do not retain cloudflared releases below the minimum version pruneManagedVersions kept the newest older release unconditionally. When that release is below CLOUDFLARED_MIN_VERSION, resolve() can never use it, so it sat on disk forever. Keep the newest older release only when it is still compatible and remove the rest. --- packages/shared/src/relayClient.test.ts | 34 +++++++++++++++++++++---- packages/shared/src/relayClient.ts | 10 ++++++-- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/packages/shared/src/relayClient.test.ts b/packages/shared/src/relayClient.test.ts index 594d5ad215b1a..5ca93fe494735 100644 --- a/packages/shared/src/relayClient.test.ts +++ b/packages/shared/src/relayClient.test.ts @@ -751,14 +751,14 @@ describe("RelayClient", () => { Effect.gen(function* () { const fileSystem = yield* FileSystem.FileSystem; const pathBinary = `${baseDir}/bin/cloudflared`; - const older = managedPathFor(baseDir, "2025.9.0"); - const newer = managedPathFor(baseDir, "2026.1.0"); + const older = managedPathFor(baseDir, "2026.10.2"); + const newer = managedPathFor(baseDir, "2026.10.3"); const pinned = managedPathFor(baseDir, RelayClient.CLOUDFLARED_VERSION); const newerServer = managedPathFor(baseDir, "2099.1.0"); versions[newerServer] = "2099.1.0"; yield* writeExecutable(newerServer); versions[pathBinary] = "2026.10.3"; - versions[older] = "2025.9.0"; + versions[older] = "2026.10.2"; versions[newer] = "2026.10.3"; yield* writeExecutable(pathBinary); yield* writeExecutable(older); @@ -784,11 +784,11 @@ describe("RelayClient", () => { yield* manager.pruneManagedVersions; expect( (yield* fileSystem.readDirectory(`${baseDir}/tools/cloudflared`)).sort(), - ).toEqual(["2026.1.0", RelayClient.CLOUDFLARED_VERSION, "2099.1.0"]); + ).toEqual(["2026.10.3", RelayClient.CLOUDFLARED_VERSION, "2099.1.0"]); yield* fileSystem.remove(pinned); expect(yield* resolveWith).toMatchObject({ source: "managed", version: "2026.10.3" }); - yield* fileSystem.remove(`${baseDir}/tools/cloudflared/2026.1.0`, { + yield* fileSystem.remove(`${baseDir}/tools/cloudflared/2026.10.3`, { recursive: true, }); expect(yield* resolveWith).toMatchObject({ source: "path", version: "2026.10.3" }); @@ -798,6 +798,30 @@ describe("RelayClient", () => { }, ); + it.effect.skipIf(windowsHost)("prunes an older release below the minimum version", () => { + const versions: Record = {}; + return run( + (baseDir) => + Effect.gen(function* () { + const fileSystem = yield* FileSystem.FileSystem; + const pinned = managedPathFor(baseDir, RelayClient.CLOUDFLARED_VERSION); + const outdated = managedPathFor(baseDir, "2026.10.0"); + versions[pinned] = RelayClient.CLOUDFLARED_VERSION; + versions[outdated] = "2026.10.0"; + yield* writeExecutable(pinned); + yield* writeExecutable(outdated); + const manager = yield* RelayClient.makeCloudflaredRelayClient({ baseDir }); + + yield* manager.pruneManagedVersions; + + expect( + (yield* fileSystem.readDirectory(`${baseDir}/tools/cloudflared`)).sort(), + ).toEqual([RelayClient.CLOUDFLARED_VERSION]); + }), + { versions }, + ); + }); + it.effect.skipIf(windowsHost)( "keeps a self-updated managed binary as a fallback but still installs the pin", () => { diff --git a/packages/shared/src/relayClient.ts b/packages/shared/src/relayClient.ts index 19e42955ea554..de5d66b8e03bd 100644 --- a/packages/shared/src/relayClient.ts +++ b/packages/shared/src/relayClient.ts @@ -422,8 +422,14 @@ export const makeCloudflaredRelayClient = Effect.fn("cloudflared.make")(function }).pipe(Effect.withSpan("cloudflared.resolve")); const pruneManagedVersions: RelayClientShape["pruneManagedVersions"] = Effect.gen(function* () { - // Retain the newest older release for rollback or older servers that cannot redownload it. - for (const version of (yield* olderManagedVersions).slice(1)) { + const olderVersions = yield* olderManagedVersions; + // Keep the newest older release that can still run, for rollback or older servers + // that cannot redownload it. Releases below the minimum version are unusable. + const retained = olderVersions.find( + (version) => compareCloudflaredVersions(version, CLOUDFLARED_MIN_VERSION) >= 0, + ); + for (const version of olderVersions) { + if (version === retained) continue; // Windows cannot delete another server's running connector; retry next prune. yield* fileSystem.remove(path.join(managedRoot, version), { recursive: true }).pipe( Effect.tap(() => Effect.logInfo("Removed an older managed relay client", { version })),