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

chore: simplify post_data processing (#19490)

Browse source
This commit is contained in:
Pavel Feldman 2022-12-15 11:57:51 -08:00 committed by GitHub
parent 0be1fc8559
commit 3f333a8ef7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
packages/playwright-core/src/client/network.ts
View file

@ -77,7 +77,6 @@ export class Request extends ChannelOwner<channels.RequestChannel> implements ap
_failureText: string | null = null; _failureText: string | null = null;
private _provisionalHeaders: RawHeaders; private _provisionalHeaders: RawHeaders;
private _actualHeadersPromise: Promise<RawHeaders> | undefined; private _actualHeadersPromise: Promise<RawHeaders> | undefined;
private _postData: Buffer | null;
_timing: ResourceTiming; _timing: ResourceTiming;
private _fallbackOverrides: SerializedFallbackOverrides = {}; private _fallbackOverrides: SerializedFallbackOverrides = {};
@ -95,7 +94,7 @@ export class Request extends ChannelOwner<channels.RequestChannel> implements ap
if (this._redirectedFrom) if (this._redirectedFrom)
this._redirectedFrom._redirectedTo = this; this._redirectedFrom._redirectedTo = this;
this._provisionalHeaders = new RawHeaders(initializer.headers); this._provisionalHeaders = new RawHeaders(initializer.headers);
this._postData = initializer.postData ?? null; this._fallbackOverrides.postDataBuffer = initializer.postData;
this._timing = { this._timing = {
startTime: 0, startTime: 0,
domainLookupStart: -1, domainLookupStart: -1,
@ -122,15 +121,11 @@ export class Request extends ChannelOwner<channels.RequestChannel> implements ap
} }
postData(): string | null { postData(): string | null {
if (this._fallbackOverrides.postDataBuffer) return this._fallbackOverrides.postDataBuffer?.toString('utf-8') || null;
return this._fallbackOverrides.postDataBuffer.toString('utf-8');
return this._postData ? this._postData.toString('utf8') : null;
} }
postDataBuffer(): Buffer | null { postDataBuffer(): Buffer | null {
if (this._fallbackOverrides.postDataBuffer) return this._fallbackOverrides.postDataBuffer || null;
return this._fallbackOverrides.postDataBuffer;
return this._postData;
} }
postDataJSON(): Object | null { postDataJSON(): Object | null {
@ -256,21 +251,19 @@ export class Request extends ChannelOwner<channels.RequestChannel> implements ap
} }
_applyFallbackOverrides(overrides: FallbackOverrides) { _applyFallbackOverrides(overrides: FallbackOverrides) {
const basicOptions = { ...overrides, postData: undefined }; if (overrides.url)
this._fallbackOverrides.url = overrides.url;
if (overrides.method)
this._fallbackOverrides.method = overrides.method;
if (overrides.headers)
this._fallbackOverrides.headers = overrides.headers;
const postData = overrides.postData; if (isString(overrides.postData))
let postDataBuffer = this._fallbackOverrides.postDataBuffer; this._fallbackOverrides.postDataBuffer = Buffer.from(overrides.postData, 'utf-8');
if (isString(postData)) else if (overrides.postData instanceof Buffer)
postDataBuffer = Buffer.from(postData, 'utf-8'); this._fallbackOverrides.postDataBuffer = overrides.postData;
else if (postData instanceof Buffer) else if (overrides.postData)
postDataBuffer = postData; this._fallbackOverrides.postDataBuffer = Buffer.from(JSON.stringify(overrides.postData), 'utf-8');
else if (postData)
postDataBuffer = Buffer.from(JSON.stringify(postData), 'utf-8');
this._fallbackOverrides = {
...this._fallbackOverrides,
...basicOptions,
postDataBuffer,
};
} }
_fallbackOverridesForContinue() { _fallbackOverridesForContinue() {