nodejs · ruyadorno · Mar 31, 2021 · Mar 12, 2021 · Mar 9, 2021 · Mar 11, 2021
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -307,7 +307,7 @@ module.exports = {
     'template-curly-spacing': 'error',
     'unicode-bom': 'error',
     'use-isnan': 'error',
-    'valid-typeof': 'error',
+    'valid-typeof': ['error', { requireStringLiterals: true }],
 
     // Custom rules from eslint-plugin-node-core
     'node-core/no-unescaped-regexp-dot': 'error',

diff --git a/.gitignore b/.gitignore
@@ -139,6 +139,15 @@ tools/*/*.i.tmp
 # === Rules for Windows vcbuild.bat ===
 /temp-vcbuild
 
+# === Rules for CMake ===
+cmake-build-debug/
+CMakeCache.txt
+CMakeFiles
+CTestTestfile.cmake
+cmake_install.cmake
+install_manifest.txt
+*.cbp
+
 # === Global Rules ===
 # Keep last to avoid being excluded
 *.pyc

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,7 +32,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V15.md#15.12.0">15.12.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V15.md#15.13.0">15.13.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V15.md#15.12.0">15.12.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V15.md#15.11.0">15.11.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V15.md#15.10.0">15.10.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V15.md#15.9.0">15.9.0</a><br/>

diff --git a/GOVERNANCE.md b/GOVERNANCE.md
@@ -82,7 +82,7 @@ The current list of TSC members is in
 [the project README](./README.md#current-project-team-members).
 
 The [TSC Charter][] governs the operations of the TSC. All changes to the
-Charter need approval by the OpenJS Foundation Board of Directors.
+Charter need approval by the OpenJS Foundation Cross-Project Council (CPC).
 
 ### TSC meetings
 

diff --git a/LICENSE b/LICENSE
@@ -1578,3 +1578,55 @@ The externally maintained libraries used by Node.js are:
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
   """
+
+- ngtcp2, located at deps/ngtcp2/ngtcp2/, is licensed as follows:
+  """
+    The MIT License
+
+    Copyright (c) 2016 ngtcp2 contributors
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  """
+
+- nghttp3, located at deps/ngtcp2/nghttp3/, is licensed as follows:
+  """
+    The MIT License
+
+    Copyright (c) 2019 nghttp3 contributors
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  """
diff --git a/README.md b/README.md
@@ -285,6 +285,8 @@ For information about the governance of the Node.js project, see
 **Danielle Adams** &lt;[email protected]&gt; (she/her)
 * [davisjam](https://github.com/davisjam) -
 **Jamie Davis** &lt;[email protected]&gt; (he/him)
+* [DerekNonGeneric](https://github.com/DerekNonGeneric) -
+**Derek Lewis** &lt;[email protected]&gt; (he/him)
 * [devnexen](https://github.com/devnexen) -
 **David Carlier** &lt;[email protected]&gt;
 * [devsnek](https://github.com/devsnek) -
@@ -353,6 +355,8 @@ For information about the governance of the Node.js project, see
 **Chengzhong Wu** &lt;[email protected]&gt; (he/him)
 * [Leko](https://github.com/Leko) -
 **Shingo Inoue** &lt;[email protected]&gt; (he/him)
+* [linkgoron](https://github.com/linkgoron) -
+**Nitzan Uziely** &lt;[email protected]&gt;
 * [lpinca](https://github.com/lpinca) -
 **Luigi Pinca** &lt;[email protected]&gt; (he/him)
 * [lundibundi](https://github.com/lundibundi) -
@@ -476,8 +480,6 @@ For information about the governance of the Node.js project, see
 **Claudio Rodriguez** &lt;[email protected]&gt;
 * [DavidCai1993](https://github.com/DavidCai1993) -
 **David Cai** &lt;[email protected]&gt; (he/him)
-* [DerekNonGeneric](https://github.com/DerekNonGeneric) -
-**Derek Lewis** &lt;[email protected]&gt; (he/him)
 * [digitalinfinity](https://github.com/digitalinfinity) -
 **Hitesh Kanwathirtha** &lt;[email protected]&gt; (he/him)
 * [eljefedelrodeodeljefe](https://github.com/eljefedelrodeodeljefe) -
@@ -591,6 +593,8 @@ maintaining the Node.js project.
 
 ### Triagers
 
+* [Ayase-252](https://github.com/Ayase-252) -
+**Qingyu Deng** &lt;[email protected]&gt;
 * [marsonya](https://github.com/marsonya) -
 **Akhil Marsonya** &lt;[email protected]&gt; (he/him)
 * [PoojaDurgad](https://github.com/PoojaDurgad) -

diff --git a/benchmark/.eslintrc.yaml b/benchmark/.eslintrc.yaml
@@ -6,10 +6,4 @@ env:
 
 rules:
   no-var: error
-  comma-dangle:
-    - error
-    - arrays: 'always-multiline'
-      objects: 'only-multiline'
-      imports: 'only-multiline'
-      exports: 'only-multiline'
   prefer-arrow-callback: error
diff --git a/benchmark/streams/readable-from.js b/benchmark/streams/readable-from.js
@@ -0,0 +1,26 @@
+'use strict';
+
+const common = require('../common');
+const Readable = require('stream').Readable;
+
+const bench = common.createBenchmark(main, {
+  n: [1e7],
+});
+
+async function main({ n }) {
+  const arr = [];
+  for (let i = 0; i < n; i++) {
+    arr.push(`${i}`);
+  }
+
+  const s = new Readable.from(arr);
+
+  bench.start();
+  s.on('data', (data) => {
+    // eslint-disable-next-line no-unused-expressions
+    data;
+  });
+  s.on('close', () => {
+    bench.end(n);
+  });
+}
diff --git a/common.gypi b/common.gypi
@@ -36,7 +36,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.27',
+    'v8_embedder_string': '-node.28',
 
     ##### V8 defaults for Node.js #####
 

diff --git a/configure.py b/configure.py
@@ -38,6 +38,7 @@
 sys.path.insert(0, 'tools')
 import getmoduleversion
 import getnapibuildversion
+import getsharedopensslhasquic
 from gyp_node import run_gyp
 
 # parse our options
@@ -283,6 +284,50 @@
     dest='shared_nghttp2_libpath',
     help='a directory to search for the shared nghttp2 DLLs')
 
+shared_optgroup.add_argument('--shared-nghttp3',
+    action='store_true',
+    dest='shared_nghttp3',
+    default=None,
+    help='link to a shared nghttp3 DLL instead of static linking')
+
+shared_optgroup.add_argument('--shared-nghttp3-includes',
+    action='store',
+    dest='shared_nghttp3_includes',
+    help='directory containing nghttp3 header files')
+
+shared_optgroup.add_argument('--shared-nghttp3-libname',
+    action='store',
+    dest='shared_nghttp3_libname',
+    default='nghttp3',
+    help='alternative lib name to link to [default: %(default)s]')
+
+shared_optgroup.add_argument('--shared-nghttp3-libpath',
+    action='store',
+    dest='shared_nghttp3_libpath',
+    help='a directory to search for the shared nghttp3 DLLs')
+
+shared_optgroup.add_argument('--shared-ngtcp2',
+    action='store_true',
+    dest='shared_ngtcp2',
+    default=None,
+    help='link to a shared ngtcp2 DLL instead of static linking')
+
+shared_optgroup.add_argument('--shared-ngtcp2-includes',
+    action='store',
+    dest='shared_ngtcp2_includes',
+    help='directory containing ngtcp2 header files')
+
+shared_optgroup.add_argument('--shared-ngtcp2-libname',
+    action='store',
+    dest='shared_ngtcp2_libname',
+    default='ngtcp2',
+    help='alternative lib name to link to [default: %(default)s]')
+
+shared_optgroup.add_argument('--shared-ngtcp2-libpath',
+    action='store',
+    dest='shared_ngtcp2_libpath',
+    help='a directory to search for the shared tcp2 DLLs')
+
 shared_optgroup.add_argument('--shared-openssl',
     action='store_true',
     dest='shared_openssl',
@@ -1346,8 +1391,11 @@ def configure_openssl(o):
   variables = o['variables']
   variables['node_use_openssl'] = b(not options.without_ssl)
   variables['node_shared_openssl'] = b(options.shared_openssl)
+  variables['node_shared_ngtcp2'] = b(options.shared_ngtcp2)
+  variables['node_shared_nghttp3'] = b(options.shared_nghttp3)
   variables['openssl_is_fips'] = b(options.openssl_is_fips)
   variables['openssl_fips'] = ''
+  variables['openssl_quic'] = b(True)
 
   if options.openssl_no_asm:
     variables['openssl_no_asm'] = 1
@@ -1403,6 +1451,9 @@ def without_ssl_error(option):
   if options.openssl_fips or options.openssl_fips == '':
      error('FIPS is not supported in this version of Node.js')
 
+  if options.shared_openssl:
+    variables['openssl_quic'] = b(getsharedopensslhasquic.get_has_quic(options.__dict__['shared_openssl_includes']))
+
   configure_library('openssl', o)
 
 
@@ -1831,6 +1882,8 @@ def make_bin_override():
 configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc'])
 configure_library('cares', output, pkgname='libcares')
 configure_library('nghttp2', output, pkgname='libnghttp2')
+configure_library('nghttp3', output, pkgname='libnghttp3')
+configure_library('ngtcp2', output, pkgname='libngtcp2')
 configure_v8(output)
 configure_openssl(output)
 configure_intl(output)

diff --git a/deps/ngtcp2/.gitignore b/deps/ngtcp2/.gitignore
@@ -0,0 +1,8 @@
+*.in
+*.am
+*.txt
+*.pc
+Makefile
+*gnutls*
+ngtcp2/**/.gitignore
+ngtcp2/**/.deps
diff --git a/deps/ngtcp2/LICENSE_nghttp3 b/deps/ngtcp2/LICENSE_nghttp3
@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2019 nghttp3 contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/ngtcp2/LICENSE_ngtcp2 b/deps/ngtcp2/LICENSE_ngtcp2
@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2016 ngtcp2 contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/deps/ngtcp2/README.md b/deps/ngtcp2/README.md
@@ -0,0 +1,45 @@
+# ngtcp2 and nghttp3
+
+The ngtcp2 and nghttp3 dependencies provide the core functionality for
+QUIC and HTTP/3.
+
+The sources are pulled from:
+
+* ngtcp2: https://github.com/ngtcp2/ngtcp2
+* nghttp3: https://github.com/ngtcp2/nghttp3
+
+In both the `ngtcp2` and `nghttp3` git repos, the active development occurs
+in the default branch (currently named `master` in each).
+
+We only use a subset of the sources for each.
+
+## Updating
+
+The `nghttp3` library depends on `ngtcp2`. Both should always be updated
+together. From `ngtcp2` we only want the contents of the `lib` and `crypto`
+directories; from `nghttp3` we only want the contents o the `lib`.
+
+### Updating ngtcp2
+
+To update ngtcp2:
+
+```sh
+$ git clone https://github.com/ngtcp2/ngtcp2
+$ cd ngtcp2
+$ autoreconf -i
+$ ./configure --prefix=$PWD/build --enable-lib-only
+$ cp -R lib/* ../node/deps/ngtcp2/ngtcp2/lib/
+$ cp -R crypto/* ../node/deps/ngtcp2/ngtcp2/crypto/
+```
+
+### Updating nghttp3
+
+To update ngtcp2:
+
+```sh
+$ git clone https://github.com/ngtcp2/nghttp3
+$ cd nghttp3
+$ autoreconf -i
+$ ./configure --prefix=$PWD/build --enable-lib-only
+$ cp -R lib/* ../node/deps/ngtcp2/nghttp3/lib/
+```