@saptools/cf-inspector 0.4.7 → 0.4.10

package/dist/index.d.ts

@@ -117,6 +117,7 @@ interface InspectorConnectOptions {
     readonly port: number;
     readonly host?: string;
     readonly connectTimeoutMs?: number;
+    readonly targetIndex?: number;
 }
 
 declare function parseBreakpointSpec(input: string): BreakpointLocation;
@@ -338,7 +339,7 @@ interface TunnelTarget {
 }
 interface OpenedTunnel {
     readonly localPort: number;
-    readonly handle: DebuggerHandle;
+    readonly handle?: DebuggerHandle;
     dispose(): Promise<void>;
 }
 declare function openCfTunnel(target: TunnelTarget): Promise<OpenedTunnel>;

package/dist/index.js

@@ -1004,11 +1004,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 +1872,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,