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

chore: move setting PW User-Agent on connectOverCDP to the server side (#10899)

Browse source
This commit is contained in:
Max Schmitt 2021-12-13 17:20:04 -08:00 committed by GitHub
parent a82a3f1128
commit 67b16497cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/playwright-core/src/client/browserType.ts
View file

@ -23,7 +23,7 @@ import { Connection } from './connection';
import { Events } from './events'; import { Events } from './events';
import { ChildProcess } from 'child_process'; import { ChildProcess } from 'child_process';
import { envObjectToArray } from './clientHelper'; import { envObjectToArray } from './clientHelper';
import { assert, headersObjectToArray, getUserAgent, monotonicTime } from '../utils/utils'; import { assert, headersObjectToArray, monotonicTime } from '../utils/utils';
import * as api from '../../types/types'; import * as api from '../../types/types';
import { kBrowserClosedError } from '../utils/errors'; import { kBrowserClosedError } from '../utils/errors';
import { raceAgainstDeadline } from '../utils/async'; import { raceAgainstDeadline } from '../utils/async';
@ -205,9 +205,7 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
async _connectOverCDP(endpointURL: string, params: api.ConnectOverCDPOptions = {}): Promise<Browser> { async _connectOverCDP(endpointURL: string, params: api.ConnectOverCDPOptions = {}): Promise<Browser> {
if (this.name() !== 'chromium') if (this.name() !== 'chromium')
throw new Error('Connecting over CDP is only supported in Chromium.'); throw new Error('Connecting over CDP is only supported in Chromium.');
const logger = params.logger; const headers = params.headers ? headersObjectToArray(params.headers) : undefined;
const paramsHeaders = Object.assign({ 'User-Agent': getUserAgent() }, params.headers);
const headers = paramsHeaders ? headersObjectToArray(paramsHeaders) : undefined;
const result = await this._channel.connectOverCDP({ const result = await this._channel.connectOverCDP({
endpointURL, endpointURL,
headers, headers,
@ -217,7 +215,7 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
const browser = Browser.from(result.browser); const browser = Browser.from(result.browser);
if (result.defaultContext) if (result.defaultContext)
browser._contexts.add(BrowserContext.from(result.defaultContext)); browser._contexts.add(BrowserContext.from(result.defaultContext));
browser._logger = logger; browser._logger = params.logger;
browser._setBrowserType(this); browser._setBrowserType(this);
browser._localUtils = this._playwright._utils; browser._localUtils = this._playwright._utils;
return browser; return browser;

7
packages/playwright-core/src/server/chromium/chromium.ts
View file

@ -27,7 +27,7 @@ import { ConnectionTransport, ProtocolRequest, WebSocketTransport } from '../tra
import { CRDevTools } from './crDevTools'; import { CRDevTools } from './crDevTools';
import { Browser, BrowserOptions, BrowserProcess, PlaywrightOptions } from '../browser'; import { Browser, BrowserOptions, BrowserProcess, PlaywrightOptions } from '../browser';
import * as types from '../types'; import * as types from '../types';
import { debugMode, fetchData, headersArrayToObject, HTTPRequestParams, removeFolders, streamToString } from '../../utils/utils'; import { debugMode, fetchData, getUserAgent, headersArrayToObject, HTTPRequestParams, removeFolders, streamToString } from '../../utils/utils';
import { RecentLogsCollector } from '../../utils/debugLogger'; import { RecentLogsCollector } from '../../utils/debugLogger';
import { Progress, ProgressController } from '../progress'; import { Progress, ProgressController } from '../progress';
import { TimeoutSettings } from '../../utils/timeoutSettings'; import { TimeoutSettings } from '../../utils/timeoutSettings';
@ -63,6 +63,11 @@ export class Chromium extends BrowserType {
if (options.headers) if (options.headers)
headersMap = headersArrayToObject(options.headers, false); headersMap = headersArrayToObject(options.headers, false);
if (!headersMap)
headersMap = { 'User-Agent': getUserAgent() };
else if (headersMap && !Object.keys(headersMap).some(key => key.toLowerCase() === 'user-agent'))
headersMap['User-Agent'] = getUserAgent();
const artifactsDir = await fs.promises.mkdtemp(ARTIFACTS_FOLDER); const artifactsDir = await fs.promises.mkdtemp(ARTIFACTS_FOLDER);
const wsEndpoint = await urlToWSEndpoint(progress, endpointURL); const wsEndpoint = await urlToWSEndpoint(progress, endpointURL);