querysub 0.256.0 → 0.257.0

package/package.json

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

package/src/-f-node-discovery/NodeDiscovery.ts

@@ -472,6 +472,11 @@ if (isServer()) {
     }
 }
 
+export async function forceRemoveNode(nodeId: string) {
+    await archives().del(nodeId);
+    void tellEveryoneNodesChanges();
+}
+
 
 /** Called on shutdown, to completely remove this node from discovery. */
 export async function nodeDiscoveryShutdown() {

package/src/4-querysub/Querysub.ts

@@ -48,6 +48,8 @@ import yargs, { check } from "yargs";
 import { parseArgsFactory } from "../misc/rawParams";
 
 import * as typesafecss from "typesafecss";
+
+
 typesafecss.setMeasureBlock(measureBlock);
 typesafecss.setDelayFnc(async fnc => {
     await (clientWatcher.waitForBeforeTriggerFinished() || Promise.resolve());
@@ -1254,6 +1256,13 @@ setImmediate(async () => {
     await import("../5-diagnostics/nodeMetadata");
 });
 
+setImmediate(async () => {
+    if (isNode()) {
+        const { doRegisterNodeForMachineCleanup } = await import("../deployManager/machineSchema");
+        doRegisterNodeForMachineCleanup();
+    }
+});
+
 registerGetCompressNetwork(() => Querysub.COMPRESS_NETWORK);
 registerGetCompressDisk(() => Querysub.COMPRESS_DISK);
 
@@ -1269,4 +1278,5 @@ import { css } from "../4-dom/css";
 import { getCountPerPaint } from "../functional/onNextPaint";
 import { addEpsilons } from "../bits";
 import { blue } from "socket-function/src/formatting/logColors";
+import { MachineController } from "../deployManager/machineController";
 

package/src/deployManager/machineApplyMainCode.ts

@@ -2,9 +2,9 @@ import "../inject";
 
 import { measureWrap } from "socket-function/src/profiling/measure";
 import { getOwnMachineId } from "../-a-auth/certs";
-import { getOurNodeId, getOurNodeIdAssert } from "../-f-node-discovery/NodeDiscovery";
+import { forceRemoveNode, getOurNodeId, getOurNodeIdAssert } from "../-f-node-discovery/NodeDiscovery";
 import { Querysub } from "../4-querysub/QuerysubController";
-import { MACHINE_RESYNC_INTERVAL, MachineServiceControllerBase, MachineInfo, ServiceConfig, serviceConfigs, SERVICE_FOLDER, machineInfos } from "./machineSchema";
+import { MACHINE_RESYNC_INTERVAL, MachineServiceControllerBase, MachineInfo, ServiceConfig, serviceConfigs, SERVICE_FOLDER, machineInfos, SERVICE_NODE_FILE_NAME } from "./machineSchema";
 import { runPromise } from "../functional/runCommand";
 import { getExternalIP } from "socket-function/src/networking";
 import { errorToUndefined, errorToUndefinedSilent } from "../errors";
@@ -305,10 +305,17 @@ const getScreenState = measureWrap(async function getScreenState(populateIsProce
 
     return screenList;
 });
+async function removeOldNodeId(screenName: string) {
+    let screenNameFile = os.homedir() + "/" + SERVICE_FOLDER + screenName + "/" + SERVICE_NODE_FILE_NAME;
+    if (fs.existsSync(screenNameFile)) {
+        let nodeId = await fs.promises.readFile(screenNameFile, "utf8");
+        await fs.promises.unlink(screenNameFile);
+        await forceRemoveNode(nodeId);
+    }
+}
 const runScreenCommand = measureWrap(async function runScreenCommand(config: {
     screenName: string;
     command: string;
-    folder: string;
 }) {
     let screenName = config.screenName;
     // C:/cygwin64/bin/tmux has-session -t myproj 2>/dev/null || C:/cygwin64/bin/tmux new-session -d -s myproj
@@ -321,6 +328,7 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
     await runPromise(`${prefix}tmux send-keys -t ${screenName} 'C-c' Enter`);
     await delay(1000);
 
+
     let screens = await getScreenState();
     let screen = screens.find(x => x.screenName === screenName);
     let pid = screen?.pid;
@@ -343,23 +351,24 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
                 await runScreenCommand({
                     screenName,
                     command: config.command,
-                    folder: config.folder,
                 });
                 return;
             }
         }
     }
-    await runPromise(`${prefix}tmux send-keys -t ${screenName} 'cd ${config.folder}' Enter`);
+    await removeOldNodeId(screenName);
+    let folder = os.homedir() + "/" + SERVICE_FOLDER + screenName + "/";
+    await runPromise(`${prefix}tmux send-keys -t ${screenName} 'cd ${folder}git' Enter`);
     let command = `#!/bin/bash
 ${config.command}
 `;
-    await fs.promises.writeFile(config.folder + "../command.sh", command);
+    await fs.promises.writeFile(folder + "command.sh", command);
     await runPromise(`${prefix}tmux send-keys -t ${screenName} 'bash ../command.sh' Enter`);
 
     // Setup pipe-pane as well
 
-    let pipeFile = path.resolve(config.folder + "../pipe.txt");
-    let pipeScript = path.resolve(config.folder + "../pipe.sh");
+    let pipeFile = path.resolve(folder + "pipe.txt");
+    let pipeScript = path.resolve(folder + "pipe.sh");
     await fs.promises.writeFile(pipeScript, `#!/bin/bash
 line_count=0
 while IFS= read -r line; do
@@ -390,6 +399,7 @@ const killScreen = measureWrap(async function killScreen(config: {
 }) {
     let prefix = getTmuxPrefix();
     await runPromise(`${prefix}tmux kill-session -t ${config.screenName}`);
+    await removeOldNodeId(config.screenName);
 });
 const ensureGitSynced = measureWrap(async function ensureGitSynced(config: {
     // Ensures existingFolder is the repo, as in, cwd to it, and git clone ., if needed. Reset the hash, in whatever way we need to, to force it to gitRef (git add --all and stash, etc, etc).
@@ -515,7 +525,6 @@ const resyncServicesBase = runInSerial(measureWrap(async function resyncServices
                 await runScreenCommand({
                     screenName,
                     command: config.parameters.command,
-                    folder: gitFolder,
                 });
                 await delay(2000);
                 let newScreens = await getScreenState(false);

package/src/deployManager/machineSchema.ts

@@ -18,9 +18,12 @@ import { OnServiceChange } from "./machineController";
 import path from "path";
 import fs from "fs";
 import { runPromise } from "../functional/runCommand";
+import { isNode } from "typesafecss";
 
-export const SERVICE_FOLDER = "machine-services/";
+const SERVICE_FOLDER_NAME = "machine-services";
+export const SERVICE_FOLDER = `${SERVICE_FOLDER_NAME}/`;
 export const MACHINE_RESYNC_INTERVAL = timeInMinute * 15;
+export const SERVICE_NODE_FILE_NAME = "serviceNodeId.txt";
 
 export type MachineInfo = {
     machineId: string;
@@ -83,6 +86,20 @@ export type ServiceConfig = {
 export const machineInfos = archiveJSONT<MachineInfo>(() => nestArchives("machines/machine-heartbeats/", getArchivesBackblaze(getDomain())));
 export const serviceConfigs = archiveJSONT<ServiceConfig>(() => nestArchives("machines/service-configs/", getArchivesBackblaze(getDomain())));
 
+export function doRegisterNodeForMachineCleanup() {
+    if (isNode()) {
+        void SocketFunction.mountPromise.finally(() => {
+            void registerNodeForMachineCleanup(SocketFunction.mountedNodeId);
+        });
+    }
+}
+async function registerNodeForMachineCleanup(nodeId: string) {
+    let currentPath = path.resolve(".").replaceAll("\\", "/");
+    let array = currentPath.split("/");
+    if (array.at(-1) === "git" && array.at(-2) === SERVICE_FOLDER_NAME) {
+        await fs.promises.writeFile(array.slice(0, -2).join("/") + "/" + SERVICE_NODE_FILE_NAME, nodeId);
+    }
+}
 
 export class MachineServiceControllerBase {
 

package/src/deployManager/spec.txt

@@ -1,10 +1,4 @@
-OH, okay, so... we DO need machine update support, because... we will need to update them
-
-
-7) Quick node removal on process crash OR removal
-    - In the service, check our parent folder to see if we are in a screen (/machine-services/git/), and then write our nodeId to /machine-services/nodeId
-    - If we see a nodeId when we are removing a screen, or killing the service, then delete that nodeId from the nodeId directory (and call tellEveryoneNodesChanges)
-7.1) Verify this by killing a lot of services (the function runner?), by just poking it over and over, verifying the nodes are quickly deleted
+7.1) Verify quick node removal work by having a repeatedly crashing service, verifying the node exists, and then goes away on crash.