querysub 0.389.0 → 0.391.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.389.0",
+  "version": "0.391.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

@@ -705,6 +705,12 @@ const resyncServicesBase = runInSerial(measureWrap(async function resyncServices
                 let sameParameters = prevParameters === newParametersString;
                 let screenIsRunning = screenStateMap.get(screenName)?.isProcessRunning;
 
+                let nodePathId = folder + SERVICE_NODE_FILE_NAME;
+                if (await fsExistsAsync(nodePathId)) {
+                    let nodeId = await fs.promises.readFile(nodePathId, "utf8");
+                    machineInfo.services[config.serviceId].nodeId = nodeId;
+                }
+
                 if (sameParameters && screenIsRunning) {
                     console.log(green(`Verified ${magenta(screenName)} is running`));
                     continue;
@@ -714,12 +720,6 @@ const resyncServicesBase = runInSerial(measureWrap(async function resyncServices
 
                 await fs.promises.writeFile(parameterPath, newParametersString);
 
-                let nodePathId = folder + SERVICE_NODE_FILE_NAME;
-                if (await fsExistsAsync(nodePathId)) {
-                    let nodeId = await fs.promises.readFile(nodePathId, "utf8");
-                    machineInfo.services[config.serviceId].nodeId = nodeId;
-                }
-
                 await runScreenCommand({
                     screenName,
                     command: config.parameters.command,
@@ -862,7 +862,7 @@ export async function machineApplyMain() {
     await Querysub.hostService("machine-apply");
     onServiceConfigChange(resyncServices);
 
-    runInfinitePoll(timeInMinute, async () => {
+    runInfinitePoll(timeInMinute * 3, async () => {
         //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...

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

@@ -205,6 +205,8 @@ DO NOT include variables. If something is some dynamic path that includes number
 
 The string must be exactly included. You can't stitch together pieces, it will be checked for with .includes() in javascript.
 
+Also, you will be searching the JSON stringified version of this string. So for example, if there's a ", you're going to have to search with it escaped. So you're going to have to search \\" quote. 
+
 Respond with a JSON object with a "pattern" field containing the search string.`;
 
     const response = await callOpenRouterJSON<PatternResponse>(openRouterAPIKey, prompt);
@@ -322,41 +324,40 @@ export async function exposeErrorWatchService() {
                     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) continue;
 
-            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 (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);
+            } else {
+                queueDiscordNotification(matchedSuppressionId, 1, false);
             }
+
+            void ErrorNotificationService.triggerUnmatchedError(error);
         } catch (error) {
             console.warn("Error in watch loop:", error);
         }

package/src/diagnostics/logs/lifeCycleAnalysis/lifeCycles.tsx

@@ -23,9 +23,7 @@ IMPORTANT! Now I am properly calling shutdown, so none of the streamed logs shou
 //todonext
 
 
-2) One of the cyoa instances... does not exist? I think the tmux screen might be in a bad state?
-    - Maybe... our collection has... duplicates, and/or, references something broken? Because... tmux ls looks fine to me...
-        - In the deployed machines list, we should really show the screen name. Don't we know the screen name? Isn't that the only way we know it's deployed to that machine? 
+
 3) "guessed node id" is never working? At least, on the machine's page it is ALWAYS empty, even though it should be almost always detected...
 
 4) Verify it works again, when we have multiple servers