From a09158bb4b8dd846603b35adf96059950421970f Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Tue, 7 Mar 2017 13:13:15 -0800 Subject: [PATCH] Delete `socket.upgradeReq` when it is no longer needed to reduce memory usage cc @lpinca --- lib/server/parse-websocket.js | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/lib/server/parse-websocket.js b/lib/server/parse-websocket.js index b6fecb3..0900fdd 100644 --- a/lib/server/parse-websocket.js +++ b/lib/server/parse-websocket.js @@ -52,15 +52,27 @@ function parseWebSocketRequest (socket, opts, params) { throw new Error('invalid action in WS request: ' + params.action) } - params.ip = opts.trustProxy - ? socket.upgradeReq.headers['x-forwarded-for'] || socket.upgradeReq.connection.remoteAddress - : socket.upgradeReq.connection.remoteAddress.replace(common.REMOVE_IPV4_MAPPED_IPV6_RE, '') // force ipv4 - params.port = socket.upgradeReq.connection.remotePort - if (params.port) { - params.addr = (common.IPV6_RE.test(params.ip) ? '[' + params.ip + ']' : params.ip) + ':' + params.port + // On first parse, save important data from `socket.upgradeReq` and delete it + // to reduce memory usage. + if (socket.upgradeReq) { + socket.ip = opts.trustProxy + ? socket.upgradeReq.headers['x-forwarded-for'] || socket.upgradeReq.connection.remoteAddress + : socket.upgradeReq.connection.remoteAddress.replace(common.REMOVE_IPV4_MAPPED_IPV6_RE, '') // force ipv4 + socket.port = socket.upgradeReq.connection.remotePort + if (socket.port) { + socket.addr = (common.IPV6_RE.test(socket.ip) ? '[' + socket.ip + ']' : socket.ip) + ':' + socket.port + } + + socket.headers = socket.upgradeReq.headers + + // Delete `socket.upgradeReq` when it is no longer needed to reduce memory usage + socket.upgradeReq = null } - params.headers = socket.upgradeReq.headers + params.ip = socket.ip + params.port = socket.port + params.addr = socket.addr + params.headers = socket.headers return params }