querysub 0.401.0 → 0.403.0

package/package.json

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

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

@@ -9,7 +9,7 @@ import { SocketFunction } from "socket-function/SocketFunction";
 import { CallerContext } from "socket-function/SocketFunctionTypes";
 import { cache, cacheWeak, lazy } from "socket-function/src/caching";
 import { getClientNodeId, getNodeId, getNodeIdDomain, getNodeIdIP, getNodeIdLocation, isClientNodeId } from "socket-function/src/nodeCache";
-import { getCommonName, getIdentityCA, getMachineId, getPublicIdentifier, getThreadKeyCert, parseCert, sign, validateCertificate, verify } from "../-a-auth/certs";
+import { decodeNodeId, getCommonName, getIdentityCA, getMachineId, getPublicIdentifier, getThreadKeyCert, parseCert, sign, validateCertificate, verify } from "../-a-auth/certs";
 import { getShortNumber } from "../bits";
 import { measureBlock, measureFnc, measureWrap } from "socket-function/src/profiling/measure";
 import { timeoutToError } from "../errors";
@@ -18,6 +18,7 @@ import { formatTime } from "socket-function/src/formatting/format";
 import { waitForFirstTimeSync } from "socket-function/time/trueTimeShim";
 import { red } from "socket-function/src/formatting/logColors";
 import { isNode } from "typesafecss";
