diff --git a/packages/capture-kit/src/network-traffic.test.ts b/packages/capture-kit/src/network-traffic.test.ts index 48e9cc93db..b3f5a3c116 100644 --- a/packages/capture-kit/src/network-traffic.test.ts +++ b/packages/capture-kit/src/network-traffic.test.ts @@ -75,6 +75,47 @@ test('keeps missing canonical app-log text distinct and merges recovery first', ); }); +test('bounds merged network scans while preserving primary entries', () => { + const scan = (urls: string[], path: string) => + readRecentNetworkTrafficFromText( + [...urls] + .reverse() + .map((url) => `GET ${url} status=200`) + .join('\n'), + { + path, + exists: urls.length > 0, + backend: 'android', + maxEntries: 2, + include: 'summary', + maxPayloadChars: 2048, + maxScanLines: 100, + }, + ); + const urls = (value: ReturnType) => value.dump.entries.map(({ url }) => url); + const primary = scan(['https://a.example.test', 'https://b.example.test'], 'primary'); + const secondary = scan(['https://c.example.test', 'https://d.example.test'], 'secondary'); + const primaryBefore = urls(primary); + + assert.deepEqual(urls(mergeNetworkScans(primary, secondary, 2)), [ + 'https://a.example.test', + 'https://b.example.test', + ]); + assert.deepEqual(urls(primary), primaryBefore); + assert.deepEqual(urls(mergeNetworkScans(primary, secondary, 1)), ['https://a.example.test']); + assert.deepEqual( + urls( + mergeNetworkScans( + scan(['https://a.example.test'], 'one'), + scan(['https://a.example.test', 'https://b.example.test'], 'duplicate'), + 2, + ), + ), + ['https://a.example.test', 'https://b.example.test'], + ); + assert.deepEqual(urls(mergeNetworkScans(scan([], 'empty-a'), scan([], 'empty-b'), 2)), []); +}); + test('keeps Android adjacent enrichment disabled for Apple backends', () => { const { dump } = readRecentNetworkTrafficFromText( [ diff --git a/packages/capture-kit/src/network-traffic.ts b/packages/capture-kit/src/network-traffic.ts index 197b7a156d..64c8174e6c 100644 --- a/packages/capture-kit/src/network-traffic.ts +++ b/packages/capture-kit/src/network-traffic.ts @@ -61,14 +61,14 @@ export function mergeNetworkScans( secondary: NetworkScan, maxEntries = primary.dump.limits.maxEntries, ): NetworkScan { - const entries = [...primary.dump.entries]; + const entries = primary.dump.entries.slice(0, maxEntries); const seen = new Set(entries.map(networkEntryKey)); for (const entry of secondary.dump.entries) { + if (entries.length >= maxEntries) break; const key = networkEntryKey(entry); if (seen.has(key)) continue; seen.add(key); entries.push(entry); - if (entries.length >= maxEntries) break; } // The two windows can cover different, overlapping, or disjoint traffic. A // request either window named is named, and the rest union by identity, so