@velum-labs/routekit-daemon 1.3.2 → 1.5.0

package/dist/account-query-service.js

@@ -1,96 +1,98 @@
 import { Effect } from "effect";
 import { AccountRecovery } from "./account-recovery-context.js";
-import { daemonAccountServices } from "./account-services.js";
+import { DaemonEnv } from "./daemon-env-context.js";
 import { accountEntries } from "./daemon-maintenance.js";
+import { DaemonState } from "./daemon-state-context.js";
+import { ActiveGateway } from "./services/active-gateway/service.js";
+import { Sidecar } from "./sidecar-context.js";
 /** Owns account inventory, live status, and usage queries. */
-export class AccountQueryService {
-    handlers() {
+export const accountQueryHandlers = {
+    "accounts.list": () => Effect.gen(function* () {
+        const daemonEnv = yield* DaemonEnv;
+        const runtimeState = yield* DaemonState;
         return {
-            "accounts.list": () => Effect.gen(function* () {
-                const { env: daemonEnv, state: runtimeState } = yield* daemonAccountServices;
-                return {
-                    accounts: accountEntries(daemonEnv.env).map((entry) => {
-                        if (entry.connector === "native")
-                            return entry;
-                        const { credentialValid: _credentialValid, ...listed } = entry;
-                        return listed;
-                    }),
-                    revision: runtimeState.revisions.accounts
-                };
+            accounts: accountEntries(daemonEnv.env).map((entry) => {
+                if (entry.connector === "native")
+                    return entry;
+                const { credentialValid: _credentialValid, ...listed } = entry;
+                return listed;
             }),
-            "accounts.status": () => Effect.gen(function* () {
-                const { env: daemonEnv, state: runtimeState, sidecar, gateway } = yield* daemonAccountServices;
-                const recovery = yield* AccountRecovery;
-                const env = daemonEnv.env;
-                const entries = accountEntries(env);
-                const cliproxyConfigured = runtimeState.config.providers.cliproxy !== undefined;
-                const cliproxyReachable = entries.some((entry) => entry.connector === "cliproxy") && cliproxyConfigured
-                    ? yield* sidecar.reachable()
-                    : false;
+            revision: runtimeState.revisions.accounts
+        };
+    }),
+    "accounts.status": () => Effect.gen(function* () {
+        const daemonEnv = yield* DaemonEnv;
+        const runtimeState = yield* DaemonState;
+        const sidecar = yield* Sidecar;
+        const gateway = yield* ActiveGateway;
+        const recovery = yield* AccountRecovery;
+        const entries = accountEntries(daemonEnv.env);
+        const configuredModules = new Set(Object.values(runtimeState.config.sources).map((source) => source.use));
+        const cliproxyConfigured = configuredModules.has("cliproxy");
+        const cliproxyReachable = entries.some((entry) => entry.connector === "cliproxy") && cliproxyConfigured
+            ? yield* sidecar.reachable()
+            : false;
+        return {
+            accounts: entries.map((entry) => {
+                if (entry.connector === "cliproxy") {
+                    const ready = entry.credentialValid && cliproxyConfigured && cliproxyReachable;
+                    return {
+                        subscriptionKind: entry.subscriptionKind,
+                        label: entry.label,
+                        connector: entry.connector,
+                        ...(entry.localOnly === true ? { localOnly: true } : {}),
+                        credentialValid: entry.credentialValid,
+                        configured: cliproxyConfigured,
+                        relayOpen: ready,
+                        serving: false,
+                        inFlight: 0,
+                        lastSelected: false,
+                        ...(entry.credentialValid
+                            ? {}
+                            : { readinessReasons: [{ code: "credential_invalid" }] }),
+                        models: []
+                    };
+                }
+                const member = gateway
+                    .router()
+                    .accountSnapshots()
+                    .find((snapshot) => snapshot.mode === entry.subscriptionKind)
+                    ?.members.find((candidate) => candidate.label === entry.label);
                 return {
-                    accounts: entries.map((entry) => {
-                        if (entry.connector === "cliproxy") {
-                            const ready = entry.credentialValid && cliproxyConfigured && cliproxyReachable;
-                            return {
-                                subscriptionKind: entry.subscriptionKind,
-                                label: entry.label,
-                                connector: entry.connector,
-                                ...(entry.localOnly === true ? { localOnly: true } : {}),
-                                credentialValid: entry.credentialValid,
-                                configured: cliproxyConfigured,
-                                relayOpen: ready,
-                                serving: false,
-                                inFlight: 0,
-                                lastSelected: false,
-                                ...(entry.credentialValid
-                                    ? {}
-                                    : { readinessReasons: [{ code: "credential_invalid" }] }),
-                                models: []
-                            };
-                        }
-                        const member = gateway
-                            .router()
-                            .accountSnapshots()
-                            .find((snapshot) => snapshot.mode === entry.subscriptionKind)
-                            ?.members.find((candidate) => candidate.label === entry.label);
-                        return {
-                            subscriptionKind: entry.subscriptionKind,
-                            label: entry.label,
-                            connector: entry.connector,
-                            credentialValid: member?.credentialValid ?? false,
-                            ...(member?.upstreamAuthState !== undefined
-                                ? { upstreamAuthState: member.upstreamAuthState }
-                                : {}),
-                            configured: runtimeState.config.providers[entry.subscriptionKind] !== undefined,
-                            relayOpen: member?.relayReady === true &&
-                                runtimeState.config.providers[entry.subscriptionKind] !== undefined,
-                            serving: member?.serving ?? false,
-                            inFlight: member?.inFlight ?? 0,
-                            ...(member?.lastSelectedAt !== undefined
-                                ? { lastSelectedAt: member.lastSelectedAt }
-                                : {}),
-                            lastSelected: member?.lastSelected ?? false,
-                            ...(member?.readinessReasons !== undefined
-                                ? { readinessReasons: member.readinessReasons }
-                                : member === undefined
-                                    ? { readinessReasons: [{ code: "credential_invalid" }] }
-                                    : {}),
-                            models: member?.models ?? [],
-                            ...(member?.limits !== undefined ? { limits: member.limits } : {})
-                        };
-                    }),
-                    revision: runtimeState.revisions.accounts,
-                    recovery: {
-                        state: recovery.recovered > 0 ? "recovered" : "clean",
-                        recovered: recovery.recovered,
-                        cleaned: recovery.cleaned
-                    }
+                    subscriptionKind: entry.subscriptionKind,
+                    label: entry.label,
+                    connector: entry.connector,
+                    credentialValid: member?.credentialValid ?? false,
+                    ...(member?.upstreamAuthState !== undefined
+                        ? { upstreamAuthState: member.upstreamAuthState }
+                        : {}),
+                    configured: configuredModules.has(entry.subscriptionKind),
+                    relayOpen: member?.relayReady === true && configuredModules.has(entry.subscriptionKind),
+                    serving: member?.serving ?? false,
+                    inFlight: member?.inFlight ?? 0,
+                    ...(member?.lastSelectedAt !== undefined
+                        ? { lastSelectedAt: member.lastSelectedAt }
+                        : {}),
+                    lastSelected: member?.lastSelected ?? false,
+                    ...(member?.readinessReasons !== undefined
+                        ? { readinessReasons: member.readinessReasons }
+                        : member === undefined
+                            ? { readinessReasons: [{ code: "credential_invalid" }] }
+                            : {}),
+                    models: member?.models ?? [],
+                    ...(member?.limits !== undefined ? { limits: member.limits } : {})
                 };
             }),
-            "accounts.usage": (_params, context) => Effect.gen(function* () {
-                const { gateway } = yield* daemonAccountServices;
-                return yield* gateway.router().usage(context.signal);
-            })
+            revision: runtimeState.revisions.accounts,
+            recovery: {
+                state: recovery.recovered > 0 ? "recovered" : "clean",
+                recovered: recovery.recovered,
+                cleaned: recovery.cleaned
+            }
         };
-    }
-}
+    }),
+    "accounts.usage": (_params, context) => Effect.gen(function* () {
+        const gateway = yield* ActiveGateway;
+        return yield* gateway.router().usage(context.signal);
+    })
+};