From f36cbd9c280137eb24eb6fa60f06bcd14e2078de Mon Sep 17 00:00:00 2001 From: Paolo Ceschi Berrini Date: Tue, 12 Nov 2019 15:32:24 +0000 Subject: [PATCH 1/3] http2: replace var with let/const --- lib/internal/http2/util.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/internal/http2/util.js b/lib/internal/http2/util.js index 9cc2a30897b6ae..b7fb976fe2467d 100644 --- a/lib/internal/http2/util.js +++ b/lib/internal/http2/util.js @@ -197,7 +197,7 @@ const IDX_OPTIONS_MAX_SESSION_MEMORY = 8; const IDX_OPTIONS_FLAGS = 9; function updateOptionsBuffer(options) { - var flags = 0; + let flags = 0; if (typeof options.maxDeflateDynamicTableSize === 'number') { flags |= (1 << IDX_OPTIONS_MAX_DEFLATE_DYNAMIC_TABLE_SIZE); optionsBuffer[IDX_OPTIONS_MAX_DEFLATE_DYNAMIC_TABLE_SIZE] = @@ -254,43 +254,43 @@ function getDefaultSettings() { const flags = settingsBuffer[IDX_SETTINGS_FLAGS]; if ((flags & (1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) === - (1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) { + (1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) { holder.headerTableSize = settingsBuffer[IDX_SETTINGS_HEADER_TABLE_SIZE]; } if ((flags & (1 << IDX_SETTINGS_ENABLE_PUSH)) === - (1 << IDX_SETTINGS_ENABLE_PUSH)) { + (1 << IDX_SETTINGS_ENABLE_PUSH)) { holder.enablePush = settingsBuffer[IDX_SETTINGS_ENABLE_PUSH] === 1; } if ((flags & (1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) === - (1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) { + (1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) { holder.initialWindowSize = settingsBuffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE]; } if ((flags & (1 << IDX_SETTINGS_MAX_FRAME_SIZE)) === - (1 << IDX_SETTINGS_MAX_FRAME_SIZE)) { + (1 << IDX_SETTINGS_MAX_FRAME_SIZE)) { holder.maxFrameSize = settingsBuffer[IDX_SETTINGS_MAX_FRAME_SIZE]; } if ((flags & (1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) === - (1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) { + (1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) { holder.maxConcurrentStreams = settingsBuffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS]; } if ((flags & (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) === - (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) { + (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) { holder.maxHeaderListSize = settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE]; } if ((flags & (1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) === - (1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) { + (1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) { holder.enableConnectProtocol = settingsBuffer[IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL]; } @@ -318,7 +318,7 @@ function getSettings(session, remote) { } function updateSettingsBuffer(settings) { - var flags = 0; + let flags = 0; if (typeof settings.headerTableSize === 'number') { flags |= (1 << IDX_SETTINGS_HEADER_TABLE_SIZE); settingsBuffer[IDX_SETTINGS_HEADER_TABLE_SIZE] = @@ -507,9 +507,9 @@ class NghttpError extends Error { const assertIsObject = hideStackFrames((value, name, types) => { if (value !== undefined && - (value === null || - typeof value !== 'object' || - Array.isArray(value))) { + (value === null || + typeof value !== 'object' || + Array.isArray(value))) { throw new ERR_INVALID_ARG_TYPE(name, types || 'Object', value); } }); @@ -527,11 +527,11 @@ const assertWithinRange = hideStackFrames( function toHeaderObject(headers) { const obj = Object.create(null); for (var n = 0; n < headers.length; n = n + 2) { - var name = headers[n]; - var value = headers[n + 1]; + const name = headers[n]; + let value = headers[n + 1]; if (name === HTTP2_HEADER_STATUS) value |= 0; - var existing = obj[name]; + const existing = obj[name]; if (existing === undefined) { obj[name] = name === HTTP2_HEADER_SET_COOKIE ? [value] : value; } else if (!kSingleValueHeaders.has(name)) { From c04da8c8c5750f30b7bc5a0841e85a0f2e3bb82d Mon Sep 17 00:00:00 2001 From: Paolo Ceschi Berrini Date: Tue, 12 Nov 2019 16:07:41 +0000 Subject: [PATCH 2/3] Apply suggestions from code review Co-Authored-By: James M Snell --- lib/internal/http2/util.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/internal/http2/util.js b/lib/internal/http2/util.js index b7fb976fe2467d..c5325495eaebdf 100644 --- a/lib/internal/http2/util.js +++ b/lib/internal/http2/util.js @@ -254,19 +254,19 @@ function getDefaultSettings() { const flags = settingsBuffer[IDX_SETTINGS_FLAGS]; if ((flags & (1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) === - (1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) { + (1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) { holder.headerTableSize = settingsBuffer[IDX_SETTINGS_HEADER_TABLE_SIZE]; } if ((flags & (1 << IDX_SETTINGS_ENABLE_PUSH)) === - (1 << IDX_SETTINGS_ENABLE_PUSH)) { + (1 << IDX_SETTINGS_ENABLE_PUSH)) { holder.enablePush = settingsBuffer[IDX_SETTINGS_ENABLE_PUSH] === 1; } if ((flags & (1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) === - (1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) { + (1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) { holder.initialWindowSize = settingsBuffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE]; } @@ -278,19 +278,19 @@ function getDefaultSettings() { } if ((flags & (1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) === - (1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) { + (1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) { holder.maxConcurrentStreams = settingsBuffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS]; } if ((flags & (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) === - (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) { + (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) { holder.maxHeaderListSize = settingsBuffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE]; } if ((flags & (1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) === - (1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) { + (1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL)) { holder.enableConnectProtocol = settingsBuffer[IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL]; } @@ -507,9 +507,9 @@ class NghttpError extends Error { const assertIsObject = hideStackFrames((value, name, types) => { if (value !== undefined && - (value === null || - typeof value !== 'object' || - Array.isArray(value))) { + (value === null || + typeof value !== 'object' || + Array.isArray(value))) { throw new ERR_INVALID_ARG_TYPE(name, types || 'Object', value); } }); From ace8b68cfcd27b41b2cf00331a5f3f6f40e5b443 Mon Sep 17 00:00:00 2001 From: Paolo Ceschi Berrini Date: Tue, 12 Nov 2019 16:21:52 +0000 Subject: [PATCH 3/3] Update lib/internal/http2/util.js Co-Authored-By: James M Snell --- lib/internal/http2/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/http2/util.js b/lib/internal/http2/util.js index c5325495eaebdf..a0640b242cd8b1 100644 --- a/lib/internal/http2/util.js +++ b/lib/internal/http2/util.js @@ -272,7 +272,7 @@ function getDefaultSettings() { } if ((flags & (1 << IDX_SETTINGS_MAX_FRAME_SIZE)) === - (1 << IDX_SETTINGS_MAX_FRAME_SIZE)) { + (1 << IDX_SETTINGS_MAX_FRAME_SIZE)) { holder.maxFrameSize = settingsBuffer[IDX_SETTINGS_MAX_FRAME_SIZE]; }