querysub 0.261.0 → 0.263.0

package/package.json

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

@@ -32,7 +32,7 @@ export function startEdgeNotifier() {
 }
 
 let watchingClientNodes = new Set<string>();
-const notifyClients = throttleFunction(timeInMinute * 5, async function notifyClients(liveHash: string, refreshThresholdTime: number) {
+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);
@@ -67,21 +67,30 @@ function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
     // Start notification loop
     void (async () => {
         // Show notifications at intervals
-        for (let i = 0; i < notifyIntervals.length; i++) {
+        for (let i = 0; i < notifyIntervals.length - 1; i++) {
             // Don't show if a newer notification is active
             if (curHash !== liveHash) return;
 
             let waitDuration = (notifyIntervals[i + 1] - notifyIntervals[i]) * refreshThresholdTime;
-            if (i >= notifyIntervals.length - 1 && waitDuration <= 30 * 1000) continue;
+            // If the duration is short, and it's not the last one, skip it
+            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 (!skipFirst) {
+                if (currentNotification) {
+                    currentNotification.close();
+                    currentNotification = null;
+                }
                 // Show notification modal
-                currentNotification = {
+                let nextNotification = {
                     close: showModal({
+                        onClose: () => {
+                            if (currentNotification !== nextNotification) return;
+                            currentNotification = null;
+                        },
                         content: (
                             <div
                                 title={`Live Hash: ${liveHash}, prev hash: ${prevHash}`}
@@ -92,11 +101,14 @@ function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
                                         .bottom(10)
                                         .right(10)
                                         .zIndex(1000)
+                                    + " keepModalsOpen"
                                 }
                             >
                                 <div className={css.vbox(10).maxWidth(250)}>
                                     <h3 className={css.margin(0)}>Server Update Available</h3>
                                     <div>The server has been updated. Please refresh the page to ensure you don't experience incompatibility issues.</div>
+                                    {i !== notifyIntervals.length - 2 && <div>This notification will be shown again in {formatTime(waitDuration)}</div>}
+                                    {i === notifyIntervals.length - 2 && <div>The page will automatically refresh in {formatTime(waitDuration)}</div>}
                                 </div>
                                 <div className={css.hbox(10).justifyContent("flex-end")}>
                                     <button
@@ -126,6 +138,7 @@ function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
                         )
                     }).close
                 };
+                currentNotification = nextNotification;
             }
             skipFirst = false;
 
@@ -133,9 +146,6 @@ function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
             await delay(waitDuration);
         }
 
-        console.log(red(`Force refresh after 30 seconds`));
-        await delay(30 * 1000);
-
         // Only force refresh if this is still the current notification
         if (curHash === liveHash) {
             window.location.reload();

package/src/deployManager/components/DeployPage.tsx

@@ -268,6 +268,7 @@ export class DeployPage extends qreact.Component {
             <div className={css.hbox(10)}>
                 <UpdateButtons services={[]} />
                 <button
+                    disabled={controller.isAnyLoading()}
                     className={buttonStyle.alignSelf("stretch").center.hsl(240, 70, 50).colorhsl(0, 0, 100)
                         + (anyUncommitted && css.opacity(0.5))
                         + (this.state.isDeploying && css.opacity(0.7))

package/src/deployManager/components/DeployProgressView.tsx

@@ -2,6 +2,7 @@ import { css } from "typesafecss";
 import { qreact } from "../../4-dom/qreact";
 import { formatDateJSX } from "../../misc/formatJSX";
 import { formatTime } from "socket-function/src/formatting/format";
+import { Querysub } from "../../4-querysub/QuerysubController";
 
 module.hotreload = true;
 
@@ -36,7 +37,7 @@ export function DeployProgressView({ stages, isDeploying, deploySuccess, deployS
 }) {
     if (!isDeploying && !deploySuccess) return null;
 
-    const now = Date.now();
+    const now = Querysub.timeDelayed(1000);
     const elapsed = (deployEndTime || now) - (deployStartTime || now);
 
     // Separate pending and finished stages