querysub 0.294.0 → 0.296.0

package/package.json

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

package/src/4-deploy/edgeClientWatcher.tsx

@@ -66,7 +66,8 @@ function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
     if (liveHash === curHash) return;
     let prevHash = curHash;
     // Don't notify the user right away. Hopefully they refresh naturally, and we never have to notify them at all!
-    let notifyIntervals = [0.4, 0.75, 1];
+    // Also, refresh BEFORE the server dies, not exactly when it is about to die
+    let notifyIntervals = [0.4, 0.75, 0.95];
     console.log(blue(`Client liveHash changed ${liveHash}, prev hash: ${prevHash}`));
     // If we are replacing an already existing notification, don't show immediately
     let skipFirst = false;

package/src/deployManager/components/ServiceDetailPage.tsx

@@ -359,9 +359,9 @@ type ServiceConfig = ${serviceConfigType}
                                 </div>
                                 {serviceInfo && (
                                     <>
-                                        <div title={formatVeryNiceDateTime(serviceInfo.lastLaunchedTime)}>
+                                        {!!serviceInfo.lastLaunchedTime && <div title={formatVeryNiceDateTime(serviceInfo.lastLaunchedTime)}>
                                             Uptime: {formatTime(now - serviceInfo.lastLaunchedTime)}
-                                        </div>
+                                        </div>}
                                         <div>
                                             Launches: {serviceInfo.totalTimesLaunched}
                                         </div>

package/src/deployManager/machineApplyMainCode.ts

@@ -349,6 +349,7 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
                 // REMOVE the nodeId file, so we the node isn't terminated!
                 await fs.promises.unlink(nodeIdPath);
                 try {
+                    console.log(green(`Triggering rolling update notification to ${nodeId} for ${screenName} at ${new Date().toLocaleString()}`));
                     await triggerRollingUpdate({
                         nodeId,
                         time: rollingFinalTime,
@@ -356,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()}`));
@@ -487,6 +490,13 @@ let lastLaunchedTimePerService = new Map<string, number>();
 
 async function quickIsOutdated() {
     let machineId = getOwnMachineId();
+    // If any rolling are ready to restart, we are outdated
+    for (let [rollingScreenName, rollingInfo] of rollingKeepScreenAlive) {
+        if (rollingInfo.pinnedTime + rollingInfo.pinnedDuration < Date.now()) {
+            console.log(red(`Rolling screen ${rollingScreenName} is finished, doing a full resync`));
+            return true;
+        }
+    }
     let configs = await serviceConfigs.values();
     let relevantConfigs = configs.filter(config => config.machineIds.includes(machineId)).filter(x => x.parameters.deploy);
     let screens = await getScreenState();
@@ -508,7 +518,6 @@ async function quickIsOutdated() {
             if (!fs.existsSync(parameterPath)) return true;
             let prevParameters = await fs.promises.readFile(parameterPath, "utf8");
             if (prevParameters !== newParametersString) return true;
-
         }
     }
     return false;

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}/`;
@@ -101,7 +102,11 @@ 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);
+        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}`));
     }
 }