From fe28e0f7488a38dda55ad8966e7820bcd7d4b07a Mon Sep 17 00:00:00 2001 From: Dan Smolsky Date: Sat, 7 Nov 2026 06:46:29 -0500 Subject: [PATCH] fix(core): skip unreachable wellknown sources instead of dropping all --- packages/core/src/wellknown.ts | 16 ++++++++++++---- packages/core/test/wellknown.test.ts | 20 ++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/packages/core/src/wellknown.ts b/packages/core/src/wellknown.ts index a01b0bea1d0..e54c71282ba 100644 --- a/packages/core/src/wellknown.ts +++ b/packages/core/src/wellknown.ts @@ -136,16 +136,24 @@ const layer = Layer.effect( return { origin, integrationID: Integration.ID.make(origin), manifest } }) + const loadSource = (origin: string) => + loadEntry(origin).pipe( + Effect.catch((error) => + Effect.logWarning("skipping wellknown source", { origin, error }).pipe(Effect.as(undefined)), + ), + ) + const readOrigins = kv.get(sourcesKey).pipe(Effect.map((value) => (Schema.is(Sources)(value) ? value : []))) const load = Effect.fn("WellKnown.load")(function* () { const origins = yield* readOrigins const current = yield* Ref.get(cache) - const entries = yield* Effect.forEach(origins, (origin) => { + const loaded = yield* Effect.forEach(origins, (origin) => { const cached = current.get(origin) if (cached) return Effect.succeed(cached) - return loadEntry(origin) + return loadSource(origin) }) + const entries = loaded.filter((entry) => entry !== undefined) yield* Ref.set(cache, new Map(entries.map((entry) => [entry.origin, entry]))) return entries }) @@ -154,8 +162,8 @@ const layer = Layer.effect( function* () { const origins = yield* readOrigins if (!origins.length) return false - const entries = yield* Effect.forEach(origins, loadEntry) - const next = new Map(entries.map((entry) => [entry.origin, entry])) + const entries = yield* Effect.forEach(origins, loadSource) + const next = new Map(entries.filter((entry) => entry !== undefined).map((entry) => [entry.origin, entry])) const changed = !isDeepStrictEqual(Ref.getUnsafe(cache), next) if (!changed) return false yield* Ref.set(cache, next) diff --git a/packages/core/test/wellknown.test.ts b/packages/core/test/wellknown.test.ts index 2e34c173116..328f1993f4b 100644 --- a/packages/core/test/wellknown.test.ts +++ b/packages/core/test/wellknown.test.ts @@ -127,3 +127,23 @@ serviceIt.live("refreshes changed manifests", () => ({ server }) => Effect.promise(() => server.stop(true)), ), ) + +serviceIt.live("skips an unreachable source without a cached manifest", () => + Effect.acquireUseRelease( + Effect.sync(() => + Bun.serve({ + port: 0, + fetch: () => Response.json({ auth: { command: ["login"], env: "TOKEN" } }), + }), + ), + (server) => + Effect.gen(function* () { + const wellknown = yield* WellKnown.Service + const kv = yield* KV.Service + yield* kv.set("wellknown:sources", ["http://127.0.0.1:1", server.url.origin]) + + expect((yield* wellknown.entries()).map((entry) => entry.origin)).toEqual([server.url.origin]) + }), + (server) => Effect.promise(() => server.stop(true)), + ), +)