Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

http: refactor agent 'free' handler #32801

Closed
wants to merge 4 commits into from
Closed

http: refactor agent 'free' handler #32801

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcbf1d7
http: refactor agent 'free' handler
ronag Apr 12, 2020
b0c8a22
http: agent use once helper
ronag Apr 12, 2020
f88a185
Update lib/_http_agent.js
ronag Apr 14, 2020
41af730
fixup
ronag Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 49 additions & 48 deletions lib/_http_agent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ const {
ERR_INVALID_ARG_TYPE,
},
} = require('internal/errors');
const { once } = require('internal/util');

const kOnKeylog = Symbol('onkeylog');
// New Agent code.

Expand Down Expand Up @@ -94,52 +96,55 @@ function Agent(options) {
// case of socket.destroy() below this 'error' has no handler
// and could cause unhandled exception.

if (socket.writable &&
this.requests[name] && this.requests[name].length) {
const req = this.requests[name].shift();
if (!socket.writable) {
socket.destroy();
return;
}

const requests = this.requests[name];
if (requests && requests.length) {
const req = requests.shift();
setRequestSocket(this, req, socket);
if (this.requests[name].length === 0) {
// don't leak
if (requests.length === 0) {
delete this.requests[name];
}
} else {
// If there are no pending requests, then put it in
// the freeSockets pool, but only if we're allowed to do so.
const req = socket._httpMessage;
if (req &&
req.shouldKeepAlive &&
socket.writable &&
this.keepAlive) {
let freeSockets = this.freeSockets[name];
const freeLen = freeSockets ? freeSockets.length : 0;
let count = freeLen;
if (this.sockets[name])
count += this.sockets[name].length;

if (count > this.maxSockets || freeLen >= this.maxFreeSockets) {
socket.destroy();
} else if (this.keepSocketAlive(socket)) {
freeSockets = freeSockets || [];
this.freeSockets[name] = freeSockets;
socket[async_id_symbol] = -1;
socket._httpMessage = null;
this.removeSocket(socket, options);

const agentTimeout = this.options.timeout || 0;
if (socket.timeout !== agentTimeout) {
socket.setTimeout(agentTimeout);
}

socket.once('error', freeSocketErrorListener);
freeSockets.push(socket);
} else {
// Implementation doesn't want to keep socket alive
socket.destroy();
}
} else {
socket.destroy();
}
return;
}

// If there are no pending requests, then put it in
// the freeSockets pool, but only if we're allowed to do so.
const req = socket._httpMessage;
if (!req || !req.shouldKeepAlive || !this.keepAlive) {
socket.destroy();
return;
}

let freeSockets = this.freeSockets[name];
const freeLen = freeSockets ? freeSockets.length : 0;
let count = freeLen;
if (this.sockets[name])
count += this.sockets[name].length;

if (count > this.maxSockets ||
freeLen >= this.maxFreeSockets ||
!this.keepSocketAlive(socket)) {
socket.destroy();
return;
}

freeSockets = freeSockets || [];
this.freeSockets[name] = freeSockets;
socket[async_id_symbol] = -1;
socket._httpMessage = null;
this.removeSocket(socket, options);

const agentTimeout = this.options.timeout || 0;
if (socket.timeout !== agentTimeout) {
socket.setTimeout(agentTimeout);
}

socket.once('error', freeSocketErrorListener);
freeSockets.push(socket);
});

// Don't emit keylog events unless there is a listener for them.
Expand Down Expand Up @@ -266,12 +271,8 @@ Agent.prototype.createSocket = function createSocket(req, options, cb) {

debug('createConnection', name, options);
options.encoding = null;
let called = false;

const oncreate = (err, s) => {
if (called)
return;
called = true;
const oncreate = once((err, s) => {
if (err)
return cb(err);
if (!this.sockets[name]) {
Expand All @@ -281,7 +282,7 @@ Agent.prototype.createSocket = function createSocket(req, options, cb) {
debug('sockets', name, this.sockets[name].length);
installListeners(this, s, options);
cb(null, s);
};
});

const newSocket = this.createConnection(options, oncreate);
if (newSocket)
Expand Down