@saptools/cf-inspector 0.4.8 → 0.4.11

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { DebuggerHandle, SessionStatus } from '@saptools/cf-debugger';
 
-type CfInspectorErrorCode = "INVALID_ARGUMENT" | "INVALID_BREAKPOINT" | "INVALID_REMOTE_ROOT" | "INVALID_EXPRESSION" | "INVALID_HIT_COUNT" | "INVALID_PAUSE_TYPE" | "BREAKPOINT_DID_NOT_BIND" | "INSPECTOR_DISCOVERY_FAILED" | "INSPECTOR_CONNECTION_FAILED" | "CDP_REQUEST_FAILED" | "BREAKPOINT_NOT_HIT" | "UNRELATED_PAUSE" | "UNRELATED_PAUSE_TIMEOUT" | "EVALUATION_FAILED" | "MISSING_TARGET" | "ABORTED";
+type CfInspectorErrorCode = "INVALID_ARGUMENT" | "INVALID_BREAKPOINT" | "INVALID_REMOTE_ROOT" | "INVALID_EXPRESSION" | "SETUP_EVAL_FAILED" | "INVALID_HIT_COUNT" | "INVALID_PAUSE_TYPE" | "BREAKPOINT_DID_NOT_BIND" | "INSPECTOR_DISCOVERY_FAILED" | "INSPECTOR_CONNECTION_FAILED" | "CDP_REQUEST_FAILED" | "BREAKPOINT_NOT_HIT" | "UNRELATED_PAUSE" | "UNRELATED_PAUSE_TIMEOUT" | "EVALUATION_FAILED" | "MISSING_TARGET" | "ABORTED";
 declare class CfInspectorError extends Error {
     readonly code: CfInspectorErrorCode;
     readonly detail?: string;
@@ -117,6 +117,7 @@ interface InspectorConnectOptions {
     readonly port: number;
     readonly host?: string;
     readonly connectTimeoutMs?: number;
+    readonly targetIndex?: number;
 }
 
 declare function parseBreakpointSpec(input: string): BreakpointLocation;
@@ -264,6 +265,7 @@ declare function resume(session: InspectorSession): Promise<void>;
 declare function setPauseOnExceptions(session: InspectorSession, state: PauseOnExceptionsState): Promise<void>;
 declare function evaluateOnFrame(session: InspectorSession, callFrameId: string, expression: string): Promise<CdpEvalResult>;
 declare function evaluateGlobal(session: InspectorSession, expression: string): Promise<CdpEvalResult>;
+declare function runSetupEvals(session: InspectorSession, expressions: readonly string[]): Promise<void>;
 declare function listScripts(session: InspectorSession): readonly ScriptInfo[];
 declare function validateExpression(session: InspectorSession, expression: string): Promise<void>;
 declare function getProperties(session: InspectorSession, objectId: string): Promise<readonly CdpProperty[]>;
@@ -338,9 +340,9 @@ interface TunnelTarget {
 }
 interface OpenedTunnel {
     readonly localPort: number;
-    readonly handle: DebuggerHandle;
+    readonly handle?: DebuggerHandle;
     dispose(): Promise<void>;
 }
 declare function openCfTunnel(target: TunnelTarget): Promise<OpenedTunnel>;
 
-export { type BreakpointHandle, type BreakpointLocation, type CallFrameInfo, type CaptureSnapshotOptions, type CapturedExpression, CfInspectorError, type CfInspectorErrorCode, type DebuggerState, type ExceptionSnapshot, type FrameSnapshot, type InspectorConnectOptions, type InspectorSession, type InspectorTarget, type LogpointConditionOptions, type LogpointEvent, type LogpointStopReason, type LogpointStreamOptions, type LogpointStreamResult, type OpenedTunnel, type PauseEvent, type PauseOnExceptionsState, type RemoteRootSetting, type ResolvedLocation, type ScopeInfo, type ScopeSnapshot, type ScriptInfo, type SetBreakpointInput, type SnapshotCaptureResult, type SnapshotResult, type TunnelTarget, type VariableSnapshot, type WaitForPauseOptions, type WalkStackOptions, type WatchEvent, buildBreakpointUrlRegex, buildHitCountedCondition, buildLogpointCondition, captureException, captureSnapshot, connectInspector, discoverInspectorTargets, evaluateGlobal, evaluateOnFrame, fetchInspectorVersion, getProperties, listScripts, openCfTunnel, parseBreakpointSpec, parseRemoteRoot, removeBreakpoint, resume, setBreakpoint, setPauseOnExceptions, streamLogpoint, validateExpression, waitForPause, walkStack };
+export { type BreakpointHandle, type BreakpointLocation, type CallFrameInfo, type CaptureSnapshotOptions, type CapturedExpression, CfInspectorError, type CfInspectorErrorCode, type DebuggerState, type ExceptionSnapshot, type FrameSnapshot, type InspectorConnectOptions, type InspectorSession, type InspectorTarget, type LogpointConditionOptions, type LogpointEvent, type LogpointStopReason, type LogpointStreamOptions, type LogpointStreamResult, type OpenedTunnel, type PauseEvent, type PauseOnExceptionsState, type RemoteRootSetting, type ResolvedLocation, type ScopeInfo, type ScopeSnapshot, type ScriptInfo, type SetBreakpointInput, type SnapshotCaptureResult, type SnapshotResult, type TunnelTarget, type VariableSnapshot, type WaitForPauseOptions, type WalkStackOptions, type WatchEvent, buildBreakpointUrlRegex, buildHitCountedCondition, buildLogpointCondition, captureException, captureSnapshot, connectInspector, discoverInspectorTargets, evaluateGlobal, evaluateOnFrame, fetchInspectorVersion, getProperties, listScripts, openCfTunnel, parseBreakpointSpec, parseRemoteRoot, removeBreakpoint, resume, runSetupEvals, setBreakpoint, setPauseOnExceptions, streamLogpoint, validateExpression, waitForPause, walkStack };

package/dist/index.js

@@ -723,6 +723,20 @@ async function evaluateGlobal(session, expression) {
     silent: true
   });
 }
