querysub 0.400.0 → 0.402.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.400.0",
+  "version": "0.402.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

@@ -17,6 +17,8 @@ import { ClientWatcher } from "../1-path-client/pathValueClientWatcher";
 import { auditLog, isDebugLogEnabled } from "./auditLogs";
 import { debugNodeId } 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,16 +82,18 @@ 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, });
-        for (let value of values) {
-            console.info("Received PathValue for path", { path: value.path, time: value.time.time, callerId });
-        }
 
         if (isCoreQuiet) {
             await pathValueCommitter.ingestRemoteValues({

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";
@@ -1567,11 +1567,6 @@ class PathWatcher {
                 callback(changes, parentPaths ?? []);
             }
         } else {
-            if (isDiskAudit()) {
-                for (let change of changes) {
-                    auditLog("non-local TRIGGER", { path: change.path, time: change.time.time, watcher });
-                }
-            }
             if (!isCoreQuiet) {
                 console.log(`(${Date.now()}) Sending values to client: ${changes.length} (${watcher})`);
             }
@@ -1584,10 +1579,18 @@ class PathWatcher {
                     stripSource: !allowSource,
                 });
 
-                if (isDebugLogEnabled()) {
+                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/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/errorNotifications2/ErrorNotificationPage.tsx

@@ -426,7 +426,7 @@ class SuppressionItem extends qreact.Component<{
                 <Button
                     hue={0}
                     onClick={() => {
-                        if (!confirm(`Delete this suppression?`)) return;
+                        if (!confirm(`Delete this suppression "${suppression.pattern}"?`)) return;
 
                         Querysub.onCommitFinished(async () => {
                             await this.manager.deleteSuppression(suppression.id);

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"
         }>
@@ -57,7 +56,7 @@ export class LifeCycleEntryEditor extends qreact.Component<{
                 <Button
                     hue={0}
                     onClick={() => {
-                        if (!confirm("Delete this entry?")) return;
+                        if (!confirm(`Delete this entry "${entry.matchPattern}"?`)) return;
 
                         let updatedLifeCycle = deepCloneJSON(lifeCycle);
                         updatedLifeCycle.entries.splice(entryIndex, 1);
@@ -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"

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

@@ -18,11 +18,12 @@ export class LifeCycleInstanceTableView extends qreact.Component<{
             let entry = lifeCycle.entries.find(e => e.matchPattern === entryData.matchPattern);
             if (!entry) continue;
 
-            let variables = getVariables(entry);
-            for (let variable of variables) {
-                allColumnKeys.add(variable.key);
-                if (variable.title && !columnKeyToTitle.has(variable.key)) {
-                    columnKeyToTitle.set(variable.key, variable.title);
+            // ONLY variables, as the group by values will be the same for all entries in this instance!
+            for (let [key, value] of Object.entries(entry.variables)) {
+                let title = value.title || key;
+                allColumnKeys.add(key);
+                if (!columnKeyToTitle.has(key)) {
+                    columnKeyToTitle.set(key, title);
                 }
             }
         }

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={() => {

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

@@ -564,7 +564,13 @@ export function createLifeCycleSearch(
             }
         }
 
-        sort(allInstances, x => -x.startTime);
+        let range = Querysub.localRead(() => getTimeRange());
+
+        if (range.searchFromStart) {
+            sort(allInstances, x => x.startTime);
+        } else {
+            sort(allInstances, x => -x.startTime);
+        }
 
         return allInstances;
     };