querysub 0.240.0 → 0.241.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.240.0",
+  "version": "0.241.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/machineApplyMainCode.ts

@@ -95,21 +95,17 @@ export async function streamScreenOutput(config: {
             const captureCommand = `${prefix}tmux capture-pane -p -S -2000 -t ${screenName}`;
             // Initial data
             const initialContent = await runPromise(captureCommand, { quiet: true });
-            console.log(green(`Callback to onDataWrapped ${screenName} ${initialContent.length}`));
             if (initialContent) {
                 await onDataWrapped(initialContent);
             }
-            console.log(green(`After callback to onDataWrapped ${screenName} ${initialContent.length}`));
 
-            childProcess = spawn(`${prefix}tmux pipe-pane -t ${screenName}`, {
+            childProcess = spawn(`${prefix}tmux pipe-pane -t ${screenName} 'cat'`, {
                 shell: true,
                 stdio: "pipe",
             });
 
             let started = new PromiseObj<void>();
 
-            console.log(green(`Has stdout: ${!!childProcess.stdout}`));
-
             childProcess.stdout?.on("data", (data) => {
                 if (stopped) return;
                 console.log(`Captured data for ${screenName}: ${data.length}`);

package/src/functional/runCommand.ts

@@ -14,7 +14,8 @@ export async function runPromise(command: string, config?: {
         const childProc = child_process.spawn(command, {
             shell: true,
             cwd: config?.cwd,
-            stdio: ["inherit", "pipe", "pipe"], // stdin: inherit, stdout: pipe, stderr: pipe
+            // NOTE: Now we pipe stdin, as I think inheriting it was causing us to block sometimes?
+            stdio: ["pipe", "pipe", "pipe"],
         });
 
         let fullOutput = "";