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

fix(webkit): wait for the incoming pipe message prior to writing into it

Browse source
This commit is contained in:
Pavel Feldman 2020-02-06 23:56:15 -08:00
parent fe2431e34b
commit c2d149a280
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/server/webkit.ts
View file

@ -136,7 +136,7 @@ export class WebKit implements BrowserType {
}); });
transport = new PipeTransport(launchedProcess.stdio[3] as NodeJS.WritableStream, launchedProcess.stdio[4] as NodeJS.ReadableStream); transport = new PipeTransport(launchedProcess.stdio[3] as NodeJS.WritableStream, launchedProcess.stdio[4] as NodeJS.ReadableStream);
browserServer = new BrowserServer(launchedProcess, gracefullyClose, launchType === 'server' ? wrapTransportWithWebSocket(transport, port || 0) : null); browserServer = new BrowserServer(launchedProcess, gracefullyClose, launchType === 'server' ? await wrapTransportWithWebSocket(transport, port || 0) : null);
return { browserServer, transport }; return { browserServer, transport };
} }
@ -253,7 +253,7 @@ class SequenceNumberMixer<V> {
} }
} }
function wrapTransportWithWebSocket(transport: ConnectionTransport, port: number) { async function wrapTransportWithWebSocket(transport: ConnectionTransport, port: number) {
const server = new ws.Server({ port }); const server = new ws.Server({ port });
const guid = uuidv4(); const guid = uuidv4();
const idMixer = new SequenceNumberMixer<{id: number, socket: ws}>(); const idMixer = new SequenceNumberMixer<{id: number, socket: ws}>();
@ -262,8 +262,11 @@ function wrapTransportWithWebSocket(transport: ConnectionTransport, port: number
const browserContextIds = new Map<string, ws>(); const browserContextIds = new Map<string, ws>();
const pageProxyIds = new Map<string, ws>(); const pageProxyIds = new Map<string, ws>();
const sockets = new Set<ws>(); const sockets = new Set<ws>();
let processStartedCallback: () => void;
const processStarted = new Promise(f => processStartedCallback = f);
transport.onmessage = message => { transport.onmessage = message => {
processStartedCallback();
const parsedMessage = JSON.parse(message); const parsedMessage = JSON.parse(message);
if ('id' in parsedMessage) { if ('id' in parsedMessage) {
if (parsedMessage.id === -9999) if (parsedMessage.id === -9999)
@ -399,5 +402,6 @@ function wrapTransportWithWebSocket(transport: ConnectionTransport, port: number
const address = server.address(); const address = server.address();
if (typeof address === 'string') if (typeof address === 'string')
return address + '/' + guid; return address + '/' + guid;
await processStarted;
return 'ws://127.0.0.1:' + address.port + '/' + guid; return 'ws://127.0.0.1:' + address.port + '/' + guid;
} }