querysub 0.20.0 → 0.21.0

package/package.json

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

package/src/-f-node-discovery/NodeDiscovery.ts

@@ -351,6 +351,8 @@ async function runMainSyncLoops(discoveryReady: PromiseObj<void>) {
         await timeoutToUndefinedSilent(timeInSecond * 5, errorToUndefinedSilent(NodeDiscoveryController.nodes[nodeId].addNode(getOwnNodeId())));
     }));
 
+    console.log(magenta(`Node discovery is ready and first heartbeat + sync is done`));
+
     await runInfinitePoll(HEARTBEAT_INTERVAL, async function nodeDiscoverHeartbeat() {
         // If we waited too long, other nodes might think we are dead. In which case, we SHOULD terminate.
         if (!isNoNetwork()) {

package/src/3-path-functions/pathFunctionLoader.ts

@@ -16,7 +16,7 @@ import { isNode, isNodeTrue, nextId, timeInSecond } from "socket-function/src/mi
 import { getPathStr2, getPathStr3 } from "../path";
 import { consistentHash } from "../misc/hash";
 import { setExternalHotReloading } from "socket-function/hot/HotReloadController";
-import { isPublic } from "../config";
+import { devDebugbreak, isPublic } from "../config";
 import { SocketFunction } from "socket-function/SocketFunction";
 import { requiresNetworkTrustHook } from "../-d-trust/NetworkTrust2";
 import { getControllerNodeId, getControllerNodeIdList } from "../-g-core-values/NodeCapabilities";
@@ -281,6 +281,10 @@ async function getModuleFromSpecBase(
         deployPath = packagePath + "deploy.ts";
     }
 
+    if (path.startsWith("/root")) {
+        devDebugbreak();
+    }
+
     console.log(blue(`require(${JSON.stringify(path)})`));
 
     // Set functionSpec for the next synchronous evaluation

package/src/5-diagnostics/nodeMetadata.ts

@@ -6,10 +6,11 @@ import { requiresNetworkTrustHook } from "../-d-trust/NetworkTrust2";
 import { cache } from "socket-function/src/caching";
 import { TimeGrouper } from "./TimeGrouper";
 import { runInfinitePollCallAtStart } from "socket-function/src/batching";
-import { timeInMinute } from "socket-function/src/misc";
+import { throttleFunction, timeInMinute } from "socket-function/src/misc";
 import { formatNumber, formatPercent, formatTime } from "socket-function/src/formatting/format";
 import os from "os";
 import { isNode } from "typesafecss";
+import { diskLog } from "../diagnostics/logs/diskLogger";
 
 // Undefined means we infer the column
 // Null means the column is removed
@@ -40,8 +41,12 @@ export function registerNodeMetadata(getter: ExtraMetadata) {
 
 let stateValues = cache((title: string, format: (value: number) => string): { (value: number): void } => {
     let timeGrouper = new TimeGrouper();
+    let logToDisk = throttleFunction(timeInMinute, (value: number) => {
+        diskLog(title, { value, formatted: format(value) });
+    });
     function onValue(value: number) {
         timeGrouper.onValueChanged(value);
+        void logToDisk(value);
     }
     registerNodeMetadata({
         columnName: title,
@@ -54,8 +59,12 @@ let stateValues = cache((title: string, format: (value: number) => string): { (v
 });
 let eventValues = cache((title: string, format: (value: number) => string): { (value: number): void } => {
     let timeGrouper = new TimeGrouper();
+    let logToDisk = throttleFunction(timeInMinute, (value: number) => {
+        diskLog(title, { value, formatted: format(value) });
+    });
     function onValue(value: number) {
         timeGrouper.onValueChanged(value);
+        void logToDisk(value);
     }
     registerNodeMetadata({
         columnName: title,
@@ -97,7 +106,8 @@ if (isNode()) {
         logNodeStateStats("System|CPU Count", formatNumber)(cpuCount);
 
         let load = os.loadavg();
-        logNodeStateStats("System|Average Free Cores", formatPercent)((1 - load[0]) * os.cpus().length);
+        logNodeStateStats("System|Average Load", formatPercent)(load[0]);
+        logNodeStateStats("System|Average Free Cores", formatPercent)((os.cpus().length - load[0]));
 
     });
 }

package/src/diagnostics/logs/DiskLoggerPage.tsx

@@ -182,7 +182,7 @@ export class DiskLoggerPage extends qreact.Component {
                         if (!canHaveChildren(value)) {
                             // Add to search as well
                             if (filterURL.value.trim()) {
-                                filterURL.value += " | ";
+                                filterURL.value += " & ";
                             }
                             filterURL.value += String(value);
                         }
@@ -244,17 +244,17 @@ export class DiskLoggerPage extends qreact.Component {
         };
 
         table.columns["remaining"] = {
+            title: "Object",
             formatter(value, context) {
                 return <ObjectDisplay
                     value={context?.row}
-                    excludedFields={fullSelectedFields}
                     onClickKey={path => addPath(path)}
                     onClickValue={(path, value) => {
                         addPath(path);
                         if (!canHaveChildren(value)) {
                             // Add to search as well
                             if (filterURL.value.trim()) {
-                                filterURL.value += " | ";
+                                filterURL.value += " & ";
                             }
                             filterURL.value += String(value);
                         }

package/src/diagnostics/logs/diskLogger.ts

@@ -1,6 +1,6 @@
 
 import { batchFunction, runInfinitePoll } from "socket-function/src/batching";
-import { timeInDay, timeInHour } from "socket-function/src/misc";
+import { nextId, timeInDay, timeInHour } from "socket-function/src/misc";
 import { getStorageDir, getStorageFolder } from "../../fs";
 import fs from "fs";
 import { canHaveChildren } from "socket-function/src/types";
@@ -188,9 +188,11 @@ function safeCopyObject<T>(obj: T): T {
         return { errorCopying: e.messsage } as any;
     }
 }
+let __baseThreadId = nextId();
 function packageLogObj(args: unknown[]): LogObj {
     let logObj: LogObj = {
         time: Date.now(),
+        __baseThreadId,
     };
     for (let part of globalContextParts) {
         Object.assign(logObj, safeCopyObject(part()));