querysub 0.581.0 → 0.583.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.581.0",
+  "version": "0.583.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -71,7 +71,7 @@
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
     "peggy": "^5.0.6",
-    "sliftutils": "^1.7.50",
+    "sliftutils": "^1.7.53",
     "socket-function": "^1.2.26",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",

package/src/deployManager/components/RouteConfigView.tsx

@@ -28,7 +28,8 @@ const PAST_COLOR = { h: 0, s: 0, l: 90 };
 const FUTURE_COLOR = { h: 45, s: 80, l: 85 };
 // Windows are days or hours wide, so the countdown only has to be roughly right
 const TIME_REFRESH_INTERVAL = 60 * 1000;
-const WATCH_POLL_INTERVAL = 60 * 1000;
+// Watching exists to see a config change as it happens - a deploy or a server disagreeing with the others - so it polls far faster than the window countdowns need to update
+const WATCH_POLL_INTERVAL = 5 * 1000;
 const WATCH_ACTIVE_COLOR = { h: 195, s: 60, l: 85 };
 const WINDOW_HEADER_SIZE = 13;
 const WINDOW_TIME_SIZE = 14;
@@ -513,7 +514,8 @@ class RouteConfigGroupView extends qreact.Component<{ group: RouteConfigGroup }>
 class LiveWatchView extends qreact.Component<{ watchKey: string; watch: LiveWatch }> {
     render() {
         let { watchKey, watch } = this.props;
-        let now = Querysub.timeDelayed(TIME_REFRESH_INTERVAL);
+        // Ticks with the polling, not with the window countdowns - "updated 1 minute ago" on something refreshed seconds ago reads as broken
+        let now = Querysub.timeDelayed(WATCH_POLL_INTERVAL);
         let sources = (watch.routing?.sources || []).map(normalizeSource);
         return <div className={css.vbox(10).fillWidth.pad2(10, 8).bord2(WATCH_ACTIVE_COLOR.h, WATCH_ACTIVE_COLOR.s, WATCH_ACTIVE_COLOR.l - 25)}>
             <div className={css.hbox(8).wrap.fontSize(WINDOW_HEADER_SIZE)}>

package/src/deployManager/components/ServiceDetailPage.tsx

@@ -17,7 +17,7 @@ import { getPathStr2 } from "../../path";
 import { ATag, Anchor } from "../../library-components/ATag";
 import { ScrollOnMount } from "../../library-components/ScrollOnMount";
 import { PrimitiveDisplay } from "../../diagnostics/logs/ObjectDisplay";
-import { RenderGitRefInfo, UpdateServiceButtons, bigEmoji, buttonStyle } from "./deployButtons";
+import { RenderGitRefInfo, UpdateServiceButtons, bigEmoji, buttonStyle, confirmNoOverlapDeploy } from "./deployButtons";
 import { TypedConfigEditor } from "../../library-components/TypedConfigEditor";
 import { managementPageURL } from "../../diagnostics/managementPages";
 import { getLogViewerParams } from "../../diagnostics/logs/IndexedLogs/LogViewerParams";
@@ -645,7 +645,9 @@ export class ServiceDetailPage extends qreact.Component {
                             disabled={this.state.isDeploying}
                             title="Deploys now AND shuts the old instances down as soon as the new ones are up (overlap of 0)"
                             onClick={() => {
-                                this.deployConfig(makeDeployConfig(0));
+                                confirmNoOverlapDeploy("Deploy, No Overlap", () => {
+                                    this.deployConfig(makeDeployConfig(0));
+                                });
                             }}>
                             Deploy, No Overlap
                         </button>

package/src/deployManager/components/deployButtons.tsx

@@ -12,6 +12,7 @@ import { MachineController } from "../machineController";
 import { deepCloneJSON } from "socket-function/src/misc";
 import { unique } from "../../misc";
 import { CommitModal } from "./CommitModal";
+import { closeAllModals } from "../../5-diagnostics/Modal";
 
 module.hotreload = true;
 
@@ -71,6 +72,40 @@ export class RenderGitRefInfo extends qreact.Component<{
 
 export const buttonStyle = css.pad2(12, 8).button.bord2(0, 0, 20).fontWeight("bold").vbox(2).alignItems("center");
 
+/** Confirms a no-overlap deploy. It is worth interrupting for because the thing it buys is smaller than it looks: the old instances still get their shutdown while the new ones are up, so it trades minutes of overlap for seconds of it rather than removing overlap at all. */
+class NoOverlapConfirmModal extends qreact.Component<{ actionLabel: string; onConfirm: () => void }> {
+    render() {
+        return <div className={css.vbox(14).maxWidth(560)}>
+            <div className={css.fontSize(18).boldStyle}>Shut the old instances down immediately?</div>
+            <div>
+                This does not give you a clean cut over. The new instances are already up before the old ones are told to stop, and stopping is not instant, so there is still a few seconds of overlap either way.
+            </div>
+            <div>
+                Since the overlap cannot be avoided, deploying normally — and letting the old instances run for {formatTime(DEFAULT_OVERLAP_TIME)} — is usually the better choice.
+            </div>
+            <div className={css.hbox(10)}>
+                <button
+                    className={buttonStyle.hsl(0, 85, 70)}
+                    onClick={() => {
+                        closeAllModals();
+                        this.props.onConfirm();
+                    }}
+                >
+                    {this.props.actionLabel}
+                </button>
+                <button className={buttonStyle.hsl(0, 0, 90)} onClick={() => closeAllModals()}>
+                    Cancel
+                </button>
+            </div>
+        </div>;
+    }
+}
+export function confirmNoOverlapDeploy(actionLabel: string, onConfirm: () => void) {
+    showFullscreenModal({
+        content: <NoOverlapConfirmModal actionLabel={actionLabel} onConfirm={onConfirm} />,
+    });
+}
+
 export class UpdateButtons extends qreact.Component<{
     services: ServiceConfig[];
 }> {
@@ -178,7 +213,9 @@ export class UpdateButtons extends qreact.Component<{
                     disabled={this.state.isDeploying}
                     title="Deploys now AND shuts the old instances down as soon as the new ones are up (overlap of 0)"
                     onClick={() => {
-                        this.deployAll(outdatedServices, gitInfo.latestRef, true);
+                        confirmNoOverlapDeploy(`Deploy All (${outdatedServices.length}), No Overlap`, () => {
+                            this.deployAll(outdatedServices, gitInfo.latestRef, true);
+                        });
                     }}
                 >
                     <div>
@@ -250,7 +287,9 @@ export class UpdateServiceButtons extends qreact.Component<{
                 disabled={this.state.isDeploying}
                 title="Deploys now AND shuts the old instances down as soon as the new ones are up (overlap of 0)"
                 onClick={() => {
-                    this.deploy(gitInfo.latestRef, true);
+                    confirmNoOverlapDeploy("Update to New, No Overlap", () => {
+                        this.deploy(gitInfo.latestRef, true);
+                    });
                 }}
             >
                 <div>