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

properly clean up

Browse source
This commit is contained in:
Simon Knott 2024-10-04 14:12:57 +02:00
parent 3c57a78f63
commit 20bcb49bd6
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
packages/playwright-core/src/server/fetch.ts
View file

@ -312,8 +312,11 @@ export abstract class APIRequestContext extends SdkObject {
let securityDetails: har.SecurityDetails | undefined; let securityDetails: har.SecurityDetails | undefined;
const cleanup: (() => void)[] = [];
const request = requestConstructor(url, requestOptions as any, async response => { const request = requestConstructor(url, requestOptions as any, async response => {
const responseAt = monotonicTime(); const responseAt = monotonicTime();
const notifyRequestFinished = (body?: Buffer) => { const notifyRequestFinished = (body?: Buffer) => {
const endAt = monotonicTime(); const endAt = monotonicTime();
// spec: http://www.softwareishard.com/blog/har-12-spec/#timings // spec: http://www.softwareishard.com/blog/har-12-spec/#timings
@ -483,7 +486,8 @@ export abstract class APIRequestContext extends SdkObject {
request.destroy(); request.destroy();
}; };
this.on(APIRequestContext.Events.Dispose, disposeListener); this.on(APIRequestContext.Events.Dispose, disposeListener);
request.on('close', () => this.off(APIRequestContext.Events.Dispose, disposeListener)); cleanup.push(() => this.off(APIRequestContext.Events.Dispose, disposeListener));
request.on('close', () => cleanup.forEach(c => c()));
request.on('socket', socket => { request.on('socket', socket => {
// happy eyeballs don't emit lookup and connect events, so we use our custom ones // happy eyeballs don't emit lookup and connect events, so we use our custom ones
@ -493,9 +497,14 @@ export abstract class APIRequestContext extends SdkObject {
// non-happy-eyeballs sockets // non-happy-eyeballs sockets
socket.setMaxListeners(100); // default is 10. there might be more than 10 requests to the same server in parallel, and they all use the same socket socket.setMaxListeners(100); // default is 10. there might be more than 10 requests to the same server in parallel, and they all use the same socket
socket.once('lookup', () => { dnsLookupAt = monotonicTime(); });
socket.once('connect', () => { tcpConnectionAt = monotonicTime(); }); const onLookup = () => { dnsLookupAt = monotonicTime(); };
socket.once('secureConnect', () => { socket.once('lookup', onLookup);
cleanup.push(() => socket.removeListener('lookup', onLookup));
const onConnect = () => { tcpConnectionAt = monotonicTime(); };
socket.once('connect', onConnect);
cleanup.push(() => socket.removeListener('connect', onConnect));
const onSecureConnect = () => {
tlsHandshakeAt = monotonicTime(); tlsHandshakeAt = monotonicTime();
if (socket instanceof TLSSocket) { if (socket instanceof TLSSocket) {
@ -508,7 +517,9 @@ export abstract class APIRequestContext extends SdkObject {
issuer: peerCertificate.issuer.CN issuer: peerCertificate.issuer.CN
}; };
} }
}); };
socket.once('secureConnect', () => onSecureConnect);
cleanup.push(() => socket.removeListener('secureConnect', onSecureConnect));
serverIPAddress = socket.remoteAddress; serverIPAddress = socket.remoteAddress;
serverPort = socket.remotePort; serverPort = socket.remotePort;