querysub 0.252.0 → 0.253.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.252.0",
+  "version": "0.253.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -22,7 +22,7 @@
     "js-sha512": "^0.9.0",
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
-    "socket-function": "^0.133.0",
+    "socket-function": "^0.134.0",
     "terser": "^5.31.0",
     "typesafecss": "^0.22.0",
     "yaml": "^2.5.0",

package/src/3-path-functions/PathFunctionRunner.ts

@@ -354,6 +354,7 @@ export class PathFunctionRunner {
                     let runCallPromise = self.runCall(call, functionSpec);
                     void runCallPromise.finally(() => {
                         outstandingCalls--;
+                        // IMPORTANT! We remove the call, NOT for GC, but! Because if the call writes are rejected (due to contention), then the Result will also be rejected, changing it back to undefined, so (as long as little enough time has passed), we will run the call again! Or rather, we will try to, as long as runningCalls doesn't have the value!
                         runningCalls.delete(call.CallId);
                     });
                     logErrors(runCallPromise);

package/src/4-deploy/git.ts

@@ -11,6 +11,40 @@ export async function getGitRefLive(gitDir = ".") {
     return (await runPromise(`git rev-parse HEAD`, { cwd: gitDir })).trim();
 }
 
+export async function getGitUncommitted(gitDir = "."): Promise<string[]> {
+    return (await runPromise(`git status --porcelain`, { cwd: gitDir })).split("\n").map(x => x.trim()).filter(x => x);
+}
+
+export async function getLatestRefOnUpstreamBranch(gitDir = ".") {
+    await runPromise(`git fetch`, { cwd: gitDir });
+    return (await runPromise(`git rev-parse @{upstream}`, { cwd: gitDir })).trim();
+}
+
+export async function commitAndPush(config: {
+    gitDir: string;
+    message: string;
+}) {
+    await runPromise(`git add --all`, { cwd: config.gitDir });
+    await runPromise(`git commit -m "${config.message}"`, { cwd: config.gitDir });
+    await runPromise(`git push`, { cwd: config.gitDir });
+}
+
+export async function getGitRefInfo(config: {
+    gitDir: string;
+    ref: string;
+}): Promise<{
+    time: number;
+    description: string;
+}> {
+    const timeOutput = await runPromise(`git show --format="%ct" -s ${config.ref}`, { cwd: config.gitDir });
+    const descriptionOutput = await runPromise(`git show --format="%s" -s ${config.ref}`, { cwd: config.gitDir });
+
+    return {
+        time: parseInt(timeOutput.trim(), 10) * 1000,
+        description: descriptionOutput.trim()
+    };
+}
+
 export const getGitURLSync = cache(function getGitURLSync(gitDir?: string) {
     return child_process.execSync(`git remote get-url origin`, { cwd: gitDir || "." }).toString().trim();
 });
@@ -20,7 +54,6 @@ export const getGitRefSync = cache(function getGitRefSync(gitDir?: string) {
 
 export const setGitRef = measureWrap(async function setGitRef(config: {
     gitFolder: string;
-    repoUrl: string;
     gitRef: string;
 }) {
     await fs.promises.mkdir(config.gitFolder, { recursive: true });

package/src/deployManager/MachinesPage.tsx

@@ -1,12 +1,13 @@
 import { SocketFunction } from "socket-function/SocketFunction";
 import { qreact } from "../4-dom/qreact";
-import { DeployController } from "./machineSchema";
+import { MachineServiceController } from "./machineSchema";
 import { css } from "typesafecss";
 import { currentViewParam, selectedServiceIdParam, selectedMachineIdParam } from "./urlParams";
 import { ServicesListPage } from "./components/ServicesListPage";
 import { MachinesListPage } from "./components/MachinesListPage";
 import { ServiceDetailPage } from "./components/ServiceDetailPage";
 import { MachineDetailPage } from "./components/MachineDetailPage";
+import { Anchor } from "../library-components/ATag";
 
 export class MachinesPage extends qreact.Component {
     private renderTabs() {
@@ -19,24 +20,20 @@ export class MachinesPage extends qreact.Component {
                 { key: "services", label: "Services", otherKeys: ["service-detail"] },
             ].map(tab => {
                 let isActive = currentViewParam.value === tab.key || tab.otherKeys.includes(currentViewParam.value);
-                return <div key={tab.key}
+                return <Anchor noStyles key={tab.key}
+                    values={[currentViewParam.getOverride(tab.key as any), selectedServiceIdParam.getOverride(""), selectedMachineIdParam.getOverride("")]}
                     className={css.pad2(12, 8).button
                         + (isActive && css.hsl(0, 0, 100).bord2(210, 50, 50))
                         + (!isActive && css.hsl(0, 0, 70).colorhsl(0, 0, 50).bord2(0, 0, 50))
-                    }
-                    onClick={() => {
-                        currentViewParam.value = tab.key as any;
-                        selectedServiceIdParam.value = "";
-                        selectedMachineIdParam.value = "";
-                    }}>
+                    }>
                     {tab.label}
-                </div>;
+                </Anchor>;
             })}
         </div>;
     }
 
     render() {
-        let controller = DeployController(SocketFunction.browserNodeId());
+        let controller = MachineServiceController(SocketFunction.browserNodeId());
         let serviceConfigType = controller.getServiceConfigType();
         if (!serviceConfigType) return <div>Loading...</div>;
 

package/src/deployManager/components/MachineDetailPage.tsx

@@ -1,17 +1,18 @@
 import { SocketFunction } from "socket-function/SocketFunction";
 import { qreact } from "../../4-dom/qreact";
-import { MACHINE_RESYNC_INTERVAL, DeployController, ServiceConfig } from "../machineSchema";
+import { MACHINE_RESYNC_INTERVAL, MachineServiceController, ServiceConfig } from "../machineSchema";
 import { css } from "typesafecss";
 import { currentViewParam, selectedMachineIdParam, selectedServiceIdParam } from "../urlParams";
 import { formatVeryNiceDateTime } from "socket-function/src/formatting/format";
 import { sort } from "socket-function/src/misc";
+import { Anchor } from "../../library-components/ATag";
 
 export class MachineDetailPage extends qreact.Component {
     render() {
         const selectedMachineId = selectedMachineIdParam.value;
         if (!selectedMachineId) return <div>No machine selected</div>;
 
-        let controller = DeployController(SocketFunction.browserNodeId());
+        let controller = MachineServiceController(SocketFunction.browserNodeId());
         let machineInfo = controller.getMachineInfo(selectedMachineId);
         let serviceList = controller.getServiceList();
 
@@ -77,14 +78,10 @@ export class MachineDetailPage extends qreact.Component {
                         <h3>⚠️ Configured Services Not Running ({configuredButNotRunning.length})</h3>
                         <div className={css.vbox(8)}>
                             {configuredButNotRunning.map(([serviceId, serviceConfig]) => (
-                                <div key={serviceId}
-                                    className={
-                                        css.pad2(12).button.bord2(0, 0, 20).hsl(0, 70, 90)
-                                    }
-                                    onClick={() => {
-                                        currentViewParam.value = "service-detail";
-                                        selectedServiceIdParam.value = serviceId;
-                                    }}>
+                                <Anchor noStyles
+                                    key={serviceId}
+                                    values={[currentViewParam.getOverride("service-detail"), selectedServiceIdParam.getOverride(serviceId)]}
+                                    className={css.pad2(12).button.bord2(0, 0, 20).hsl(0, 70, 90)}>
                                     <div className={css.hbox(12)}>
                                         <div className={css.flexGrow(1)}>
                                             {serviceConfig.info.title} ({serviceConfig.parameters.key} / {serviceId})
@@ -96,7 +93,7 @@ export class MachineDetailPage extends qreact.Component {
                                             Deploy: {serviceConfig.parameters.deploy ? "Yes" : "No"}
                                         </div>
                                     </div>
-                                </div>
+                                </Anchor>
                             ))}
                         </div>
                     </div>
@@ -118,15 +115,10 @@ export class MachineDetailPage extends qreact.Component {
                             }
 
                             return (
-                                <div key={serviceId}
-                                    className={
-                                        css.pad2(12).button.bord2(0, 0, 20)
-                                        + backgroundColor
-                                    }
-                                    onClick={() => {
-                                        currentViewParam.value = "service-detail";
-                                        selectedServiceIdParam.value = serviceId;
-                                    }}>
+                                <Anchor noStyles
+                                    key={serviceId}
+                                    values={[currentViewParam.getOverride("service-detail"), selectedServiceIdParam.getOverride(serviceId)]}
+                                    className={css.pad2(12).button.bord2(0, 0, 20) + backgroundColor}>
                                     <div className={css.hbox(12)}>
                                         <div className={css.flexGrow(1)}>
                                             {serviceConfig && <>{serviceConfig.info.title} ({serviceConfig.parameters.key})</> || <>serviceId = {serviceId}</>}
@@ -148,7 +140,7 @@ export class MachineDetailPage extends qreact.Component {
                                             </div>
                                         )}
                                     </div>
-                                </div>
+                                </Anchor>
                             );
                         })}
                     </div>

package/src/deployManager/components/MachinesListPage.tsx

@@ -1,12 +1,15 @@
 import { SocketFunction } from "socket-function/SocketFunction";
 import { qreact } from "../../4-dom/qreact";
-import { MACHINE_RESYNC_INTERVAL, DeployController } from "../machineSchema";
+import { MACHINE_RESYNC_INTERVAL, MachineServiceController } from "../machineSchema";
 import { css } from "typesafecss";
 import { t } from "../../2-proxy/schema2";
 import { Querysub } from "../../4-querysub/QuerysubController";
 import { currentViewParam, selectedMachineIdParam } from "../urlParams";
 import { formatVeryNiceDateTime } from "socket-function/src/formatting/format";
 import { sort } from "socket-function/src/misc";
+import { formatTimeJSX } from "../../misc/formatJSX";
+import { DeployMachineButtons, RenderGitRefInfo } from "./deployButtons";
+import { isDefined } from "../../misc";
 
 export class MachinesListPage extends qreact.Component {
     state = t.state({
@@ -16,7 +19,7 @@ export class MachinesListPage extends qreact.Component {
     });
 
     render() {
-        let controller = DeployController(SocketFunction.browserNodeId());
+        let controller = MachineServiceController(SocketFunction.browserNodeId());
         let machineList = controller.getMachineList();
 
         if (!machineList) return <div>Loading machines...</div>;
@@ -52,6 +55,8 @@ export class MachinesListPage extends qreact.Component {
                     </button>
                 )}
 
+                <DeployMachineButtons machines={machines.map(x => x[1]).filter(isDefined)} />
+
                 {this.state.isDeleteMode && (
                     <div className={css.hbox(8)}>
                         <div className={css.pad2(8, 4)}>
@@ -116,58 +121,64 @@ export class MachinesListPage extends qreact.Component {
                         return acc + (service.totalTimesLaunched || 0);
                     }, 0);
 
-                    return <div key={machineId}
-                        className={
-                            css.pad2(12).bord2(0, 0, 20).button
-                            + (
-                                failingServices.length > 0 && css.hsl(0, 50, 60)
-                                || isMachineDead && css.hsl(0, 0, 50)
-                                || css.hsl(0, 0, 100)
-                            )
-                            + (this.state.isDeleteMode && isSelected && css.bord2(200, 80, 60, 2))
-                        }
-                        onClick={() => {
-                            if (this.state.isDeleteMode) {
-                                if (this.state.selectedForDeletion[machineId]) {
-                                    delete this.state.selectedForDeletion[machineId];
+                    return <div className={css.hbox(10)}>
+                        <div
+                            className={
+                                css.pad2(12).bord2(0, 0, 20).button
+                                + (
+                                    failingServices.length > 0 && css.hsl(0, 50, 60)
+                                    || isMachineDead && css.hsl(0, 0, 50)
+                                    || css.hsl(0, 0, 100)
+                                )
+                                + (this.state.isDeleteMode && isSelected && css.bord2(200, 80, 60, 2))
+                            }
+                            onClick={() => {
+                                if (this.state.isDeleteMode) {
+                                    if (this.state.selectedForDeletion[machineId]) {
+                                        delete this.state.selectedForDeletion[machineId];
+                                    } else {
+                                        this.state.selectedForDeletion[machineId] = true;
+                                    }
                                 } else {
-                                    this.state.selectedForDeletion[machineId] = true;
+                                    currentViewParam.value = "machine-detail";
+                                    selectedMachineIdParam.value = machineId;
                                 }
-                            } else {
-                                currentViewParam.value = "machine-detail";
-                                selectedMachineIdParam.value = machineId;
-                            }
-                        }}>
-                        <div className={css.hbox(12)}>
-                            {this.state.isDeleteMode && (
-                                <div className={css.flexShrink0}>
-                                    <input
-                                        type="checkbox"
-                                        checked={isSelected}
-                                        onChange={() => { }} // Controlled by onClick above
-                                        onClick={(e) => e.stopPropagation()} // Prevent double-toggle
-                                        className={css.size(16, 16)}
-                                    />
-                                </div>
-                            )}
-                            {isMachineDead && <div className={css.colorhsl(0, 80, 50)}>
-                                ⚠️ Machine is likely dead
-                            </div>}
-                            <div>
-                                Last heartbeat {formatVeryNiceDateTime(machineInfo.heartbeat)}
-                            </div>
-                            <div className={css.vbox(4).flexGrow(1)}>
-                                <div>
-                                    {machineId}
-                                </div>
-                                <div>
-                                    {machineInfo.info["getExternalIP"]}
+                            }}>
+                            <div className={css.hbox(12)}>
+                                {this.state.isDeleteMode && (
+                                    <div className={css.flexShrink0}>
+                                        <input
+                                            type="checkbox"
+                                            checked={isSelected}
+                                            onChange={() => { }} // Controlled by onClick above
+                                            onClick={(e) => e.stopPropagation()} // Prevent double-toggle
+                                            className={css.size(16, 16)}
+                                        />
+                                    </div>
+                                )}
+                                {isMachineDead && <div className={css.colorhsl(0, 80, 50)}>
+                                    ⚠️ Machine is likely dead
+                                </div>}
+                                <div className={css.vbox(4)}>
+                                    <div>
+                                        Last heartbeat {formatTimeJSX(machineInfo.heartbeat)}
+                                    </div>
+                                    <RenderGitRefInfo gitRef={machineInfo.gitRef} />
                                 </div>
-                                <div>
-                                    {serviceCount} services {failingServices.length > 0 ? `(${failingServices.length} failing)` : ""} • {totalLaunches} launches
+                                <div className={css.vbox(4).flexGrow(1)}>
+                                    <div>
+                                        {machineId}
+                                    </div>
+                                    <div>
+                                        {machineInfo.info["getExternalIP"]}
+                                    </div>
+                                    <div>
+                                        {serviceCount} services {failingServices.length > 0 ? `(${failingServices.length} failing)` : ""} • {totalLaunches} launches
+                                    </div>
                                 </div>
                             </div>
                         </div>
+                        <DeployMachineButtons machines={[machineInfo]} />
                     </div>;
                 })}
             </div>

package/src/deployManager/components/ServiceDetailPage.tsx

@@ -1,6 +1,6 @@
 import { SocketFunction } from "socket-function/SocketFunction";
 import { qreact } from "../../4-dom/qreact";
-import { MACHINE_RESYNC_INTERVAL, DeployController, ServiceConfig } from "../machineSchema";
+import { MACHINE_RESYNC_INTERVAL, MachineServiceController, ServiceConfig } from "../machineSchema";
 import { css } from "typesafecss";
 import { t } from "../../2-proxy/schema2";
 import { Querysub } from "../../4-querysub/QuerysubController";
@@ -13,6 +13,7 @@ import { Button } from "../../library-components/Button";
 import { isDefined } from "../../misc";
 import { watchScreenOutput, stopWatchingScreenOutput } from "../machineController";
 import { getPathStr2 } from "../../path";
+import { Anchor } from "../../library-components/ATag";
 import { ScrollOnMount } from "../../library-components/ScrollOnMount";
 import { StickyBottomScroll } from "../../library-components/StickyBottomScroll";
 import { PrimitiveDisplay } from "../../diagnostics/logs/ObjectDisplay";
@@ -179,7 +180,7 @@ type ServiceConfig = ${serviceConfigType}
                         model.setValue(`const config: ServiceConfig = ${newConfigStr}`);
                     }
                 }
-                await DeployController(SocketFunction.browserNodeId()).setServiceConfig.promise(selectedServiceId, updatedConfig);
+                await MachineServiceController(SocketFunction.browserNodeId()).setServiceConfigs.promise([updatedConfig]);
             } catch (error) {
                 Querysub.localCommit(() => {
                     this.state.saveError = error instanceof Error ? error.message : String(error);
@@ -198,7 +199,7 @@ type ServiceConfig = ${serviceConfigType}
         const selectedServiceId = selectedServiceIdParam.value;
         if (!selectedServiceId) return <div>No service selected</div>;
 
-        let controller = DeployController(SocketFunction.browserNodeId());
+        let controller = MachineServiceController(SocketFunction.browserNodeId());
         let originalConfig = controller.getServiceConfig(selectedServiceId);
         let serviceConfigType = controller.getServiceConfigType();
 
@@ -371,15 +372,12 @@ type ServiceConfig = ${serviceConfigType}
                                     </div>
                                 )}
 
-                                <div
+                                <Anchor noStyles
+                                    values={[currentViewParam.getOverride("machine-detail"), selectedMachineIdParam.getOverride(machineId)]}
                                     className={css.button.pad2(16, 8).bord2(0, 0, 10) + css.hsl(200, 70, 90)}
-                                    onClick={() => {
-                                        currentViewParam.value = "machine-detail";
-                                        selectedMachineIdParam.value = machineId;
-                                    }}
                                 >
                                     View Machine
-                                </div>
+                                </Anchor>
 
 
                                 <div

package/src/deployManager/components/ServicesListPage.tsx

@@ -1,18 +1,25 @@
 import { SocketFunction } from "socket-function/SocketFunction";
 import { qreact } from "../../4-dom/qreact";
-import { DeployController, ServiceConfig } from "../machineSchema";
+import { MachineServiceController, ServiceConfig } from "../machineSchema";
 import { css } from "typesafecss";
 import { t } from "../../2-proxy/schema2";
 import { Querysub } from "../../4-querysub/QuerysubController";
 import { currentViewParam, selectedServiceIdParam } from "../urlParams";
 import { formatNiceDateTime, formatTime, formatVeryNiceDateTime } from "socket-function/src/formatting/format";
-import { sort } from "socket-function/src/misc";
+import { sort, timeInMinute } from "socket-function/src/misc";
 import { cache } from "socket-function/src/caching";
+import { Anchor } from "../../library-components/ATag";
+import { isPublic } from "../../config";
+import { UpdateButtons, UpdateServiceButtons } from "./deployButtons";
+import { isDefined } from "../../misc";
+import { formatTimeJSX } from "../../misc/formatJSX";
+
+module.hotreload = true;
 
 export class ServicesListPage extends qreact.Component {
 
     render() {
-        let controller = DeployController(SocketFunction.browserNodeId());
+        let controller = MachineServiceController(SocketFunction.browserNodeId());
         let serviceList = controller.getServiceList();
 
         if (!serviceList) return <div>Loading services...</div>;
@@ -23,7 +30,7 @@ export class ServicesListPage extends qreact.Component {
         let getMachineInfo = cache((machineId: string) => controller.getMachineInfo(machineId));
 
         return <div className={css.vbox(16)}>
-            <div className={css.hbox(12)}>
+            <div className={css.hbox(12).wrap}>
                 <h2 className={css.flexGrow(1)}>Services</h2>
                 <button className={css.pad2(12, 8).button.bord2(0, 0, 20).hsl(0, 0, 100)}
                     onClick={() => {
@@ -36,14 +43,14 @@ export class ServicesListPage extends qreact.Component {
                                 parameters: {
                                     key: newServiceId,
                                     repoUrl: gitInfo.repoUrl,
-                                    gitRef: gitInfo.gitRef,
+                                    gitRef: gitInfo.latestRef,
                                     command: "ping 1.1.1.1",
                                     deploy: false
                                 },
                                 info: {
                                     title: `New Service created at ${formatNiceDateTime(Date.now())}`,
                                     notes: "Notes",
-                                    lastUpdatedTime: Date.now()
+                                    lastUpdatedTime: Date.now(),
                                 }
                             };
 
@@ -56,10 +63,11 @@ export class ServicesListPage extends qreact.Component {
                     }}>
                     + New Service
                 </button>
+                <UpdateButtons services={services.map(x => x[1]).filter(isDefined)} />
             </div>
             <div className={css.vbox(8)}>
                 {services.map(([serviceId, config]) => {
-                    if (!config) return <div key={serviceId}>Config is broken?</div>;
+                    if (!config) return <div key={serviceId}>Config is broken? Missing value for service? Is the file corrupted?</div>;
                     let failingMachines = config.machineIds.filter(machineId => {
                         let machineInfo = getMachineInfo(machineId);
                         return machineInfo?.services[serviceId]?.errorFromLastRun;
@@ -78,33 +86,35 @@ export class ServicesListPage extends qreact.Component {
                         return acc + (machineInfo?.services[serviceId]?.totalTimesLaunched || 0);
                     }, 0);
                     let unknown = config.machineIds.length - runningMachines.length - failingMachines.length - missingMachines.length;
-                    return <div key={serviceId}
-                        className={
-                            css.pad2(12).button.bord2(0, 0, 20)
-                            + (
-                                failingMachines.length > 0 && css.hsl(0, 50, 60)
-                                || config.parameters.deploy && css.hsl(0, 0, 100)
-                                || !config.parameters.deploy && css.hsl(0, 0, 70)
-                            )
-                        }
-                        onClick={() => {
-                            currentViewParam.value = "service-detail";
-                            selectedServiceIdParam.value = serviceId;
-                        }}>
-                        <div className={css.hbox(12)}>
-                            <div className={css.vbox(4).flexGrow(1)}>
-                                <div className={css.fontSize(14).boldStyle}>{config.info.title}</div>
-                                <div>{config.parameters.key}</div>
+                    return <div className={css.hbox(10)}>
+                        <Anchor noStyles key={serviceId}
+                            values={[currentViewParam.getOverride("service-detail"), selectedServiceIdParam.getOverride(serviceId)]}
+                            className={
+                                css.pad2(12).button.bord2(0, 0, 20)
+                                + (
+                                    failingMachines.length > 0 && css.hsl(0, 50, 60)
+                                    || config.parameters.deploy && css.hsl(0, 0, 100)
+                                    || !config.parameters.deploy && css.hsl(0, 0, 70)
+                                )
+                            }
+                        >
+                            <div className={css.hbox(12)}>
+                                <div className={css.vbox(4).flexGrow(1)}>
+                                    <div className={css.fontSize(14).boldStyle}>{config.info.title}</div>
+                                    <div>{config.parameters.key}</div>
+                                    <div>
+                                        {config.machineIds.length} configured {failingMachines.length > 0 && `(${failingMachines.length} failing)`} {missingMachines.length > 0 && `(${missingMachines.length} machine hasn't run service yet)`} {unknown > 0 && `(${unknown} unknown)`} • {totalLaunches} launches •
+                                        Deploy: {config.parameters.deploy ? "enabled" : "disabled"}
+                                    </div>
+                                </div>
                                 <div>
-                                    {config.machineIds.length} configured {failingMachines.length > 0 && `(${failingMachines.length} failing)`} {missingMachines.length > 0 && `(${missingMachines.length} machine hasn't run service yet)`} {unknown > 0 && `(${unknown} unknown)`} • {totalLaunches} launches •
-                                    Deploy: {config.parameters.deploy ? "enabled" : "disabled"}
+                                    Updated {formatTimeJSX(config.info.lastUpdatedTime)}
                                 </div>
                             </div>
-                            <div>
-                                Updated {formatVeryNiceDateTime(config.info.lastUpdatedTime)}
-                            </div>
-                        </div>
-                    </div>;
+                        </Anchor>
+                        <UpdateServiceButtons service={config} />
+                    </div>
+                        ;
                 })}
             </div>
         </div>;