Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions packages/capture-kit/src/network-traffic.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<typeof scan>) => 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(
[
Expand Down
4 changes: 2 additions & 2 deletions packages/capture-kit/src/network-traffic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading