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

cherry-pick(#17349): fix(socks proxy): destroy sockets on close to avoid hanging (#17366)

Browse source
This commit is contained in:
Dmitry Gozman 2022-09-15 09:53:55 -07:00 committed by Andrey Lushnikov
parent ae4c5bf125
commit e1681a3a89
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/playwright-core/src/common/socksProxy.ts
View file

@ -294,6 +294,8 @@ export class SocksProxy extends EventEmitter implements SocksConnectionClient {
private _server: net.Server;
private _connections = new Map<string, SocksConnection>();
private _sockets = new Set<net.Socket>();
private _closed = false;
constructor() {
super();
@ -302,6 +304,14 @@ export class SocksProxy extends EventEmitter implements SocksConnectionClient {
const connection = new SocksConnection(uid, socket, this);
this._connections.set(uid, connection);
});
this._server.on('connection', socket => {
if (this._closed) {
socket.destroy();
return;
}
this._sockets.add(socket);
socket.once('close', () => this._sockets.delete(socket));
});
}
async listen(port: number): Promise<number> {
@ -315,6 +325,10 @@ export class SocksProxy extends EventEmitter implements SocksConnectionClient {
}
async close() {
this._closed = true;
for (const socket of this._sockets)
socket.destroy();
this._sockets.clear();
await new Promise(f => this._server.close(f));
}