@@ -18,6 +18,7 @@ import path from 'path';
1818
1919import { assert } from '@isomorphic/assert' ;
2020import { headersObjectToArray } from '@isomorphic/headers' ;
21+ import { jsonStringifyForceASCII } from '@utils/ascii' ;
2122import { Browser } from './browser' ;
2223import { BrowserContext , prepareBrowserContextParams } from './browserContext' ;
2324import { ChannelOwner , apiCall } from './channelOwner' ;
@@ -69,12 +70,7 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
6970
7071 const logger = options . logger || this . _playwright . _defaultLaunchOptions ?. logger ;
7172 options = { ...this . _playwright . _defaultLaunchOptions , ...options } ;
72- const launchOptions : channels . BrowserTypeLaunchParams = {
73- ...options ,
74- ignoreDefaultArgs : Array . isArray ( options . ignoreDefaultArgs ) ? options . ignoreDefaultArgs : undefined ,
75- ignoreAllDefaultArgs : ! ! options . ignoreDefaultArgs && ! Array . isArray ( options . ignoreDefaultArgs ) ,
76- env : options . env ? envObjectToArray ( options . env ) : undefined ,
77- } ;
73+ const launchOptions = toLaunchParams ( options ) ;
7874 const browser = Browser . from ( ( await this . _channel . launch ( launchOptions , new TimeoutSettings ( ) . launchTimeout ( options ) ) ) . browser ) ;
7975 browser . _connectToBrowserType ( this , options , logger ) ;
8076 return browser ;
@@ -126,7 +122,14 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
126122 }
127123
128124 async _connect ( params : ConnectOptions ) : Promise < Browser > {
129- const browser = await connectToBrowser ( this . _playwright , { browserName : this . name ( ) , ...params } ) ;
125+ const { launchOptions, ...connectParams } = params ;
126+ if ( launchOptions ) {
127+ connectParams . headers = {
128+ 'x-playwright-launch-options' : jsonStringifyForceASCII ( toLaunchParams ( launchOptions ) ) ,
129+ ...connectParams . headers ,
130+ } ;
131+ }
132+ const browser = await connectToBrowser ( this . _playwright , { browserName : this . name ( ) , ...connectParams } ) ;
130133 browser . _connectToBrowserType ( this , { } , undefined ) ;
131134 return browser ;
132135 }
@@ -179,6 +182,15 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
179182 }
180183}
181184
185+ function toLaunchParams ( options : LaunchOptions ) : channels . BrowserTypeLaunchParams {
186+ return {
187+ ...options ,
188+ ignoreDefaultArgs : Array . isArray ( options . ignoreDefaultArgs ) ? options . ignoreDefaultArgs : undefined ,
189+ ignoreAllDefaultArgs : ! ! options . ignoreDefaultArgs && ! Array . isArray ( options . ignoreDefaultArgs ) ,
190+ env : options . env ? envObjectToArray ( options . env ) : undefined ,
191+ } ;
192+ }
193+
182194function isConnectionTransport ( value : any ) : value is api . ConnectOverCDPTransport {
183195 return ! ! value && typeof value === 'object' && typeof value . send === 'function' && typeof value . close === 'function' ;
184196}
0 commit comments