Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,12 @@ function createTargetCreatedHandler(requests: Set<string>): (popup: Page) => Pro
* @ignore
*/
function isTopFrameNavigationRequest(page: Page, req: Request): boolean {
return req.isNavigationRequest() && req.frame() === page.mainFrame();
try {
return req.isNavigationRequest() && req.frame() === page.mainFrame();
} catch (error) {
log.error('Error in isTopFrameNavigationRequest', { error });
return false;
}
}

/**
Expand Down Expand Up @@ -567,11 +572,12 @@ async function waitForPageIdle({
*/
async function restoreHistoryNavigationAndSaveCapturedUrls(page: Page, requests: Set<string>): Promise<void> {
/* istanbul ignore next */
const state = await page.evaluate(() => {
const { stateHistory } = window.history as unknown as ApifyWindow;
(window as unknown as Dictionary).history = (window as unknown as Dictionary).__originalHistory__;
return stateHistory;
});
const state =
(await page.evaluate(() => {
const { stateHistory } = window.history as unknown as ApifyWindow;
(window as unknown as Dictionary).history = (window as unknown as Dictionary).__originalHistory__;
return stateHistory;
})) ?? [];

state.forEach((args) => {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,12 @@ function createInterceptRequestHandler(page: Page, requests: Set<string>): (req:
* @ignore
*/
function isTopFrameNavigationRequest(page: Page, req: PuppeteerRequest): boolean {
return req.isNavigationRequest() && req.frame() === page.mainFrame();
try {
return req.isNavigationRequest() && req.frame() === page.mainFrame();
} catch (error) {
log.error('Error in isTopFrameNavigationRequest', { error });
return false;
}
}

/**
Expand Down Expand Up @@ -583,11 +588,12 @@ async function waitForPageIdle({
*/
async function restoreHistoryNavigationAndSaveCapturedUrls(page: Page, requests: Set<string>): Promise<void> {
/* istanbul ignore next */
const state = await page.evaluate(() => {
const { stateHistory } = window.history as unknown as ApifyWindow;
(window as unknown as Dictionary).history = (window as unknown as Dictionary).__originalHistory__;
return stateHistory;
});
const state =
(await page.evaluate(() => {
const { stateHistory } = window.history as unknown as ApifyWindow;
(window as unknown as Dictionary).history = (window as unknown as Dictionary).__originalHistory__;
return stateHistory;
})) ?? [];
state.forEach((args) => {
try {
const stateUrl = args[args.length - 1] as string;
Expand Down
Loading