Skip to content

Commit 8ae3dfc

Browse files
authored
fix(providers): a failed provider check no longer drops later settings changes (#24794)
1 parent 6eaf397 commit 8ae3dfc

2 files changed

Lines changed: 65 additions & 1 deletion

File tree

‎packages/provider-core/src/server/managedProvider.test.ts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
DEFAULT_SERVER_SETTINGS,
44
ProviderDriverKind,
55
ProviderInstanceId,
6+
ServerSettingsError,
67
type ServerProvider,
78
} from "@t3tools/contracts";
89
import { createModelCapabilities } from "@t3tools/shared/model";
@@ -410,6 +411,67 @@ describe("makeManagedServerProvider", () => {
410411
).pipe(Effect.provide(layerAlwaysRunTest)),
411412
);
412413

414+
it.effect("keeps consuming settings changes after a provider check fails", () =>
415+
Effect.scoped(
416+
Effect.gen(function* () {
417+
const settingsChanges = yield* PubSub.unbounded<TestSettings>();
418+
const checkCalls = yield* Ref.make(0);
419+
const releaseInitialCheck = yield* Deferred.make<void>();
420+
const thirdCheckStarted = yield* Deferred.make<void>();
421+
const releaseRecoveredCheck = yield* Deferred.make<void>();
422+
const provider = yield* makeManagedServerProvider<TestSettings>({
423+
resolveMaintenance: () => Effect.succeed(maintenanceCapabilities),
424+
getSettings: Effect.succeed({ enabled: true }),
425+
streamSettings: Stream.fromPubSub(settingsChanges),
426+
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
427+
initialSnapshot: () => Effect.succeed(initialSnapshot),
428+
checkProvider: Ref.updateAndGet(checkCalls, (count) => count + 1).pipe(
429+
Effect.flatMap((count) =>
430+
count === 1
431+
? Deferred.await(releaseInitialCheck).pipe(Effect.as(refreshedSnapshot))
432+
: count === 2
433+
? Effect.fail(
434+
new ServerSettingsError({
435+
settingsPath: "/t3/userdata/settings.json",
436+
operation: "read-file",
437+
}),
438+
)
439+
: Deferred.succeed(thirdCheckStarted, undefined).pipe(
440+
Effect.andThen(Deferred.await(releaseRecoveredCheck)),
441+
Effect.as(refreshedSnapshotSecond),
442+
),
443+
),
444+
),
445+
refreshInterval: "1 hour",
446+
});
447+
448+
const updatesFiber = yield* Stream.take(provider.streamChanges, 2).pipe(
449+
Stream.runCollect,
450+
Effect.forkChild,
451+
);
452+
yield* Effect.yieldNow;
453+
yield* Deferred.succeed(releaseInitialCheck, undefined);
454+
455+
// The first change fails its provider check; the failed application never
456+
// advances the stored settings, so the same change still differs next time.
457+
yield* PubSub.publish(settingsChanges, { enabled: false });
458+
yield* Effect.yieldNow;
459+
assert.strictEqual(yield* Ref.get(checkCalls), 2);
460+
461+
// The subscription must survive that failure and retry on the next change;
462+
// on main the dead consumer never starts the third check and this times out.
463+
yield* PubSub.publish(settingsChanges, { enabled: false });
464+
yield* Deferred.await(thirdCheckStarted);
465+
assert.strictEqual(yield* Ref.get(checkCalls), 3);
466+
yield* Deferred.succeed(releaseRecoveredCheck, undefined);
467+
468+
const updates = Array.from(yield* Fiber.join(updatesFiber));
469+
assert.deepStrictEqual(updates, [refreshedSnapshot, refreshedSnapshotSecond]);
470+
assert.deepStrictEqual(yield* provider.getSnapshot, refreshedSnapshotSecond);
471+
}),
472+
).pipe(Effect.provide(layerAlwaysRunTest)),
473+
);
474+
413475
it.effect("streams supplemental snapshot updates after the base provider check completes", () =>
414476
Effect.scoped(
415477
Effect.gen(function* () {

‎packages/provider-core/src/server/managedProvider.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,10 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
295295
);
296296
}
297297

298+
// A failed check must not end this subscription: the next settings change
299+
// retries, like the periodic and initial checks below.
298300
yield* Stream.runForEach(input.streamSettings, (nextSettings) =>
299-
Effect.asVoid(applySnapshot(nextSettings)),
301+
Effect.asVoid(applySnapshot(nextSettings)).pipe(Effect.ignoreCause({ log: true })),
300302
).pipe(Effect.forkScoped);
301303

302304
yield* Effect.forever(

0 commit comments

Comments
 (0)