Skip to content

Commit 79b3c15

Browse files
committed
fix(server): include completed remote targets in initial configuration
1 parent ceca580 commit 79b3c15

2 files changed

Lines changed: 30 additions & 19 deletions

File tree

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

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -613,9 +613,9 @@ const layerConfigSources = Layer.mergeAll(
613613
Layer.provideMerge(NodeServices.layer),
614614
);
615615

616-
it.effect(
617-
"starts remote discovery alongside initial config and preserves updates through discovery and ACK",
618-
() =>
616+
it.effect.each(["pending", "cached"] as const)(
617+
"%s remote discovery preserves initial config and updates through discovery and ACK",
618+
(discovery) =>
619619
Effect.gen(function* () {
620620
const keybindings = yield* Keybindings.Keybindings;
621621
const settings = yield* ServerSettings.ServerSettingsService;
@@ -653,7 +653,9 @@ it.effect(
653653
Layer.mock(RemoteOpenTargets.RemoteOpenTargets)({
654654
resolveTargets: () =>
655655
Deferred.succeed(remoteDiscoveryStarted, undefined).pipe(
656-
Effect.andThen(Deferred.await(finishRemoteDiscovery)),
656+
Effect.andThen(
657+
discovery === "cached" ? Effect.void : Deferred.await(finishRemoteDiscovery),
658+
),
657659
Effect.as(targets),
658660
),
659661
}),
@@ -737,7 +739,7 @@ it.effect(
737739
const snapshot = yield* Queue.take(responses);
738740
assert.equal(snapshot.type, "snapshot");
739741
if (snapshot.type !== "snapshot") return yield* Effect.die("Missing initial snapshot");
740-
assert.deepEqual(snapshot.config.remoteOpenTargets, []);
742+
assert.deepEqual(snapshot.config.remoteOpenTargets, discovery === "cached" ? targets : []);
741743
assert.isFalse(snapshot.config.settings.defaultAutoPull);
742744
assert.deepEqual(snapshot.config.keybindings, initialKeybindings);
743745
const duringAck = yield* keybindings.upsertKeybindingRule({
@@ -774,18 +776,20 @@ it.effect(
774776
}
775777
assert.isEmpty(expectedSettings);
776778
assert.isEmpty(expectedKeybindings);
777-
yield* Deferred.await(remoteDiscoveryStarted);
778-
yield* Deferred.succeed(finishRemoteDiscovery, undefined);
779-
const resolved = yield* Queue.take(responses);
780-
assert.equal(resolved.type, "snapshot");
781-
if (resolved.type !== "snapshot") return yield* Effect.die("Missing remote targets");
782-
assert.deepEqual(resolved.config.remoteOpenTargets, targets);
783-
assert.deepEqual(
784-
resolved.config.settings,
785-
ServerSettings.redactServerSettingsForClient(latestSettings),
786-
);
787-
assert.deepEqual(resolved.config.keybindings, latestKeybindings);
788-
yield* acknowledge;
779+
if (discovery === "pending") {
780+
yield* Deferred.await(remoteDiscoveryStarted);
781+
yield* Deferred.succeed(finishRemoteDiscovery, undefined);
782+
const resolved = yield* Queue.take(responses);
783+
assert.equal(resolved.type, "snapshot");
784+
if (resolved.type !== "snapshot") return yield* Effect.die("Missing remote targets");
785+
assert.deepEqual(resolved.config.remoteOpenTargets, targets);
786+
assert.deepEqual(
787+
resolved.config.settings,
788+
ServerSettings.redactServerSettingsForClient(latestSettings),
789+
);
790+
assert.deepEqual(resolved.config.keybindings, latestKeybindings);
791+
yield* acknowledge;
792+
}
789793
yield* server.write(0, { _tag: "Interrupt", requestId, interruptors: [] });
790794
}).pipe(
791795
Effect.provide(

‎apps/server/src/ws.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3239,9 +3239,16 @@ export const layerWsRpc = (
32393239
),
32403240
);
32413241

3242+
const remoteResult = yield* Effect.sync(() => remoteTargets.pollUnsafe());
3243+
const initialConfig =
3244+
remoteResult?._tag === "Success"
3245+
? { ...config, remoteOpenTargets: remoteResult.value }
3246+
: config;
32423247
return Stream.concat(
3243-
rpcInitialItems([{ version: 1 as const, type: "snapshot" as const, config }]),
3244-
withLateConfigDiscovery(config, liveUpdates, externalLauncher, {
3248+
rpcInitialItems([
3249+
{ version: 1 as const, type: "snapshot" as const, config: initialConfig },
3250+
]),
3251+
withLateConfigDiscovery(initialConfig, liveUpdates, externalLauncher, {
32453252
resolveTargets: () => Fiber.join(remoteTargets),
32463253
}),
32473254
);

0 commit comments

Comments
 (0)