noninteractive 0.3.22 → 0.3.24

package/bin/noninteractive.js

@@ -35,6 +35,7 @@ var exports_paths = {};
 __export(exports_paths, {
   socketPath: () => socketPath,
   sessionUrlsFile: () => sessionUrlsFile,
+  sessionOutputFile: () => sessionOutputFile,
   sessionDir: () => sessionDir,
   sessionBinDir: () => sessionBinDir,
   ensureSessionsDir: () => ensureSessionsDir,
@@ -58,6 +59,9 @@ function sessionBinDir(name) {
 function sessionUrlsFile(name) {
   return resolve(SESSIONS_DIR, name, "urls");
 }
+function sessionOutputFile(name) {
+  return resolve(SESSIONS_DIR, `${name}.output`);
+}
 var SESSIONS_DIR;
 var init_paths = __esm(() => {
   SESSIONS_DIR = resolve(homedir(), ".noninteractive", "sessions");
@@ -82,6 +86,9 @@ function sessionBinDir2(name) {
 function sessionUrlsFile2(name) {
   return resolve2(SESSIONS_DIR2, name, "urls");
 }
+function sessionOutputFile2(name) {
+  return resolve2(SESSIONS_DIR2, `${name}.output`);
+}
 var SESSIONS_DIR2;
 var init_paths2 = __esm(() => {
   SESSIONS_DIR2 = resolve2(homedir2(), ".noninteractive", "sessions");
@@ -236,6 +243,9 @@ function runDaemon(sessionName, executable, args) {
     exitCode = code;
     outputBuffer += `
 [exited ${code}]`;
+    try {
+      writeFileSync(sessionOutputFile2(sessionName), outputBuffer);
+    } catch {}
     if (notifyDebounce)
       clearTimeout(notifyDebounce);
     notifyDebounce = null;
@@ -329,6 +339,9 @@ function runDaemon(sessionName, executable, args) {
         break;
       }
       case "stop":
+        try {
+          writeFileSync(sessionOutputFile2(sessionName), outputBuffer);
+        } catch {}
         proc.kill("SIGTERM");
         socket.end(JSON.stringify({ ok: true }));
         setTimeout(() => {
@@ -364,7 +377,7 @@ var init_daemon = __esm(() => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "noninteractive",
-    version: "0.3.22",
+    version: "0.3.24",
     type: "module",
     bin: {
       noninteractive: "./bin/noninteractive.js"
@@ -394,7 +407,7 @@ var require_package = __commonJS((exports, module) => {
 
 // src/index.ts
 import { execSync, spawn as spawn2 } from "child_process";
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 
 // src/client.ts
 import { createConnection } from "node:net";
@@ -490,11 +503,85 @@ more examples:
   npx noninteractive vercel                 # session "vercel"
   npx noninteractive supabase init          # session "supabase"
   npx noninteractive start vercel login     # explicit start for non-npx commands`;
-var stripAnsi = (s) => s.replace(/\x1b\[[012]?K/g, `
-`).replace(/\x1b\[[\x20-\x3f]*[\x40-\x7e]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\x1b[()][A-Z0-9]|\x1b[\x20-\x2f]*[\x30-\x7e]|\x07/g, "").replace(/\r\n?/g, `
+function stripAnsi(s) {
+  s = s.replace(/\x1b\[[012]?K/g, `
+`);
+  let result = "";
+  let bold = false;
+  let boldBuf = "";
+  let i = 0;
+  while (i < s.length) {
+    if (s[i] === "\x1B" && s[i + 1] === "[") {
+      const end = s.indexOf("m", i + 2);
+      if (end !== -1 && end - i < 16 && /^[\d;]*$/.test(s.slice(i + 2, end))) {
+        const codes = s.slice(i + 2, end).split(";").map(Number);
+        for (const code of codes) {
+          if (code === 1 || code === 4 || code === 7) {
+            if (!bold) {
+              bold = true;
+              boldBuf = "";
+            }
+          } else if (code === 0 || code === 22 || code === 24 || code === 27) {
+            if (bold && boldBuf.trim()) {
+              result += `**${boldBuf}**`;
+            } else if (bold) {
+              result += boldBuf;
+            }
+            bold = false;
+            boldBuf = "";
+          }
+        }
+        i = end + 1;
+        continue;
+      }
+    }
+    if (s[i] === "\x1B") {
+      if (s[i + 1] === "[") {
+        const end = s.slice(i + 2).search(/[\x40-\x7e]/);
+        if (end !== -1) {
+          i += end + 3;
+          continue;
+        }
+      } else if (s[i + 1] === "]") {
+        const end = s.indexOf("\x07", i);
+        if (end !== -1) {
+          i = end + 1;
+          continue;
+        }
+        const end2 = s.indexOf("\x1B\\", i);
+        if (end2 !== -1) {
+          i = end2 + 2;
+          continue;
+        }
+      } else if (s[i + 1] === "(" || s[i + 1] === ")") {
+        i += 3;
+        continue;
+      } else {
+        i += 2;
+        continue;
+      }
+    }
+    if (s[i] === "\x07") {
+      i++;
+      continue;
+    }
+    if (bold) {
+      boldBuf += s[i];
+    } else {
+      result += s[i];
+    }
+    i++;
+  }
+  if (bold && boldBuf.trim()) {
+    result += `**${boldBuf}**`;
+  } else if (bold) {
+    result += boldBuf;
+  }
+  return result.replace(/\r\n?/g, `
 `).replace(/\n{3,}/g, `
 
 `);
+}
 var seenUrls = new Set;
 function openUrl(url) {
   try {
@@ -654,13 +741,26 @@ async function read(name, wait, timeout, noOpen = false) {
     msg.timeout = timeout;
   }
   const clientTimeout = wait ? timeout + 5000 : 5000;
-  const res = await sendMessage(sock, msg, clientTimeout);
-  if (res.output !== undefined)
-    process.stdout.write(stripAnsi(res.output));
-  handleUrls(res, noOpen);
-  if (res.exited)
-    console.log(`
+  try {
+    const res = await sendMessage(sock, msg, clientTimeout);
+    if (res.output !== undefined)
+      process.stdout.write(stripAnsi(res.output));
+    handleUrls(res, noOpen);
+    if (res.exited)
+      console.log(`
 [exited ${res.exitCode}]`);
+  } catch {
+    const outputFile = sessionOutputFile(name);
+    if (existsSync2(outputFile)) {
+      const output = readFileSync2(outputFile, "utf-8");
+      process.stdout.write(stripAnsi(output));
+      console.log(`
+[session exited]`);
+    } else {
+      console.error(`session '${name}' not found`);
+      process.exit(1);
+    }
+  }
 }
 async function send(name, text, wait, timeout, noOpen = false) {
   if (text === "")
@@ -668,17 +768,30 @@ async function send(name, text, wait, timeout, noOpen = false) {
   text = text.replace(/\\x([0-9a-fA-F]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16))).replace(/\\r/g, "\r").replace(/\\n/g, `
 `).replace(/\\t/g, "\t");
   const sock = socketPath(name);
-  if (wait) {
-    const res = await sendMessage(sock, { action: "sendread", data: text, timeout }, timeout + 5000);
-    if (res.output !== undefined)
-      process.stdout.write(stripAnsi(res.output));
-    handleUrls(res, noOpen);
-    if (res.exited)
-      console.log(`
+  try {
+    if (wait) {
+      const res = await sendMessage(sock, { action: "sendread", data: text, timeout }, timeout + 5000);
+      if (res.output !== undefined)
+        process.stdout.write(stripAnsi(res.output));
+      handleUrls(res, noOpen);
+      if (res.exited)
+        console.log(`
 [exited ${res.exitCode}]`);
-  } else {
-    await sendMessage(sock, { action: "send", data: text });
-    console.log(`[sent to '${name}' \u2014 run "npx noninteractive read ${name}" to see the result]`);
+    } else {
+      await sendMessage(sock, { action: "send", data: text });
+      console.log(`[sent to '${name}' \u2014 run "npx noninteractive read ${name}" to see the result]`);
+    }
+  } catch {
+    const outputFile = sessionOutputFile(name);
+    if (existsSync2(outputFile)) {
+      const output = readFileSync2(outputFile, "utf-8");
+      process.stdout.write(stripAnsi(output));
+      console.log(`
+[session exited]`);
+    } else {
+      console.error(`session '${name}' not found`);
+      process.exit(1);
+    }
   }
 }
 async function stop(name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noninteractive",
-  "version": "0.3.22",
+  "version": "0.3.24",
   "type": "module",
   "bin": {
     "noninteractive": "./bin/noninteractive.js"