rename: @cocalc/nats --> @cocalc/conat

Author: williamstein

src/compute/compute/package.json

@@ -32,7 +32,7 @@
     "@cocalc/backend": "workspace:*",
     "@cocalc/compute": "link:",
     "@cocalc/jupyter": "workspace:*",
-    "@cocalc/nats": "workspace:*",
+    "@cocalc/conat": "workspace:*",
     "@cocalc/project": "workspace:*",
     "@cocalc/sync": "workspace:*",
     "@cocalc/sync-client": "workspace:*",

src/compute/conat

@@ -0,0 +1 @@
+../packages/conat

src/compute/nats

@@ -3,7 +3,7 @@ packages:
   - backend
   - comm
   - jupyter
-  - nats
+  - conat
   - project
   - sync
   - sync-fs

src/compute/pnpm-lock.yaml

@@ -3,7 +3,7 @@ import {
   connect as connect0,
   Client,
   type ConnectOptions,
-} from "@cocalc/nats/core/client";
+} from "@cocalc/conat/core/client";
 
 export type { Client };
 

src/compute/pnpm-workspace.yaml

@@ -9,8 +9,8 @@ import { readFile } from "node:fs/promises";
 import getLogger from "@cocalc/backend/logger";
 import { getEnv } from "./env";
 export { getEnv };
-import { inboxPrefix } from "@cocalc/nats/names";
-import { setNatsClient } from "@cocalc/nats/client";
+import { inboxPrefix } from "@cocalc/conat/names";
+import { setNatsClient } from "@cocalc/conat/client";
 import getConnection, {
   setConnectionOptions,
 } from "@cocalc/backend/nats/persistent-connection";

src/packages/backend/nats/conat.ts

@@ -1,6 +1,6 @@
 import "./index";
 import betterSqlite3 from "better-sqlite3";
-import { initContext } from "@cocalc/nats/persist/context";
+import { initContext } from "@cocalc/conat/persist/context";
 import { compress, decompress } from "zstd-napi";
 import { syncFiles } from "@cocalc/backend/data";
 import ensureContainingDirectoryExists from "@cocalc/backend/misc/ensure-containing-directory-exists";
@@ -13,9 +13,9 @@ initContext({
   ensureContainingDirectoryExists,
 });
 
-export { pstream } from "@cocalc/nats/persist/storage";
+export { pstream } from "@cocalc/conat/persist/storage";
 export {
   init as initServer,
   terminate as terminateServer,
-} from "@cocalc/nats/persist/server";
-export { getAll, set, get } from "@cocalc/nats/persist/client";
+} from "@cocalc/conat/persist/server";
+export { getAll, set, get } from "@cocalc/conat/persist/client";

src/packages/backend/nats/index.ts

@@ -28,7 +28,7 @@ the connection object itself, so it's possible to do this at all! :-)
 import { getLogger } from "@cocalc/backend/logger";
 import { delay } from "awaiting";
 import { reuseInFlight } from "@cocalc/util/reuse-in-flight";
-import type { NatsConnection } from "@cocalc/nats/types";
+import type { NatsConnection } from "@cocalc/conat/types";
 import { connect as connectViaTCP } from "nats";
 import { connect as connectViaWebsocket } from "nats.ws";
 import { CONNECT_OPTIONS } from "@cocalc/util/nats";
