cleanup

Tim Smart committed 8 months ago

Commit fd988351 parent c6dc7c62 files · +26 −66Browse files

Unified · Split

2 files

apps/server/src/provider/Layers/ProviderHealth.ts +6 −49
apps/server/src/wsServer.ts +20 −17

apps/server/src/provider/Layers/ProviderHealth.ts+6−49

@@ -13,7 +13,7 @@ import type { · 12 unmodified lines
13	ServerProviderStatus,	13	ServerProviderStatus,
14	ServerProviderStatusState,	14	ServerProviderStatusState,
15	} from "@t3tools/contracts";	15	} from "@t3tools/contracts";
16	import { Effect, Layer, Option, Result, Stream } from "effect";	16	import { Array, Effect, Fiber, Layer, Option, Result, Stream } from "effect";
17	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";	17	import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
18		18
19	import {	19	import {
@@ -312,56 +312,13 @@ export const checkCodexProviderStatus: Effect.Effect< · 292 unmodified lines
312	export const ProviderHealthLive = Layer.effect(	312	export const ProviderHealthLive = Layer.effect(
313	ProviderHealth,	313	ProviderHealth,
314	Effect.gen(function* () {	314	Effect.gen(function* () {
315	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;	315	const codexStatusFiber = yield* checkCodexProviderStatus.pipe(
316	let cachedStatuses: ReadonlyArray<ServerProviderStatus> = [	316	Effect.map(Array.of),
317	{	317	Effect.forkScoped,
318	provider: CODEX_PROVIDER,	318	);
319	status: "warning",
320	available: false,
321	authStatus: "unknown",
322	checkedAt: new Date().toISOString(),
323	message: "Checking Codex CLI availability...",
324	},
325	];
326
327	let readyListeners: Array<(statuses: ReadonlyArray<ServerProviderStatus>) => void> = [];
328	let resolved = false;
329
330	const notifyReady = (statuses: ReadonlyArray<ServerProviderStatus>) => {
331	resolved = true;
332	cachedStatuses = statuses;
333	for (const cb of readyListeners) cb(statuses);
334	readyListeners = [];
335	};
336
337	// Run health checks in the background so they don't block server startup.
338	checkCodexProviderStatus.pipe(
339	Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
340	Effect.runPromise,
341	).then((status) => {
342	notifyReady([status]);
343	}).catch(() => {
344	notifyReady([
345	{
346	provider: CODEX_PROVIDER,
347	status: "error",
348	available: false,
349	authStatus: "unknown",
350	checkedAt: new Date().toISOString(),
351	message: "Failed to check Codex CLI status.",
352	},
353	]);
354	});
355		319
356	return {	320	return {
357	getStatuses: Effect.sync(() => cachedStatuses),	321	getStatuses: Fiber.join(codexStatusFiber),
358	onReady: (cb) => {
359	if (resolved) {
360	cb(cachedStatuses);
361	} else {
362	readyListeners.push(cb);
363	}
364	},
365	} satisfies ProviderHealthShape;	322	} satisfies ProviderHealthShape;
366	}),	323	}),
367	);	324	);

apps/server/src/wsServer.ts+20−17

   WebSocketRequest,
   WsPush,
   WsResponse,
+  ServerProviderStatus,
 } from "@t3tools/contracts";
 import * as NodeHttpServer from "@effect/platform-node/NodeHttpServer";
 import {
     ),
   );
-  // Read provider statuses lazily so background health checks are reflected.
-  const getProviderStatuses = () => Effect.runSync(providerHealth.getStatuses);
   const clients = yield* Ref.make(new Set<WebSocket>());
   const logger = createLogger("ws");
   const subscriptionsScope = yield* Scope.make("sequential");
   yield* Effect.addFinalizer(() => Scope.close(subscriptionsScope, Exit.void));
+  // Push updated provider statuses to connected clients once background health checks finish.
+  let providers: ReadonlyArray<ServerProviderStatus> = [];
+  yield* providerHealth.getStatuses.pipe(
+    Effect.flatMap((statuses) => {
+      providers = statuses;
+      return broadcastPush({
+        type: "push",
+        channel: WS_CHANNELS.serverConfigUpdated,
+        data: {
+          issues: [],
+          providers: statuses,
+        },
+      });
+    }),
+    Effect.forkIn(subscriptionsScope),
+  );
   yield* Stream.runForEach(orchestrationEngine.streamDomainEvents, (event) =>
     broadcastPush({
       type: "push",
       channel: WS_CHANNELS.serverConfigUpdated,
       data: {
         issues: event.issues,
-        providers: getProviderStatuses(),
+        providers,
       },
     }),
   ).pipe(Effect.forkIn(subscriptionsScope));
-  // Push updated provider statuses to connected clients once background health checks finish.
-  providerHealth.onReady((statuses) => {
-    broadcastPush({
-      type: "push",
-      channel: WS_CHANNELS.serverConfigUpdated,
-      data: {
-        issues: [],
-        providers: statuses,
-      },
-    }).pipe(Effect.runPromise).catch(() => {});
-  });
   yield* Scope.provide(orchestrationReactor.start, subscriptionsScope);
   let welcomeBootstrapProjectId: ProjectId | undefined;
           keybindingsConfigPath,
           keybindings: keybindingsConfig.keybindings,
           issues: keybindingsConfig.issues,
-          providers: getProviderStatuses(),
+          providers,
           availableEditors,
         };