querysub 0.372.0 → 0.373.0

package/package.json

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

package/src/diagnostics/logs/IndexedLogs/FilePathSelector.tsx

@@ -25,6 +25,15 @@ export type FilePathsByMachine = {
     errorCount: number;
 };
 
+function getSourceColor(sourceName: string | undefined): string | undefined {
+    if (!sourceName) return undefined;
+    const lastPart = sourceName.split("/").pop()?.toLowerCase();
+    if (lastPart === "error") return css.colorhsl(0, 80, 40);
+    if (lastPart === "warn") return css.colorhsl(40, 80, 40);
+    if (lastPart === "info") return css.colorhsl(280, 80, 40);
+    if (lastPart === "log") return css.colorhsl(200, 80, 40);
+    return undefined;
+}
 
 export class FilePathSelector extends qreact.Component<{
     paths: TimeFilePathWithSize[];
@@ -377,7 +386,7 @@ export class FilePathSelectorModal extends qreact.Component<{
                 </td>
                 <td className={css.pad2(2)}>{this.props.formatBytes(file.size)}</td>
                 <td className={css.pad2(2)}>{file.logCount !== undefined ? formatNumber(file.logCount) : <span className={css.colorhsl(40, 60, 40)}>pending</span>}</td>
-                <td className={css.pad2(2)}>{file.sourceName}</td>
+                <td className={css.pad2(2) + (getSourceColor(file.sourceName) || "")}>{file.sourceName}</td>
                 <td className={css.pad2(2)}>{file.dedupe}</td>
                 <td className={css.pad2(2)}>{formatDateTime(file.startTime)}</td>
                 <td className={css.pad2(2)}>
@@ -429,7 +438,7 @@ export class FilePathSelectorModal extends qreact.Component<{
                             <div className={css.vbox(5)}>
                                 {Array.from(bySource.entries()).map(([sourceName, stats]) => (
                                     <div key={sourceName} className={css.hbox(10)}>
-                                        <div className={css.minWidth(240)}>{sourceName}:</div>
+                                        <div className={css.minWidth(240) + (getSourceColor(sourceName) || "")}>{sourceName}:</div>
                                         <div className={css.minWidth(140)}>Files: {formatNumber(stats.fileCount)} ({formatNumber(stats.pendingCount)} pending)</div>
                                         <div className={css.minWidth(120)}>Size: {this.props.formatBytes(stats.size)}</div>
                                         <div className={css.minWidth(100)}>Logs: {formatNumber(stats.logCount)}</div>

package/src/diagnostics/logs/IndexedLogs/IndexedLogs.ts

@@ -25,6 +25,7 @@ import { blue } from "socket-function/src/formatting/logColors";
 import { LimitGroup } from "../../../functional/limitProcessing";
 import { getAllNodeIds } from "../../../-f-node-discovery/NodeDiscovery";
 import { NodeCapabilitiesController } from "../../../-g-core-values/NodeCapabilities";
+import { getLoggers2Async } from "../diskLogger";
 
 export type TimeFilePathWithSize = TimeFilePath & {
     size: number;
@@ -40,7 +41,6 @@ export class IndexedLogs<T> {
         name: string,
         maxSingleFileData?: number;
         maxCountPerFile?: number;
-        forceUsePublicLogs?: boolean;
         getTime: (result: T) => number | undefined;
     }) {
         loggerByName.set(this.config.name, this as any);
@@ -48,9 +48,10 @@ export class IndexedLogs<T> {
 
 
     private static shouldRunLoop = false;
-    public static runLogMoveLoop() {
+    public static async runLogMoveLoop() {
         IndexedLogs.shouldRunLoop = true;
-        for (let indexedLogs of loggerByName.values()) {
+        let allLoggers = await getLoggers2Async();
+        for (let indexedLogs of Object.values(allLoggers)) {
             indexedLogs.runLogMoverLoop();
         }
     }
@@ -91,7 +92,7 @@ export class IndexedLogs<T> {
         let basePublic: Archives = getArchivesHome(getDomain());
         // NOTE: The local disk is so fast that reading in 10 megabytes is nothing, And if we read in too small of a value, the overhead per read ends up making this take forever. 
         let extraReadSize = 1024 * 1024 * 10;
-        if (this.config.forceUsePublicLogs || isPublic()) {
+        if (isPublic()) {
             basePublic = getArchivesBackblaze(getDomain());
             // NOTE: While the latency to back plays is high, now we're reading in parallel, so it shouldn't be as big of an issue. 
             extraReadSize = 1024 * 1024 * 1;
@@ -274,8 +275,16 @@ export class IndexedLogs<T> {
         forceReadPublic?: boolean;
     }): Promise<TimeFilePathWithSize[]> {
         let finalPaths: TimeFilePathWithSize[] = [];
+        if (config.forceReadPublic && !isPublic()) {
+            let machineNodes = await this.getMachineNodes();
+            if (machineNodes.length === 0) throw new Error(`Cannot find any public nodes to read from`);
+            return await IndexedLogShimController.nodes[machineNodes[0]].getPaths({
+                ...config,
+                indexedLogsName: this.config.name,
+            });
+        }
 
-        if (!config.only && (config.forceReadPublic || isPublic())) {
+        if (config.only !== "local" && isPublic()) {
             let machineNodes = await this.getMachineNodes();
             await Promise.all(machineNodes.map(async (machineNode) => {
                 try {
@@ -291,11 +300,6 @@ export class IndexedLogs<T> {
             }));
         }
 
-        // If we're forcefully reading from the public server, but we're not public, the code above will be the only code which adds to results
-        if (!isPublic() && config.forceReadPublic) {
-            return finalPaths;
-        }
-
         let localLogs = this.getLocalLogs();
         let backblazeLogs = this.getPublicLogs();
         let paths: TimeFilePath[] = [];
@@ -347,6 +351,16 @@ export class IndexedLogs<T> {
         onResult: (match: T) => void;
         onResults?: (results: IndexedLogResults) => Promise<boolean>;
     }): Promise<IndexedLogResults> {
+
+        if (config.params.forceReadPublic && !isPublic()) {
+            let machineNodes = await this.getMachineNodes();
+            if (machineNodes.length === 0) throw new Error(`Cannot find any public nodes to read from`);
+            return await this.clientFind({
+                ...config,
+                nodeId: machineNodes[0],
+            });
+        }
+
         let startTime = Date.now();
         let interval: NodeJS.Timeout | undefined;
 
@@ -360,7 +374,8 @@ export class IndexedLogs<T> {
         let allResults = new Map<string, IndexedLogResults>();
         let allDone: Promise<void>[] = [];
 
-        if (config.params.only !== "local" && (config.params.forceReadPublic || isPublic())) {
+        // Read other nodes if on a public server
+        if (config.params.only !== "local" && isPublic()) {
             let machineNodes = await this.getMachineNodes();
             allDone.push(...machineNodes.map(async (machineNode) => {
                 try {
@@ -385,12 +400,6 @@ export class IndexedLogs<T> {
             }));
         }
 
-        // If we're forcefully reading from the public server, but we're not public, the code above will be the only code which adds to results
-        if (!isPublic() && config.params.forceReadPublic) {
-            await Promise.all(allDone);
-            return getFinalResults();
-        }
-
 
         let results: IndexedLogResults = createEmptyIndexedLogResults();
         allResults.set("", results);

package/src/diagnostics/logs/IndexedLogs/LogViewer3.tsx

@@ -686,6 +686,12 @@ export class LogViewer3 extends qreact.Component {
                         checkbox
                         label="Exclude Pending Results"
                         url={excludePendingResults}
+                        onChangeValue={(newValue) => {
+                            if (newValue) {
+                                savedPathsURL.value = "";
+                                void this.loadPaths();
+                            }
+                        }}
                     />
                     {!isPublic() && <InputLabelURL
                         checkbox

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

@@ -20,8 +20,6 @@ IMPORTANT! Now I am properly calling shutdown, so none of the streamed logs shou
 
 
 
-UGH... I'm seeing the remote move logs saying that it moved a lot of files. 
-
 3) Ensure our moveloops are working correctly, on both dev and public