+import { getOwnThreadId } from "../-f-node-discovery/NodeDiscovery";
 
 let callerInfo = new Map<CallerContext, {
     reconnectNodeId: string | undefined;
@@ -68,6 +69,11 @@ export function debugNodeId(nodeId: string) {
 };
 (globalThis as any).debugNodeId = debugNodeId;
 
+export function debugNodeThread(nodeId: string) {
+    nodeId = debugNodeId(nodeId);
+    return decodeNodeId(nodeId)?.threadId || nodeId;
+}
+
 /** Gets the nodeId of the machine, which should be consistent. When deciding to trust a node
  *      this should be used instead of the reconnectId (otherwise you will have to trust
  *      every single process individually, which will take forever!)

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

@@ -15,8 +15,10 @@ import { sha256 } from "js-sha256";
 import debugbreak from "debugbreak";
 import { ClientWatcher } from "../1-path-client/pathValueClientWatcher";
 import { auditLog, isDebugLogEnabled } from "./auditLogs";
-import { debugNodeId } from "../-c-identity/IdentityController";
+import { debugNodeId, debugNodeThread } from "../-c-identity/IdentityController";
 import { logDisk } from "../diagnostics/logs/diskLogger";
+import { isDiskAudit } from "../config";
+import { decodeNodeId } from "../-a-auth/certs";
 export { pathValueCommitter };
 
 class PathValueControllerBase {
@@ -80,10 +82,15 @@ class PathValueControllerBase {
             }
         }
 
-        if (isDebugLogEnabled()) {
+        if (isDebugLogEnabled() || isDiskAudit()) {
             let sourceNodeId = debugNodeId(callerId);
             for (let value of values) {
-                auditLog("RECEIVE VALUE", { path: value.path, time: value.time.time, sourceNodeId });
+                auditLog("RECEIVE VALUE", {
+                    path: value.path,
+                    time: value.time.time,
+                    sourceNodeId,
+                    sourceNodeThreadId: decodeNodeId(sourceNodeId)?.threadId,
+                });
             }
         }
         console.info("Received PathValues via forwardWrites", { valueCount: values.length, callerId, });
@@ -175,7 +182,7 @@ class PathValueControllerBase {
         if (isDebugLogEnabled()) {
             let sourceNodeId = debugNodeId(callerId);
             for (let value of config.paths) {
-                auditLog("WATCH PATH", { path: value, sourceNodeId });
+                auditLog("WATCH PATH", { path: value, sourceNodeId, sourceNodeThreadId: debugNodeThread(callerId) });
             }
             for (let value of config.parentPaths) {
                 auditLog("WATCH PARENT PATH", { path: value, sourceNodeId });
@@ -188,7 +195,7 @@ class PathValueControllerBase {
         if (isDebugLogEnabled()) {
             let sourceNodeId = debugNodeId(SocketFunction.getCaller().nodeId);
             for (let value of config.paths) {
-                auditLog("UNWATCH PATH", { path: value, sourceNodeId });
+                auditLog("UNWATCH PATH", { path: value, sourceNodeId, sourceNodeThreadId: debugNodeThread(callerId) });
             }
             for (let value of config.parentPaths) {
                 auditLog("UNWATCH PARENT PATH", { path: value, sourceNodeId });

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

@@ -5,7 +5,7 @@ import { addEpsilons, getBufferFraction, minusEpsilon } from "../bits";
 import { errorToUndefined, ignoreErrors, logErrors } from "../errors";
 import { appendToPathStr, getParentPathStr, getPathDepth, getPathFromStr, getPathIndexAssert, getPathStr, hack_getPackedPathSuffix, hack_setPackedPathSuffix, hack_stripPackedPath, removePathLastPart, rootPathStr } from "../path";
 import { measureBlock, measureFnc, measureWrap } from "socket-function/src/profiling/measure";
-import { IdentityController_getOwnPubKeyShort, debugNodeId } from "../-c-identity/IdentityController";
+import { IdentityController_getOwnPubKeyShort, debugNodeId, debugNodeThread } from "../-c-identity/IdentityController";
 import { pathValueArchives } from "./pathValueArchives";
 import { blue, magenta, red, yellow } from "socket-function/src/formatting/logColors";
 import { PathValueController, pathValueCommitter } from "./PathValueController";
@@ -1254,7 +1254,11 @@ class PathWatcher {
                 }
             } else {
                 for (let path of newPathsWatched) {
-                    auditLog("new non-local WATCH VALUE", { path, watcher: config.callback });
+                    auditLog("new non-local WATCH VALUE", {
+                        path,
+                        watcher: config.callback,
+                        targetNodeThreadId: debugNodeThread(config.callback),
+                    });
                 }
                 for (let path of newParentsWatched) {
                     auditLog("new non-local WATCH PARENT", { path, watcher: config.callback });
@@ -1579,9 +1583,18 @@ class PathWatcher {
                     stripSource: !allowSource,
                 });
 
-                if (isDiskAudit()) {
+                if (isDebugLogEnabled() || isDiskAudit()) {
                     for (let pathValue of changes) {
-                        auditLog("SEND VALUE", { path: pathValue.path, time: pathValue.time.time, watcher, nodeId: debugNodeId(watcher), transparent: pathValue.isTransparent, canGC: pathValue.canGCValue });
+                        auditLog("SEND VALUE", {
+                            path: pathValue.path,
+                            time: pathValue.time.time,
+                            watcher,
+                            nodeId: debugNodeId(watcher),
+                            targetNodeId: debugNodeId(watcher),
+                            targetNodeThreadId: debugNodeThread(watcher),
+                            transparent: pathValue.isTransparent,
+                            canGC: pathValue.canGCValue,
+                        });
                     }
                 }
                 await PathValueController.nodes[watcher].forwardWrites(

package/src/1-path-client/RemoteWatcher.ts

@@ -17,7 +17,8 @@ import { appendToPathStr, getParentPathStr, getPathDepth, getPathIndexAssert, ge
 import { isEmpty } from "../misc";
 import debugbreak from "debugbreak";
 import { isDevDebugbreak } from "../config";
-import { auditLog } from "../0-path-value-core/auditLogs";
+import { auditLog, isDebugLogEnabled } from "../0-path-value-core/auditLogs";
+import { debugNodeThread } from "../-c-identity/IdentityController";
 
 // NOTE: In some cases this can half our the PathValues sent. AND, it can reduce our sync requests by N, and as those are uploads those are event more expensive. However, it also complicates other code, requiring not just checking if a value is synced, but also the parent path. We should try to make this stable, but worst case scenario, we can set this to false, and it will make our synchronization a lot easier to verify.
 const STOP_KEYS_DOUBLE_SENDS = true;
@@ -457,6 +458,14 @@ export class RemoteWatcher {
                         paths: Array.from(paths),
                         parentPaths: Array.from(parentPaths),
                     };
+                    if (isDebugLogEnabled()) {
+                        for (let path of paths) {
+                            auditLog("Asking to watch path", { path, authorityId, targetNodeThreadId: debugNodeThread(authorityId) });
+                        }
+                        for (let path of parentPaths) {
+                            auditLog("Asking to watch parent path", { path, authorityId, targetNodeThreadId: debugNodeThread(authorityId) });
+                        }
+                    }
                     logErrors(RemoteWatcher.REMOTE_WATCH_FUNCTION(config, authorityId));
                 }
             });

package/src/5-diagnostics/FullscreenModal.tsx

@@ -53,6 +53,7 @@ export class FullscreenModal extends qreact.Component<{
         if (this.props.noModalWrap) return base;
         return (
             <Modal
+                onlyExplicitClose={this.props.onlyExplicitClose}
                 onClose={() => {
                     if (this.props.parentState) this.props.parentState.open = false;
                     return this.props.onCancel?.();

package/src/5-diagnostics/Modal.tsx

@@ -43,6 +43,7 @@ const ensureRendering = lazy(() => {
 /** IMPORTANT! Use the .keepModalsOpen class to prevent clicks from closing the model */
 export class Modal extends qreact.Component<{
     onClose?: () => void | "abortClose";
+    onlyExplicitClose?: boolean;
 }> {
     id = nextId();
     componentWillUnmount(): void {
@@ -55,6 +56,7 @@ export class Modal extends qreact.Component<{
         data().modals[this.id] = atomicObjectWriteNoFreeze({
             value: this.props.children,
             onClose: this.props.onClose,
+            onlyExplicitClose: this.props.onlyExplicitClose,
         });
         return undefined;
     }

package/src/diagnostics/logs/lifeCycleAnalysis/LifeCycleEntryEditor.tsx

@@ -35,7 +35,6 @@ export class LifeCycleEntryEditor extends qreact.Component<{
         return <div className={
             css.pad2(4).bord2(150, 30, 70)
                 .vbox(4)
-                .cursor("auto")
             + bgClass
             + " LifeCycleEntryEditor"
         }>
@@ -282,6 +281,21 @@ export class LifeCycleEntryEditor extends qreact.Component<{
                                 >
                                     Copy to All
                                 </Button>
+                                <Button hue={160} onClick={() => {
+                                    let updatedLifeCycle = deepCloneJSON(lifeCycle);
+                                    updatedLifeCycle.entries.forEach((e) => {
+                                        if (key in e.variables) {
+                                            let varData = e.variables[key];
+                                            delete e.variables[key];
+                                            e.variables = { [key]: varData, ...e.variables };
+                                        }
+                                    });
+                                    Querysub.onCommitFinished(async () => {
+                                        await this.controller.setLifeCycle.promise(updatedLifeCycle);
+                                    });
+                                }}>
+                                    Move to start
+                                </Button>
                                 <span className={css.minWidth(150).boldStyle}>{key}</span>
                                 <InputLabel
                                     placeholder="Variable title"
@@ -317,7 +331,11 @@ export class LifeCycleEntryEditor extends qreact.Component<{
                                     hue={0}
                                     onClick={() => {
                                         let updatedLifeCycle = deepCloneJSON(lifeCycle);
-                                        delete updatedLifeCycle.entries[entryIndex].variables[key];
+                                        for (let e of updatedLifeCycle.entries) {
+                                            if (key in e.variables) {
+                                                delete e.variables[key];
+                                            }
+                                        }
                                         Querysub.onCommitFinished(async () => {
                                             await this.controller.setLifeCycle.promise(updatedLifeCycle);
                                         });

package/src/diagnostics/logs/lifeCycleAnalysis/LifeCycleRenderer.tsx

@@ -271,7 +271,7 @@ export class LifeCycleInstanceRenderer extends qreact.Component<{
             </div>
 
             {this.state.expanded && (
-                <div className={css.vbox(8) + "LifeCycleRenderer-contents"}>
+                <div className={css.vbox(8).cursor("auto") + "LifeCycleRenderer-contents"}>
                     <Button
                         hue={200}
                         onClick={() => {