querysub 0.387.0 → 0.389.0

package/package.json

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

package/src/deployManager/machineApplyMainCode.ts

@@ -863,18 +863,18 @@ export async function machineApplyMain() {
     onServiceConfigChange(resyncServices);
 
     runInfinitePoll(timeInMinute, async () => {
-        console.log(magenta(`Quick outdated check at ${new Date().toISOString()}`));
-        if (await quickIsOutdated()) {
-            console.log(magenta("Likely outdated, resyncing now"));
-            await resyncServices();
-        } else {
-            let config = await machineInfos.get(getOwnMachineId());
-            if (config) {
-                config.heartbeat = Date.now();
-                console.log(magenta(`Updating heartbeat for ${getOwnMachineId()} to ${config.heartbeat}`));
-                await machineInfos.set(getOwnMachineId(), config);
-            }
-        }
+        //console.log(magenta(`Quick outdated check at ${new Date().toISOString()}`));
+        // console.log(magenta("Likely outdated, resyncing now"));
+        // NOTE: I'm not sure why we were hesitant to call this. It shouldn't be that slow...
+        await resyncServices();
+        // } else {
+        //     let config = await machineInfos.get(getOwnMachineId());
+        //     if (config) {
+        //         config.heartbeat = Date.now();
+        //         console.log(magenta(`Updating heartbeat for ${getOwnMachineId()} to ${config.heartbeat}`));
+        //         await machineInfos.set(getOwnMachineId(), config);
+        //     }
+        // }
     });
 
     runInfinitePoll(timeInMinute, async () => {

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

@@ -201,6 +201,10 @@ Please provide a SHORT search string that would match this type of error. The st
 - Be generic enough to match similar errors (avoid dynamic values like timestamps, IDs, or specific numbers)
 - Be a simple substring (no special operators)
 
+DO NOT include variables. If something is some dynamic path that includes numbers, etc., definitely do not include that in the match pattern. That is a very, very bad match pattern.
+
+The string must be exactly included. You can't stitch together pieces, it will be checked for with .includes() in javascript.
+
 Respond with a JSON object with a "pattern" field containing the search string.`;
 
     const response = await callOpenRouterJSON<PatternResponse>(openRouterAPIKey, prompt);
@@ -303,54 +307,58 @@ export async function exposeErrorWatchService() {
 
     let errorLogs = await getErrorLogs();
     for await (let error of watchAllValues(errorLogs)) {
-        let suppressionEntries = await getSuppressionEntries();
-        let suppressed = false;
-        let matchedSuppressionId: string | undefined = undefined;
-
-        for (let suppressionEntry of suppressionEntries) {
-            let status = applySuppression(error, suppressionEntry);
-            if (status === "suppressed" || status === "matched-timeout-passed") {
-                matchedSuppressionId = suppressionEntry.id;
-                void ErrorNotificationService.triggerSuppressionUpdate(suppressionEntry.id);
-            }
-            if (status === "suppressed") {
-                suppressed = true;
+        try {
+            let suppressionEntries = await getSuppressionEntries();
+            let suppressed = false;
+            let matchedSuppressionId: string | undefined = undefined;
+
+            for (let suppressionEntry of suppressionEntries) {
+                let status = applySuppression(error, suppressionEntry);
+                if (status === "suppressed" || status === "matched-timeout-passed") {
+                    matchedSuppressionId = suppressionEntry.id;
+                    void ErrorNotificationService.triggerSuppressionUpdate(suppressionEntry.id);
+                }
+                if (status === "suppressed") {
+                    suppressed = true;
+                }
             }
-        }
 
-        console.log(`Watch loop received error, ${suppressed ? "suppressed" : "not suppressed"}, matched suppression id: ${matchedSuppressionId}: ${error.param0}`);
+            console.log(`Watch loop received error, ${suppressed ? "suppressed" : "not suppressed"}, matched suppression id: ${matchedSuppressionId}: ${error.param0}`);
 
-        if (suppressed && matchedSuppressionId) {
-            queueDiscordNotification(matchedSuppressionId, 1, false);
-        } else if (!suppressed) {
-            if (unmatchedErrors.length > unmatchedIndex) {
-                unmatchedErrors[unmatchedIndex] = error;
-                unmatchedIndex = (unmatchedIndex + 1) % MAX_UNMATCHED;
-            } else {
-                unmatchedErrors.push(error);
-            }
+            if (suppressed && matchedSuppressionId) {
+                queueDiscordNotification(matchedSuppressionId, 1, false);
+            } else if (!suppressed) {
+                if (unmatchedErrors.length > unmatchedIndex) {
+                    unmatchedErrors[unmatchedIndex] = error;
+                    unmatchedIndex = (unmatchedIndex + 1) % MAX_UNMATCHED;
+                } else {
+                    unmatchedErrors.push(error);
+                }
 
-            if (!matchedSuppressionId) {
-                const pattern = await generatePatternForError(error);
-                if (pattern) {
-                    const newEntry: SuppressionEntry = {
-                        id: nextId(),
-                        pattern,
-                        timeout: 0,
-                        createdTime: Date.now(),
-                        lastUpdatedTime: Date.now(),
-                    };
-
-                    suppressionCache.push(newEntry);
-                    void suppression.set(newEntry.id, newEntry);
-                    applySuppression(error, newEntry);
-                    queueDiscordNotification(newEntry.id, 1, true);
-
-                    void ErrorNotificationService.triggerSuppressionUpdate(newEntry.id);
+                if (!matchedSuppressionId) {
+                    const pattern = await generatePatternForError(error);
+                    if (pattern) {
+                        const newEntry: SuppressionEntry = {
+                            id: nextId(),
+                            pattern,
+                            timeout: 0,
+                            createdTime: Date.now(),
+                            lastUpdatedTime: Date.now(),
+                        };
+
+                        suppressionCache.push(newEntry);
+                        void suppression.set(newEntry.id, newEntry);
+                        applySuppression(error, newEntry);
+                        queueDiscordNotification(newEntry.id, 1, true);
+
+                        void ErrorNotificationService.triggerSuppressionUpdate(newEntry.id);
+                    }
                 }
-            }
 
-            void ErrorNotificationService.triggerUnmatchedError(error);
+                void ErrorNotificationService.triggerUnmatchedError(error);
+            }
+        } catch (error) {
+            console.warn("Error in watch loop:", error);
         }
     }
 }