conat: fix llm test

Author: williamstein

src/packages/backend/conat/test/llm.test.ts

@@ -12,6 +12,9 @@ import "@cocalc/backend/conat";
 
 import { init, close } from "@cocalc/conat/llm/server";
 import { llm } from "@cocalc/conat/llm/client";
+import { before, after } from "@cocalc/backend/conat/test/setup";
+
+beforeAll(before);
 
 describe("create an llm server, client, and stub evaluator, and run an evaluation", () => {
   // define trivial evaluate
@@ -82,3 +85,5 @@ describe("test an evaluate that throws an error half way through", () => {
     await close();
   });
 });
+
+afterAll(after);

src/packages/conat/llm/client.ts

@@ -6,7 +6,6 @@ import { getEnv } from "@cocalc/conat/client";
 import type { ChatOptions } from "@cocalc/util/types/llm";
 import { isValidUUID } from "@cocalc/util/misc";
 import { llmSubject } from "./server";
-import { waitUntilConnected } from "@cocalc/conat/util";
 
 export async function llm(options: ChatOptions): Promise<string> {
   if (!options.system?.trim()) {
@@ -22,7 +21,6 @@ export async function llm(options: ChatOptions): Promise<string> {
   let lastSeq = -1;
   const { cn } = await getEnv();
   let { stream, ...opts } = options;
-  await waitUntilConnected();
   for await (const resp of await cn.requestMany(subject, opts, {
     maxWait: opts.timeout ?? 1000 * 60 * 10,
   })) {

src/packages/conat/tiered-storage/client.ts

@@ -6,7 +6,6 @@ import type { Info, Command } from "./server";
 import { tieredStorageSubject } from "./server";
 import { getEnv, getLogger } from "@cocalc/conat/client";
 import { type Location } from "@cocalc/conat/types";
-import { waitUntilConnected } from "@cocalc/conat/util";
 import { reuseInFlight } from "@cocalc/util/reuse-in-flight";
 import { delay } from "awaiting";
 
@@ -84,7 +83,6 @@ export const waitUntilReady = reuseInFlight(
     logger.debug("waitUntilReady", location);
     let d = 1000;
     while (true) {
-      await waitUntilConnected();
       const locationInfo = await info(location);
       const active = lastActive(locationInfo);
       if (locationInfo.nats.kv != null || locationInfo.nats.stream != null) {

src/packages/conat/time.ts

@@ -41,7 +41,6 @@ import { timeClient } from "@cocalc/conat/service/time";
 import { reuseInFlight } from "@cocalc/util/reuse-in-flight";
 import { getClient } from "@cocalc/conat/client";
 import { delay } from "awaiting";
-import { waitUntilConnected } from "./util";
 
 // we use exponential backoff starting with a short interval
 // then making it longer
@@ -97,7 +96,6 @@ export const getSkew = reuseInFlight(async (): Promise<number> => {
     return skew;
   }
   try {
-    await waitUntilConnected();
     const start = Date.now();
     const client = getClient();
     const tc = timeClient(client);

src/packages/conat/util.ts

@@ -188,14 +188,4 @@ export const getMaxPayload = reuseInFlight(async () => {
   }
 });
 
-export const waitUntilConnected = reuseInFlight(async () => {
-  const nc = (await getConnection()) as any;
-  if (nc.protocol?.connected) {
-    return;
-  }
-  console.log("NATS waitUntilConnected: waiting...");
-  while (!nc.protocol?.connected) {
-    await delay(500);
-  }
-  console.log("NATS waitUntilConnected: connected");
-});
+export const waitUntilConnected = reuseInFlight(async () => {});