querysub 0.689.0 → 0.690.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.689.0",
+  "version": "0.690.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/bufferSearchFindMatcher.ts

@@ -109,6 +109,12 @@ function getSimplerStructure(structure: MatchStructure): Buffer[][] {
 }
 export const createMatchesPatternCached = cacheLimited(1000, (pattern: string) => createMatchesPattern(Buffer.from(pattern), false));
 
+// Suppression patterns are usually copied out of a UI that renders multi-line errors on a single line, so the copied text has plain spaces where the real error has line breaks and indentation — those patterns can never match unless whitespace is collapsed on both sides. The matched subject is JSON-stringified, where whitespace appears as escape sequences rather than raw bytes, so both forms collapse to one space. This must NOT be applied to log-index searches: the on-disk index units are built from the raw bytes, so a normalized query would miss them.
+const WHITESPACE_OR_JSON_ESCAPED_WHITESPACE_RUN = /(?:\s|\\n|\\r|\\t)+/g;
+export function normalizeMatchWhitespace(text: string): string {
+    return text.replace(WHITESPACE_OR_JSON_ESCAPED_WHITESPACE_RUN, " ");
+}
+
 // Each WILD_CARD_BYTE in pattern acts as a multi-byte wildcard: the segments on either
 // side must appear in order somewhere within buffer.
 // Returns a function that matches buffers against the pre-processed pattern.

package/src/diagnostics/logs/errorNotifications2/ErrorNotificationPage.tsx

@@ -10,7 +10,7 @@ import { isPublic } from "../../../config";
 import { MachineThreadInfo } from "../../MachineThreadInfo";
 import { ErrorWarning } from "./ErrorWarning";
 import { getErrorNotificationsManager } from "./errorWatcher";
-import { createMatchesPattern } from "../IndexedLogs/bufferSearchFindMatcher";
+import { createMatchesPattern, normalizeMatchWhitespace } from "../IndexedLogs/bufferSearchFindMatcher";
 import { cacheLimited } from "socket-function/src/caching";
 import { managementPageURL, showingManagementURL } from "../../managementPages";
 import { searchTextURL, readProductionLogsURL } from "../IndexedLogs/LogViewerParams";
