querysub 0.247.0 → 0.248.0

package/package.json

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

@@ -97,9 +97,54 @@ export async function streamScreenOutput(config: {
     return (async () => {
         try {
             const pipeFile = `${root}${screenName}/pipe.txt`;
+            const tailScript = `${root}${screenName}/smart_tail.sh`;
+
+            // Create a smart tail script that handles file truncation
+            await fs.promises.writeFile(tailScript, `#!/bin/bash
+PIPE_FILE="$1"
+
+# Initialize position tracking
+CURRENT_POS=0
+
+# Read initial content and get file size
+if [ -f "$PIPE_FILE" ]; then
+    CURRENT_SIZE=$(stat -c%s "$PIPE_FILE" 2>/dev/null || wc -c < "$PIPE_FILE")
+    # Output initial content like tail would
+    if [ $CURRENT_SIZE -gt 0 ]; then
+        cat "$PIPE_FILE"
+        CURRENT_POS=$CURRENT_SIZE
+    fi
+else
+    CURRENT_SIZE=0
+fi
+
+# Watch for file changes
+while inotifywait -q -e modify "$PIPE_FILE" 2>/dev/null; do
+    if [ -f "$PIPE_FILE" ]; then
+        NEW_SIZE=$(stat -c%s "$PIPE_FILE" 2>/dev/null || wc -c < "$PIPE_FILE")
+        
+        if [ $NEW_SIZE -lt $CURRENT_SIZE ]; then
+            # File has shrunk (truncated), reset position to end of file
+            # Don't output anything, just reset our tracking
+            CURRENT_POS=$NEW_SIZE
+            CURRENT_SIZE=$NEW_SIZE
+        elif [ $NEW_SIZE -gt $CURRENT_SIZE ]; then
+            # File grew normally, read only the new part
+            if [ $CURRENT_POS -lt $NEW_SIZE ]; then
+                # Use tail with byte offset to read from current position
+                tail -c +$((CURRENT_POS + 1)) "$PIPE_FILE" | head -c $((NEW_SIZE - CURRENT_POS))
+                CURRENT_POS=$NEW_SIZE
+            fi
+            CURRENT_SIZE=$NEW_SIZE
+        fi
+        # If sizes are equal, no change to output
+    fi
+done`);
+
+            await runPromise(`chmod +x ${tailScript}`);
 
-            // Use tail -f to follow the pipe file
-            childProcess = spawn(`tail`, ["-f", pipeFile, "--lines", "1000"], {
+            // Use our smart tail script instead of regular tail
+            childProcess = spawn("bash", [tailScript, pipeFile], {
                 stdio: "pipe",
             });
 
@@ -312,6 +357,8 @@ while IFS= read -r line; do
             # Count total lines in file
             total_lines=$(wc -l < "${pipeFile}")
             if [ "$total_lines" -gt ${PIPE_FILE_LINE_LIMIT} ]; then
+                # Wait 2 seconds to give the watcher time to read pending content
+                sleep 2
                 # Keep only the last ${PIPE_FILE_LINE_LIMIT} lines when file gets too many lines
                 tail -n ${Math.floor(PIPE_FILE_LINE_LIMIT / 2)} "${pipeFile}" > "${pipeFile}.tmp" && mv "${pipeFile}.tmp" "${pipeFile}"
             fi