querysub 0.217.0 → 0.219.0

package/package.json

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

@@ -68,31 +68,27 @@ function textTableLineToObj(text: string): Record<string, string>[] {
     let dataLines = lines.slice(1);
 
     // Parse column positions from header
-    let columns: { name: string; start: number; end: number }[] = [];
     let headerWords = headerLine.match(/\S+/g) || [];
+    if (headerWords.length === 0) return [];
 
+    // Find column boundaries: start at 0, then at end of each header word (except last), then start of last header, then end of line
+    let boundaries: number[] = [0];
+    let searchPos = 0;
     for (let i = 0; i < headerWords.length; i++) {
         let word = headerWords[i];
-        let wordStart = headerLine.indexOf(word, i === 0 ? 0 : columns[i - 1].end);
-        let wordEnd = wordStart + word.length;
-
-        let columnStart: number;
-        let columnEnd: number;
-
-        if (i === headerWords.length - 1) {
-            // Last header: column starts at the start of header word and goes to end of line
-            columnStart = wordStart;
-            columnEnd = headerLine.length;
-        } else {
-            // Non-last headers: column starts after previous column and ends at end of header word
-            columnStart = i === 0 ? 0 : columns[i - 1].end;
-            columnEnd = wordEnd;
-        }
+        searchPos = headerLine.indexOf(word, searchPos) + word.length;
+        boundaries.push(searchPos);
+    }
+    boundaries[boundaries.length - 1] = Number.MAX_SAFE_INTEGER;
+    console.log(`boundaries: ${JSON.stringify(boundaries)}`);
 
+    // Create column definitions using boundaries
+    let columns: { name: string; start: number; end: number }[] = [];
+    for (let i = 0; i < headerWords.length; i++) {
         columns.push({
-            name: word,
-            start: columnStart,
-            end: columnEnd
+            name: headerWords[i],
+            start: boundaries[i],
+            end: boundaries[i + 1]
         });
     }
 
@@ -109,18 +105,6 @@ function textTableLineToObj(text: string): Record<string, string>[] {
 
     return results;
 }
-async function getLinuxProcessInfo(pid: string) {
-    try {
-        let extraArgs = os.platform() !== "win32" && " -o ppid,cmd" || "";
-        let psInfo = await runPromise(`ps -p ${pid}${extraArgs}`);
-        let results = textTableLineToObj(psInfo);
-        let obj = results[0] as { PPID: string; CMD: string };
-        return obj;
-    } catch (e: any) {
-        console.warn(`Error getting tmux process info for ${pid}: ${e.stack}`);
-        return undefined;
-    }
-}
 const getLinuxChildPids = measureWrap(async function getLinuxChildPids(pid: string): Promise<{ PID: string; PPID: string; CMD: string }[]> {
     let prefix = getTmuxPrefix();
     if (os.platform() === "win32") {