Skip to content

Commit 21ef91a

Browse files
committed
fix: address post-rebase review feedback
1 parent 2896676 commit 21ef91a

5 files changed

Lines changed: 51 additions & 9 deletions

File tree

‎apps/server/src/cloud/bootService.test.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,22 @@ it.layer(NodeServices.layer)("boot service install", (it) => {
140140
}),
141141
);
142142

143+
it.effect("reports the installed version across launcher protocol revisions", () =>
144+
Effect.gen(function* () {
145+
const { service, fs, statePath } = yield* makeHarness();
146+
yield* service.install;
147+
yield* fs.writeFileString(
148+
statePath,
149+
`{"protocol":${String(SERVICE_LAUNCHER_PROTOCOL + 1)},"activeVersion":"9.9.9"}`,
150+
);
151+
152+
expect(yield* service.status).toMatchObject({
153+
current: false,
154+
installedVersion: "9.9.9",
155+
});
156+
}),
157+
);
158+
143159
it.effect("restarts an installed service when repair fails", () =>
144160
Effect.gen(function* () {
145161
const { service, commands, control } = yield* makeHarness();

‎apps/server/src/cloud/bootService.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
SERVICE_LAUNCHER_PROTOCOL,
2222
SERVICE_STATE_FILE,
2323
parseServiceState,
24+
serviceStateActiveVersion,
2425
serviceStateHasPendingUpdate,
2526
type ServiceState,
2627
} from "./serviceProtocol.ts";
@@ -391,10 +392,13 @@ export const make = Effect.fn("cloud.boot_service.make")(function* (input: {
391392
fs.readFileString(statePath).pipe(Effect.option),
392393
]);
393394
const state = Option.isSome(stateText) ? parseServiceState(stateText.value) : undefined;
395+
const installedVersion = Option.isSome(stateText)
396+
? serviceStateActiveVersion(stateText.value)
397+
: undefined;
394398
return {
395399
supported: true,
396400
installed: true,
397-
...(state?.activeVersion === undefined ? {} : { installedVersion: state.activeVersion }),
401+
...(installedVersion === undefined ? {} : { installedVersion }),
398402
current:
399403
unit === renderBootServiceUnit(plan) &&
400404
launcherExists &&

‎apps/server/src/cloud/serviceProtocol.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,20 @@ export function serviceStateHasPendingUpdate(value: string): boolean {
180180
}
181181
}
182182

183+
/** Reads the active version across launcher protocol revisions for downgrade protection. */
184+
export function serviceStateActiveVersion(value: string): string | undefined {
185+
try {
186+
const parsed: unknown = JSON.parse(value);
187+
return isRecord(parsed) &&
188+
typeof parsed.activeVersion === "string" &&
189+
isExactServiceVersion(parsed.activeVersion)
190+
? parsed.activeVersion
191+
: undefined;
192+
} catch {
193+
return undefined;
194+
}
195+
}
196+
183197
export function decodeServiceLauncherContext(value: string): ServiceLauncherContext | undefined {
184198
let parsed: unknown;
185199
try {

‎packages/client-runtime/src/authorization/layer.test.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ describe("RemoteEnvironmentAuthorization", () => {
389389
}),
390390
);
391391

392-
it.effect("refreshes a cached endpoint after descriptor discovery fails", () =>
392+
it.effect("keeps a valid cached token when descriptor refresh fails transiently", () =>
393393
Effect.gen(function* () {
394394
const cached = new TokenStore.RemoteDpopAccessToken({
395395
environmentId: ENVIRONMENT_ID,
@@ -404,9 +404,6 @@ describe("RemoteEnvironmentAuthorization", () => {
404404
responses: [
405405
websocketTicket("cached-ticket"),
406406
new Response("endpoint unavailable", { status: 503 }),
407-
Response.json(DESCRIPTOR),
408-
accessToken("replacement-access-token"),
409-
websocketTicket("replacement-ticket"),
410407
],
411408
});
412409

@@ -418,14 +415,15 @@ describe("RemoteEnvironmentAuthorization", () => {
418415
});
419416
}).pipe(Effect.provide(harness.layer));
420417

421-
expect(authorized.socketUrl).toContain("wsTicket=replacement-ticket");
422-
expect(yield* Ref.get(harness.bootstrapCalls)).toBe(1);
418+
expect(authorized.socketUrl).toContain("wsTicket=cached-ticket");
419+
expect(authorized.serverVersion).toBeUndefined();
420+
expect(yield* Ref.get(harness.bootstrapCalls)).toBe(0);
423421
expect((yield* Ref.get(harness.tokens)).get(ENVIRONMENT_ID)).toEqual(
424422
expect.objectContaining({
425-
accessToken: "replacement-access-token",
423+
accessToken: "cached-access-token",
426424
}),
427425
);
428-
expect(harness.fetch.calls).toHaveLength(5);
426+
expect(harness.fetch.calls).toHaveLength(2);
429427
}),
430428
);
431429

‎packages/client-runtime/src/authorization/service.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,16 @@ export const make = Effect.gen(function* () {
241241
if (cachedDescriptor.failure._tag === "ConnectionBlockedError") {
242242
return yield* cachedDescriptor.failure;
243243
}
244+
return {
245+
environmentId: cached.value.environmentId,
246+
label: cached.value.label,
247+
httpBaseUrl: cached.value.endpoint.httpBaseUrl,
248+
socketUrl: cachedSocket.success,
249+
httpAuthorization: {
250+
_tag: "Dpop" as const,
251+
accessToken: cached.value.accessToken,
252+
},
253+
};
244254
} else if (cachedSocket.failure._tag === "ConnectionBlockedError") {
245255
return yield* mapDpopSocketError(cachedSocket.failure);
246256
}

0 commit comments

Comments
 (0)