@@ -58,9 +58,13 @@ function TicketButton(props: {
 qreact.inline(TicketButton);
 
 export let getMatcher = cacheLimited(100, (pattern: string) =>
-    createMatchesPattern(Buffer.from(pattern), false)
+    createMatchesPattern(Buffer.from(normalizeMatchWhitespace(pattern)), false)
 );
 
+export function getMatchBuffer(datum: LogDatum): Buffer {
+    return Buffer.from(normalizeMatchWhitespace(JSON.stringify(datum)));
+}
+
 export class LogDatumRenderer extends qreact.Component<{
     datum: LogDatum;
     inlineMode?: boolean;
@@ -81,7 +85,7 @@ export class LogDatumRenderer extends qreact.Component<{
         if (!this.manager.state.isLoading && !this.props.hideSuppression) {
             for (let suppression of this.manager.state.suppressionEntries) {
                 let matcher = getMatcher(suppression.pattern);
-                let errorBuffer = Buffer.from(JSON.stringify(datum));
+                let errorBuffer = getMatchBuffer(datum);
                 if (matcher(errorBuffer)) {
                     matchingSuppressions.push(suppression);
                 }
@@ -461,7 +465,7 @@ class SuppressionItem extends qreact.Component<{
                         if (example) return example;
                         // No example recorded for this suppression — find any live error matching the pattern, so the ticket stores a real, full log entry instead of a synthetic stub.
                         let matcher = getMatcher(suppression.pattern);
-                        let fallback = this.manager.state.unmatchedErrors.find(e => matcher(Buffer.from(JSON.stringify(e))));
+                        let fallback = this.manager.state.unmatchedErrors.find(e => matcher(getMatchBuffer(e)));
                         return fallback || {
                             time: Date.now(),
                             __LOG_TYPE: "error",

package/src/diagnostics/logs/errorNotifications2/ErrorWarning.tsx

@@ -4,7 +4,7 @@ import { css } from "typesafecss";
 import { SocketFunction } from "socket-function/SocketFunction";
 import { ATag } from "../../../library-components/ATag";
 import { managementPageURL, showingManagementURL } from "../../managementPages";
-import { getMatcher, LogDatumRenderer } from "./ErrorNotificationPage";
+import { getMatcher, getMatchBuffer, LogDatumRenderer } from "./ErrorNotificationPage";
 import { getErrorNotificationsManager } from "./errorWatcher";
 import { LogDatum } from "../diskLogger";
 import { TicketsController } from "../errorTickets/tickets";
@@ -58,7 +58,7 @@ export class ErrorWarning extends qreact.Component {
             openTicketPatterns.push(ticket.suppressionPattern);
         }
         const isCoveredByOpenTicket = (datum: LogDatum) => {
-            let errorBuffer = Buffer.from(JSON.stringify(datum));
+            let errorBuffer = getMatchBuffer(datum);
             return openTicketPatterns.some(pattern => getMatcher(pattern)(errorBuffer));
         };
 

package/src/diagnostics/logs/errorNotifications2/errorNotifications.ts

@@ -3,7 +3,7 @@ import { archiveJSONT } from "../../../-a-archives/archivesJSONT";
 import { Querysub } from "../../../4-querysub/Querysub";
 import { getDomain, isPublic } from "../../../config";
 import { MachineInfo } from "../../../deployManager/machineSchema";
-import { createMatchesPattern } from "../IndexedLogs/bufferSearchFindMatcher";
+import { createMatchesPattern, normalizeMatchWhitespace } from "../IndexedLogs/bufferSearchFindMatcher";
 import { LogDatum, getErrorLogs } from "../diskLogger";
 import { watchAllValues } from "./logWatcher";
 import { batchFunction, runInSerial, runInfinitePollCallAtStart } from "socket-function/src/batching";
@@ -55,7 +55,7 @@ export async function getSuppressionEntries(): Promise<SuppressionEntry[]> {
     return await suppression.values();
 }
 
-let getMatcher = cacheLimited(10000, (text: string) => createMatchesPattern(Buffer.from(text), false));
+let getMatcher = cacheLimited(10000, (text: string) => createMatchesPattern(Buffer.from(normalizeMatchWhitespace(text)), false));
 
 // The watch loop checks every incoming error against the suppression list. Reading the suppression archive once per error produced thousands of storage listings per minute, so the hot path is served from a cached copy: the first pass tolerates 15 minute staleness, and only errors that pass unsuppressed force a fresher (30 second) re-read.
 const SUPPRESSION_CACHE_TTL = timeInMinute * 15;
@@ -89,7 +89,7 @@ function invalidateSuppressionEntriesCaches() {
 
 // Side-effect-free version of applySuppression's "suppressed" verdict, for deciding which entry set the watch loop should apply against.
 function isSuppressedByAny(error: LogDatum, suppressionEntries: SuppressionEntry[]): boolean {
-    let errorBuffer = Buffer.from(JSON.stringify(error));
+    let errorBuffer = Buffer.from(normalizeMatchWhitespace(JSON.stringify(error)));
     for (let suppressionEntry of suppressionEntries) {
         let isMatch = getMatcher(suppressionEntry.pattern);
         if (isMatch(errorBuffer) && error.time <= suppressionEntry.timeout) {
@@ -125,7 +125,7 @@ export function getChunkEndTime(chunk: number) {
 type SuppressionStatus = "suppressed" | "matched-timeout-passed" | "no-match";
 
 function applySuppression(error: LogDatum, suppressionEntry: SuppressionEntry): SuppressionStatus {
-    let errorBuffer = Buffer.from(JSON.stringify(error));
+    let errorBuffer = Buffer.from(normalizeMatchWhitespace(JSON.stringify(error)));
     let isMatch = getMatcher(suppressionEntry.pattern);
     if (!isMatch(errorBuffer)) return "no-match";