querysub 0.367.0 → 0.368.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.367.0",
+  "version": "0.368.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/IndexedLogs.ts

@@ -239,8 +239,8 @@ export class IndexedLogs<T> {
                 if (!hasLogger) return false;
                 // NOTE: Prefer to do the searching on the move logs service. However, if it's not available, any service can do searching. It just might lag that server... 
                 if (preferredOnly) {
-                    let entryPoint = await NodeCapabilitiesController.nodes[nodeId].getEntryPoint();
-                    if (!entryPoint.includes("movelogs")) return false;
+                    let entryPoint = await timeoutToUndefinedSilent(2500, NodeCapabilitiesController.nodes[nodeId].getEntryPoint());
+                    if (!entryPoint?.includes("movelogs")) return false;
                 }
                 added = true;
 
@@ -298,21 +298,28 @@ export class IndexedLogs<T> {
         let backblazeLogs = this.getPublicLogs();
         let paths: TimeFilePath[] = [];
 
+        let promises: Promise<void>[] = [];
+
         if (config.only !== "public") {
-            let localPaths = await new TimeFileTree(localLogs).findAllPaths({
-                startTime: config.startTime,
-                endTime: config.endTime,
-            });
-            paths.push(...localPaths);
+            promises.push((async () => {
+                let localPaths = await new TimeFileTree(localLogs).findAllPaths({
+                    startTime: config.startTime,
+                    endTime: config.endTime,
+                });
+                paths.push(...localPaths);
+            })());
         }
 
         if (config.only !== "local") {
-            let backblazePaths = await new TimeFileTree(backblazeLogs).findAllPaths({
-                startTime: config.startTime,
-                endTime: config.endTime,
-            });
-            paths.push(...backblazePaths);
+            promises.push((async () => {
+                let backblazePaths = await new TimeFileTree(backblazeLogs).findAllPaths({
+                    startTime: config.startTime,
+                    endTime: config.endTime,
+                });
+                paths.push(...backblazePaths);
+            })());
         }
+        await Promise.all(promises);
 
         // Bake in the size to ensure more cache hits (without this, every single access will always result in a file/remote call).
         let pathsWithSize = await Promise.all(paths.map(async (path): Promise<TimeFilePathWithSize> => {
@@ -357,6 +364,10 @@ export class IndexedLogs<T> {
                 try {
                     let resultObj = await this.clientFind({
                         ...config,
+                        params: {
+                            ...config.params,
+                            only: "local",
+                        },
                         nodeId: machineNode,
                         onResult(match) {
                             config.onResult(match);

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

@@ -25,6 +25,7 @@ import { errorToUndefined } from "../../../errors";
 import { IndexedLogResults, createEmptyIndexedLogResults, mergeIndexedLogResults } from "./BufferIndexHelpers";
 import { TimeFilePath } from "./TimeFileTree";
 import { isPublic } from "../../../config";
+import { Zip } from "../../../zip";
 
 let searchText = new URLParam("searchText", "");
 let excludePendingResults = new URLParam("excludePendingResults", false);
@@ -76,7 +77,7 @@ export class LogViewer3 extends qreact.Component {
         let paths: TimeFilePathWithSize[] = [];
         if (savedPathsURL.value) {
             const compressed = Buffer.from(savedPathsURL.value, "base64");
-            const decompressed = LZ4.decompress(compressed);
+            const decompressed = Zip.gunzipSync(compressed);
             paths = JSON.parse(decompressed.toString("utf8"));
         } else {
             paths = this.state.paths;
@@ -95,7 +96,7 @@ export class LogViewer3 extends qreact.Component {
     freezePaths() {
         const json = JSON.stringify(this.state.paths);
         const buffer = Buffer.from(json, "utf8");
-        const compressed = LZ4.compress(buffer);
+        const compressed = Zip.gzipSync(buffer, 9);
         savedPathsURL.value = compressed.toString("base64");
     }
 
@@ -342,6 +343,8 @@ export class LogViewer3 extends qreact.Component {
 
         Querysub.commitLocal(() => {
             this.state.loadingPaths = true;
+            this.state.results = [];
+            this.state.stats = undefined;
         });
 
         let loggers = await getLoggers2Async();
@@ -364,7 +367,7 @@ export class LogViewer3 extends qreact.Component {
         let allPaths: TimeFilePathWithSize[] = [];
         let range = Querysub.localRead(() => getTimeRange());
 
-        for (let logger of selectedLoggers) {
+        await Promise.all(selectedLoggers.map(async (logger) => {
             let paths = await logger.clientGetPaths({
                 startTime: range.startTime,
                 endTime: range.endTime,
@@ -372,7 +375,7 @@ export class LogViewer3 extends qreact.Component {
                 forceReadPublic: readPublicLogs.value,
             });
             allPaths.push(...paths);
-        }
+        }));
         sort(allPaths, x => -x.startTime);
 
         Querysub.commitLocal(() => {
@@ -740,7 +743,9 @@ export class LogViewer3 extends qreact.Component {
                     </Button>
                     <TimeRangeSelector />
                 </div>
-                {!isPublic() && readPublicLogs.value && <h1>Reading public logs</h1>}
+                {!isPublic() && readPublicLogs.value && <div className={css.fontSize(40).pad2(12, 6).hsl(280, 40, 50).colorhsl(0, 0, 100).boldStyle}>
+                    Reading public logs
+                </div>}
 
                 <div className={css.hbox(10).fillWidth}>
                     <InputLabelURL

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

@@ -156,12 +156,12 @@ export class TimeFileTree {
                 // Find all days in this month
                 const days = await this.archives.find(monthFolder + "/", { shallow: true, type: "folders" });
 
-                for (const dayFolder of days) {
+                await Promise.all(days.map(async (dayFolder) => {
                     // dayFolder is a full path like "2024/01/15"
                     const day = parseInt(dayFolder.split("/").at(-1) || "", 10);
 
                     if (isNaN(day) || day < 1 || day > 31) {
-                        continue;
+                        return;
                     }
 
                     // Check if this day is in range
@@ -169,7 +169,7 @@ export class TimeFileTree {
                     const dayEndDate = new Date(Date.UTC(year, month - 1, day, 23, 59, 59, 999));
 
                     if (dayEndDate.getTime() < config.startTime || dayDate.getTime() > config.endTime) {
-                        continue;
+                        return;
                     }
 
                     // Find all log files in this day
@@ -187,7 +187,7 @@ export class TimeFileTree {
                             results.push(decoded);
                         }
                     }
-                }
+                }));
             }
         }