mirror of
https://github.com/anomalyco/opencode.git
synced 2026-11-20 10:18:46 +03:00
fix(core): skip unreachable wellknown sources instead of dropping all
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)),
|
||||
),
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user