nats --> conat rename

Author: williamstein

src/compute/compute/lib/filesystem.ts

@@ -22,7 +22,7 @@ import { apiCall } from "@cocalc/api-client";
 import sendFiles from "./send-files";
 import getFiles from "./get-files";
 // ensure that the nats client is initialized so that syncfs can connect to nats properly.
-import "@cocalc/project/nats";
+import "@cocalc/project/conat";
 
 const logger = getLogger("compute:filesystem");
 

src/compute/compute/lib/manager.ts

@@ -7,7 +7,7 @@ The manager does the following:
 */
 
 import debug from "debug";
-import startProjectServers from "@cocalc/project/nats";
+import startProjectServers from "@cocalc/project/conat";
 import { pingProjectUntilSuccess, waitUntilFilesystemIsOfType } from "./util";
 import { apiCall, project } from "@cocalc/api-client";
 

src/package.json

@@ -26,7 +26,7 @@
     "nats-server-verbose": "cd ${COCALC_ROOT:=$INIT_CWD}/packages/backend && node -e \"require('@cocalc/backend/conat/install').main()\" && node -e \"require('@cocalc/backend/conat/conf').main()\" && node -e \"require('@cocalc/backend/conat/server').main({verbose:true})\"",
     "nats-cli": "cd ${COCALC_ROOT:=$INIT_CWD}/packages/backend && node -e \"require('@cocalc/backend/conat/cli').main()\"",
     "nats-sys": "cd ${COCALC_ROOT:=$INIT_CWD}/packages/backend && node -e \"require('@cocalc/backend/conat/cli').main({user:'sys'})\"",
-    "nats-tiered-storage": "cd ${COCALC_ROOT:=$INIT_CWD}/packages/server && DEBUG=cocalc:* DEBUG_CONSOLE=yes node -e \"require('@cocalc/server/nats/tiered-storage').init()\"",
+    "nats-tiered-storage": "cd ${COCALC_ROOT:=$INIT_CWD}/packages/server && DEBUG=cocalc:* DEBUG_CONSOLE=yes node -e \"require('@cocalc/server/conat/tiered-storage').init()\"",
     "local-ci": "./scripts/ci.sh",
     "conat-server": "cd packages/server && pnpm conat-server",
     "conat-cluster": "cd packages/server && pnpm conat-cluster"

src/packages/backend/package.json

