querysub 0.21.0 → 0.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "querysub",
-    "version": "0.21.0",
+    "version": "0.23.0",
     "main": "index.js",
     "license": "MIT",
     "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/0-path-value-core/NodePathAuthorities.ts

@@ -230,6 +230,7 @@ class NodePathAuthorities {
                     return;
                 }
 
+                let time = Date.now();
                 let createTime = await errorToUndefinedSilent(PathController.nodes[nodeId].getCreateTime());
                 if (createTime === undefined) {
                     // Don't log for 127-0-0-1, as it usually fails, and is mostly a development optimization
@@ -238,7 +239,8 @@ class NodePathAuthorities {
                     }
                     return;
                 }
-                console.log(blue(`Identifying ${nodeId} as a path authority`));
+                time = Date.now() - time;
+                console.log(blue(`Identifying ${nodeId} as a path authority. ping latency = ${formatTime(time)}`));
                 this.authorities.set(nodeId, {
                     nodeId,
                     self: nodeId.startsWith("127-0-0-1."),

package/src/2-proxy/PathValueProxyWatcher.ts

@@ -23,7 +23,7 @@ import { LOCAL_DOMAIN_PATH } from "../0-path-value-core/NodePathAuthorities";
 import { registerPeriodic } from "../diagnostics/periodic";
 import { remoteWatcher } from "../1-path-client/RemoteWatcher";
 import { Schema2, Schema2Fncs } from "./schema2";
-import { devDebugbreak, getDomain } from "../config";
+import { devDebugbreak, getDomain, isPublic } from "../config";
 
 import type { CallSpec } from "../3-path-functions/PathFunctionRunner";
 import type { FunctionMetadata } from "../3-path-functions/syncSchema";
@@ -1813,9 +1813,9 @@ export function registerSchemaPrefix(config: {
     if (!list) {
         schemaPrefixes.push(list = { len, prefixes: new Map() });
     }
-    if (isNode()) {
+    if (isNode() && !globalThis.isHotReloading?.()) {
         if (list.prefixes.has(config.prefixPathStr)) {
-            throw new Error(`Prefix matches only work due to only having one version of the code ever load (except for during hot reloading development clientside). If we try to render multiple versions of the same code serverside (ex, because we pre-loaded new code during a deploy), it will break, as we can't distinguish them. ADD GIT HASH TO PREFIX SCHEMAS TO FIX THIS!`);
+            throw new Error(`Prefix matches only work due to only having one version of the code ever load (except for during hot reloading development clientside). If we try to render multiple versions of the same code serverside (ex, because we pre-loaded new code during a deploy), it will break, as we can't distinguish them. ADD GIT HASH TO PREFIX SCHEMAS TO FIX THIS! Tried to double load ${config.prefixPathStr}`);
         }
     }
     list.prefixes.set(config.prefixPathStr, config.schema);

package/src/5-diagnostics/nodeMetadata.ts

@@ -90,11 +90,11 @@ if (isNode()) {
         const free = os.freemem();
         const total = os.totalmem();
 
-        let constrainedMemory = process.constrainedMemory();
-
         logNodeStateStats("System|Memory Free", x => formatNumber(x) + "B")(free);
         logNodeStateStats("System|Memory Free %", formatPercent)(free / total);
-        if (constrainedMemory !== undefined) {
+
+        let constrainedMemory = process.constrainedMemory();
+        if (constrainedMemory !== undefined && constrainedMemory < 2 ** 48) {
             logNodeStateStats("System|Constrained Memory", x => formatNumber(x) + "B")(constrainedMemory);
         }
 

package/src/diagnostics/NodeViewer.tsx

@@ -54,7 +54,7 @@ type NodeData = {
         columns: ColumnsType;
         row: RowType;
     };
-
+    loadTime?: number;
 };
 
 module.hotreload = true;
@@ -81,6 +81,7 @@ export class NodeViewer extends qreact.Component {
                 let ourIP = await controller.getCallerIP();
 
                 await Promise.allSettled(nodeIds.map(async nodeId => {
+                    let time = Date.now();
                     let data: NodeData = { nodeId };
                     try {
                         data.table = await controller.getMiscInfo(nodeId);
@@ -100,6 +101,8 @@ export class NodeViewer extends qreact.Component {
                     } catch (e: any) {
                         data.apiError = "Error: " + e.stack;
                     }
+                    time = Date.now() - time;
+                    data.loadTime = time;
                     Querysub.commit(() => {
                         this.state.nodes[nodeId] = atomicObjectWrite(data);
                     });
@@ -182,7 +185,7 @@ export class NodeViewer extends qreact.Component {
         }
 
         let builtinGroups = {
-            "Default": ["buttons", "devToolsURL", "nodeId", "ip", "uptime", "Heap", "All Memory", "Blocking Lag", "port", "threadId", "machineId", "apiError", "live_entryPoint"],
+            "Default": ["buttons", "devToolsURL", "nodeId", "ip", "uptime", "loadTime", "Heap", "All Memory", "Blocking Lag", "port", "threadId", "machineId", "apiError", "live_entryPoint"],
         };
         // Column => group
         let builtInGroupsLookup = new Map<string, string>();
@@ -263,7 +266,6 @@ export class NodeViewer extends qreact.Component {
                                     formatter: (obj) => {
                                         let str = String(obj);
                                         if (str.startsWith("http")) return formatValue(obj);
-                                        https://noproxy.querysub.com:1111/?page=test&showingmanagement&managementpage=DiskLoggerPage&nodeId=b4d19fba5f79d48c3.b68f46ffaffad0636.querysub.com%3A41863&filter=%22%5C%22__nodeId%5C%22%3A%5C%22b654f522bf3a67c49.b68f46ffaffad0636.querysub.com%3A33473%5C%22%22
 
                                         return (
                                             <ATag values={[
@@ -277,6 +279,7 @@ export class NodeViewer extends qreact.Component {
                                     },
                                 },
                                 ip: {},
+                                loadTime: { formatter: "timeSpan" },
                                 ...x.table?.columns,
                                 //capabilities: null,
                                 apiError: { formatter: "error" },
@@ -353,8 +356,12 @@ class NodeViewerControllerBase {
         await forwardPort({ internalPort: externalPort, externalPort: externalPort, });
 
         tlsServer.on("secureConnection", (socket) => {
-            if (socket.remoteAddress !== callerIP) {
-                console.error(`Rejecting connection from ${socket.remoteAddress}, expected ${callerIP}`);
+            let matchedIP = (
+                socket.remoteAddress === callerIP ||
+                callerIP === "127.0.0.1" && socket.remoteAddress === ourIP
+            );
+            if (!matchedIP) {
+                console.error(`Rejecting connection from ${socket.remoteAddress}, expected ${callerIP} ${callerIP === "127.0.0.1" && `or ${ourIP}` || ""}`);
                 socket.end();
                 return;
             }
@@ -375,7 +382,7 @@ class NodeViewerControllerBase {
         let ourDomain = ourIP.replaceAll(".", "-") + "." + getDomain();
         await setRecord("A", ourDomain, ourIP);
 
-        console.log(`${ourDomain}:${finalPort} => ${baseNodeIPResolved}:${externalPort} => 127.0.0.1:${internalPort}, for ${callerIP}`);
+        console.log(`Inspect forward ${ourDomain}:${finalPort} => ${baseNodeIPResolved}:${externalPort} => 127.0.0.1:${internalPort}, for ${callerIP}`);
 
         return internalInspectURL.replace(`ws=127.0.0.1:${internalPort}`, `wss=${ourDomain}:${finalPort}`);
     }

package/src/diagnostics/trackResources.ts

@@ -76,7 +76,7 @@ function logResourcesNow() {
 }
 
 registerMeasureInfo(() => {
-    return formatNumber(getUsedHeapSize()) + "B";
+    return formatNumber(getHeapSize()) + "B";
 });
 
 registerPeriodic(logResourcesNow);