Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add asyncIterator #133

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add asyncIterator #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50f4059
Add asyncIterator
Modeeeeeee Nov 13, 2024
35f8e1b
Add support for AsyncIterator while maintaining functionallity for Sy…
Modeeeeeee Jan 2, 2025
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
190 changes: 103 additions & 87 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,12 @@ export function harFromMessages(messages, options) {
responseReceivedExtraInfos = [],
currentPageId;

for (const message of messages) {
const processMessage = (message) => {
const params = message.params;

const method = message.method;

if (!/^(Page|Network)\..+/.test(method)) {
continue;
return;
}

switch (method) {
Expand All @@ -86,7 +85,7 @@ export function harFromMessages(messages, options) {
const frameId = params.frameId;
const rootFrame = rootFrameMappings.get(frameId) || frameId;
if (pages.some((page) => page.__frameId === rootFrame)) {
continue;
return;
}
currentPageId = randomUUID();
const title =
Expand Down Expand Up @@ -141,7 +140,7 @@ export function harFromMessages(messages, options) {
const request = params.request;
if (!isSupportedProtocol(request.url)) {
ignoredRequests.add(params.requestId);
continue;
return;
}
const page = pages[pages.length - 1];
const cookieHeader = getHeaderValue(request.headers, 'Cookie');
Expand Down Expand Up @@ -231,7 +230,7 @@ export function harFromMessages(messages, options) {
// ignoredRequests.add(params.requestId);
entriesWithoutPage.push(entry);
paramsWithoutPage.push(params);
continue;
return;
}

entries.push(entry);
Expand All @@ -250,11 +249,11 @@ export function harFromMessages(messages, options) {
{
if (pages.length < 1) {
//we haven't loaded any pages yet.
continue;
return;
}

if (ignoredRequests.has(params.requestId)) {
continue;
return;
}

const entry = entries.find(
Expand All @@ -264,7 +263,7 @@ export function harFromMessages(messages, options) {
log(
`Received requestServedFromCache for requestId ${params.requestId} with no matching request.`,
);
continue;
return;
}

entry.__servedFromCache = true;
Expand All @@ -279,7 +278,7 @@ export function harFromMessages(messages, options) {
case 'Network.requestWillBeSentExtraInfo':
{
if (ignoredRequests.has(params.requestId)) {
continue;
return;
}

const entry = entries.find(
Expand All @@ -289,7 +288,7 @@ export function harFromMessages(messages, options) {
log(
`Extra info sent for requestId ${params.requestId} with no matching request.`,
);
continue;
return;
}

if (params.headers) {
Expand All @@ -312,11 +311,11 @@ export function harFromMessages(messages, options) {
{
if (pages.length < 1) {
//we haven't loaded any pages yet.
continue;
return;
}

if (ignoredRequests.has(params.requestId)) {
continue;
return;
}

let entry = entries.find(
Expand All @@ -331,7 +330,7 @@ export function harFromMessages(messages, options) {

if (!entry) {
responseReceivedExtraInfos.push(params);
continue;
return;
}

if (!entry.response) {
Expand All @@ -341,7 +340,7 @@ export function harFromMessages(messages, options) {
blockedCookies: params.blockedCookies,
};
responseReceivedExtraInfos.push(params);
continue;
return;
}

if (params.headers) {
Expand All @@ -355,11 +354,11 @@ export function harFromMessages(messages, options) {
if (pages.length < 1) {
//we haven't loaded any pages yet.
responsesWithoutPage.push(params);
continue;
return;
}

if (ignoredRequests.has(params.requestId)) {
continue;
return;
}

let entry = entries.find(
Expand All @@ -376,7 +375,7 @@ export function harFromMessages(messages, options) {
log(
`Received network response for requestId ${params.requestId} with no matching request.`,
);
continue;
return;
}

const frameId =
Expand All @@ -388,7 +387,7 @@ export function harFromMessages(messages, options) {
log(
`Received network response for requestId ${params.requestId} that can't be mapped to any page.`,
);
continue;
return;
}

try {
Expand Down Expand Up @@ -416,10 +415,10 @@ export function harFromMessages(messages, options) {
{
if (pages.length < 1) {
//we haven't loaded any pages yet.
continue;
return;
}
if (ignoredRequests.has(params.requestId)) {
continue;
return;
}

const entry = entries.find(
Expand All @@ -429,7 +428,7 @@ export function harFromMessages(messages, options) {
log(
`Received network data for requestId ${params.requestId} with no matching request.`,
);
continue;
return;
}
// It seems that people sometimes have an entry without a response,
// I wonder how that works
Expand Down Expand Up @@ -460,11 +459,11 @@ export function harFromMessages(messages, options) {
{
if (pages.length < 1) {
//we haven't loaded any pages yet.
continue;
return;
}
if (ignoredRequests.has(params.requestId)) {
ignoredRequests.delete(params.requestId);
continue;
return;
}

const entry = entries.find(
Expand All @@ -474,7 +473,7 @@ export function harFromMessages(messages, options) {
log(
`Network loading finished for requestId ${params.requestId} with no matching request.`,
);
continue;
return;
}

finalizeEntry(entry, params);
Expand All @@ -485,7 +484,7 @@ export function harFromMessages(messages, options) {
{
if (pages.length < 1) {
//we haven't loaded any pages yet.
continue;
return;
}

const page = pages[pages.length - 1];
Expand All @@ -502,7 +501,7 @@ export function harFromMessages(messages, options) {
{
if (pages.length < 1) {
//we haven't loaded any pages yet.
continue;
return;
}

const page = pages[pages.length - 1];
Expand Down Expand Up @@ -534,7 +533,7 @@ export function harFromMessages(messages, options) {
{
if (ignoredRequests.has(params.requestId)) {
ignoredRequests.delete(params.requestId);
continue;
return;
}

const entry = entries.find(
Expand All @@ -544,15 +543,15 @@ export function harFromMessages(messages, options) {
log(
`Network loading failed for requestId ${params.requestId} with no matching request.`,
);
continue;
return;
}

if (params.errorText === 'net::ERR_ABORTED') {
finalizeEntry(entry, params);
log(
`Loading was canceled due to Chrome or a user action for requestId ${params.requestId}.`,
);
continue;
return;
}

// This could be due to incorrect domain name etc. Sad, but unfortunately not something that a HAR file can
Expand All @@ -576,7 +575,7 @@ export function harFromMessages(messages, options) {
log(
`Received resourceChangedPriority for requestId ${params.requestId} with no matching request.`,
);
continue;
return;
}

entry._priority = message.params.newPriority;
Expand All @@ -588,67 +587,84 @@ export function harFromMessages(messages, options) {
ignoredEvents(method);
break;
}
}
};

if (!options.includeResourcesFromDiskCache) {
entries = entries.filter(
(entry) => entry.cache.beforeRequest === undefined,
);
}
const processEntriesAndPages = (entries, pages, options) => {
if (!options.includeResourcesFromDiskCache) {
entries = entries.filter((entry) => !entry.cache.beforeRequest);
}

const deleteInternalProperties = (o) => {
// __ properties are only for internal use, _ properties are custom properties for the HAR
for (const prop in o) {
if (prop.startsWith('__')) {
delete o[prop];
const deleteInternalProperties = (obj) => {
// __ properties are only for internal use, _ properties are custom properties for the HAR
for (const prop in obj) {
if (prop.startsWith('__')) {
delete obj[prop];
}
}
}
return o;
return obj;
};

entries = entries
.filter((entry) => {
if (!entry.response) {
log(`Dropping incomplete request: ${entry.request.url}`);
return false;
}
return true;
})
.map(deleteInternalProperties);

pages = pages.map(deleteInternalProperties).filter((page, index) => {
const hasEntry = entries.some((entry) => entry.pageref === page.id);
if (!hasEntry) {
log(`Skipping empty page: ${index + 1}`);
}
return hasEntry;
});

const pagerefMapping = pages.reduce((acc, page, index) => {
acc[page.id] = `page_${index + 1}`;
return acc;
}, {});

pages.forEach((page) => {
page.id = pagerefMapping[page.id];
});

entries.forEach((entry) => {
entry.pageref = pagerefMapping[entry.pageref];
});

return { pages, entries };
};

entries = entries
.filter((entry) => {
if (!entry.response) {
log(`Dropping incomplete request: ${entry.request.url}`);
}
return entry.response;
})
.map(deleteInternalProperties);
pages = pages.map(deleteInternalProperties);
pages = pages.reduce((result, page, index) => {
const hasEntry = entries.some((entry) => entry.pageref === page.id);
if (hasEntry) {
result.push(page);
} else {
log(`Skipping empty page: ${index + 1}`);
}
return result;
}, []);
const pagerefMapping = pages.reduce((result, page, index) => {
result[page.id] = `page_${index + 1}`;
return result;
}, {});

pages = pages.map((page) => {
page.id = pagerefMapping[page.id];
return page;
});
entries = entries.map((entry) => {
entry.pageref = pagerefMapping[entry.pageref];
return entry;
});

// FIXME sanity check if there are any pages/entries created
return {
log: {
version: '1.2',
creator: {
name: 'chrome-har',
version,
comment: 'https://github.com/sitespeedio/chrome-har',
const processMessages = () => {
const result = processEntriesAndPages(entries, pages, options);
return {
log: {
version: '1.2',
creator: {
name: 'chrome-har',
version,
comment: 'https://github.com/sitespeedio/chrome-har',
},
pages: result.pages,
entries: result.entries,
},
pages,
entries,
},
};
};

if (typeof messages[Symbol.asyncIterator] === 'function') {
return (async () => {
for await (const message of messages) {
processMessage(message);
}
return processMessages();
})();
} else {
for (const message of messages) {
processMessage(message);
}
return processMessages();
}
}
Loading