querysub 0.298.0 → 0.300.0

package/package.json

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

@@ -34,9 +34,6 @@ export function startEdgeNotifier() {
         let { watchOnRollingUpdate } = await import("../deployManager/machineController");
         watchOnRollingUpdate({
             callback: (time) => {
-                let duration = Date.now() - time;
-                // Refresh 10% earlier, as we don't want clients to refresh RIGHT when the server shutsdown...
-                time = Date.now() + duration * 0.9;
                 void notifyClients(`forcedupdate-at-${time}`, time);
             }
         });
@@ -45,9 +42,6 @@ export function startEdgeNotifier() {
 
 let watchingClientNodes = new Set<string>();
 const notifyClients = throttleFunction(timeInMinute, async function notifyClients(liveHash: string, refreshThresholdTime: number) {
-    // Wait, so the servers have time to load the new code. We tell the servers to preload but apparently there's some kind of lag, So we'll just delay here. 
-    console.log(blue(`Waiting 30 seconds before notifying clients about liveHash ${liveHash}`));
-    await delay(30 * 1000);
     console.log(blue(`Notifying ${watchingClientNodes.size} clients about liveHash ${liveHash}`));
     await Promise.allSettled(Array.from(watchingClientNodes).map(async clientNodeId => {
         try {
@@ -63,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!
@@ -131,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();
                                         }}
                                     >