querysub 0.240.0 → 0.242.0

package/package.json

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

@@ -23,6 +23,9 @@ import { blue, green, magenta, red } from "socket-function/src/formatting/logCol
 import { shutdown } from "../diagnostics/periodic";
 import { onServiceConfigChange } from "./machineController";
 import { PromiseObj } from "../promise";
+import path from "path";
+
+const PIPE_FILE_LINE_LIMIT = 10;
 
 const getLiveMachineInfo = measureWrap(async function getLiveMachineInfo() {
     let machineInfo: MachineInfo = {
@@ -51,6 +54,8 @@ export async function streamScreenOutput(config: {
     index: number;
     onData: (data: string) => Promise<void>;
 }) {
+    // Find the pipe file for this screen
+    const root = os.homedir() + "/" + SERVICE_FOLDER;
     let screenName = getScreenName({
         serviceKey: config.key,
         index: config.index,
@@ -95,21 +100,19 @@ 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}`, {
-                shell: true,
+            const pipeFile = `${root}${screenName}/pipe.txt`;
+
+            // Use tail -f to follow the pipe file
+            childProcess = spawn(`tail`, ["-F", pipeFile], {
                 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}`);
@@ -296,6 +299,31 @@ ${config.command}
 `;
     await fs.promises.writeFile(config.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");
+    await fs.promises.writeFile(pipeScript, `#!/bin/bash
+line_count=0
+while IFS= read -r line; do
+    echo "$line" >> "${pipeFile}"
+    ((line_count++))
+    
+    # Check file size every 100 lines to avoid too much overhead
+    if (( line_count % ${PIPE_FILE_LINE_LIMIT} == 0 )); then
+        if [ -f "${pipeFile}" ]; then
+            # Get file size (works on both Linux and macOS)
+            filesize=$(stat -f%z "${pipeFile}" 2>/dev/null || stat -c%s "${pipeFile}" 2>/dev/null || echo 0)
+            if [ "$filesize" -gt 1048576 ]; then
+                # Keep only the last 1000 lines when file gets too big
+                tail -n ${PIPE_FILE_LINE_LIMIT} "${pipeFile}" > "${pipeFile}.tmp" && mv "${pipeFile}.tmp" "${pipeFile}"
+            fi
+        fi
+    fi
+done`);
+    await runPromise(`chmod +x ${pipeScript}`);
+    await runPromise(`${prefix}tmux pipe-pane -t ${screenName} 'bash ${pipeScript}'`);
 });
 const killScreen = measureWrap(async function killScreen(config: {
     screenName: string;

package/src/deployManager/spec.txt

@@ -5,7 +5,9 @@ Syncing isn't updating?
     - Buttons per key + index, which we can figure out clientside. Stream results under the button, and we can stream multiple at once?
     - OH, just for superusers, so the browser can connect directly!
 
-OH! I think if something is scrollable, and is scrolled down, it'll stick to the bottom. We just need it to start scrollable!
+2) Verify when the file is truncated it still works
+
+3) OH! I think if something is scrollable, and is scrolled down, it'll stick to the bottom. We just need it to start scrollable!
 
 4) Destroy our testing digital ocean server
 

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 = "";