querysub 0.636.0 → 0.638.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.636.0",
+  "version": "0.638.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -79,7 +79,7 @@
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
     "peggy": "^5.0.6",
-    "sliftutils": "^1.7.106",
+    "sliftutils": "^1.7.108",
     "socket-function": "^1.2.31",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",

package/src/deployManager/components/storage/StorageLogsPage.tsx

@@ -6,7 +6,7 @@ import { Querysub } from "../../../4-querysub/Querysub";
 import { t } from "../../../2-proxy/schema2";
 import { isDefined } from "../../../misc";
 import { formatNumber, formatTime, formatDateTime } from "socket-function/src/formatting/format";
-import { timeInSecond } from "socket-function/src/misc";
+import { timeInMinute, timeInSecond } from "socket-function/src/misc";
 import type { LogFileInfo } from "sliftutils/storage/StreamingLogs";
 import { MachineServiceController } from "../../machineSchema";
 import { getStorageServers } from "./storageServers";
@@ -163,19 +163,51 @@ export class StorageLogsPage extends qreact.Component {
         return selected;
     }
 
-    private search() {
+    /** fresh drops the log file listings and the per-file search cache first, so everything searched is refetched. */
+    private search(fresh?: boolean) {
         if (this.state.searching) return;
-        // State and synced reads are captured HERE, in the tracked part, before the async work
+        // State and synced reads are captured HERE, in the tracked part, before the async work (and before the invalidation below, which would turn the listings back into loading)
         let listings = this.getListings();
-        let files = this.getSelectedFiles(listings).map(file => ({ url: file.url, name: file.name }));
+        let cachedFiles = this.getSelectedFiles(listings).map(file => ({ url: file.url, name: file.name }));
+        let urls = listings.map(listing => listing.url);
         let query = storageLogSearchParam.value;
         let { startTime, endTime, searchFromStart } = getTimeRange();
+        let synced = StorageLogsSynced(SocketFunction.browserNodeId());
+        if (fresh) {
+            invalidateStorageLogSearchCache();
+            synced.getServerLogFiles.resetAll();
+        }
         this.state.searching = true;
         this.state.error = "";
         this.state.doneFiles = 0;
-        this.state.totalFiles = files.length;
+        this.state.totalFiles = fresh ? 0 : cachedFiles.length;
         this.state.currentFile = "";
+        // Cleared up front, so anything on screen during the search is never stale results from the previous one
+        this.state.rows = [];
+        this.state.fields = [];
+        this.state.failedFiles = [];
+        this.state.durationTime = 0;
+        this.state.resultsFetchTime = 0;
         Querysub.onCommitFinished(async () => {
+            let files = cachedFiles;
+            if (fresh) {
+                // The selection has to wait for the fresh listings; a server that fails costs only its own files (its error also shows on its listing row, which refetches the same way)
+                files = [];
+                await Promise.all(urls.map(async url => {
+                    try {
+                        let listing = await synced.getServerLogFiles.promise(url);
+                        for (let file of listing.files) {
+                            if (!fileOverlapsRange(file, startTime, endTime)) continue;
+                            files.push({ url, name: file.name });
+                        }
+                    } catch (e) {
+                        console.error(`Listing log files on ${url} failed, continuing with the other servers:`, (e as Error).stack ?? e);
+                    }
+                }));
+                Querysub.commit(() => {
+                    this.state.totalFiles = files.length;
+                });
+            }
             try {
                 let result = await searchStorageLogs({
                     files,
@@ -234,7 +266,7 @@ export class StorageLogsPage extends qreact.Component {
         let selectedBytes = selectedFiles.reduce((sum, file) => sum + file.size, 0);
         let loadedListings = listings.filter(listing => listing.fetchTime);
         let oldestListingTime = loadedListings.length && Math.min(...loadedListings.map(listing => listing.fetchTime || 0)) || 0;
-        let now = Querysub.nowDelayed(timeInSecond);
+        let now = Querysub.nowDelayed(timeInMinute);
 
         // Defaults show unless explicitly toggled off, plus whatever was explicitly toggled on
         let selectedSet = new Set<string>();
@@ -328,6 +360,15 @@ export class StorageLogsPage extends qreact.Component {
                 >
                     {this.state.searching && `Searching ${this.state.doneFiles}/${this.state.totalFiles}...` || "Search"}
                 </Button>
+                <Button
+                    flavor="large"
+                    hue={120}
+                    title="Invalidates the log file listings and the cached search results, then searches"
+                    onClick={() => this.search(true)}
+                    className={this.state.searching && css.opacity(0.5) || undefined}
+                >
+                    Fresh Search
+                </Button>
             </div>
             <div className={css.vbox(4)}>
                 {listings.map(listing => {