Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions packages/shared/src/relayClient.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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" });
Expand All @@ -798,6 +798,30 @@ describe("RelayClient", () => {
},
);

it.effect.skipIf(windowsHost)("prunes an older release below the minimum version", () => {
const versions: Record<string, string> = {};
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",
() => {
Expand Down
10 changes: 8 additions & 2 deletions packages/shared/src/relayClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 })),
Expand Down
Loading