querysub 0.295.0 → 0.297.0

package/package.json

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

@@ -357,6 +357,8 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
                 } catch (e: any) {
                     console.warn(`Error triggering rolling update notification to ${nodeId} for ${screenName}: ${e.stack}`);
                 }
+            } else {
+                console.log(red(`No nodeId file found for ${screenName}, not triggering rolling update notification`));
             }
             let rollingScreenName = screenName + "-rolling" + SCREEN_SUFFIX;
             console.log(green(`Renaming screen ${screenName} to ${rollingScreenName} for rolling interval ${config.rollingWindow} at ${new Date().toLocaleString()}`));

package/src/deployManager/machineSchema.ts

@@ -22,6 +22,7 @@ import { isNode } from "typesafecss";
 import { DeployProgress, deployFunctions, deployGetFunctions } from "../4-deploy/deployFunctions";
 import { FunctionSpec, functionSchema } from "../3-path-functions/PathFunctionRunner";
 import { Querysub } from "../4-querysub/QuerysubController";
+import { green, red } from "socket-function/src/formatting/logColors";
 
 const SERVICE_FOLDER_NAME = "machine-services";
 export const SERVICE_FOLDER = `${SERVICE_FOLDER_NAME}/`;
@@ -100,8 +101,12 @@ export function doRegisterNodeForMachineCleanup() {
 async function registerNodeForMachineCleanup(nodeId: string) {
     let currentPath = path.resolve(".").replaceAll("\\", "/");
     let array = currentPath.split("/");
-    if (array.at(-1) === "git" && array.at(-2) === SERVICE_FOLDER_NAME) {
-        await fs.promises.writeFile(array.slice(0, -2).join("/") + "/" + SERVICE_NODE_FILE_NAME, nodeId);
+    if (array.at(-1) === "git" && array.at(-3) === SERVICE_FOLDER_NAME) {
+        let nodeIdPath = array.slice(0, -1).join("/") + "/" + SERVICE_NODE_FILE_NAME;
+        console.log(green(`Registering node for machine cleanup at ${nodeIdPath}`));
+        await fs.promises.writeFile(nodeIdPath, nodeId);
+    } else {
+        console.log(red(`Not registering node for machine cleanup because we are not in the service folder: ${currentPath}`));
     }
 }