@saptools/cf-inspector 0.4.3 → 0.4.4

package/dist/cli.js

@@ -152,13 +152,13 @@ var init_wsTransport = __esm({
 });
 
 // src/cli.ts
-import process11 from "process";
+import process12 from "process";
 
 // src/cli/program.ts
 import { Command } from "commander";
 
 // src/cli/commands/attach.ts
-import process2 from "process";
+import process3 from "process";
 
 // src/inspector/discovery.ts
 init_types();
@@ -387,6 +387,13 @@ function writeWatchEvent(event, json) {
   }
 }
 
+// src/cli/target.ts
+import process2 from "process";
+import {
+  readCurrentCfTarget,
+  requireCurrentCfRegion
+} from "@saptools/cf-debugger";
+
 // src/cf/tunnel.ts
 import { startDebugger } from "@saptools/cf-debugger";
 async function openCfTunnel(target) {
@@ -874,29 +881,79 @@ function parsePositiveInt(raw, label) {
   }
   return value;
 }
-function resolveTarget(opts) {
+async function resolveTargetWithCurrentCfTarget(opts) {
   const port = parsePositiveInt(opts.port, "--port");
   if (port !== void 0) {
     return { kind: "port", port, host: opts.host ?? "127.0.0.1" };
   }
-  if (hasCfTarget(opts)) {
-    const cfTimeoutSec = parsePositiveInt(opts.cfTimeout, "--cf-timeout") ?? DEFAULT_CF_TIMEOUT_SEC;
-    return {
-      kind: "cf",
-      region: opts.region,
-      org: opts.org,
-      space: opts.space,
-      app: opts.app,
-      cfTimeoutMs: cfTimeoutSec * 1e3
-    };
+  const app = optionalText(opts.app);
+  if (app === void 0) {
+    throw missingTargetError();
   }
-  throw new CfInspectorError(
-    "MISSING_TARGET",
-    "Provide either --port (and optionally --host) or all of --region, --org, --space, --app."
+  const cfTimeoutSec = parsePositiveInt(opts.cfTimeout, "--cf-timeout") ?? DEFAULT_CF_TIMEOUT_SEC;
+  const region = optionalText(opts.region);
+  const org = optionalText(opts.org);
+  const space = optionalText(opts.space);
+  if (region !== void 0 && org !== void 0 && space !== void 0) {
+    return buildCfTarget(region, org, space, app, cfTimeoutSec);
+  }
+  const current = await readCurrentTarget();
+  if (current === void 0) {
+    throw new CfInspectorError(
+      "MISSING_TARGET",
+      "No current CF target found. Run `cf target -o <org> -s <space>` or pass --region/--org/--space."
+    );
+  }
+  return buildCfTarget(
+    region ?? currentRegion(current),
+    org ?? current.org,
+    space ?? current.space,
+    app,
+    cfTimeoutSec
   );
 }
-function hasCfTarget(opts) {
-  return opts.region !== void 0 && opts.org !== void 0 && opts.space !== void 0 && opts.app !== void 0;
+function buildCfTarget(region, org, space, app, cfTimeoutSec) {
+  return {
+    kind: "cf",
+    region,
+    org,
+    space,
+    app,
+    cfTimeoutMs: cfTimeoutSec * 1e3
+  };
+}
+function optionalText(value) {
+  const trimmed = value?.trim();
+  return trimmed === void 0 || trimmed.length === 0 ? void 0 : trimmed;
+}
+function currentCfOptions() {
+  const command = process2.env["CF_DEBUGGER_CF_BIN"];
+  return command === void 0 ? void 0 : { command };
+}
+async function readCurrentTarget() {
+  try {
+    return await readCurrentCfTarget(currentCfOptions());
+  } catch (error) {
+    throw new CfInspectorError(
+      "MISSING_TARGET",
+      "No current CF target found. Run `cf target -o <org> -s <space>` or pass --region/--org/--space.",
+      error instanceof Error ? error.message : String(error)
+    );
+  }
+}
+function currentRegion(current) {
+  try {
+    return requireCurrentCfRegion(current, "Pass --region explicitly.");
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new CfInspectorError("MISSING_TARGET", message);
+  }
+}
+function missingTargetError() {
+  return new CfInspectorError(
+    "MISSING_TARGET",
+    "Provide either --port (and optionally --host), an --app with current cf target, or all of --region, --org, --space, --app."
+  );
 }
 async function withSession(target, fn, reportProgress) {
   const tunnel = await openTarget(target, reportProgress);
@@ -949,7 +1006,7 @@ async function openTarget(target, reportProgress) {
 
 // src/cli/commands/attach.ts
 async function handleAttach(opts) {
-  const target = resolveTarget(opts);
+  const target = await resolveTargetWithCurrentCfTarget(opts);
   const tunnel = await openTarget(target);
   try {
     const version = await fetchInspectorVersion(tunnel.host, tunnel.port, 5e3);
@@ -957,7 +1014,7 @@ async function handleAttach(opts) {
       writeJson({ host: tunnel.host, port: tunnel.port, ...version });
       return;
     }
-    process2.stdout.write(
+    process3.stdout.write(
       `Connected to ${tunnel.host}:${tunnel.port.toString()}
   Browser: ${version.browser}
   Protocol: ${version.protocolVersion}
@@ -969,7 +1026,7 @@ async function handleAttach(opts) {
 }
 
 // src/cli/commands/eval.ts
-import process3 from "process";
+import process4 from "process";
 
 // src/inspector/runtime.ts
 init_types();
@@ -1026,14 +1083,14 @@ async function getProperties(session, objectId) {
 
 // src/cli/commands/eval.ts
 async function handleEval(opts) {
-  const target = resolveTarget(opts);
+  const target = await resolveTargetWithCurrentCfTarget(opts);
   const result = await withSession(target, async (session) => {
     return await evaluateGlobal(session, opts.expr);
   });
   if (opts.json) {
     writeJson(result);
     if (result.exceptionDetails !== void 0) {
-      process3.exitCode = 1;
+      process4.exitCode = 1;
     }
     return;
   }
@@ -1042,33 +1099,33 @@ async function handleEval(opts) {
 function writeHumanEvalResult(result) {
   if (result.exceptionDetails !== void 0) {
     const detail = typeof result.exceptionDetails.exception?.description === "string" ? result.exceptionDetails.exception.description : typeof result.exceptionDetails.text === "string" ? result.exceptionDetails.text : "evaluation failed";
-    process3.stderr.write(`${detail}
+    process4.stderr.write(`${detail}
 `);
-    process3.exitCode = 1;
+    process4.exitCode = 1;
     return;
   }
   const inner = result.result;
   if (inner === void 0) {
-    process3.stdout.write("\n");
+    process4.stdout.write("\n");
     return;
   }
   if (typeof inner.value === "string") {
-    process3.stdout.write(`${inner.value}
+    process4.stdout.write(`${inner.value}
 `);
     return;
   }
   if (typeof inner.description === "string") {
-    process3.stdout.write(`${inner.description}
+    process4.stdout.write(`${inner.description}
 `);
     return;
   }
-  process3.stdout.write(`${JSON.stringify(inner.value)}
+  process4.stdout.write(`${JSON.stringify(inner.value)}
 `);
 }
 
 // src/cli/commands/exception.ts
 import { performance as performance3 } from "perf_hooks";
-import process5 from "process";
+import process6 from "process";
 
 // src/pathMapper.ts
 init_types();
@@ -2024,11 +2081,11 @@ function splitCaptureExpressions(raw) {
 }
 
 // src/cli/warnings.ts
-import process4 from "process";
+import process5 from "process";
 function warnOnUnboundBreakpoints(handles) {
   for (const handle of handles) {
     if (handle.resolvedLocations.length === 0) {
-      process4.stderr.write(
+      process5.stderr.write(
         `[cf-inspector] warning: breakpoint ${handle.file}:${handle.line.toString()} did not bind to any loaded script. Check the path or pass --remote-root. Use 'list-scripts' to inspect what V8 currently has loaded.
 `
       );
@@ -2040,7 +2097,7 @@ function roundDurationMs(durationMs) {
 }
 function warnOnUnmatchedPause(pause) {
   const reason = pause.reason.length > 0 ? pause.reason : "unknown";
-  process4.stderr.write(
+  process5.stderr.write(
     `[cf-inspector] warning: target is paused by another debugger event (${reason} at ${formatPauseLocation(pause)}); waiting for it to resume...
 `
   );
@@ -2069,7 +2126,8 @@ function formatPauseLocation(pause) {
 // src/cli/commands/exception.ts
 var VALID_PAUSE_TYPES = ["uncaught", "caught", "all"];
 async function handleException(opts) {
-  const prepared = prepareExceptionCommand(opts);
+  const target = await resolveTargetWithCurrentCfTarget(opts);
+  const prepared = prepareExceptionCommand(opts, target);
   const result = await runExceptionCommand(prepared, opts);
   if (opts.json) {
     writeJson(result);
@@ -2077,8 +2135,7 @@ async function handleException(opts) {
     writeHumanSnapshot(result);
   }
 }
-function prepareExceptionCommand(opts) {
-  const target = resolveTarget(opts);
+function prepareExceptionCommand(opts, target) {
   const stateRaw = (opts.type ?? "uncaught").trim().toLowerCase();
   if (!VALID_PAUSE_TYPES.includes(stateRaw)) {
     throw new CfInspectorError(
@@ -2131,7 +2188,7 @@ async function resumeAfterException(session, snapshot, pausedStartedAt) {
     await resume(session);
     return withPausedDuration(snapshot, roundDurationMs(performance3.now() - pausedStartedAt));
   } catch {
-    process5.stderr.write(
+    process6.stderr.write(
       "[cf-inspector] warning: Debugger.resume failed after exception capture; pausedDurationMs is unknown.\n"
     );
     return withPausedDuration(snapshot, null);
@@ -2145,22 +2202,22 @@ async function disablePauseOnExceptionsBestEffort(session) {
 }
 
 // src/cli/commands/listScripts.ts
-import process6 from "process";
+import process7 from "process";
 async function handleListScripts(opts) {
-  const target = resolveTarget(opts);
+  const target = await resolveTargetWithCurrentCfTarget(opts);
   const scripts = await withSession(target, (session) => Promise.resolve(listScripts(session)));
   if (opts.json) {
     writeJson(scripts);
     return;
   }
   for (const script of scripts) {
-    process6.stdout.write(`${script.scriptId}	${script.url}
+    process7.stdout.write(`${script.scriptId}	${script.url}
 `);
   }
 }
 
 // src/cli/commands/log.ts
-import process8 from "process";
+import process9 from "process";
 
 // src/logpoint/stream.ts
 init_types();
@@ -2409,25 +2466,25 @@ async function waitForStop(session, options, registerMaxEventsSignal) {
 init_types();
 
 // src/cli/signals.ts
-import process7 from "process";
+import process8 from "process";
 async function withTerminationSignal(fn) {
   const abort = new AbortController();
   const onSignal = () => {
     abort.abort();
   };
-  process7.once("SIGINT", onSignal);
-  process7.once("SIGTERM", onSignal);
+  process8.once("SIGINT", onSignal);
+  process8.once("SIGTERM", onSignal);
   try {
     return await fn(abort.signal);
   } finally {
-    process7.off("SIGINT", onSignal);
-    process7.off("SIGTERM", onSignal);
+    process8.off("SIGINT", onSignal);
+    process8.off("SIGTERM", onSignal);
   }
 }
 
 // src/cli/commands/log.ts
 async function handleLog(opts) {
-  const target = resolveTarget(opts);
+  const target = await resolveTargetWithCurrentCfTarget(opts);
   const location = parseBreakpointSpec(opts.at);
   const remoteRoot = parseRemoteRoot(opts.remoteRoot);
   const durationSec = parsePositiveInt(opts.duration, "--duration");
@@ -2466,11 +2523,11 @@ async function handleLog(opts) {
 }
 function writeLogSummary(stoppedReason, emitted, json) {
   if (json) {
-    process8.stderr.write(`${JSON.stringify({ stopped: stoppedReason, emitted })}
+    process9.stderr.write(`${JSON.stringify({ stopped: stoppedReason, emitted })}
 `);
     return;
   }
-  process8.stderr.write(
+  process9.stderr.write(
     `Stopped (${stoppedReason}); emitted ${emitted.toString()} log ${emitted === 1 ? "entry" : "entries"}.
 `
   );
@@ -2478,10 +2535,11 @@ function writeLogSummary(stoppedReason, emitted, json) {
 
 // src/cli/commands/snapshot.ts
 import { performance as performance4 } from "perf_hooks";
-import process9 from "process";
+import process10 from "process";
 init_types();
 async function handleSnapshot(opts) {
-  const prepared = prepareSnapshotCommand(opts);
+  const target = await resolveTargetWithCurrentCfTarget(opts);
+  const prepared = prepareSnapshotCommand(opts, target);
   const reportProgress = opts.quiet === true ? void 0 : writeProgress;
   const result = await runSnapshotCommand(prepared, opts, reportProgress);
   if (opts.json) {
@@ -2491,8 +2549,7 @@ async function handleSnapshot(opts) {
   }
   reportProgress?.("Snapshot complete.");
 }
-function prepareSnapshotCommand(opts) {
-  const target = resolveTarget(opts);
+function prepareSnapshotCommand(opts, target) {
   if (opts.bp.length === 0) {
     throw new CfInspectorError(
       "INVALID_BREAKPOINT",
@@ -2595,7 +2652,7 @@ async function resumeAfterSnapshot(session, snapshot, pausedStartedAt, reportPro
     reportProgress?.("Target resumed.");
     return withPausedDuration(snapshot, roundDurationMs(performance4.now() - pausedStartedAt));
   } catch {
-    process9.stderr.write(
+    process10.stderr.write(
       "[cf-inspector] warning: Debugger.resume failed after snapshot; pausedDurationMs is unknown.\n"
     );
     return withPausedDuration(snapshot, null);
@@ -2604,10 +2661,11 @@ async function resumeAfterSnapshot(session, snapshot, pausedStartedAt, reportPro
 
 // src/cli/commands/watch.ts
 import { performance as performance5 } from "perf_hooks";
-import process10 from "process";
+import process11 from "process";
 init_types();
 async function handleWatch(opts) {
-  const prepared = prepareWatchCommand(opts);
+  const target = await resolveTargetWithCurrentCfTarget(opts);
+  const prepared = prepareWatchCommand(opts, target);
   let stoppedReason = "signal";
   let emitted = 0;
   await withTerminationSignal(async (signal) => {
@@ -2619,8 +2677,7 @@ async function handleWatch(opts) {
   });
   writeWatchSummary(stoppedReason, emitted, opts.json);
 }
-function prepareWatchCommand(opts) {
-  const target = resolveTarget(opts);
+function prepareWatchCommand(opts, target) {
   if (opts.bp.length === 0) {
     throw new CfInspectorError(
       "INVALID_BREAKPOINT",
@@ -2709,7 +2766,7 @@ async function runWatchLoop(session, command, opts, signal) {
       try {
         await resume(session);
       } catch {
-        process10.stderr.write("[cf-inspector] warning: Debugger.resume failed during watch.\n");
+        process11.stderr.write("[cf-inspector] warning: Debugger.resume failed during watch.\n");
         setStop("transport-closed");
         break;
       }
@@ -2814,11 +2871,11 @@ function formatLocation(command, topFrame) {
 }
 function writeWatchSummary(reason, emitted, json) {
   if (json) {
-    process10.stderr.write(`${JSON.stringify({ stopped: reason, emitted })}
+    process11.stderr.write(`${JSON.stringify({ stopped: reason, emitted })}
 `);
     return;
   }
-  process10.stderr.write(
+  process11.stderr.write(
     `Stopped (${reason}); emitted ${emitted.toString()} watch ${emitted === 1 ? "event" : "events"}.
 `
   );
@@ -2826,7 +2883,7 @@ function writeWatchSummary(reason, emitted, json) {
 
 // src/cli/program.ts
 function applyTargetOptions(cmd) {
-  return cmd.option("--port <number>", "Local port the inspector or tunnel listens on").option("--host <host>", "Hostname (default: 127.0.0.1)", "127.0.0.1").option("--region <key>", "CF region key (e.g. eu10)").option("--org <name>", "CF org name").option("--space <name>", "CF space name").option("--app <name>", "CF app name").option("--cf-timeout <seconds>", "Timeout for CF tunnel readiness in seconds (default: 180)");
+  return cmd.option("--port <number>", "Local port the inspector or tunnel listens on").option("--host <host>", "Hostname (default: 127.0.0.1)", "127.0.0.1").option("--region <key>", "CF region key (default: current cf target)").option("--org <name>", "CF org name (default: current cf target)").option("--space <name>", "CF space name (default: current cf target)").option("--app <name>", "CF app name when not using --port").option("--cf-timeout <seconds>", "Timeout for CF tunnel readiness in seconds (default: 180)");
 }
 var collectStrings = (value, prev = []) => [
   ...prev,
@@ -2897,20 +2954,20 @@ function registerAttach(program) {
 // src/cli.ts
 init_types();
 try {
-  await main(process11.argv);
+  await main(process12.argv);
 } catch (err) {
   if (err instanceof CfInspectorError) {
-    process11.stderr.write(`Error [${err.code}]: ${err.message}
+    process12.stderr.write(`Error [${err.code}]: ${err.message}
 `);
     if (err.detail !== void 0) {
-      process11.stderr.write(`  detail: ${err.detail}
+      process12.stderr.write(`  detail: ${err.detail}
 `);
     }
-    process11.exit(1);
+    process12.exit(1);
   }
   const message = err instanceof Error ? err.message : String(err);
-  process11.stderr.write(`Error: ${message}
+  process12.stderr.write(`Error: ${message}
 `);
-  process11.exit(1);
+  process12.exit(1);
 }
 //# sourceMappingURL=cli.js.map