querysub 0.656.0 → 0.657.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.656.0",
+  "version": "0.657.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -79,8 +79,8 @@
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
     "peggy": "^5.0.6",
-    "sliftutils": "^1.7.128",
-    "socket-function": "^1.2.34",
+    "sliftutils": "^1.7.130",
+    "socket-function": "^1.2.35",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",
     "typesafecss": "^0.32.0",

package/src/deployManager/setupMachineMain.ts

@@ -114,6 +114,12 @@ async function writeRemoteFile(sshRemote: string, remotePath: string, content: s
     await runPromise(`ssh ${sshRemote} "echo ${encoded} | base64 -d | ${write}"`);
 }
 
+/** Reads one value off the remote: the last line of the command's output, since banners and connection chatter come before it. */
+async function sshValue(sshRemote: string, command: string, config?: { nothrow?: boolean }): Promise<string> {
+    let output = await runPromise(`ssh ${sshRemote} "${command}"`, { nothrow: config?.nothrow });
+    return (output.trim().split("\n").at(-1) || "").trim();
+}
+
 function getGitHubKeyCachePath(repoUrl: string): string {
     let repoOwner = "";
     let repoName = "";
@@ -491,7 +497,7 @@ async function main() {
             }
 
             // Get the public key from remote machine
-            const sshPublicKey = await runPromise(`ssh ${sshRemote} "cat ~/.ssh/id_rsa.pub"`);
+            const sshPublicKey = await sshValue(sshRemote, "cat ~/.ssh/id_rsa.pub");
             const keyTitle = `Machine Setup - ${sshRemote} - ${new Date().toISOString()}`;
 
             // Add the deploy key to GitHub repository
@@ -513,8 +519,8 @@ async function main() {
     console.log("✅ Dependencies installed");
 
     // 6. Install the daemon that keeps the machine process running
-    let remoteUser = (await runPromise(`ssh ${sshRemote} "whoami"`)).trim();
-    let remoteHome = (await runPromise(`ssh ${sshRemote} "echo $HOME"`)).trim();
+    let remoteUser = await sshValue(sshRemote, "whoami");
+    let remoteHome = await sshValue(sshRemote, "echo $HOME");
     console.log(`Installing the ${SERVICE_UNIT_NAME} daemon (user ${remoteUser}, home ${remoteHome})...`);
     await writeRemoteFile(sshRemote, `~/${DAEMON_SCRIPT_NAME}`, getDaemonScript(remoteHome), false);
     await runPromise(`ssh ${sshRemote} "chmod +x ~/${DAEMON_SCRIPT_NAME}"`);
@@ -560,7 +566,7 @@ sudo systemctl start ${SERVICE_UNIT_NAME}
     let screenDeadline = Date.now() + SCREEN_VERIFY_TIMEOUT;
     let screenUp = false;
     while (Date.now() < screenDeadline) {
-        let panePid = (await runPromise(`ssh ${sshRemote} "tmux list-panes -t ${SERVICE_NAME} -F '#{pane_pid}' 2>/dev/null || true"`, { nothrow: true })).trim();
+        let panePid = await sshValue(sshRemote, `tmux list-panes -t ${SERVICE_NAME} -F '#{pane_pid}' 2>/dev/null || true`, { nothrow: true });
         if (panePid) {
             screenUp = true;
             break;