yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: throw instead of returning error from fetch (#10451)

Browse Source
This commit is contained in:
Yury Semikhatsky 2021-11-19 20:32:29 -08:00 committed by GitHub
parent fde2f6a77f
commit 9c23a78c32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 74 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/playwright-core/src/client/fetch.ts
View File

@ -184,9 +184,7 @@ export class APIRequestContext extends ChannelOwner<channels.APIRequestContextCh
failOnStatusCode: options.failOnStatusCode, failOnStatusCode: options.failOnStatusCode,
ignoreHTTPSErrors: options.ignoreHTTPSErrors, ignoreHTTPSErrors: options.ignoreHTTPSErrors,
}); });
if (result.error) return new APIResponse(this, result.response);
throw new Error(result.error);
return new APIResponse(this, result.response!);
}); });
} }

10
packages/playwright-core/src/dispatchers/networkDispatchers.ts
View File

@ -179,18 +179,16 @@ export class APIRequestContextDispatcher extends Dispatcher<APIRequestContext, c
} }
async fetch(params: channels.APIRequestContextFetchParams, metadata?: channels.Metadata): Promise<channels.APIRequestContextFetchResult> { async fetch(params: channels.APIRequestContextFetchParams, metadata?: channels.Metadata): Promise<channels.APIRequestContextFetchResult> {
const { fetchResponse, error } = await this._object.fetch(params); const fetchResponse = await this._object.fetch(params);
let response; return {
if (fetchResponse) { response: {
response = {
url: fetchResponse.url, url: fetchResponse.url,
status: fetchResponse.status, status: fetchResponse.status,
statusText: fetchResponse.statusText, statusText: fetchResponse.statusText,
headers: fetchResponse.headers, headers: fetchResponse.headers,
fetchUid: fetchResponse.fetchUid fetchUid: fetchResponse.fetchUid
};
} }
return { response, error }; };
} }
async fetchResponseBody(params: channels.APIRequestContextFetchResponseBodyParams, metadata?: channels.Metadata): Promise<channels.APIRequestContextFetchResponseBodyResult> { async fetchResponseBody(params: channels.APIRequestContextFetchResponseBodyParams, metadata?: channels.Metadata): Promise<channels.APIRequestContextFetchResponseBodyResult> {

3
packages/playwright-core/src/protocol/channels.ts
View File

@ -296,8 +296,7 @@ export type APIRequestContextFetchOptions = {
ignoreHTTPSErrors?: boolean, ignoreHTTPSErrors?: boolean,
}; };
export type APIRequestContextFetchResult = { export type APIRequestContextFetchResult = {
response?: APIResponse, response: APIResponse,
error?: string,
}; };
export type APIRequestContextFetchResponseBodyParams = { export type APIRequestContextFetchResponseBodyParams = {
fetchUid: string, fetchUid: string,

3
packages/playwright-core/src/protocol/protocol.yml
View File

@ -254,8 +254,7 @@ APIRequestContext:
failOnStatusCode: boolean? failOnStatusCode: boolean?
ignoreHTTPSErrors: boolean? ignoreHTTPSErrors: boolean?
returns: returns:
response: APIResponse? response: APIResponse
error: string?
fetchResponseBody: fetchResponseBody:
parameters: parameters:

10
packages/playwright-core/src/server/fetch.ts
View File

@ -85,8 +85,7 @@ export abstract class APIRequestContext extends SdkObject {
return uid; return uid;
} }
async fetch(params: channels.APIRequestContextFetchParams): Promise<{fetchResponse?: Omit<types.APIResponse, 'body'> & { fetchUid: string }, error?: string}> { async fetch(params: channels.APIRequestContextFetchParams): Promise<Omit<types.APIResponse, 'body'> & { fetchUid: string }> {
try {
const headers: { [name: string]: string } = {}; const headers: { [name: string]: string } = {};
const defaults = this._defaultOptions(); const defaults = this._defaultOptions();
headers['user-agent'] = defaults.userAgent; headers['user-agent'] = defaults.userAgent;
@ -152,11 +151,8 @@ export abstract class APIRequestContext extends SdkObject {
const fetchResponse = await this._sendRequest(requestUrl, options, postData); const fetchResponse = await this._sendRequest(requestUrl, options, postData);
const fetchUid = this._storeResponseBody(fetchResponse.body); const fetchUid = this._storeResponseBody(fetchResponse.body);
if (params.failOnStatusCode && (fetchResponse.status < 200 || fetchResponse.status >= 400)) if (params.failOnStatusCode && (fetchResponse.status < 200 || fetchResponse.status >= 400))
return { error: `${fetchResponse.status} ${fetchResponse.statusText}` }; throw new Error(`${fetchResponse.status} ${fetchResponse.statusText}`);
return { fetchResponse: { ...fetchResponse, fetchUid } }; return { ...fetchResponse, fetchUid };
} catch (e) {
return { error: e instanceof Error ? e.message : String(e) };
}
} }
private async _updateCookiesFromHeader(responseUrl: string, setCookie: string[]) { private async _updateCookiesFromHeader(responseUrl: string, setCookie: string[]) {