@@ -59,7 +59,7 @@ const getConnection = reuseInFlight(async (): Promise<NatsConnection> => {
 export default getConnection;
 
 // NOTE: this monitorConnection also has to work properly with the
-// waitUntilConnected function from @cocalc/nats/util.
+// waitUntilConnected function from @cocalc/conat/util.
 
 // The NATS docs ensure us that "the client will always attempt to
 // reconnect if the connection is disrupted for a reason other than

src/packages/backend/nats/persist.ts

@@ -1,14 +1,14 @@
-import { stream as createStream, type Stream } from "@cocalc/nats/sync/stream";
+import { stream as createStream, type Stream } from "@cocalc/conat/sync/stream";
 import {
   dstream as createDstream,
   type DStream,
-} from "@cocalc/nats/sync/dstream";
-import { kv as createKV, type KV } from "@cocalc/nats/sync/kv";
-import { dkv as createDKV, type DKV } from "@cocalc/nats/sync/dkv";
-import { dko as createDKO, type DKO } from "@cocalc/nats/sync/dko";
-import { akv as createAKV, type AKV } from "@cocalc/nats/sync/akv";
-import { createOpenFiles, type OpenFiles } from "@cocalc/nats/sync/open-files";
-export { inventory } from "@cocalc/nats/sync/inventory";
+} from "@cocalc/conat/sync/dstream";
+import { kv as createKV, type KV } from "@cocalc/conat/sync/kv";
+import { dkv as createDKV, type DKV } from "@cocalc/conat/sync/dkv";
+import { dko as createDKO, type DKO } from "@cocalc/conat/sync/dko";
+import { akv as createAKV, type AKV } from "@cocalc/conat/sync/akv";
+import { createOpenFiles, type OpenFiles } from "@cocalc/conat/sync/open-files";
+export { inventory } from "@cocalc/conat/sync/inventory";
 import "./index";
 
 export type { Stream, DStream, KV, DKV, DKO, AKV };

src/packages/backend/nats/persistent-connection.ts

@@ -9,7 +9,7 @@ pnpm exec jest --watch --forceExit --detectOpenHandles "read.test.ts"
 */
 
 import "@cocalc/backend/nats";
-import { close, createServer, readFile } from "@cocalc/nats/files/read";
+import { close, createServer, readFile } from "@cocalc/conat/files/read";
 import { createReadStream } from "fs";
 import { file as tempFile } from "tmp-promise";
 import { writeFile as fsWriteFile } from "fs/promises";

src/packages/backend/nats/sync.ts

@@ -9,7 +9,7 @@ DEVELOPMENT:
 */
 
 import "@cocalc/backend/nats";
-import { close, createServer, writeFile } from "@cocalc/nats/files/write";
+import { close, createServer, writeFile } from "@cocalc/conat/files/write";
 import { createWriteStream, createReadStream } from "fs";
 import { file as tempFile } from "tmp-promise";
 import { writeFile as fsWriteFile, readFile } from "fs/promises";

src/packages/backend/nats/test/files/read.test.ts

@@ -10,8 +10,8 @@ DEVELOPMENT:
 // this sets client
 import "@cocalc/backend/nats";
 
-import { init, close } from "@cocalc/nats/llm/server";
-import { llm } from "@cocalc/nats/llm/client";
+import { init, close } from "@cocalc/conat/llm/server";
+import { llm } from "@cocalc/conat/llm/client";
 
 describe("create an llm server, client, and stub evaluator, and run an evaluation", () => {
   // define trivial evaluate

src/packages/backend/nats/test/files/write.test.ts

@@ -6,7 +6,7 @@ pnpm test --forceExit service.test.ts
 
 */
 
-import { callNatsService, createNatsService } from "@cocalc/nats/service";
+import { callNatsService, createNatsService } from "@cocalc/conat/service";
 import { once } from "@cocalc/util/async-utils";
 import "@cocalc/backend/nats";
 

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

@@ -9,7 +9,7 @@ pnpm exec jest --forceExit "akv.test.ts"
 
 import { dkv as createDkv, akv as createAkv } from "@cocalc/backend/nats/sync";
 import { once } from "@cocalc/util/async-utils";
-import { getMaxPayload } from "@cocalc/nats/util";
+import { getMaxPayload } from "@cocalc/conat/util";
 
 describe("test basics with an akv", () => {
   let kv;

src/packages/backend/nats/test/service.test.ts

@@ -10,7 +10,7 @@ pnpm exec jest --forceExit "binary.test.ts"
 */
 
 import "@cocalc/backend/nats"; // ensure client is setup
-import { getMaxPayload } from "@cocalc/nats/util";
+import { getMaxPayload } from "@cocalc/conat/util";
 import { dstream, dkv } from "@cocalc/backend/nats/sync";
 
 describe("test binary data with a dstream", () => {

src/packages/backend/nats/test/sync/akv.test.ts

@@ -14,7 +14,7 @@ about potentially having to fork NATS.
 */
 
 import "@cocalc/backend/nats"; // ensure client is setup
-import { getMaxPayload } from "@cocalc/nats/util";
+import { getMaxPayload } from "@cocalc/conat/util";
 import { createDstream } from "./util";
 import { dstream } from "@cocalc/backend/nats/sync";
 import { dkv as createDkv } from "@cocalc/backend/nats/sync";

src/packages/backend/nats/test/sync/binary.test.ts

@@ -8,7 +8,7 @@ pnpm exec jest --forceExit "dko.test.ts"
 */
 
 import { dko as createDko } from "@cocalc/backend/nats/sync";
-import { getMaxPayload } from "@cocalc/nats/util";
+import { getMaxPayload } from "@cocalc/conat/util";
 
 describe("create a public dko and do a basic operation", () => {
   let kv;

src/packages/backend/nats/test/sync/chunk.test.ts

@@ -395,7 +395,7 @@ describe("tests involving null/undefined values", () => {
   });
 });
 
-import { numSubscriptions } from "@cocalc/nats/client";
+import { numSubscriptions } from "@cocalc/conat/client";
 
 describe("ensure there are no NATS subscription leaks", () => {
   // There is some slight slack at some point due to the clock stuff,

src/packages/backend/nats/test/sync/dko.test.ts

@@ -252,7 +252,7 @@ describe("dstream typescript test", () => {
   });
 });
 
-import { numSubscriptions } from "@cocalc/nats/client";
+import { numSubscriptions } from "@cocalc/conat/client";
 
 describe("ensure there are no NATS subscription leaks", () => {
   // There is some slight slack at some point due to the clock stuff,

src/packages/backend/nats/test/sync/dkv.test.ts

@@ -249,7 +249,7 @@ describe("dstream typescript test", () => {
   });
 });
 
-import { numSubscriptions } from "@cocalc/nats/client";
+import { numSubscriptions } from "@cocalc/conat/client";
 
 describe("ensure there are no NATS subscription leaks", () => {
   // There is some slight slack at some point due to the clock stuff,

src/packages/backend/nats/test/sync/dstream.test.ts

@@ -12,8 +12,8 @@ pnpm exec jest --forceExit "general-kv.test.ts"
 // import { once } from "@cocalc/util/async-utils";
 import { delay } from "awaiting";
 import { getEnv } from "@cocalc/backend/nats/env";
-import { GeneralKV } from "@cocalc/nats/sync/general-kv";
-import { getMaxPayload } from "@cocalc/nats/util";
+import { GeneralKV } from "@cocalc/conat/sync/general-kv";
+import { getMaxPayload } from "@cocalc/conat/util";
 
 describe("create a general kv and do basic operations", () => {
   let kv, kv2, kv3, env;

src/packages/backend/nats/test/sync/estream.test.ts

@@ -7,7 +7,7 @@ pnpm exec jest --forceExit "headers.test.ts"
 */
 
 import "@cocalc/backend/nats"; // ensure client is setup
-import { getMaxPayload } from "@cocalc/nats/util";
+import { getMaxPayload } from "@cocalc/conat/util";
 import { dstream, stream, dkv, kv } from "@cocalc/backend/nats/sync";
 import { once } from "@cocalc/util/async-utils";
 

src/packages/backend/nats/test/sync/general-kv.test.ts

@@ -7,7 +7,7 @@ pnpm test ./time.test.ts
 // this sets client
 import "@cocalc/backend/nats";
 
-import time, { getSkew } from "@cocalc/nats/time";
+import time, { getSkew } from "@cocalc/conat/time";
 
 describe("get time from nats", () => {
   it("tries to get the time before the skew, so it is not initialized yet", () => {
@@ -29,7 +29,7 @@ describe("get time from nats", () => {
   });
 });
 
-import { timeClient, createTimeService } from "@cocalc/nats/service/time";
+import { timeClient, createTimeService } from "@cocalc/conat/service/time";
 
 describe("start the time server and client and test that it works", () => {
   it("starts the time server and queries it", async () => {

src/packages/backend/nats/test/sync/headers.test.ts

@@ -25,7 +25,7 @@
   "license": "SEE LICENSE.md",
   "dependencies": {
     "@cocalc/backend": "workspace:*",
-    "@cocalc/nats": "workspace:*",
+    "@cocalc/conat": "workspace:*",
     "@cocalc/util": "workspace:*",
     "@nats-io/nkeys": "^2.0.3",
     "@types/debug": "^4.1.12",

src/packages/backend/nats/test/time.test.ts

@@ -7,5 +7,5 @@
     "outDir": "dist"
   },
   "exclude": ["node_modules", "dist", "test"],
-  "references": [{ "path": "../util", "path": "../nats" }]
+  "references": [{ "path": "../util", "path": "../conat" }]
 }

src/packages/backend/package.json

@@ -11,7 +11,7 @@ changefeed(...) -- returns async iterator that outputs:
 renew({id, lifetime}) -- keeps the changefeed alive for at least lifetime more ms.
 */
 
-import { getEnv } from "@cocalc/nats/client";
+import { getEnv } from "@cocalc/conat/client";
 import { isValidUUID } from "@cocalc/util/misc";
 import { changefeedSubject, renewSubject } from "./server";
 export { DEFAULT_LIFETIME } from "./server";

src/packages/backend/tsconfig.json

@@ -6,10 +6,10 @@ Multiresponse request/response NATS changefeed server.
 - Heartbeats
 */
 
-import { getEnv } from "@cocalc/nats/client";
-import { type Subscription } from "@cocalc/nats/core/client";
+import { getEnv } from "@cocalc/conat/client";
+import { type Subscription } from "@cocalc/conat/core/client";
 import { isValidUUID, uuid } from "@cocalc/util/misc";
-import { getLogger } from "@cocalc/nats/client";
+import { getLogger } from "@cocalc/conat/client";
 import { delay } from "awaiting";
 
 export const DEFAULT_LIFETIME = 1000 * 60;

src/packages/nats/README.md renamed to src/packages/conat/README.md

@@ -2,14 +2,14 @@
 DEVELOPMENT:
 
 ~/cocalc/src/packages/backend$ node
-> require('@cocalc/backend/nats'); c = require('@cocalc/nats/client').getClient()
+> require('@cocalc/backend/nats'); c = require('@cocalc/conat/client').getClient()
 > c.state
 'connected'
 > Object.keys(await c.getNatsEnv())
 [ 'nc', 'jc' ]
 */
 
-import type { NatsEnv, NatsEnvFunction } from "@cocalc/nats/types";
+import type { NatsEnv, NatsEnvFunction } from "@cocalc/conat/types";
 import { init } from "./time";
 import { EventEmitter } from "events";
 import { reuseInFlight } from "@cocalc/util/reuse-in-flight";

src/packages/nats/changefeed/client.ts renamed to src/packages/conat/changefeed/client.ts

@@ -9,7 +9,7 @@ Access this in the browser for the project you have open:
 
 */
 
-import { dkv, type DKV } from "@cocalc/nats/sync/dkv";
+import { dkv, type DKV } from "@cocalc/conat/sync/dkv";
 import { reuseInFlight } from "@cocalc/util/reuse-in-flight";
 import { EventEmitter } from "events";
 import { delay } from "awaiting";

src/packages/nats/changefeed/server.ts renamed to src/packages/conat/changefeed/server.ts

@@ -139,7 +139,7 @@ For developing at the command line, cd to packages/backend, then in node:
    
 or
 
-   c = require('@cocalc/nats/core/client').connect('http://localhost:3000')
+   c = require('@cocalc/conat/core/client').connect('http://localhost:3000')
 
    c.watch('a')
 
@@ -172,10 +172,10 @@ then in another console
 Wildcard subject:
 
    
-   c = require('@cocalc/nats/core/client').connect(); c.watch('a.*');
+   c = require('@cocalc/conat/core/client').connect(); c.watch('a.*');
    
    
-   c = require('@cocalc/nats/core/client').connect(); c.publish('a.x', 'foo')
+   c = require('@cocalc/conat/core/client').connect(); c.publish('a.x', 'foo')
    
    
 Testing disconnect
@@ -197,17 +197,17 @@ import {
 import { EventIterator } from "@cocalc/util/event-iterator";
 import type { ServerInfo } from "./types";
 import * as msgpack from "@msgpack/msgpack";
-import { randomId } from "@cocalc/nats/names";
+import { randomId } from "@cocalc/conat/names";
 import type { JSONValue } from "@cocalc/util/types";
 import { EventEmitter } from "events";
 import { callback } from "awaiting";
 import {
   isValidSubject,
   isValidSubjectWithoutWildcards,
-} from "@cocalc/nats/util";
+} from "@cocalc/conat/util";
 import { reuseInFlight } from "@cocalc/util/reuse-in-flight";
 import { once } from "@cocalc/util/async-utils";
-import { getLogger } from "@cocalc/nats/client";
+import { getLogger } from "@cocalc/conat/client";
 
 const logger = getLogger("core/client");
 

src/packages/nats/client.ts renamed to src/packages/conat/client.ts

@@ -17,9 +17,9 @@ For clustering:
    
 Corresponding clients:
 
-   c0 = require('@cocalc/nats/core/client').connect('http://localhost:3000')
+   c0 = require('@cocalc/conat/core/client').connect('http://localhost:3000')
 
-   c1 = require('@cocalc/nats/core/client').connect('http://localhost:3001')
+   c1 = require('@cocalc/conat/core/client').connect('http://localhost:3001')
 
 ---
     
@@ -34,7 +34,7 @@ import {
   matchesPattern,
   isValidSubject,
   isValidSubjectWithoutWildcards,
-} from "@cocalc/nats/util";
+} from "@cocalc/conat/util";
 import { createAdapter } from "@socket.io/redis-streams-adapter";
 import Valkey from "iovalkey";
 import { delay } from "awaiting";