@crouton-kit/capture 1.4.16 → 1.4.18

package/bin/capture

@@ -6010,11 +6010,12 @@ function normalizeUrlForMatch(value) {
   try {
     const url = new URL(value);
     const path48 = url.pathname.replace(/\/+$/, "") || "/";
+    const hostname = url.hostname.toLowerCase();
+    const loopback = hostname === "localhost" || hostname === "127.0.0.1";
+    const port = url.port || (url.protocol === "http:" ? "80" : url.protocol === "https:" ? "443" : "");
     return {
       full: `${url.origin}${path48}${url.search}${url.hash}`.toLowerCase(),
-      // `host` (not `hostname`): two local dev servers on the same loopback
-      // address but different ports must not register as a host match.
-      host: url.host.toLowerCase(),
+      origin: `${url.protocol}//${loopback ? "loopback" : hostname}:${port}`,
       path: path48.toLowerCase()
     };
   } catch {
@@ -6026,14 +6027,11 @@ function scoreTabUrlMatch(tabUrl, requestedUrl) {
   const requested = normalizeUrlForMatch(requestedUrl);
   if (tab && requested) {
     if (tab.full === requested.full) return 100;
-    if (tab.host === requested.host && tab.path === requested.path) return 95;
-    if (tab.host === requested.host && tab.path.startsWith(requested.path)) return 90;
-    if (tab.host === requested.host && requested.path.startsWith(tab.path)) return 85;
-    if (tab.host === requested.host) return 70;
-    if (tab.full.includes(requested.full)) return 60;
-    if (tab.full.includes(requested.host)) return 50;
-    if (requested.full.includes(tab.full)) return 40;
-    return 0;
+    if (tab.origin !== requested.origin) return 0;
+    if (tab.path === requested.path) return 95;
+    if (tab.path.startsWith(requested.path)) return 90;
+    if (requested.path.startsWith(tab.path)) return 85;
+    return 70;
   }
   const tabLower = tabUrl.toLowerCase();
   const requestedLower = requestedUrl.toLowerCase();
@@ -10561,7 +10559,7 @@ function validateHarAppendBatch(value, source) {
   return { entries, incompleteLifecycles };
 }
 function captureVersion() {
-  const version = "1.4.16";
+  const version = "1.4.18";
   return typeof version === "string" && version.length > 0 ? version : "development";
 }
 function token() {
@@ -12663,7 +12661,7 @@ function wallTime(value) {
   }
 }
 function captureVersion2() {
-  const version = "1.4.16";
+  const version = "1.4.18";
   return typeof version === "string" && version.length > 0 ? version : "development";
 }
 function deepFreeze(value) {
@@ -231612,7 +231610,11 @@ var init_core = __esm({
         walk2("");
         return files;
       }
-      async drainOne(live, cause) {
+      drainOne(live, cause) {
+        if (!live.draining) live.draining = this.drain(live, cause);
+        return live.draining;
+      }
+      async drain(live, cause) {
         const outcome = await live.collector.drain(cause);
         unlinkPrivateFile(path24.join(live.row.dir, "collecting.json"));
         const files = this.finalizedFiles(live.row.dir);
@@ -231642,9 +231644,10 @@ var init_core = __esm({
         return { completion: drained.completion, summary: drained.outcome.summary, files: drained.outcome.files };
       }
       async teardown(trigger = "session-stop") {
-        const stopping = this.cutoff(this.live.values());
+        const liveCollectors = [...this.live.values()];
+        this.cutoff(liveCollectors);
         const outcomes = [];
-        for (const live of stopping) {
+        for (const live of liveCollectors) {
           try {
             const drained = await this.drainOne(live, { trigger, clientUsable: this.clientUsable });
             outcomes.push({ status: "drained", id: live.row.id, kind: live.row.kind, completion: drained.completion, dir: live.row.dir });
@@ -244116,7 +244119,7 @@ async function stopComposedRecorder(opts) {
     const host = await liveHost(opts.sessionDir);
     const row = motionHandle(host, recId);
     if (!row) throw new Error(`No live motion collector named "${recId}".`);
-    const response = await sendHostRequest(host.socketPath, { type: "collector-stop", nonce: host.nonce, id: recId }, 3e4);
+    const response = await sendHostRequest(host.socketPath, { type: "collector-stop", nonce: host.nonce, id: recId }, 12e4);
     if (!response.ok) throw new Error(response.error ?? "collector host refused to stop motion recording");
     if (getActiveSession()?.dir === opts.sessionDir && getActiveRecId() === recId) await clearActiveRecId();
     return finalFromMeta(row.dir, recId);
@@ -267359,7 +267362,7 @@ I/O contract: flags and positionals on input; one rendered prose block on stdout
 A CDP-enabled browser must be running; \`capture tab list\` is the probe, and \`capture tab launch\` starts one capture owns and reaps when nothing is (never hand-roll a detached browser \u2014 nothing reaps that). Capture never signals a browser it did not start, so attaching to your own with --port is unchanged. CDP_PORT / CDP_TARGET pin the browser + tab for target-selecting commands \u2014 precedence: explicit flag > active session > env. \`session start\` adopts only an explicit --target.`;
 }
 function printVersion() {
-  const declared = "1.4.16";
+  const declared = "1.4.18";
   if (declared) {
     console.log(declared);
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crouton-kit/capture",
-  "version": "1.4.16",
+  "version": "1.4.18",
   "description": "Browser automation and UI validation via CDP — session-based screenshots, HAR, a11y, click/type, and JS exec",
   "bin": {
     "capture": "./bin/capture"

package/src/cdp/host/core.ts

@@ -12,7 +12,7 @@ export interface CollectorRow { id: string; kind: CollectorKind; dir: string; cl
 export interface HostSnapshot { collectors: readonly CollectorRow[]; reservations: readonly ClaimReservation[]; }
 export interface HostIdentity { pid: number; birth: PidBirth; targetId: string; }
 
-interface LiveCollector { row: CollectorRow; collector: Collector; startedAt: string; losses: Array<{ reason: string; detail?: Record<string, unknown> }>; stopping: boolean; }
+interface LiveCollector { row: CollectorRow; collector: Collector; startedAt: string; losses: Array<{ reason: string; detail?: Record<string, unknown> }>; stopping: boolean; draining?: Promise<{ completion: Completion; outcome: DrainOutcome }>; }
 
 export class CollectorHost {
   private readonly live = new Map<string, LiveCollector>();
@@ -131,7 +131,12 @@ export class CollectorHost {
     return files;
   }
 
-  private async drainOne(live: LiveCollector, cause: DrainCause): Promise<{ completion: Completion; outcome: DrainOutcome }> {
+  private drainOne(live: LiveCollector, cause: DrainCause): Promise<{ completion: Completion; outcome: DrainOutcome }> {
+    if (!live.draining) live.draining = this.drain(live, cause);
+    return live.draining;
+  }
+
+  private async drain(live: LiveCollector, cause: DrainCause): Promise<{ completion: Completion; outcome: DrainOutcome }> {
     const outcome = await live.collector.drain(cause);
     unlinkPrivateFile(path.join(live.row.dir, 'collecting.json'));
     const files = this.finalizedFiles(live.row.dir);
@@ -163,9 +168,10 @@ export class CollectorHost {
   }
 
   async teardown(trigger: DrainCause['trigger'] = 'session-stop'): Promise<TeardownOutcome[]> {
-    const stopping = this.cutoff(this.live.values());
+    const liveCollectors = [...this.live.values()];
+    this.cutoff(liveCollectors);
     const outcomes: TeardownOutcome[] = [];
-    for (const live of stopping) {
+    for (const live of liveCollectors) {
       try {
         const drained = await this.drainOne(live, { trigger, clientUsable: this.clientUsable });
         outcomes.push({ status: 'drained', id: live.row.id, kind: live.row.kind, completion: drained.completion, dir: live.row.dir });

package/src/cdp/motion/recorder.ts

@@ -100,7 +100,7 @@ export async function stopComposedRecorder(opts: { sessionDir: string; recId?: s
     const host = await liveHost(opts.sessionDir);
     const row = motionHandle(host, recId);
     if (!row) throw new Error(`No live motion collector named "${recId}".`);
-    const response = await sendHostRequest(host.socketPath, { type: 'collector-stop', nonce: host.nonce, id: recId }, 30_000);
+    const response = await sendHostRequest(host.socketPath, { type: 'collector-stop', nonce: host.nonce, id: recId }, 120_000);
     if (!response.ok) throw new Error(response.error ?? 'collector host refused to stop motion recording');
     if (getActiveSession()?.dir === opts.sessionDir && getActiveRecId() === recId) await clearActiveRecId();
     return finalFromMeta(row.dir, recId);

package/src/cdp/targets.ts

@@ -149,15 +149,17 @@ export async function findUnambiguousPageTabInPorts(
   return candidates[0] ?? null;
 }
 
-function normalizeUrlForMatch(value: string): { full: string; host: string; path: string } | null {
+function normalizeUrlForMatch(value: string): { full: string; origin: string; path: string } | null {
   try {
     const url = new URL(value);
     const path = url.pathname.replace(/\/+$/, '') || '/';
+    const hostname = url.hostname.toLowerCase();
+    // Electron may expose a localhost page when the caller uses its equivalent IPv4 loopback URL.
+    const loopback = hostname === 'localhost' || hostname === '127.0.0.1';
+    const port = url.port || (url.protocol === 'http:' ? '80' : url.protocol === 'https:' ? '443' : '');
     return {
       full: `${url.origin}${path}${url.search}${url.hash}`.toLowerCase(),
-      // `host` (not `hostname`): two local dev servers on the same loopback
-      // address but different ports must not register as a host match.
-      host: url.host.toLowerCase(),
+      origin: `${url.protocol}//${loopback ? 'loopback' : hostname}:${port}`,
       path: path.toLowerCase(),
     };
   } catch {
@@ -171,14 +173,11 @@ export function scoreTabUrlMatch(tabUrl: string, requestedUrl: string): number {
 
   if (tab && requested) {
     if (tab.full === requested.full) return 100;
-    if (tab.host === requested.host && tab.path === requested.path) return 95;
-    if (tab.host === requested.host && tab.path.startsWith(requested.path)) return 90;
-    if (tab.host === requested.host && requested.path.startsWith(tab.path)) return 85;
-    if (tab.host === requested.host) return 70;
-    if (tab.full.includes(requested.full)) return 60;
-    if (tab.full.includes(requested.host)) return 50;
-    if (requested.full.includes(tab.full)) return 40;
-    return 0;
+    if (tab.origin !== requested.origin) return 0;
+    if (tab.path === requested.path) return 95;
+    if (tab.path.startsWith(requested.path)) return 90;
+    if (requested.path.startsWith(tab.path)) return 85;
+    return 70;
   }
 
   const tabLower = tabUrl.toLowerCase();