Skip to content

Commit 79d9820

Browse files
only21milclaude
andauthored
fix(providers): apply the registry deadline while reading version metadata (#22044)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 3c3a8f5 commit 79d9820

2 files changed

Lines changed: 41 additions & 13 deletions

File tree

‎packages/provider-core/src/server/maintenanceResolver.test.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ import * as Fiber from "effect/Fiber";
1313
import * as Sink from "effect/Sink";
1414
import * as Stream from "effect/Stream";
1515
import * as HttpClient from "effect/http/HttpClient";
16+
import * as HttpClientResponse from "effect/http/HttpClientResponse";
1617
import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
18+
import * as TestClock from "effect/testing/TestClock";
1719
import * as ProviderLatestVersions from "./ProviderLatestVersions.ts";
1820
import {
1921
createProviderVersionAdvisory,
@@ -141,6 +143,39 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
141143
),
142144
);
143145

146+
it.effect("reads the latest version from the npm registry", () =>
147+
resolveLatestProviderVersion(manualPackageTool).pipe(
148+
Effect.provide(ProviderLatestVersions.layer),
149+
Effect.provideService(
150+
HttpClient.HttpClient,
151+
HttpClient.make((request) =>
152+
Effect.succeed(HttpClientResponse.fromWeb(request, Response.json({ version: "1.2.3" }))),
153+
),
154+
),
155+
Effect.map((version) => {
156+
expect(version).toBe("1.2.3");
157+
}),
158+
),
159+
);
160+
161+
it.effect("gives up on a registry body that stalls after the headers", () =>
162+
Effect.gen(function* () {
163+
const lookup = yield* resolveLatestProviderVersion(manualPackageTool).pipe(
164+
Effect.provide(ProviderLatestVersions.layer),
165+
Effect.provideService(
166+
HttpClient.HttpClient,
167+
HttpClient.make((request) =>
168+
Effect.succeed(HttpClientResponse.fromWeb(request, new Response(new ReadableStream()))),
169+
),
170+
),
171+
Effect.forkChild({ startImmediately: true }),
172+
);
173+
yield* TestClock.adjust("4 seconds");
174+
expect(lookup.pollUnsafe()).toBeDefined();
175+
expect(yield* Fiber.join(lookup)).toBeNull();
176+
}),
177+
);
178+
144179
it.effect("does not fetch latest provider versions when update checks are disabled", () =>
145180
enrichProviderSnapshotWithVersionAdvisory(
146181
{ ...installedPackageToolProvider, installedVersion: "1.1.0" },

‎packages/provider-core/src/server/maintenanceResolver.ts‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import * as Schema from "effect/Schema";
2727
import * as Stream from "effect/Stream";
2828
import * as HttpClient from "effect/http/HttpClient";
2929
import * as HttpClientRequest from "effect/http/HttpClientRequest";
30+
import * as HttpClientResponse from "effect/http/HttpClientResponse";
3031
import * as ChildProcess from "effect/process/ChildProcess";
3132
import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
3233

@@ -827,22 +828,14 @@ const fetchNpmLatestVersion = Effect.fn("fetchNpmLatestVersion")(function* (pack
827828
const request = HttpClientRequest.get(
828829
`https://registry.npmjs.org/${encodeURIComponent(packageName)}/latest`,
829830
).pipe(HttpClientRequest.setHeader("accept", "application/json"));
830-
const response = yield* client.execute(request).pipe(
831+
// The deadline covers the body too: headers can arrive before the JSON stalls.
832+
const payload = yield* client.execute(request).pipe(
833+
Effect.flatMap(HttpClientResponse.filterStatusOk),
834+
Effect.flatMap(HttpClientResponse.schemaBodyJson(NpmLatestVersionResponse)),
831835
Effect.timeoutOption(LATEST_VERSION_TIMEOUT_MS),
832836
Effect.orElseSucceed(() => Option.none()),
833837
);
834-
if (Option.isNone(response)) {
835-
return null;
836-
}
837-
const httpResponse = response.value;
838-
if (httpResponse.status < 200 || httpResponse.status >= 300) {
839-
return null;
840-
}
841-
const payload = yield* httpResponse.json.pipe(
842-
Effect.flatMap(Schema.decodeUnknownEffect(NpmLatestVersionResponse)),
843-
Effect.orElseSucceed(() => null),
844-
);
845-
return payload ? nonEmptyString(payload.version) : null;
838+
return Option.isSome(payload) ? nonEmptyString(payload.value.version) : null;
846839
});
847840

848841
/** The installer's own answer is cached apart from the npm registry entry. */

0 commit comments

Comments
 (0)