querysub 0.578.0 → 0.580.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.578.0",
+  "version": "0.580.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.49",
+    "sliftutils": "^1.7.50",
     "socket-function": "^1.2.26",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",

package/src/deployManager/components/deployButtons.tsx

@@ -85,8 +85,8 @@ export class UpdateButtons extends qreact.Component<{
             let updated = deepCloneJSON(service);
             updated.parameters.gitRef = latestRef;
             updated.parameters.releaseTime = Date.now();
-            // Always set, never inherited: the overlap belongs to the deploy being made, and leaving the previous deploy's value in place means one no-overlap deploy silently makes every later deploy a no-overlap one
-            updated.parameters.overlapTime = noOverlap && 0 || DEFAULT_OVERLAP_TIME;
+            // Always set, never inherited: the overlap belongs to the deploy being made, and leaving the previous deploy's value in place means one no-overlap deploy silently makes every later deploy a no-overlap one. A ternary, as 0 is the value we actually want here and it is falsy.
+            updated.parameters.overlapTime = noOverlap ? 0 : DEFAULT_OVERLAP_TIME;
             return updated;
         });
         let controller = MachineServiceController(SocketFunction.browserNodeId());
@@ -203,8 +203,8 @@ export class UpdateServiceButtons extends qreact.Component<{
         let service = deepCloneJSON(this.props.service);
         service.parameters.gitRef = latestRef;
         service.parameters.releaseTime = Date.now();
-        // Always set, never inherited - see deployAll
-        service.parameters.overlapTime = noOverlap && 0 || DEFAULT_OVERLAP_TIME;
+        // Always set, never inherited - see deployAll. A ternary, as 0 is the value we actually want here and it is falsy.
+        service.parameters.overlapTime = noOverlap ? 0 : DEFAULT_OVERLAP_TIME;
         let controller = MachineServiceController(SocketFunction.browserNodeId());
         Querysub.onCommitFinished(async () => {
             try {

package/src/deployManager/machineSchema.ts

@@ -109,7 +109,7 @@ export type ServiceConfig = {
     };
 };
 
-export const DEFAULT_OVERLAP_TIME = timeInSecond * 60;
+export const DEFAULT_OVERLAP_TIME = timeInSecond * 600;
 
 const TEMPLATE_VARIABLE_REGEX = /\$\{([a-zA-Z0-9_-]+)\}/g;
 /** The `${name}` placeholder names in a command template, in order of first appearance. */

package/src/deployManager/processManager.ts

@@ -28,7 +28,8 @@ export function getScreenName(config: { serviceKey: string; index: number }): st
 const RETIRING_MARKER = "-retiring-";
 /** A version being replaced is renamed to this, which frees the canonical name for its replacement at once. The name carries WHEN it is to be killed, so nothing has to remember: any pass that sees the screen can read its own deadline off it, and a restart loses nothing. */
 export function getRetiringScreenName(canonicalScreenName: string, killTime: number): string {
-    return canonicalScreenName.slice(0, -SCREEN_SUFFIX.length) + RETIRING_MARKER + killTime + SCREEN_SUFFIX;
+    // Rounded because tmux reads a "." in a target as the window/pane separator, so a fractional time makes the name unkillable - it goes looking for a pane named after everything past the point
+    return canonicalScreenName.slice(0, -SCREEN_SUFFIX.length) + RETIRING_MARKER + Math.round(killTime) + SCREEN_SUFFIX;
 }
 /** When a retiring screen is due to be killed, or undefined when it is not a retiring screen at all. */
 export function getRetiringKillTime(screenName: string): number | undefined {