querysub 0.300.0 → 0.302.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.300.0",
+  "version": "0.302.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/edgeBootstrap.ts

@@ -229,7 +229,10 @@ async function edgeNodeFunction(config: {
     // JUST use it on the first loop, so if we can't find any matches, we ignore it.
     if (liveHashOverrideObj) {
         try {
-            let liveHashOverrideObject = JSON.parse(liveHashOverrideObj);
+            let liveHashOverrideObject = JSON.parse(liveHashOverrideObj) as {
+                liveHash: string;
+                time: number;
+            };
             liveHashOverrideExpiryTime = liveHashOverrideObject.time + 1000 * 30;
             liveHashOverride = liveHashOverrideObject.liveHash;
         } catch (e: any) {

package/src/4-deploy/edgeClientWatcher.tsx

@@ -87,9 +87,11 @@ function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
             if (i < notifyIntervals.length - 2 && waitDuration <= 30 * 1000) continue;
 
             // Update the URL override for manual refreshes
-            Querysub.localCommit(() => {
-                liveHashOverrideURL.value = { liveHash, time: Date.now() };
-            });
+            if (!liveHash.startsWith("forced")) {
+                Querysub.localCommit(() => {
+                    liveHashOverrideURL.value = { liveHash, time: Date.now() };
+                });
+            }
             if (!skipFirst) {
                 if (currentNotification) {
                     currentNotification.close();

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,9 +1,17 @@
-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
 
+1) Auto restart if the connect to the cyoa server is down, after 30 seconds, instead of just infinitely erroring out.
+    - Give a notification after 15 seconds warning them, with the ability to not restart if they click "do not restart"
+    - In edgeClientWatcher
+
+
+9) In machine info, support an object which can show current, and max, so we can show it as a bar and the max amount for:
+    RAM
+    CPU
+    DISK
+
 10) Add RAM total, ram % used, cpu count, CPU %, disk size, disk % used to machine info
     - Show this all in the list page, with nice bars?
         - Filled, but the total size will also depend on the maximum (to a degree), so it's very nice.
@@ -11,4 +19,5 @@ Hmm... our cyoa servers are dying very fast... why?
     (Yes, it overlaps with node metrics, but that's okay, sometimes we want to look at machines, other times services, and the types of errors that show up in either changes).
 
 
-11) Restart the server and verify everything starts up nicely on reboot!
+11) Restart the server and verify everything starts up nicely on reboot!
+    - Or... screw it, and move onto audio apis...