querysub 0.530.0 → 0.532.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.530.0",
+  "version": "0.532.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.13",
+    "sliftutils": "^1.7.15",
     "socket-function": "^1.2.21",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",

package/src/-a-archives/archivesBackBlaze.ts

@@ -59,7 +59,7 @@ export class ArchivesBackblaze {
     public async get2(fileName: string, config?: { range?: { start: number; end: number; } }): Promise<{ data: Buffer; writeTime: number; size: number } | undefined> {
         return this.archives.get2(fileName, config);
     }
-    public async set(fileName: string, data: Buffer, config?: { lastModified?: number }): Promise<void> {
+    public async set(fileName: string, data: Buffer, config?: { lastModified?: number }): Promise<string> {
         return this.archives.set(fileName, data, config);
     }
     public async append(fileName: string, data: Buffer): Promise<void> {

package/src/deployManager/components/ServicesListPage.tsx

@@ -141,7 +141,19 @@ export class ServicesListPage extends qreact.Component {
                                 </div>
                                 <div className={css.vbox(4)}>
                                     <div>Updated {formatDateJSX(config.info.lastUpdatedTime)} AGO</div>
-                                    {config.parameters.overlapTime && <div className={css.colorhsl(210, 50, 50).fontSize(14).fontWeight("bold")}>Deploy overlap: {formatTime(config.parameters.overlapTime)}</div> || undefined}
+                                    {(() => {
+                                        // The old instances probably still run out their overlap (purely time-based, we don't verify they're actually running)
+                                        let releaseTime = config.parameters.releaseTime || 0;
+                                        let overlapTime = config.parameters.overlapTime ?? DEFAULT_OVERLAP_TIME;
+                                        if (!releaseTime || !config.oldParameters) return undefined;
+                                        if (now < releaseTime || now >= releaseTime + overlapTime) return undefined;
+                                        return <div
+                                            className={css.colorhsl(280, 60, 45).fontSize(14).fontWeight("bold")}
+                                            title={`Old instances shut down at ${formatDateTimeDetailed(releaseTime + overlapTime)}`}
+                                        >
+                                            🔀 Old version still running for {formatTime(releaseTime + overlapTime - now)}
+                                        </div>;
+                                    })()}
                                     {(() => {
                                         let releaseTime = config.parameters.releaseTime || 0;
                                         if (!releaseTime || releaseTime <= now || !config.oldParameters) return undefined;

package/src/deployManager/components/deployButtons.tsx

@@ -46,18 +46,21 @@ export class UpdateButtons extends qreact.Component<{
     state = t.state({
         isDeploying: t.type(false),
     });
-    // Deploys all outdated services to latestRef. Scheduled releases delay the release by the configured overlap (an unrelated value, but a reasonable delay); immediate releases right away.
-    private deployAll(outdatedServices: ServiceConfig[], latestRef: string, immediate: boolean) {
+    // Deploys all outdated services to latestRef. "scheduled" delays the release by the configured overlap (an unrelated value, but a reasonable delay); "now" releases immediately but the old instances still run out their configured overlap; "nowNoOverlap" releases immediately AND shuts the old instances down immediately.
+    private deployAll(outdatedServices: ServiceConfig[], latestRef: string, mode: "scheduled" | "now" | "nowNoOverlap") {
         this.state.isDeploying = true;
         // Props are synchronized state, so everything the async work needs is cloned into plain locals HERE, in the synced part
         let toDeploy = outdatedServices.map(service => {
             let updated = deepCloneJSON(service);
             updated.parameters.gitRef = latestRef;
-            if (immediate) {
-                updated.parameters.releaseTime = undefined;
-            } else {
+            if (mode === "scheduled") {
                 let overlap = updated.parameters.overlapTime ?? DEFAULT_OVERLAP_TIME;
                 updated.parameters.releaseTime = Date.now() + overlap;
+            } else {
+                updated.parameters.releaseTime = Date.now();
+                if (mode === "nowNoOverlap") {
+                    updated.parameters.overlapTime = 0;
+                }
             }
             return updated;
         });
@@ -72,6 +75,32 @@ export class UpdateButtons extends qreact.Component<{
             }
         });
     }
+    private confirmDeployAllNow(outdatedServices: ServiceConfig[], latestRef: string, noOverlap: boolean) {
+        let modal: { close: () => void } | undefined;
+        modal = showFullscreenModal({
+            content: <div className={css.vbox(12).pad2(20)}>
+                <div className={css.boldStyle.fontSize(16)}>⚡ Deploy all {outdatedServices.length} services now?</div>
+                <div>{noOverlap
+                    ? "All services release immediately AND their old instances shut down immediately (overlap of 0)."
+                    : "All services release immediately. Their old instances keep running for their configured overlap before shutting down."}</div>
+                <div className={css.hbox(10)}>
+                    <button
+                        className={css.pad2(12, 8).button.bord2(0, 70, 40).hsl(0, 70, 90)}
+                        onClick={() => {
+                            modal && modal.close();
+                            this.deployAll(outdatedServices, latestRef, noOverlap ? "nowNoOverlap" : "now");
+                        }}>
+                        ⚡ Deploy Now
+                    </button>
+                    <button
+                        className={css.pad2(12, 8).button.bord2(0, 0, 20).hsl(0, 0, 100)}
+                        onClick={() => modal && modal.close()}>
+                        Cancel
+                    </button>
+                </div>
+            </div>
+        });
+    }
     render() {
         let controller = MachineServiceController(SocketFunction.browserNodeId());
         const gitInfo = controller.getGitInfo();
@@ -129,7 +158,7 @@ export class UpdateButtons extends qreact.Component<{
                     className={buttonStyle.hsl(120, 70, 90)}
                     disabled={this.state.isDeploying}
                     onClick={() => {
-                        this.deployAll(outdatedServices, gitInfo.latestRef, false);
+                        this.deployAll(outdatedServices, gitInfo.latestRef, "scheduled");
                     }}
                 >
                     <div>
@@ -147,15 +176,27 @@ export class UpdateButtons extends qreact.Component<{
                 <button
                     className={buttonStyle.hsl(0, 70, 90)}
                     disabled={this.state.isDeploying}
-                    title="Deploys immediately, with no overlap: the old instances are shut down right away"
+                    title="Deploys immediately; the old instances keep running for their configured overlap before shutting down"
                     onClick={() => {
-                        this.deployAll(outdatedServices, gitInfo.latestRef, true);
+                        this.confirmDeployAllNow(outdatedServices, gitInfo.latestRef, false);
                     }}
                 >
                     <div>
                         {bigEmoji("⚡")} <span>{this.state.isDeploying && "⏳ Deploying..." || `Deploy All (${outdatedServices.length}) Now (no delay)`}</span>
                     </div>
                 </button>
+                <button
+                    className={buttonStyle.hsl(0, 85, 70)}
+                    disabled={this.state.isDeploying}
+                    title="Deploys immediately AND shuts down the old instances immediately (overlap of 0)"
+                    onClick={() => {
+                        this.confirmDeployAllNow(outdatedServices, gitInfo.latestRef, true);
+                    }}
+                >
+                    <div>
+                        {bigEmoji("⚡")} <span>{this.state.isDeploying && "⏳ Deploying..." || `Deploy All (${outdatedServices.length}) Now (no delay, no overlap)`}</span>
+                    </div>
+                </button>
             </>}
         </>;
     }