querysub 0.560.0 → 0.561.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.560.0",
+  "version": "0.561.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/deployManager/components/ProcessesView.tsx

@@ -17,6 +17,7 @@ const DEAD_COLOR = { h: 0, s: 0, l: 92 };
 const OUTPUT_BUFFER_LIMIT = 1_000_000;
 const OUTPUT_BUFFER_KEPT = 100_000;
 const OUTPUT_MAX_HEIGHT = "40vh";
+const DETAIL_FONT_SIZE = 12;
 const ANSI_SATURATION = 70;
 const ANSI_LIGHTNESS = 70;
 
@@ -113,6 +114,17 @@ class ProcessRow extends qreact.Component<{ record: ProcessRecord; machineNodeId
                     {this.state.watching && "Hide output" || "Watch output"}
                 </Button>
             </div>
+            {/* The ref and the command are both long, so they get their own line rather than pushing the summary around */}
+            <div className={css.hbox(10).wrap.fontSize(DETAIL_FONT_SIZE).colorhsl(0, 0, 30)}>
+                {record.parameters.gitRef && <div className={css.hbox(4)}>
+                    <span className={css.colorhsl(0, 0, 45)}>ref</span>
+                    <span className={css.fontFamily("monospace")}>{record.parameters.gitRef}</span>
+                </div>}
+                {record.parameters.command && <div className={css.hbox(4).flexGrow(1)}>
+                    <span className={css.colorhsl(0, 0, 45)}>command</span>
+                    <span className={css.fontFamily("monospace").whiteSpace("pre-wrap")}>{record.parameters.command}</span>
+                </div>}
+            </div>
             {this.state.watching && <ProcessOutput record={record} machineNodeId={this.props.machineNodeId} />}
         </div>;
     }

package/src/deployManager/components/ServiceDetailPage.tsx

@@ -13,6 +13,7 @@ import { InputLabel } from "../../library-components/InputLabel";
 import { Button } from "../../library-components/Button";
 import { isDefined } from "../../misc";
 import { ProcessesView } from "./ProcessesView";
+import { ResyncMachinesButton } from "./deployButtons";
 import { getPathStr2 } from "../../path";
 import { ATag, Anchor } from "../../library-components/ATag";
 import { ScrollOnMount } from "../../library-components/ScrollOnMount";
@@ -345,7 +346,10 @@ export class ServiceDetailPage extends qreact.Component {
             </div>
             {/* Machine Status */}
             {config.parameters.deploy && <div className={css.vbox(8).fillWidth}>
-                <h3>Deployed Machines ({machineIds.length})</h3>
+                <div className={css.hbox(12).wrap.alignItems("center")}>
+                    <h3 className={css.flexGrow(1)}>Deployed Machines ({machineIds.length})</h3>
+                    <ResyncMachinesButton applyNodeIds={machineStatuses.map(x => x.machineInfo?.applyNodeId || "")} />
+                </div>
                 <div className={css.vbox(4).fillWidth}>
                     {machineStatuses.map(({ machineId, variables, machineInfo, serviceInfo, isMachineDead, hasError, isDisabled, index }) => {
                         if (!machineInfo) return <div key={machineId}>Loading {machineId}...</div>;

package/src/deployManager/components/ServicesListPage.tsx

@@ -10,7 +10,7 @@ import { sort, timeInMinute, timeInSecond } from "socket-function/src/misc";
 import { cache } from "socket-function/src/caching";
 import { Anchor } from "../../library-components/ATag";
 import { isPublic } from "../../config";
-import { PendingDeployInfo, UpdateButtons, UpdateServiceButtons } from "./deployButtons";
+import { PendingDeployInfo, ResyncMachinesButton, UpdateButtons, UpdateServiceButtons } from "./deployButtons";
 import { isDefined } from "../../misc";
 import { formatDateJSX } from "../../misc/formatJSX";
 import { Tools } from "./Tools";
@@ -43,6 +43,9 @@ export class ServicesListPage extends qreact.Component {
         return <div className={css.vbox(16)}>
             <div className={css.hbox(12).wrap}>
                 <h2 className={css.flexGrow(1)}>Services</h2>
+                <ResyncMachinesButton applyNodeIds={(machineConfigList || []).map(x =>
+                    controller.getMachineInfo(x.machineId)?.applyNodeId || ""
+                )} />
                 <button className={css.pad2(12, 8).button.bord2(0, 0, 20).hsl(0, 0, 100)}
                     onClick={() => {
                         Querysub.onCommitFinished(async () => {

package/src/deployManager/components/deployButtons.tsx

@@ -19,6 +19,37 @@ export function bigEmoji(emoji: string, topOffset = 0) {
     return <span className={css.fontSize(26).marginTop(topOffset)}>{emoji}</span>;
 }
 
+/** Makes the machines re-read the service configs immediately, instead of waiting out their fallback poll. Useful when a config was changed without the machines being notified, or a notification was missed. */
+export class ResyncMachinesButton extends qreact.Component<{ applyNodeIds: string[] }> {
+    state = t.state({
+        isResyncing: t.type(false),
+    });
+    render() {
+        let applyNodeIds = unique(this.props.applyNodeIds.filter(x => x));
+        if (!applyNodeIds.length) return undefined;
+        return <button
+            className={css.pad2(12, 8).button.bord2(0, 0, 20).hsl(200, 70, 90)}
+            disabled={this.state.isResyncing}
+            title="Tells each machine's apply code to re-read the service configs now"
+            onClick={() => {
+                this.state.isResyncing = true;
+                let controller = MachineController(SocketFunction.browserNodeId());
+                Querysub.onCommitFinished(async () => {
+                    try {
+                        await Promise.all(applyNodeIds.map(nodeId => controller.resyncMachine.promise({ nodeId })));
+                    } finally {
+                        Querysub.commit(() => {
+                            this.state.isResyncing = false;
+                        });
+                    }
+                });
+            }}
+        >
+            {this.state.isResyncing && "⏳ Resyncing..." || `🔄 Resync ${applyNodeIds.length} machine${applyNodeIds.length === 1 && "" || "s"}`}
+        </button>;
+    }
+}
+
 export class RenderGitRefInfo extends qreact.Component<{
     gitRef: string;
     isQuerysub?: boolean;

package/src/deployManager/machineController.ts

@@ -73,6 +73,10 @@ export const OnServiceChange = SocketFunction.register(
 
 class MachineControllerBase {
     // NOTE: We don't need to worry about escaping commands here. YES, the user CAN inject code into the key. But this system is literally for running arbitrary commands, so they could just write a serviceConfig and run anything they want, on all the machines...
+    /** Tells a machine's apply code to re-read the service configs now, rather than waiting for its 15 minute fallback poll. Forwarded, as clients can't reach the machines directly. */
+    public async resyncMachine(config: { nodeId: string }): Promise<void> {
+        await OnServiceChange.nodes[config.nodeId].onServiceConfigChange();
+    }
     /** Every process this machine has a record of, running or dead. */
     public async listProcesses(): Promise<ProcessRecord[]> {
         return await listProcessRecords();
@@ -143,6 +147,7 @@ export const MachineController = getSyncedController(SocketFunction.register(
     "machine-controller-c3157d4a-580c-4e76-9dc9-072dd92e70af",
     () => new MachineControllerBase(),
     () => ({
+        resyncMachine: {},
         listProcesses: {},
         streamProcessOutput: {},
         listOtherProcesses: {},