Skip to content

Commit 745cc23

Browse files
fix(server): validate settings watch topology after attachment
1 parent ea95f9e commit 745cc23

3 files changed

Lines changed: 46 additions & 6 deletions

File tree

‎apps/server/src/restartingWatch.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as Deferred from "effect/Deferred";
2+
import * as Duration from "effect/Duration";
23
import * as Effect from "effect/Effect";
34
import * as Fiber from "effect/Fiber";
45
import * as Stream from "effect/Stream";
@@ -27,7 +28,15 @@ export const restartingWatch = <A, E, R, E2, R2>(
2728
onStarted();
2829
if (recovering)
2930
yield* Effect.raceFirst(
30-
reconcile.pipe(Effect.retry({ schedule: Schedule.spaced("100 millis") })),
31+
reconcile.pipe(
32+
Effect.retry({
33+
schedule: Schedule.exponential("100 millis").pipe(
34+
Schedule.modifyDelay(({ duration }) =>
35+
Effect.succeed(Math.min(Duration.toMillis(duration), 5000)),
36+
),
37+
),
38+
}),
39+
),
3140
Fiber.join(watcher),
3241
);
3342
yield* Fiber.join(watcher);

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {
116116
const disconnect = yield* Deferred.make<void>();
117117
const disconnected = yield* Deferred.make<void>();
118118
const repointComplete = yield* Deferred.make<void>();
119+
const staleTargetReleased = yield* Deferred.make<void>();
119120
const events = yield* Queue.unbounded<FileSystem.WatchEvent>();
120121
const failedRecoveryRead = yield* Deferred.make<void>();
121122
const recovered = yield* Deferred.make<void>();
@@ -147,8 +148,13 @@ it.layer(NodeServices.layer)("server settings", (it) => {
147148
yield* Deferred.await(repointComplete);
148149
activeTargets.add(first);
149150
options?.onReady?.();
151+
return ending === "attachment-repoint" && recovering;
150152
}),
151-
() => Effect.sync(() => activeTargets.delete(first)),
153+
(staleReplacement) =>
154+
Effect.sync(() => {
155+
activeTargets.delete(first);
156+
if (staleReplacement) Deferred.doneUnsafe(staleTargetReleased, Effect.void);
157+
}),
152158
).pipe(
153159
Effect.andThen(Deferred.succeed(attached, undefined)),
154160
Effect.as(
@@ -256,6 +262,10 @@ it.layer(NodeServices.layer)("server settings", (it) => {
256262
}
257263
failRead = true;
258264
yield* TestClock.adjust("1 second");
265+
if (ending === "attachment-repoint") {
266+
yield* Deferred.await(staleTargetReleased);
267+
yield* TestClock.adjust("1 second");
268+
}
259269
yield* Deferred.await(failedRecoveryRead);
260270
yield* TestClock.adjust("1 minute");
261271
yield* Deferred.await(recovered);

‎apps/server/src/serverSettings.ts‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,21 +1111,42 @@ const make = Effect.gen(function* () {
11111111
Stream.unwrap(
11121112
Effect.gen(function* () {
11131113
const initialLinkTarget = yield* watchLinkTarget;
1114+
const rootReady = yield* Deferred.make<void>();
1115+
const linkReady = yield* Deferred.make<void>();
1116+
const targetReady = yield* Deferred.make<void>();
11141117
const linkTargetEvents = Stream.make(initialLinkTarget).pipe(
11151118
Stream.concat(
1116-
watchFileChanges(settingsPath).pipe(Stream.mapEffect(() => watchLinkTarget)),
1119+
watchFileChanges(settingsPath, () => {
1120+
Deferred.doneUnsafe(linkReady, Effect.void);
1121+
}).pipe(Stream.mapEffect(() => watchLinkTarget)),
11171122
),
11181123
Stream.changes,
11191124
Stream.switchMap(
11201125
Option.match({
11211126
onNone: () => Stream.empty,
1122-
onSome: (target) => watchFileChanges(target, onReady),
1127+
onSome: (target) =>
1128+
watchFileChanges(target, () => {
1129+
Deferred.doneUnsafe(targetReady, Effect.void);
1130+
}),
11231131
}),
11241132
),
11251133
);
1134+
const topologyReady = Stream.fromEffect(
1135+
Effect.gen(function* () {
1136+
yield* Deferred.await(rootReady);
1137+
yield* Deferred.await(linkReady);
1138+
if (Option.isSome(initialLinkTarget)) yield* Deferred.await(targetReady);
1139+
// A repoint before link-watch attachment must rebuild the target watch too.
1140+
if (!Equal.equals(initialLinkTarget, yield* watchLinkTarget))
1141+
return yield* new SettingsWatchEnded({});
1142+
onReady();
1143+
}),
1144+
).pipe(Stream.drain);
11261145
return Stream.merge(
1127-
watchFileChanges(settingsPath, Option.isNone(initialLinkTarget) ? onReady : undefined),
1128-
linkTargetEvents,
1146+
watchFileChanges(settingsPath, () => {
1147+
Deferred.doneUnsafe(rootReady, Effect.void);
1148+
}),
1149+
Stream.merge(linkTargetEvents, topologyReady),
11291150
).pipe(Stream.debounce(Duration.millis(100)));
11301151
}),
11311152
);

0 commit comments

Comments
 (0)