querysub 0.527.0 → 0.528.0

package/bin/storageserve.js

@@ -1,8 +1,4 @@
 #!/usr/bin/env node
 
 require("typenode");
-require("../src/inject.ts");
-const config = require("../src/config");
-let url = `https://storage.${config.getDomain()}:${config.getPort()}`;
-process.argv.push(`--url=${url}`);
-require("sliftutils/storage/remoteStorage/storageServerCli");
+require("../src/storageSetup.ts");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.527.0",
+  "version": "0.528.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -71,7 +71,7 @@
     "pako": "^2.1.0",
     "peggy": "^5.0.6",
     "sliftutils": "^1.7.5",
-    "socket-function": "^1.2.15",
+    "socket-function": "^1.2.16",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",
     "typesafecss": "^0.32.0",

package/src/-c-identity/IdentityController.ts

@@ -197,7 +197,7 @@ class IdentityControllerBase {
         });
 
         let duration = Date.now() - time;
-        console.log(`Authenticated identity for ${caller.nodeId} in ${formatTime(duration)}, at ${Date.now()}`, {
+        console.info(`Authenticated identity for ${caller.nodeId} in ${formatTime(duration)}, at ${Date.now()}`, {
             clientId: caller.nodeId,
             reconnectNodeId,
             duration,
@@ -208,7 +208,7 @@ class IdentityControllerBase {
         SocketFunction.onNextDisconnect(caller.nodeId, () => {
             // NOTE: I don't really see any purpose of deleting from caller info. I don't think we're going to run out of memory because of too many callers authenticating. 
             // However, logging here is useful as it allows us to complete the life cycle so we know how long a client was connected for.
-            console.log(`Disconnected client`, {
+            console.info(`Disconnected client`, {
                 clientId: caller.nodeId,
             });
         });

package/src/-d-trust/NetworkTrust2.ts

@@ -104,6 +104,11 @@ let populateTrustedCache = lazy(async () => {
     }, TRUSTED_CACHE_RESET_INTERVAL);
 });
 
+export async function getTrustedMachineIds() {
+    await populateTrustedCache();
+    return Array.from(trustedCache);
+}
+
 export async function isNodeTrusted(nodeId: string) {
     let domainName = getNodeIdDomainMaybeUndefined(nodeId);
     if (!domainName) return false;

package/src/storageSetup.ts

@@ -0,0 +1,27 @@
+import "./inject";
+import { getDomain, getPort } from "./config";
+import { getTrustedMachineIds } from "./-d-trust/NetworkTrust2";
+import { getExternalIP } from "socket-function/src/networking";
+
+// The storage server entry point (see bin/storageserve.js): sets up the CLI args the sliftutils storage server expects, synchronizes our network trust list into its trust store, and runs its CLI.
+
+async function main() {
+    if (!process.argv.includes("--url")) {
+        let ip = await getExternalIP();
+        let ipDomain = ip.replaceAll(".", "-");
+        process.argv.push("--url", `https://${ipDomain}.${getDomain()}:${getPort()}`);
+    }
+
+    let trustedMachineIds = await getTrustedMachineIds();
+
+    let { setTrustedMachines } = await import("sliftutils/storage/remoteStorage/storageServerState");
+    await setTrustedMachines({ account: "root", machineIds: trustedMachineIds });
+    console.log(`Synchronized ${trustedMachineIds.length} trusted machines`);
+
+    await import("sliftutils/storage/remoteStorage/storageServerCli");
+}
+
+main().catch(e => {
+    console.error(e.stack || e);
+    process.exit(1);
+});

package/test.ts

@@ -1,11 +1,11 @@
 import { chdir } from "process";
-import { getRecordsRaw, setRecord } from "./src/-b-authorities/dnsAuthority";
+import { getRecords, setRecord } from "./src/-b-authorities/dnsAuthority";
 import { timeInMinute } from "socket-function/src/misc";
 chdir("D:/repos/qs-cyoa/");
 
 
 async function main() {
-    let rawRecords = await getRecordsRaw("A", "test.querysubtest.com");
+    let rawRecords = await getRecords("A", "test.querysubtest.com");
     for (let record of rawRecords) {
         console.log(record);
     }