Skip to content

Commit 7931227

Browse files
juliusmarmingeBil0000claude
authored
fix(server): stop refreshing providers on every config subscription (#11811)
Co-authored-by: Bil0000 <[email protected]> Co-authored-by: Claude Fable 5 <[email protected]>
1 parent 8419238 commit 7931227

2 files changed

Lines changed: 15 additions & 41 deletions

File tree

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

Lines changed: 15 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6327,48 +6327,26 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
63276327
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
63286328
);
63296329

6330-
it.effect("refreshes providers for each subscribeServerConfig connection", () =>
6330+
it.effect("serves config on reconnect without starting provider probes", () =>
63316331
Effect.gen(function* () {
6332-
const refreshCalls = yield* Ref.make(0);
6333-
const firstRefreshDone = yield* Deferred.make<void>();
6334-
const secondRefreshDone = yield* Deferred.make<void>();
6335-
6332+
const refresh = vi.fn(() => Effect.never);
63366333
yield* buildAppUnderTest({
6337-
layers: {
6338-
providerRegistry: {
6339-
refresh: () =>
6340-
Ref.updateAndGet(refreshCalls, (count) => count + 1).pipe(
6341-
Effect.tap((count) =>
6342-
Deferred.succeed(
6343-
count === 1 ? firstRefreshDone : secondRefreshDone,
6344-
undefined,
6345-
).pipe(Effect.ignore),
6346-
),
6347-
Effect.as([]),
6348-
),
6349-
},
6350-
},
6334+
layers: { providerRegistry: { refresh } },
63516335
});
63526336

63536337
const wsUrl = yield* getWsServerUrl("/ws");
6354-
yield* Effect.scoped(
6355-
withWsRpcClient(wsUrl, (client) =>
6356-
Effect.gen(function* () {
6357-
yield* client[WS_METHODS.subscribeServerConfig]({}).pipe(Stream.runHead);
6358-
yield* Deferred.await(firstRefreshDone);
6359-
}),
6360-
),
6361-
);
6362-
yield* Effect.scoped(
6363-
withWsRpcClient(wsUrl, (client) =>
6364-
Effect.gen(function* () {
6365-
yield* client[WS_METHODS.subscribeServerConfig]({}).pipe(Stream.runHead);
6366-
yield* Deferred.await(secondRefreshDone);
6367-
}),
6368-
),
6369-
);
6370-
6371-
assert.equal(yield* Ref.get(refreshCalls), 2);
6338+
for (let connection = 0; connection < 2; connection += 1) {
6339+
const event = yield* Effect.scoped(
6340+
withWsRpcClient(wsUrl, (client) =>
6341+
client[WS_METHODS.subscribeServerConfig]({}).pipe(
6342+
Stream.runHead,
6343+
Effect.map(Option.getOrThrow),
6344+
),
6345+
),
6346+
);
6347+
assert.equal(event.type, "snapshot");
6348+
}
6349+
assert.equal(refresh.mock.calls.length, 0);
63726350
}).pipe(Effect.provide(NodeHttpServer.layerTest)),
63736351
);
63746352

‎apps/server/src/ws.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3371,10 +3371,6 @@ const makeWsRpcLayer = (
33713371
})),
33723372
);
33733373

3374-
yield* providerRegistry
3375-
.refresh()
3376-
.pipe(Effect.ignoreCause({ log: true }), Effect.forkScoped);
3377-
33783374
const liveUpdates = Stream.merge(
33793375
keybindingsUpdates,
33803376
Stream.merge(

0 commit comments

Comments
 (0)