@@ -5,7 +5,7 @@
   "exports": {
     "./*": "./dist/*.js",
     "./database": "./dist/database/index.js",
-    "./nats": "./dist/nats/index.js",
+    "./conat": "./dist/conat/index.js",
     "./server-settings": "./dist/server-settings/index.js",
     "./auth/*": "./dist/auth/*.js",
     "./auth/tokens/*": "./dist/auth/tokens/*.js"

src/packages/conat/core/server.ts

@@ -4,16 +4,16 @@
 cd packages/server
 
 
-   s = await require('@cocalc/server/nats/socketio').initConatServer()
+   s = await require('@cocalc/server/conat/socketio').initConatServer()
    
-   s0 = await require('@cocalc/server/nats/socketio').initConatServer({port:3000})
+   s0 = await require('@cocalc/server/conat/socketio').initConatServer({port:3000})
    
 
 For clustering:
 
-   s0 = await require('@cocalc/server/nats/socketio').initConatServer({valkey:'redis://localhost:6379', port:3000})
+   s0 = await require('@cocalc/server/conat/socketio').initConatServer({valkey:'redis://localhost:6379', port:3000})
    
-   s1 = await require('@cocalc/server/nats/socketio').initConatServer({valkey:'redis://localhost:6379', port:3001})
+   s1 = await require('@cocalc/server/conat/socketio').initConatServer({valkey:'redis://localhost:6379', port:3001})
    
 Corresponding clients:
 

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

@@ -4,7 +4,7 @@ NATS service that provides tiered storage of data.
 This is pure javascript and sets the basic interface,
 behavior and types for both client and server.
 
-See also @cocalc/server/nats/tiered-storage.
+See also @cocalc/server/conat/tiered-storage.
 
 DEVELOPMENT:
 

src/packages/database/nats/changefeed-api.ts renamed to src/packages/database/conat/changefeed-api.ts

@@ -10,7 +10,7 @@ In a node session:
 
 DEBUG=cocalc*changefeed* DEBUG_CONSOLE=yes node
 
-    require('@cocalc/backend/conat'); require('@cocalc/database/nats/changefeed-api').init()
+    require('@cocalc/backend/conat'); require('@cocalc/database/conat/changefeed-api').init()
 
 In another session:
 

src/packages/database/nats/changefeeds.ts renamed to src/packages/database/conat/changefeeds.ts

@@ -26,7 +26,7 @@ DEVELOPMENT:
 
 DEBUG_CONSOLE=yes DEBUG=cocalc:debug:database:nats:changefeeds
 
-   require("@cocalc/database/nats/changefeeds").init()
+   require("@cocalc/database/conat/changefeeds").init()
 
 
 */

src/packages/database/nats/coordinator.ts renamed to src/packages/database/conat/coordinator.ts

@@ -12,7 +12,7 @@ they are considered gone.
 
 DEVELOPMENT:
 
-c = await require('@cocalc/database/nats/coordinator').coordinator({timeout:10000})
+c = await require('@cocalc/database/conat/coordinator').coordinator({timeout:10000})
 
 */
 

src/packages/database/nats/leak-search.ts renamed to src/packages/database/conat/leak-search.ts

@@ -12,7 +12,7 @@ ACCOUNT_ID="6aae57c6-08f1-4bb5-848b-3ceb53e61ede" DEBUG=cocalc:* DEBUG_CONSOLE=y
 
 Then do this
 
-   a = require('@cocalc/database/nats/leak-search')
+   a = require('@cocalc/database/conat/leak-search')
    await a.testQueryOnly(50)
    await a.testChangefeed(50)
 

src/packages/database/package.json

@@ -5,7 +5,7 @@
   "exports": {
     ".": "./dist/index.js",
     "./accounts/*": "./dist/accounts/*.js",
-    "./nats/*": "./dist/nats/*.js",
+    "./conat/*": "./dist/conat/*.js",
     "./pool": "./dist/pool/index.js",
     "./pool/*": "./dist/pool/*.js",
     "./postgres/*": "./dist/postgres/*.js",

src/packages/frontend/client/client.ts

@@ -21,7 +21,7 @@ import { SyncClient } from "@cocalc/sync/client/sync-client";
 import { UsersClient } from "./users";
 import { FileClient } from "./file";
 import { TrackingClient } from "./tracking";
-import { NatsClient } from "@cocalc/frontend/nats/client";
+import { NatsClient } from "@cocalc/frontend/conat/client";
 import { HubClient } from "./hub";
 import { IdleClient } from "./idle";
 import { version } from "@cocalc/util/smc-version";

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

@@ -4,7 +4,7 @@ React Hook to provide access to directory listings in a project.
 This is NOT used yet, but seems like the right way to do directly listings in a modern
 clean dynamic way.  It would be used like this:
 
-import useListing from "@cocalc/frontend/nats/use-listing";
+import useListing from "@cocalc/frontend/conat/use-listing";
 function ListingTest({ path, compute_server_id }) {
   const listing = useListing({ path, compute_server_id });
   return <div>{JSON.stringify(listing)}</div>;

src/packages/frontend/nats/connection.ts renamed to src/packages/frontend/conat/connection.ts

@@ -112,7 +112,7 @@ export async function get_directory_listing(opts: ListingOpts) {
   }
 }
 
-import { Listings } from "@cocalc/frontend/nats/listings";
+import { Listings } from "@cocalc/frontend/conat/listings";
 
 export async function get_directory_listing2(opts: ListingOpts): Promise<any> {
   log("get_directory_listing2", opts);

src/packages/frontend/nats/listings.ts renamed to src/packages/frontend/conat/listings.ts

@@ -23,7 +23,7 @@ import {
   useTypedRedux,
 } from "@cocalc/frontend/app-framework";
 import useVirtuosoScrollHook from "@cocalc/frontend/components/virtuoso-scroll-hook";
-import { WATCH_THROTTLE_MS } from "@cocalc/frontend/nats/listings";
+import { WATCH_THROTTLE_MS } from "@cocalc/frontend/conat/listings";
 import { ProjectActions } from "@cocalc/frontend/project_actions";
 import { MainConfiguration } from "@cocalc/frontend/project_configuration";
 import * as misc from "@cocalc/util/misc";

src/packages/frontend/nats/permissions-cache.ts renamed to src/packages/frontend/conat/permissions-cache.ts

@@ -35,7 +35,7 @@ import {
   DirectoryListingEntry,
   FileMap,
 } from "@cocalc/frontend/project/explorer/types";
-import { WATCH_THROTTLE_MS } from "@cocalc/frontend/nats/listings";
+import { WATCH_THROTTLE_MS } from "@cocalc/frontend/conat/listings";
 import { mutate_data_to_compute_public_files } from "@cocalc/frontend/project_store";
 import track from "@cocalc/frontend/user-tracking";
 import {

src/packages/frontend/nats/types.ts renamed to src/packages/frontend/conat/types.ts

@@ -26,7 +26,7 @@ import {
   TypedMap,
 } from "@cocalc/frontend/app-framework";
 import { ProjectLogMap } from "@cocalc/frontend/project/history/types";
-import { Listings, listings } from "@cocalc/frontend/nats/listings";
+import { Listings, listings } from "@cocalc/frontend/conat/listings";
 import {
   FILE_ACTIONS,
   ProjectActions,

src/packages/frontend/nats/use-listing.ts renamed to src/packages/frontend/conat/use-listing.ts

@@ -47,7 +47,7 @@ import {
   initNatsChangefeedServer,
   initNatsTieredStorage,
   initNatsServer,
-} from "@cocalc/server/nats";
+} from "@cocalc/server/conat";
 import initHttpRedirect from "./servers/http-redirect";
 import initPrimus from "./servers/primus";
 import initVersionServer from "./servers/version";

src/packages/frontend/project/directory-listing.ts

@@ -33,7 +33,7 @@ import { database } from "./database";
 import initHttpServer from "./http";
 import initRobots from "./robots";
 import { initNatsServer } from "./nats";
-import { initConatServer } from "@cocalc/server/nats/socketio";
+import { initConatServer } from "@cocalc/server/conat/socketio";
 
 // Used for longterm caching of files. This should be in units of seconds.
 const MAX_AGE = Math.round(ms("10 days") / 1000);

src/packages/frontend/project/explorer/file-listing/file-listing.tsx

@@ -12,7 +12,7 @@ import { Router } from "express";
 import { Server } from "http";
 import Primus from "primus";
 import type { PrimusWithChannels } from "@cocalc/terminal";
-import initNats from "@cocalc/project/nats";
+import initNats from "@cocalc/project/conat";
 
 // We are NOT using UglifyJS because it can easily take 3 blocking seconds of cpu
 // during project startup to save 100kb -- it just isn't worth it.  Obviously, it

src/packages/frontend/project/page/flyouts/files.tsx

@@ -48,10 +48,10 @@ import * as sage_session from "./sage_session";
 import { getListingsTable } from "@cocalc/project/sync/listings";
 import { get_synctable } from "./sync/open-synctables";
 import { get_syncdoc } from "./sync/sync-doc";
-import synctable_nats from "@cocalc/project/nats/synctable";
-import pubsub from "@cocalc/project/nats/pubsub";
+import synctable_nats from "@cocalc/project/conat/synctable";
+import pubsub from "@cocalc/project/conat/pubsub";
 import type { NatsSyncTableFunction } from "@cocalc/conat/sync/synctable";
-import { getEnv as getNatsEnv } from "@cocalc/project/nats/env";
+import { getEnv as getNatsEnv } from "@cocalc/project/conat/env";
 import {
   callNatsService,
   createNatsService,

src/packages/frontend/project_store.ts

@@ -33,7 +33,7 @@ key changing when the project is restarted.
     $ . project-env.sh
     $ node
     ...
-    > require("@cocalc/project/nats/api/index").init()
+    > require("@cocalc/project/conat/api/index").init()
 
 You can then easily be able to grab some state, e.g., by writing this in any cocalc code,
 rebuilding and restarting:
@@ -52,13 +52,13 @@ Remember, if you don't set API_KEY, then the project MUST be running so that the
 
 import getLogger from "@cocalc/backend/logger";
 import { type ProjectApi } from "@cocalc/conat/project-api";
-import { connectToConat } from "@cocalc/project/nats/connection";
+import { connectToConat } from "@cocalc/project/conat/connection";
 import { getSubject } from "../names";
-import { terminate as terminateOpenFiles } from "@cocalc/project/nats/open-files";
-import { close as closeListings } from "@cocalc/project/nats/listings";
+import { terminate as terminateOpenFiles } from "@cocalc/project/conat/open-files";
+import { close as closeListings } from "@cocalc/project/conat/listings";
 import { project_id } from "@cocalc/project/data";
-import { close as closeFilesRead } from "@cocalc/project/nats/files/read";
-import { close as closeFilesWrite } from "@cocalc/project/nats/files/write";
+import { close as closeFilesRead } from "@cocalc/project/conat/files/read";
+import { close as closeFilesWrite } from "@cocalc/project/conat/files/write";
 
 const logger = getLogger("project:nats:api");
 

src/packages/hub/hub.ts

@@ -4,7 +4,7 @@ export async function ping() {
 
 export async function terminate() {}
 
-import getConnection from "@cocalc/project/nats/connection";
+import getConnection from "@cocalc/project/conat/connection";
 export async function resetConnection() {
   const nc = await getConnection();
   await nc.close();

src/packages/hub/servers/express-app.ts

@@ -14,11 +14,11 @@ How to do development (so in a dev project doing cc-in-cc dev):
 
 3. Do this:
 
-     echo 'require("@cocalc/project/client").init(); require("@cocalc/project/nats/browser-websocket-api").init()' | DEBUG=cocalc:* DEBUG_CONSOLE=yes node
+     echo 'require("@cocalc/project/client").init(); require("@cocalc/project/conat/browser-websocket-api").init()' | DEBUG=cocalc:* DEBUG_CONSOLE=yes node
 
 Or just run node then paste in
 
-     require("@cocalc/project/client").init(); require("@cocalc/project/nats/browser-websocket-api").init()
+     require("@cocalc/project/client").init(); require("@cocalc/project/conat/browser-websocket-api").init()
 
 A nice thing about doing that is if you write this deep in some code:
 

src/packages/project/browser-websocket/server.ts

@@ -19,12 +19,12 @@ You can also skip step 1 if you instead set COMPUTE_SERVER_ID to something nonze
     Welcome to Node.js v18.17.1.
     Type ".help" for more information.
 
-    require('@cocalc/project/nats/files/read').init()
+    require('@cocalc/project/conat/files/read').init()
 
 
 */
 
-import "@cocalc/project/nats/env"; // ensure nats env available
+import "@cocalc/project/conat/env"; // ensure nats env available
 
 import { createReadStream as fs_createReadStream } from "fs";
 import { compute_server_id, project_id } from "@cocalc/project/data";

src/packages/project/client.ts

@@ -19,12 +19,12 @@ You can also skip step 1 if you instead set COMPUTE_SERVER_ID to something nonze
     Welcome to Node.js v18.17.1.
     Type ".help" for more information.
 
-    require('@cocalc/project/nats/files/write').init()
+    require('@cocalc/project/conat/files/write').init()
 
 
 */
 
-import "@cocalc/project/nats/env"; // ensure nats env available
+import "@cocalc/project/conat/env"; // ensure nats env available
 import ensureContainingDirectoryExists from "@cocalc/backend/misc/ensure-containing-directory-exists";
 import { createWriteStream as fs_createWriteStream } from "fs";
 import { rename } from "fs/promises";

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

@@ -25,7 +25,7 @@ DEVELOPMENT:
 .../src/packages/project/nats$ node
 
 
-    await require('@cocalc/project/nats/listings').init()
+    await require('@cocalc/project/conat/listings').init()
 
 */
 

src/packages/project/nats/api/editor.ts renamed to src/packages/project/conat/api/editor.ts

@@ -15,7 +15,7 @@ Set env variables as in a project (see  api/index.ts ), then in nodejs:
 
 DEBUG_CONSOLE=yes DEBUG=cocalc:debug:project:nats:* node
 
-    x = await require("@cocalc/project/nats/open-files").init(); Object.keys(x)
+    x = await require("@cocalc/project/conat/open-files").init(); Object.keys(x)
 
 
 [ 'openFiles', 'openDocs', 'formatter', 'terminate', 'computeServers' ]
@@ -32,7 +32,7 @@ DEBUG_CONSOLE=yes DEBUG=cocalc:debug:project:nats:* node
 
 OR:
 
- echo "require('@cocalc/project/nats/open-files').init(); require('@cocalc/project/bug-counter').init()" | node
+ echo "require('@cocalc/project/conat/open-files').init(); require('@cocalc/project/bug-counter').init()" | node
 
 COMPUTE SERVER:
 
@@ -67,7 +67,7 @@ doing this!  Then:
 /cocalc/github/src/packages/project$ COCALC_PROJECT_ID=... COCALC_SECRET_TOKEN="/secrets/secret-token/token"  NATS_SERVER=nats-server node
 Welcome to Node.js v20.19.0.
 Type ".help" for more information.
-> x = await require("@cocalc/project/nats/open-files").init(); Object.keys(x)
+> x = await require("@cocalc/project/conat/open-files").init(); Object.keys(x)
 [ 'openFiles', 'openDocs', 'formatter', 'terminate', 'computeServers' ]
 >
 
@@ -78,7 +78,7 @@ import {
   openFiles as createOpenFiles,
   type OpenFiles,
   type OpenFileEntry,
-} from "@cocalc/project/nats/sync";
+} from "@cocalc/project/conat/sync";
 import { getSyncDocType } from "@cocalc/conat/sync/syncdoc-info";
 import { NATS_OPEN_FILE_TOUCH_INTERVAL } from "@cocalc/util/nats";
 import { compute_server_id, project_id } from "@cocalc/project/data";
@@ -105,7 +105,7 @@ import {
 import { JUPYTER_SYNCDB_EXTENSIONS } from "@cocalc/util/jupyter/names";
 
 // ensure nats connection stuff is initialized
-import "@cocalc/project/nats/env";
+import "@cocalc/project/conat/env";
 import { chdir } from "node:process";
 
 const logger = getLogger("project:nats:open-files");

src/packages/project/nats/api/index.ts renamed to src/packages/project/conat/api/index.ts

@@ -12,7 +12,7 @@ import { exists } from "@cocalc/backend/misc/async-utils-node";
 import { reuseInFlight } from "@cocalc/util/reuse-in-flight";
 import { getLogger } from "@cocalc/project/logger";
 import { readlink, realpath } from "node:fs/promises";
-import { dstream, type DStream } from "@cocalc/project/nats/sync";
+import { dstream, type DStream } from "@cocalc/project/conat/sync";
 import {
   createTerminalServer,
   createBrowserClient,

src/packages/project/nats/api/sync.ts renamed to src/packages/project/conat/api/sync.ts

@@ -4,7 +4,7 @@
   "description": "CoCalc: project daemon",
   "exports": {
     "./named-servers": "./dist/named-servers/index.js",
-    "./nats": "./dist/nats/index.js",
+    "./conat": "./dist/conat/index.js",
     "./*": "./dist/*.js"
   },
   "keywords": [

src/packages/project/nats/api/system.ts renamed to src/packages/project/conat/api/system.ts

@@ -12,13 +12,13 @@ your dev hub after doing the above.
 
 2. Run this script at the terminal:
 
-    echo "require('@cocalc/server/nats/api').initAPI()" | COCALC_MODE='single-user' DEBUG_CONSOLE=yes DEBUG=cocalc:* node
+    echo "require('@cocalc/server/conat/api').initAPI()" | COCALC_MODE='single-user' DEBUG_CONSOLE=yes DEBUG=cocalc:* node
 
 
 3. Optional: start more servers -- requests get randomly routed to exactly one of them:
 
-    echo "require('@cocalc/server/nats').default()" | COCALC_MODE='single-user' DEBUG_CONSOLE=yes DEBUG=cocalc:* node
-    echo "require('@cocalc/server/nats').default()" | COCALC_MODE='single-user' DEBUG_CONSOLE=yes DEBUG=cocalc:* node
+    echo "require('@cocalc/server/conat').default()" | COCALC_MODE='single-user' DEBUG_CONSOLE=yes DEBUG=cocalc:* node
+    echo "require('@cocalc/server/conat').default()" | COCALC_MODE='single-user' DEBUG_CONSOLE=yes DEBUG=cocalc:* node
 
 
 To make use of this from a browser:
@@ -44,10 +44,10 @@ import getLogger from "@cocalc/backend/logger";
 import { type HubApi, getUserId, transformArgs } from "@cocalc/conat/hub-api";
 import { getEnv } from "@cocalc/backend/conat";
 import userIsInGroup from "@cocalc/server/accounts/is-in-group";
-import { terminate as terminateDatabase } from "@cocalc/database/nats/changefeeds";
+import { terminate as terminateDatabase } from "@cocalc/database/conat/changefeeds";
 import { terminate as terminateChangefeedServer } from "@cocalc/conat/changefeed/server";
-import { terminate as terminateAuth } from "@cocalc/server/nats/auth";
-import { terminate as terminateTieredStorage } from "@cocalc/server/nats/tiered-storage/api";
+import { terminate as terminateAuth } from "@cocalc/server/conat/auth";
+import { terminate as terminateTieredStorage } from "@cocalc/server/conat/tiered-storage/api";
 import { terminate as terminatePersistServer } from "@cocalc/conat/persist/server";
 import { delay } from "awaiting";
 

src/packages/project/nats/browser-websocket-api.ts renamed to src/packages/project/conat/browser-websocket-api.ts

@@ -42,7 +42,7 @@ by sending this message from a browser as an admin:
 
 2. Run this code in nodejs:
 
-   x = await require('@cocalc/server/nats/auth').init()
+   x = await require('@cocalc/server/conat/auth').init()
 
 
 NOTE: there's no way to turn the auth back on in the hub, so you'll have to restart