Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: add pw:api logging to har router (#14903)

Browse source
This commit is contained in:
Yury Semikhatsky 2022-06-16 07:48:57 -07:00 committed by GitHub
parent 5b9ab653fe
commit 79378dd1eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/playwright-core/src/client/harRouter.ts
View file

@ -16,6 +16,8 @@
import fs from 'fs'; import fs from 'fs';
import type { HAREntry, HARFile, HARResponse } from '../../types/types'; import type { HAREntry, HARFile, HARResponse } from '../../types/types';
import { debugLogger } from '../common/debugLogger';
import { rewriteErrorMessage } from '../utils/stackTrace';
import type { BrowserContext } from './browserContext'; import type { BrowserContext } from './browserContext';
import type { Route } from './network'; import type { Route } from './network';
import type { BrowserContextOptions } from './types'; import type { BrowserContextOptions } from './types';
@ -41,16 +43,18 @@ export class HarRouter {
method: route.request().method() method: route.request().method()
}); });
} catch (e) { } catch (e) {
// TODO: throw or at least error log? rewriteErrorMessage(e, `Error while finding entry for ${route.request().method()} ${route.request().url()} in HAR file:\n${e.message}`);
// rewriteErrorMessage(e, e.message + `\n\nFailed to find matching entry for ${route.request().method()} ${route.request().url()} in ${path}`); debugLogger.log('api', e);
// throw e;
} }
if (response) if (response) {
debugLogger.log('api', `serving from HAR: ${route.request().method()} ${route.request().url()}`);
await route.fulfill({ response }); await route.fulfill({ response });
else if (options?.fallback === 'continue') } else if (options?.fallback === 'continue') {
await route.fallback(); await route.fallback();
else } else {
debugLogger.log('api', `request not in HAR, aborting: ${route.request().method()} ${route.request().url()}`);
await route.abort(); await route.abort();
}
}; };
} }
@ -61,7 +65,7 @@ export class HarRouter {
const redirectStatus = [301, 302, 303, 307, 308]; const redirectStatus = [301, 302, 303, 307, 308];
function harFindResponse(har: HARFile, params: { url: string, method: string }): HARResponse { function harFindResponse(har: HARFile, params: { url: string, method: string }): HARResponse | undefined {
const harLog = har.log; const harLog = har.log;
const visited = new Set<HAREntry>(); const visited = new Set<HAREntry>();
let url = params.url; let url = params.url;
@ -69,7 +73,7 @@ function harFindResponse(har: HARFile, params: { url: string, method: string }):
while (true) { while (true) {
const entry = harLog.entries.find(entry => entry.request.url === url && entry.request.method === method); const entry = harLog.entries.find(entry => entry.request.url === url && entry.request.method === method);
if (!entry) if (!entry)
throw new Error(`No entry matching ${params.url}`); return;
if (visited.has(entry)) if (visited.has(entry))
throw new Error(`Found redirect cycle for ${params.url}`); throw new Error(`Found redirect cycle for ${params.url}`);
visited.add(entry); visited.add(entry);