querysub 0.251.0 → 0.253.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.251.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",
@@ -64,4 +64,4 @@
   "resolutions": {
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6"
   }
-}
+}

package/src/0-path-value-core/NodePathAuthorities.ts

@@ -366,6 +366,7 @@ class NodePathAuthorities {
         //  as being out of date.
         let now = Date.now();
         let isReadReady = await errorToUndefinedSilent(PathController.nodes[nodeId].isReadReady());
+
         // If the node is gone, delete it from authorities
         if (isReadReady === undefined) {
             console.error(yellow(`Node errored out, removing from authorities ${nodeId}`));

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/edgeBootstrap.ts

@@ -290,6 +290,16 @@ async function edgeNodeFunction(config: {
     }
     async function getEdgeNodeConfig(): Promise<EdgeNodeConfig> {
         let edgeIndex = cachedConfig || await (await fetch(config.edgeNodeConfigURL)).json() as EdgeNodesIndex;
+
+        edgeIndex.edgeNodes.sort((a, b) => -(a.bootTime - b.bootTime));
+        // Filter out duplicate hostnames (taking the max bootTime). We can't have multiple services using the same port, so duplicates are DEFINITELY dead. This fixes some issues with accessing old services, and generally makes reading the logs easier.
+        let hostNames = new Set<string>();
+        edgeIndex.edgeNodes = edgeIndex.edgeNodes.filter(x => {
+            if (hostNames.has(x.host)) return false;
+            hostNames.add(x.host);
+            return true;
+        });
+
         cachedConfig = undefined;
         let liveHashForced = false;
         if (Date.now() < liveHashOverrideExpiryTime) {

package/src/4-deploy/edgeNodes.ts

@@ -7,7 +7,7 @@ import { getArchivesBackblazePublic } from "../-a-archives/archivesBackBlaze";
 import { nestArchives } from "../-a-archives/archives";
 import { SocketFunction } from "socket-function/SocketFunction";
 import { runInSerial, runInfinitePoll, runInfinitePollCallAtStart } from "socket-function/src/batching";
-import { compare, compareArray, isNodeTrue, timeInMinute } from "socket-function/src/misc";
+import { compare, compareArray, isNodeTrue, sort, timeInMinute } from "socket-function/src/misc";
 import { cacheLimited, lazy } from "socket-function/src/caching";
 import { canHaveChildren } from "socket-function/src/types";
 import { shutdown } from "../diagnostics/periodic";

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>;
@@ -48,10 +51,12 @@ export class MachinesListPage extends qreact.Component {
                                 this.state.selectedForDeletion[machineId] = true;
                             }
                         }}>
-                        🗑️ Delete Machines
+                        🗑️ Delete Dead Machines
                     </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,18 +1,19 @@
 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";
 import { currentViewParam, selectedServiceIdParam, selectedMachineIdParam } from "../urlParams";
 import { formatTime, formatVeryNiceDateTime } from "socket-function/src/formatting/format";
 import { InputPicker } from "../../library-components/InputPicker";
-import { nextId, sort } from "socket-function/src/misc";
+import { deepCloneJSON, nextId, sort } from "socket-function/src/misc";
 import { InputLabel } from "../../library-components/InputLabel";
 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";
@@ -89,6 +90,8 @@ type ServiceConfig = ${serviceConfigType}
     }
 
     private updateUnsavedChanges(updatedConfig: ServiceConfig) {
+        // Do not let them update the serviceId, as that would break things
+        updatedConfig.serviceId = selectedServiceIdParam.value;
         const newConfigStr = JSON.stringify(updatedConfig, null, 4);
         this.state.unsavedChanges = updatedConfig;
 
@@ -159,6 +162,8 @@ type ServiceConfig = ${serviceConfigType}
         if (!selectedServiceId) return;
 
         Querysub.commit(() => {
+            // Do not let them update the serviceId, as that would break things
+            updatedConfig.serviceId = selectedServiceIdParam.value;
             this.state.isSaving = true;
             this.state.saveError = "";
         });
@@ -175,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);
@@ -194,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();
 
@@ -333,8 +338,10 @@ type ServiceConfig = ${serviceConfigType}
                             <div
                                 className={css.hbox(12)}
                             >
-                                <div className={css.flexGrow(1)}>
-                                    {machineId} ({machineInfo.info["getExternalIP"]})
+                                <div className={css.vbox(5)}>
+                                    <div>
+                                        {machineId} ({machineInfo.info["getExternalIP"]})
+                                    </div>
                                 </div>
                                 {isMachineDead && (
                                     <div className={css.colorhsl(0, 80, 50)}>
@@ -365,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
@@ -513,6 +517,33 @@ type ServiceConfig = ${serviceConfigType}
 
                 <div className={css.marginAuto}></div>
 
+                <button className={css.pad2(12, 8).button.bord2(0, 0, 20).hsl(110, 70, 90)}
+                    onClick={() => {
+                        if (!selectedServiceId) return;
+
+                        const newServiceId = `service-${Math.round(Date.now())}`;
+                        const clonedConfig = deepCloneJSON(config);
+                        clonedConfig.serviceId = newServiceId;
+                        clonedConfig.parameters.deploy = false;
+                        clonedConfig.info.title += " (Copy)";
+
+                        Querysub.onCommitFinished(async () => {
+                            try {
+                                await controller.addServiceConfig.promise(newServiceId, clonedConfig);
+                                Querysub.commit(() => {
+                                    selectedServiceIdParam.value = newServiceId;
+                                    this.state.unsavedChanges = undefined;
+                                });
+                            } catch (error) {
+                                Querysub.localCommit(() => {
+                                    this.state.saveError = error instanceof Error ? error.message : String(error);
+                                });
+                            }
+                        });
+                    }}>
+                    ✚ Duplicate Service
+                </button>
+
                 <button className={css.pad2(12, 8).button.bord2(0, 80, 50).hsl(0, 80, 90)}
                     onClick={() => {
                         if (!selectedServiceId) return;