@saptools/cf-debugger 0.1.15 → 0.1.16

package/README.md

@@ -22,7 +22,7 @@ Signal the remote process, enable SSH if needed, forward `9229` to a free local
 
 - 🚀 **One-shot tunnel** — auth, target, SSH-enable, USR1 signal, port forward, readiness probe — all hidden behind `cf-debugger start`
 - 🧵 **Multi-debugger concurrency** — run N debuggers for N apps at once; each session gets its own local port, isolated `CF_HOME`, and an entry in the shared state file
-- 🎯 **Exact process targeting** — select a CF process, instance, and optional Node PID; ambiguous Node processes fail closed
+- 🎯 **Exact process targeting** — select a CF process, instance, and optional Node PID; when several Node processes exist the one owning the app's `$PORT` listening socket is auto-selected, otherwise selection fails closed
 - 🛡️ **Duplicate-session protection** — the same `region/org/space/app/process/instance` cannot be debugged twice simultaneously (returns `SESSION_ALREADY_RUNNING`)
 - 🧹 **Crash-proof state** — provably dead entries are pruned, while ownership mismatches are retained for safe recovery instead of being deleted blindly
 - 🔌 **Deterministic ports** — auto-assigned from a safe range (`20000–20999`), or pick your own with `--port`
@@ -102,7 +102,7 @@ cf-debugger start --region eu10 --org my-org --space dev --app my-app --timeout
 | `--app <name>` | **Required.** CF app name |
 | `--process <name>` | CF process name (default: `web`) |
 | `-i, --instance <index>` | Zero-based CF process instance (default: `0`) |
-| `--node-pid <pid>` | Exact remote Node.js PID; otherwise one unambiguous PID is discovered |
+| `--node-pid <pid>` | Exact remote Node.js PID; otherwise the app-`$PORT` listener is auto-selected, else one unambiguous PID is discovered |
 | `--port <number>` | Preferred local port (auto-assigned in `20000–20999` if omitted) |
 | `--timeout <seconds>` | Tunnel-ready timeout (default: `180`) |
 | `--verbose` | Print every status transition |

package/dist/cli.js

@@ -530,8 +530,10 @@ var NODE_INSPECTOR_SCRIPT = [
   '  candidate_exe="$(readlink "/proc/$candidate_pid/exe" 2>/dev/null || true)"',
   '  [ "${candidate_exe##*/}" = node ] || [ "${candidate_exe##*/}" = nodejs ]',
   "}",
-  "find_inspector_owner() {",
-  `  socket_inode="$(awk '$2 ~ /:240D$/ && $4 == "0A" { print $10; exit }' /proc/net/tcp /proc/net/tcp6 2>/dev/null)"`,
+  "find_listener_pid() {",
+  '  listener_hex="$1"',
+  '  [ -n "$listener_hex" ] || return 0',
+  `  socket_inode="$(awk -v ph=":$listener_hex" '$4 == "0A" && $2 ~ (ph "$") { print $10; exit }' /proc/net/tcp /proc/net/tcp6 2>/dev/null)"`,
   '  [ -n "$socket_inode" ] || return 0',
   "  for pid_dir in /proc/[0-9]*; do",
   '    [ -d "$pid_dir/fd" ] || continue',
@@ -544,6 +546,14 @@ var NODE_INSPECTOR_SCRIPT = [
   "    done",
   "  done",
   "}",
+  "find_inspector_owner() {",
+  "  find_listener_pid 240D",
+  "}",
+  "find_app_port_listener() {",
+  '  [ -n "${PORT:-}" ] || return 0',
+  `  app_port_hex="$(printf '%04X' "$PORT" 2>/dev/null || true)"`,
+  '  find_listener_pid "$app_port_hex"',
+  "}",
   'owner_pid="$(find_inspector_owner)"',
   'selected_pid=""',
   'if [ -n "$requested_node_pid" ]; then',
@@ -565,7 +575,14 @@ var NODE_INSPECTOR_SCRIPT = [
   '    selected_pid="$candidate_pid"',
   "  done",
   '  if [ "$candidate_count" -eq 0 ]; then echo saptools-inspector-node-not-found; exit 0; fi',
-  '  if [ "$candidate_count" -ne 1 ]; then echo "saptools-inspector-node-ambiguous=$candidate_pids"; exit 0; fi',
+  '  if [ "$candidate_count" -ne 1 ]; then',
+  '    app_port_pid="$(find_app_port_listener)"',
+  '    if [ -n "$app_port_pid" ] && is_node_pid "$app_port_pid"; then',
+  '      selected_pid="$app_port_pid"',
+  "    else",
+  '      echo "saptools-inspector-node-ambiguous=$candidate_pids"; exit 0',
+  "    fi",
+  "  fi",
   "fi",
   'if [ -n "$owner_pid" ]; then',
   '  if [ "$owner_pid" != "$selected_pid" ]; then echo "saptools-inspector-owner-mismatch=$selected_pid:$owner_pid"; exit 0; fi',