querysub 0.449.0 → 0.451.0

package/package.json

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

package/src/0-path-value-core/pathValueArchives.ts

@@ -19,10 +19,18 @@ import { safeLoop } from "socket-function/src/batching";
 import { errorToUndefined } from "../errors";
 import { shutdown } from "../diagnostics/periodic";
 
-export const archives = lazy(() => wrapArchivesWithCache(getArchives("path-values/")));
+// Kept separate from the cache-wrapped `archives` so we can probe the underlying archives
+//  directly (without the cache layer in the way) when diagnosing missing-file failures.
+const archivesBase = lazy(() => getArchives("path-values/"));
+export const archives = lazy(() => wrapArchivesWithCache(archivesBase()));
 export const archivesLocks = lazy(() => getArchives("path-values-locks/"));
 export const archivesRecycleBin = lazy(() => wrapArchivesWithCache(getArchives("path-values-recycle-bin/")));
 
+// If getInfo reports a just-written file as missing, recheck a few times before treating it
+//  as a fatal "written too slowly" condition.
+const ARCHIVE_INFO_RECHECK_ATTEMPTS = 5;
+const ARCHIVE_INFO_RECHECK_DELAY = 5000;
+
 export type RawValuePaths = {
     dataPath: string;
     values: PathValue[];
@@ -218,8 +226,33 @@ export class PathValueArchives {
             let fileInfo = await archives().getInfo(fullPath);
             // NOTE: If no fileInfo... then our file was merged? Which... is BAD, as it means we took
             //      too long to read it, so we probably took too long to write it too!
+            for (let attempt = 0; !fileInfo && attempt < ARCHIVE_INFO_RECHECK_ATTEMPTS; attempt++) {
+                await delay(ARCHIVE_INFO_RECHECK_DELAY);
+                fileInfo = await archives().getInfo(fullPath);
+            }
             if (!fileInfo || fileInfo.writeTime > slowestFileWriteTime) {
-                console.error(red(`File ${fullPath} was written too slowly, ${fileInfo?.writeTime || "undefined"} < ${slowestFileWriteTime}. This means some values will be rejected by reads. Killing server, our state is irrecoverable. Our watches have invalid data, and we have to stop before we create more invalid dependencies.`));
+                // If we're crashing because getInfo reports the file as missing, probe the
+                //  underlying (non-cached) archives -- both getInfo and an actual get() of the
+                //  bytes -- and record the results in the crash log, so we can tell whether that
+                //  info is consistent. We do NOT use this as a fallback; we still crash.
+                let missingDiagnostic = "";
+                if (!fileInfo) {
+                    let baseInfoStr: string;
+                    try {
+                        baseInfoStr = JSON.stringify(await archivesBase().getInfo(fullPath)) ?? "undefined";
+                    } catch (e) {
+                        baseInfoStr = `threw ${(e as Error).stack ?? e}`;
+                    }
+                    let baseGetStr: string;
+                    try {
+                        let baseData = await archivesBase().get(fullPath);
+                        baseGetStr = baseData ? `${baseData.byteLength}B` : "undefined";
+                    } catch (e) {
+                        baseGetStr = `threw ${(e as Error).stack ?? e}`;
+                    }
+                    missingDiagnostic = ` [underlying archives probe: getInfo=${baseInfoStr}, get=${baseGetStr}, expected ${data.byteLength}B]`;
+                }
+                console.error(red(`File ${fullPath} was written too slowly, ${fileInfo?.writeTime || "undefined"} < ${slowestFileWriteTime}.${missingDiagnostic} This means some values will be rejected by reads. Killing server, our state is irrecoverable. Our watches have invalid data, and we have to stop before we create more invalid dependencies.`));
                 await delay(5000);
                 try {
                     await shutdown();

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

@@ -24,7 +24,7 @@ import { atomic } from "../../../2-proxy/PathValueProxyWatcher";
 import { magenta } from "socket-function/src/formatting/logColors";
 
 
-type SuppressionEntry = {
+export type SuppressionEntry = {
     id: string;
     notes?: string;
     pattern: string;
@@ -35,7 +35,7 @@ type SuppressionEntry = {
     createdTime: number;
     lastUpdatedTime: number;
 };
-const suppression = archiveJSONT<SuppressionEntry>(() => nestArchives("logs/error-suppression/", getArchivesBackblaze(getDomain())));
+export const suppression = archiveJSONT<SuppressionEntry>(() => nestArchives("logs/error-suppression/", getArchivesBackblaze(getDomain())));
 let suppressionCache: SuppressionEntry[] = [];
 
 // In-memory Discord notification throttling

package/src/diagnostics/managementPages.tsx

@@ -40,6 +40,7 @@ let pages: {
     componentName: string;
     title: string;
 }[] = [];
+let headerNotifications: preact.ComponentClass[] = [];
 
 let __schema: SchemaObject<unknown, {
     isManagementUser: () => boolean;
@@ -63,6 +64,9 @@ export async function registerManagementPages2(config: {
         controllerName?: string;
         getModule: () => Promise<any>;
 
+        // If provided, this component (exported from getModule) is rendered in the management header.
+        notificationComponentName?: string;
+
         title?: string;
     }[];
 }) {
@@ -240,6 +244,9 @@ export async function registerManagementPages2(config: {
                 componentName: page.componentName,
                 componentClass: createLazyComponent(page.getModule)(page.componentName),
             });
+            if (page.notificationComponentName) {
+                headerNotifications.push(createLazyComponent(page.getModule)(page.notificationComponentName));
+            }
         }
     }
 }
@@ -355,6 +362,7 @@ class ManagementRoot extends qreact.Component {
                     </style>
                     <div class={css.fillWidth.hbox(20, 4).wrap.hsl(245, 25, 80).pad2(20, 4).pointerEvents("all")}>
                         <ErrorWarning />
+                        {headerNotifications.map(N => <N />)}
                         <ATag values={[
                             managementPageURL.getOverride("MachinesPage"),
                             currentViewParam.getOverride("services"),