+async function runSetupEvals(session, expressions) {
+  for (const expression of expressions) {
+    const result = await evaluateGlobal(session, expression);
+    if (result.exceptionDetails !== void 0) {
+      throw new CfInspectorError(
+        "SETUP_EVAL_FAILED",
+        exceptionDetailsMessage(result, "setup evaluation failed")
+      );
+    }
+  }
+}
+function exceptionDetailsMessage(result, fallback) {
+  return typeof result.exceptionDetails?.exception?.description === "string" ? result.exceptionDetails.exception.description : typeof result.exceptionDetails?.text === "string" ? result.exceptionDetails.text : fallback;
+}
 function listScripts(session) {
   return [...session.scripts.values()];
 }
@@ -1004,11 +1018,12 @@ async function connectInspector(options) {
   const host = options.host ?? DEFAULT_HOST;
   const connectTimeoutMs = options.connectTimeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS;
   const targets = await discoverInspectorTargets(host, options.port, connectTimeoutMs);
-  const target = targets[0];
+  const targetIndex = options.targetIndex ?? 0;
+  const target = targets[targetIndex];
   if (!target) {
     throw new CfInspectorError(
       "INSPECTOR_DISCOVERY_FAILED",
-      `No inspector targets available on ${host}:${options.port.toString()}`
+      `No inspector target at index ${targetIndex.toString()} on ${host}:${options.port.toString()} (available: ${targets.length.toString()})`
     );
   }
   const client = await CdpClient.connect({
@@ -1871,15 +1886,54 @@ async function openCfTunnel(target) {
     ...target.signal === void 0 ? {} : { signal: target.signal },
     ...target.onStatus === void 0 ? {} : { onStatus: target.onStatus }
   };
-  const handle = await startDebugger(opts);
+  try {
+    const handle = await startDebugger(opts);
+    return {
+      localPort: handle.session.localPort,
+      handle,
+      dispose: async () => {
+        await handle.dispose();
+      }
+    };
+  } catch (err) {
+    return reuseExistingTunnelOrThrow(err, target.onStatus);
+  }
+}
+function reuseExistingTunnelOrThrow(err, onStatus) {
+  if (!isSessionAlreadyRunningError(err)) {
+    throw err;
+  }
+  const message = err instanceof Error ? err.message : String(err);
+  const port = extractExistingTunnelPort(message);
+  if (port === void 0) {
+    throw err;
+  }
+  const warning = `Reusing existing tunnel on port ${port.toString()}`;
+  onStatus?.("ready", warning);
   return {
-    localPort: handle.session.localPort,
-    handle,
-    dispose: async () => {
-      await handle.dispose();
-    }
+    localPort: port,
+    dispose: () => Promise.resolve()
   };
 }
+function isSessionAlreadyRunningError(err) {
+  if (typeof err !== "object" || err === null) {
+    return false;
+  }
+  const code = err.code;
+  return code === "SESSION_ALREADY_RUNNING";
+}
+function extractExistingTunnelPort(message) {
+  const match = /on port (\d+)/i.exec(message);
+  if (match === null) {
+    return void 0;
+  }
+  const rawPort = match[1];
+  if (rawPort === void 0) {
+    return void 0;
+  }
+  const port = Number.parseInt(rawPort, 10);
+  return Number.isNaN(port) ? void 0 : port;
+}
 export {
   CfInspectorError,
   buildBreakpointUrlRegex,
@@ -1899,6 +1953,7 @@ export {
   parseRemoteRoot,
   removeBreakpoint,
   resume,
+  runSetupEvals,
   setBreakpoint,
   setPauseOnExceptions,
   streamLogpoint,