noninteractive 0.3.12 → 0.3.14

package/bin/noninteractive.js

@@ -34,6 +34,9 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 var exports_paths = {};
 __export(exports_paths, {
   socketPath: () => socketPath,
+  sessionUrlsFile: () => sessionUrlsFile,
+  sessionDir: () => sessionDir,
+  sessionBinDir: () => sessionBinDir,
   ensureSessionsDir: () => ensureSessionsDir,
   SESSIONS_DIR: () => SESSIONS_DIR
 });
@@ -46,6 +49,15 @@ function ensureSessionsDir() {
 function socketPath(name) {
   return resolve(SESSIONS_DIR, `${name}.sock`);
 }
+function sessionDir(name) {
+  return resolve(SESSIONS_DIR, name);
+}
+function sessionBinDir(name) {
+  return resolve(SESSIONS_DIR, name, "bin");
+}
+function sessionUrlsFile(name) {
+  return resolve(SESSIONS_DIR, name, "urls");
+}
 var SESSIONS_DIR;
 var init_paths = __esm(() => {
   SESSIONS_DIR = resolve(homedir(), ".noninteractive", "sessions");
@@ -61,6 +73,15 @@ function ensureSessionsDir2() {
 function socketPath2(name) {
   return resolve2(SESSIONS_DIR2, `${name}.sock`);
 }
+function sessionDir2(name) {
+  return resolve2(SESSIONS_DIR2, name);
+}
+function sessionBinDir2(name) {
+  return resolve2(SESSIONS_DIR2, name, "bin");
+}
+function sessionUrlsFile2(name) {
+  return resolve2(SESSIONS_DIR2, name, "urls");
+}
 var SESSIONS_DIR2;
 var init_paths2 = __esm(() => {
   SESSIONS_DIR2 = resolve2(homedir2(), ".noninteractive", "sessions");
@@ -72,7 +93,15 @@ __export(exports_daemon, {
   runDaemon: () => runDaemon
 });
 import { spawn } from "node:child_process";
-import { unlinkSync } from "node:fs";
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync as mkdirSync3,
+  readFileSync,
+  rmSync,
+  unlinkSync,
+  writeFileSync
+} from "node:fs";
 import { createServer } from "node:net";
 import { dirname, resolve as resolve3 } from "node:path";
 function getPtyBridge() {
@@ -95,15 +124,48 @@ function getPtyBridge() {
   }
   return candidates[0];
 }
+function createInterceptorScripts(name) {
+  const binDir = sessionBinDir2(name);
+  const urlsFile = sessionUrlsFile2(name);
+  mkdirSync3(binDir, { recursive: true });
+  const openScript = `#!/bin/sh
+case "$1" in
+  http://*|https://*) echo "$1" >> "${urlsFile}" ;;
+  *) /usr/bin/open "$@" ;;
+esac
+`;
+  const xdgOpenScript = `#!/bin/sh
+echo "$1" >> "${urlsFile}"
+`;
+  const browserOpenScript = `#!/bin/sh
+echo "$1" >> "${urlsFile}"
+`;
+  for (const [file, content] of [
+    ["open", openScript],
+    ["xdg-open", xdgOpenScript],
+    ["browser-open", browserOpenScript]
+  ]) {
+    const path = resolve3(binDir, file);
+    writeFileSync(path, content);
+    chmodSync(path, 493);
+  }
+}
+function cleanupSession(name) {
+  try {
+    rmSync(sessionDir2(name), { recursive: true, force: true });
+  } catch {}
+}
 function runDaemon(sessionName, executable, args) {
   ensureSessionsDir2();
   const sock = socketPath2(sessionName);
   try {
     unlinkSync(sock);
   } catch {}
+  createInterceptorScripts(sessionName);
   let outputBuffer = "";
   let processExited = false;
   let exitCode = null;
+  const detectedUrls = new Set;
   const waiters = [];
   function notifyWaiters() {
     let w = waiters.shift();
@@ -113,18 +175,50 @@ function runDaemon(sessionName, executable, args) {
       w = waiters.shift();
     }
   }
+  const binDir = sessionBinDir2(sessionName);
   const ptyBridge = getPtyBridge();
   const proc = spawn(ptyBridge, [executable, ...args], {
     stdio: ["pipe", "pipe", "pipe"],
-    env: { ...process.env, TERM: "xterm-256color" }
+    env: {
+      ...process.env,
+      TERM: "xterm-256color",
+      BROWSER: resolve3(binDir, "browser-open"),
+      PATH: `${binDir}:${process.env.PATH}`
+    }
   });
   const { stdout, stderr, stdin } = proc;
+  function scanForUrls(text) {
+    const matches = text.match(URL_RE);
+    if (matches) {
+      for (const url of matches)
+        detectedUrls.add(url);
+    }
+  }
+  function readInterceptedUrls() {
+    const urlsFile = sessionUrlsFile2(sessionName);
+    try {
+      if (!existsSync(urlsFile))
+        return;
+      const content = readFileSync(urlsFile, "utf-8");
+      const lines = content.split(`
+`);
+      for (const line of lines) {
+        const trimmed = line.trim();
+        if (trimmed)
+          detectedUrls.add(trimmed);
+      }
+    } catch {}
+  }
   stdout?.on("data", (chunk) => {
-    outputBuffer += chunk.toString();
+    const text = chunk.toString();
+    outputBuffer += text;
+    scanForUrls(text);
     notifyWaiters();
   });
   stderr?.on("data", (chunk) => {
-    outputBuffer += chunk.toString();
+    const text = chunk.toString();
+    outputBuffer += text;
+    scanForUrls(text);
     notifyWaiters();
   });
   proc.on("exit", (code) => {
@@ -138,6 +232,7 @@ function runDaemon(sessionName, executable, args) {
       try {
         unlinkSync(sock);
       } catch {}
+      cleanupSession(sessionName);
       process.exit(0);
     }, 60000);
   });
@@ -158,11 +253,14 @@ function runDaemon(sessionName, executable, args) {
     });
   });
   function respondWithOutput(socket) {
+    readInterceptedUrls();
+    const urls = Array.from(detectedUrls);
     socket.end(JSON.stringify({
       ok: true,
       output: outputBuffer,
       exited: processExited,
-      exitCode
+      exitCode,
+      ...urls.length > 0 ? { urls } : {}
     }));
   }
   function waitForNewOutput(socket, sinceLength, timeout) {
@@ -218,6 +316,7 @@ function runDaemon(sessionName, executable, args) {
           try {
             unlinkSync(sock);
           } catch {}
+          cleanupSession(sessionName);
           process.exit(0);
         }, 500);
         break;
@@ -235,15 +334,17 @@ function runDaemon(sessionName, executable, args) {
   }
   server.listen(sock);
 }
+var URL_RE;
 var init_daemon = __esm(() => {
   init_paths2();
+  URL_RE = /https?:\/\/[^\s<>"')\]]+/g;
 });
 
 // package.json
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "noninteractive",
-    version: "0.3.12",
+    version: "0.3.14",
     type: "module",
     bin: {
       noninteractive: "./bin/noninteractive.js"
@@ -272,8 +373,8 @@ var require_package = __commonJS((exports, module) => {
 });
 
 // src/index.ts
-import { spawn as spawn2 } from "child_process";
-import { existsSync } from "fs";
+import { execSync, spawn as spawn2 } from "child_process";
+import { existsSync as existsSync2 } from "fs";
 
 // src/client.ts
 import { createConnection } from "node:net";
@@ -348,6 +449,7 @@ commands:
 flags:
   --wait, -w         block until new output appears (for send and read)
   --timeout <ms>     max wait time in ms (default: 30000, used with --wait)
+  --no-open          don't auto-open URLs in browser (still shown in output)
 
 the session name is auto-derived from the tool (e.g. "workos" \u2192 session "workos").
 
@@ -364,6 +466,30 @@ more examples:
   npx noninteractive start vercel login     # explicit start for non-npx commands`;
 var stripAnsi = (s) => s.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, `
 `);
+var seenUrls = new Set;
+function openUrl(url) {
+  try {
+    const cmd = process.platform === "darwin" ? "open" : "xdg-open";
+    execSync(`${cmd} ${JSON.stringify(url)}`, { stdio: "ignore" });
+  } catch {}
+}
+function handleUrls(res, noOpen) {
+  if (!res.urls || res.urls.length === 0)
+    return;
+  for (const url of res.urls) {
+    if (seenUrls.has(url))
+      continue;
+    seenUrls.add(url);
+    if (!noOpen) {
+      openUrl(url);
+      process.stderr.write(`[opened: ${url}]
+`);
+    } else {
+      process.stderr.write(`[url: ${url}]
+`);
+    }
+  }
+}
 function getSelfCommand() {
   const script = process.argv[1];
   if (!script)
@@ -391,7 +517,7 @@ function deriveSessionName(cmd, args) {
   const stripped = name.replace(/(?<=.)@[^/].*$/, "");
   return (stripped || name).replace(/^@[^/]+\//, "").replace(/[^a-zA-Z0-9_-]/g, "");
 }
-async function start(cmdArgs) {
+async function start(cmdArgs, noOpen = false) {
   const executable = cmdArgs[0];
   const args = cmdArgs.slice(1);
   const name = deriveSessionName(executable, args);
@@ -400,6 +526,7 @@ async function start(cmdArgs) {
     const res = await sendMessage(sock, { action: "read" });
     if (res.ok) {
       process.stdout.write(stripAnsi(res.output ?? ""));
+      handleUrls(res, noOpen);
       if (res.exited) {
         console.log(`
 [session '${name}' already exists but exited ${res.exitCode} \u2014 stopping it]`);
@@ -428,11 +555,11 @@ async function start(cmdArgs) {
   });
   child.unref();
   for (let i = 0;i < 50; i++) {
-    if (existsSync(sock))
+    if (existsSync2(sock))
       break;
     await new Promise((r) => setTimeout(r, 100));
   }
-  if (!existsSync(sock)) {
+  if (!existsSync2(sock)) {
     console.error(`error: failed to start session '${name}'.`);
     console.error(`the command was: ${executable} ${args.join(" ")}`);
     console.error(`
@@ -445,6 +572,7 @@ make sure the command exists. examples:`);
     await new Promise((r) => setTimeout(r, 200));
     try {
       const res = await sendMessage(sock, { action: "read" });
+      handleUrls(res, noOpen);
       const clean = stripAnsi(res.output ?? "").trim();
       if (clean.length > 10) {
         process.stdout.write(stripAnsi(res.output));
@@ -479,7 +607,7 @@ make sure the command exists. examples:`);
   console.log(`  npx noninteractive read ${name} --wait        # wait for new output`);
   console.log(`  npx noninteractive stop ${name}               # stop the session`);
 }
-async function read(name, wait, timeout) {
+async function read(name, wait, timeout, noOpen = false) {
   const sock = socketPath(name);
   const msg = { action: "read" };
   if (wait) {
@@ -490,16 +618,18 @@ async function read(name, wait, timeout) {
   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}]`);
 }
-async function send(name, text, wait, timeout) {
+async function send(name, text, wait, timeout, noOpen = false) {
   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(`
 [exited ${res.exitCode}]`);
@@ -542,16 +672,19 @@ async function main() {
   const cmd = args[0];
   switch (cmd) {
     case "start": {
-      if (args.length < 2) {
+      const startArgs = args.slice(1).filter((a) => a !== "--no-open");
+      const noOpen = args.includes("--no-open");
+      if (startArgs.length < 1) {
         console.error(`usage: noninteractive start <cmd> [args...]
 
 example: npx noninteractive start npx vercel`);
         process.exit(1);
       }
-      return start(args.slice(1));
+      return start(startArgs, noOpen);
     }
     case "read": {
       const readArgs = args.slice(1);
+      const noOpen = readArgs.includes("--no-open");
       const name = readArgs.find((a) => !a.startsWith("-"));
       if (!name) {
         console.error(`usage: noninteractive read <session> [-w|--wait] [--timeout <ms>]
@@ -562,11 +695,12 @@ example: npx noninteractive read vercel --wait`);
       const wait = readArgs.includes("-w") || readArgs.includes("--wait");
       const timeoutIdx = readArgs.indexOf("--timeout");
       const timeout = timeoutIdx !== -1 ? Number(readArgs[timeoutIdx + 1]) : 30000;
-      return read(name, wait, timeout);
+      return read(name, wait, timeout, noOpen);
     }
     case "sendread":
     case "send": {
       const sendArgs = args.slice(1);
+      const noOpen = sendArgs.includes("--no-open");
       const positional = sendArgs.filter((a) => !a.startsWith("-"));
       const name = positional[0];
       const text = positional[1];
@@ -579,7 +713,7 @@ example: npx noninteractive send workos "" --wait`);
       const wait = cmd === "sendread" || sendArgs.includes("-w") || sendArgs.includes("--wait");
       const timeoutIdx = sendArgs.indexOf("--timeout");
       const timeout = timeoutIdx !== -1 ? Number(sendArgs[timeoutIdx + 1]) : 30000;
-      return send(name, text, wait, timeout);
+      return send(name, text, wait, timeout, noOpen);
     }
     case "stop": {
       const name = args[1];
@@ -607,9 +741,12 @@ example: npx noninteractive stop vercel`);
     case "-h":
       console.log(HELP);
       break;
-    default:
-      console.log(`[installing and running: npx ${args.join(" ")}]`);
-      return start(["npx", "--yes", ...args]);
+    default: {
+      const noOpen = args.includes("--no-open");
+      const filteredArgs = args.filter((a) => a !== "--no-open");
+      console.log(`[installing and running: npx ${filteredArgs.join(" ")}]`);
+      return start(["npx", "--yes", ...filteredArgs], noOpen);
+    }
   }
 }
 main().catch((err) => {

package/package.json

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