querysub 0.299.0 → 0.301.0

package/package.json

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

@@ -57,7 +57,7 @@ const notifyClients = throttleFunction(timeInMinute, async function notifyClient
 let currentNotification: { close: () => void } | null = null;
 let curHash = "";
 function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
-    console.log(blue(`Client liveHash changed ${liveHash}, prev hash: ${curHash}`));
+    console.log(blue(`Received client liveHash ${liveHash}, prev hash: ${curHash}`));
     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!
@@ -125,9 +125,11 @@ function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
                                     <button
                                         className={css.pad(8, 16).hsl(200, 50, 50).color("white").pointer}
                                         onClick={(e) => {
-                                            Querysub.localCommit(() => {
-                                                liveHashOverrideURL.value = { liveHash, time: Date.now() };
-                                            });
+                                            if (!liveHash.startsWith("forced")) {
+                                                Querysub.localCommit(() => {
+                                                    liveHashOverrideURL.value = { liveHash, time: Date.now() };
+                                                });
+                                            }
                                             window.location.reload();
                                         }}
                                     >

package/src/deployManager/machineApplyMainCode.ts

@@ -340,6 +340,13 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
         if (rollingObj) {
             rollingObj.pinnedDuration = config.rollingWindow;
         }
+        // Without this check we might have only 1 service up for a long period of time. I guess even with it we can still have only 1 service up for a long period of time (if the rolling window is alive, but barely), but... idk... this seems better?
+        if (rollingObj && rollingObj.pinnedTime + rollingObj.pinnedDuration < Date.now()) {
+            console.log(red(`Rolling screen ${screenName} is finished, deleting it, it should be killed shortly`));
+            rollingKeepScreenAlive.delete(screenName);
+            rollingScreens.delete(rollingObj.rollingScreenName);
+            rollingObj = undefined;
+        }
         let existingScreen = screens.find(x => x.screenName === screenName);
         if (existingScreen && !rollingObj) {
             let nodeIdPath = os.homedir() + "/" + SERVICE_FOLDER + screenName + "/" + SERVICE_NODE_FILE_NAME;

package/src/deployManager/spec.txt

@@ -1,5 +1,3 @@
-Hmm... our cyoa servers are dying very fast... why?
-
 1) Verify clientside notifications work when we rolling update cyoa
 2) Verify edge nodes are removed when we rolling update cyoa
 3) Update cyoa rolling time back to 4 hours