querysub 0.231.0 → 0.232.0

package/package.json

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

@@ -233,6 +233,33 @@ const ensureGitSynced = measureWrap(async function ensureGitSynced(config: {
 let launchesPerService = new Map<string, number>();
 let lastLaunchedTimePerService = new Map<string, number>();
 
+async function quickIsOutdated() {
+    let machineId = getOwnMachineId();
+    let configs = await serviceConfigs.values();
+    let relevantConfigs = configs.filter(config => config.machineIds.includes(machineId)).filter(x => x.parameters.deploy);
+    let screens = await getScreenState();
+    let root = os.homedir() + "/" + SERVICE_FOLDER;
+    for (let config of relevantConfigs) {
+        let newParametersString = JSON.stringify(config.parameters);
+        let matchedCount = config.machineIds.filter(id => id === machineId).length;
+        for (let i = 0; i < matchedCount; i++) {
+            let screenName = getScreenName({
+                serviceKey: config.parameters.key,
+                index: i,
+            });
+            let screen = screens.find(x => x.screenName === screenName);
+            if (!screen) return true;
+
+            let folder = root + config.parameters.key + "-" + i + "/";
+            let parameterPath = folder + "/parameters.json";
+            if (!fs.existsSync(parameterPath)) return true;
+            let prevParameters = await fs.promises.readFile(parameterPath, "utf8");
+            if (prevParameters !== newParametersString) return true;
+        }
+    }
+    return false;
+}
+
 const resyncServicesBase = runInSerial(measureWrap(async function resyncServices() {
     console.log(magenta("Resyncing services"));
     let machineId = getOwnMachineId();
@@ -415,6 +442,13 @@ export async function machineApplyMain() {
     await Querysub.hostService("machine-apply");
     onServiceConfigChange(resyncServices);
 
+    runInfinitePoll(timeInMinute, async () => {
+        if (await quickIsOutdated()) {
+            console.log(magenta("Likely outdated, resyncing now"));
+            await resyncServices();
+        }
+    });
+
     runInfinitePoll(timeInMinute, async () => {
         let isRunning = await isPIDRunning(parentPID);
         if (!isRunning) {

package/src/deployManager/spec.txt

@@ -1,6 +1,3 @@
-7.1) Test with a node script that ignores shutting down.
-    - in qs-cyoa, so we can just git push
-
 7) More graceful shutdown of services
     - In some way communicate that we should shut down?
     - ACTUALLY, we just ctrl+c, which... we might catch right now?