meta: merge node/master into node-chakracore/master

Merge ca22c96 as of 2018-03-24
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: chakrabot <[email protected]>

Author: chakrabot

Diff for: benchmark/buffers/buffer-write.js

@@ -34,6 +34,7 @@ const INT32 = 0x7fffffff;
 const INT48 = 0x7fffffffffff;
 const UINT8 = 0xff;
 const UINT16 = 0xffff;
+const UINT32 = 0xffffffff;
 
 const mod = {
   writeInt8: INT8,
@@ -44,8 +45,8 @@ const mod = {
   writeUInt8: UINT8,
   writeUInt16BE: UINT16,
   writeUInt16LE: UINT16,
-  writeUInt32BE: INT32,
-  writeUInt32LE: INT32,
+  writeUInt32BE: UINT32,
+  writeUInt32LE: UINT32,
   writeUIntLE: INT8,
   writeUIntBE: INT16,
   writeIntLE: INT32,

Diff for: doc/api/addons.md

@@ -246,7 +246,7 @@ napi_value Method(napi_env env, napi_callback_info args) {
   napi_value greeting;
   napi_status status;
 
-  status = napi_create_string_utf8(env, "hello", 6, &greeting);
+  status = napi_create_string_utf8(env, "hello", NAPI_AUTO_LENGTH, &greeting);
   if (status != napi_ok) return nullptr;
   return greeting;
 }

Diff for: doc/api/assert.md

@@ -321,10 +321,16 @@ added: REPLACEME
 * `message` {any}
 
 Awaits for the promise returned by function `block` to complete and not be
-rejected. See [`assert.rejects()`][] for more details.
+rejected.
+
+Please note: Using `assert.doesNotReject()` is actually not useful because there
+is little benefit by catching a rejection and then rejecting it again. Instead,
+consider adding a comment next to the specific code path that should not reject
+and keep error messages as expressive as possible.
 
 When `assert.doesNotReject()` is called, it will immediately call the `block`
-function, and awaits for completion.
+function, and awaits for completion. See [`assert.rejects()`][] for more
+details.
 
 Besides the async nature to await the completion behaves identically to
 [`assert.doesNotThrow()`][].

Diff for: doc/api/buffer.md

@@ -1,6 +1,6 @@
 # Buffer
 
-<!--introduced_in=v0.10.0-->
+<!--introduced_in=v0.1.90-->
 <!--lint disable maximum-line-length-->
 
 > Stability: 2 - Stable
@@ -18,9 +18,9 @@ use cases.
 Instances of the `Buffer` class are similar to arrays of integers but
 correspond to fixed-sized, raw memory allocations outside the V8 heap.
 The size of the `Buffer` is established when it is created and cannot be
-resized.
+changed.
 
-The `Buffer` class is a global within Node.js, making it unlikely that one
+The `Buffer` class is within the global scope, making it unlikely that one
 would need to ever use `require('buffer').Buffer`.
 
 ```js

Diff for: doc/api/cluster.md

@@ -698,6 +698,9 @@ values are `"rr"` and `"none"`.
 <!-- YAML
 added: v0.7.1
 changes:
+  - version: v9.5.0
+    pr-url: https://github.com/nodejs/node/pull/18399
+    description: The `cwd` option is supported now.
   - version: 8.2.0
     pr-url: https://github.com/nodejs/node/pull/14140
     description: The `inspectPort` option is supported now.

Diff for: doc/api/crypto.md

@@ -656,6 +656,54 @@ assert.strictEqual(aliceSecret.toString('hex'), bobSecret.toString('hex'));
 // OK
 ```
 
+### ECDH.convertKey(key, curve[, inputEncoding[, outputEncoding[, format]]])
+<!-- YAML
+added: REPLACEME
+-->
+
+- `key` {string | Buffer | TypedArray | DataView}
+- `curve` {string}
+- `inputEncoding` {string}
+- `outputEncoding` {string}
+- `format` {string} Defaults to `uncompressed`.
+
+Converts the EC Diffie-Hellman public key specified by `key` and `curve` to the
+format specified by `format`. The `format` argument specifies point encoding
+and can be `'compressed'`, `'uncompressed'` or `'hybrid'`. The supplied key is
+interpreted using the specified `inputEncoding`, and the returned key is encoded
+using the specified `outputEncoding`. Encodings can be `'latin1'`, `'hex'`,
+or `'base64'`.
+
+Use [`crypto.getCurves()`][] to obtain a list of available curve names.
+On recent OpenSSL releases, `openssl ecparam -list_curves` will also display
+the name and description of each available elliptic curve.
+
+If `format` is not specified the point will be returned in `'uncompressed'`
+format.
+
+If the `inputEncoding` is not provided, `key` is expected to be a [`Buffer`][],
+`TypedArray`, or `DataView`.
+
+Example (uncompressing a key):
+
+```js
+const { ECDH } = require('crypto');
+
+const ecdh = ECDH('secp256k1');
+ecdh.generateKeys();
+
+const compressedKey = ecdh.getPublicKey('hex', 'compressed');
+
+const uncompressedKey = ECDH.convertKey(compressedKey,
+                                        'secp256k1',
+                                        'hex',
+                                        'hex',
+                                        'uncompressed');
+
+// the converted key and the uncompressed public key should be the same
+console.log(uncompressedKey === ecdh.getPublicKey('hex'));
+```
+
 ### ecdh.computeSecret(otherPublicKey[, inputEncoding][, outputEncoding])
 <!-- YAML
 added: v0.11.14

Diff for: doc/api/modules.md

@@ -600,6 +600,43 @@ filename scales linearly with the number of registered extensions.
 In other words, adding extensions slows down the module loader and
 should be discouraged.
 
+#### require.main
+<!-- YAML
+added: v0.1.17
+-->
+
+* {Object}
+
+The `Module` object representing the entry script loaded when the Node.js
+process launched.
+See ["Accessing the main module"](#modules_accessing_the_main_module).
+
+In `entry.js` script:
+
+```js
+console.log(require.main);
+```
+
+```sh
+node entry.js
+```
+
+<!-- eslint-skip -->
+```js
+Module {
+  id: '.',
+  exports: {},
+  parent: null,
+  filename: '/absolute/path/to/entry.js',
+  loaded: false,
+  children: [],
+  paths:
+   [ '/absolute/path/to/node_modules',
+     '/absolute/path/node_modules',
+     '/absolute/node_modules',
+     '/node_modules' ] }
+```
+
 #### require.resolve(request[, options])
 <!-- YAML
 added: v0.3.0

Diff for: doc/api/n-api.md

@@ -610,7 +610,7 @@ that has a loop which iterates through the elements in a large array:
 ```C
 for (int i = 0; i < 1000000; i++) {
   napi_value result;
-  napi_status status = napi_get_element(e object, i, &result);
+  napi_status status = napi_get_element(e, object, i, &result);
   if (status != napi_ok) {
     break;
   }
@@ -647,7 +647,7 @@ for (int i = 0; i < 1000000; i++) {
     break;
   }
   napi_value result;
-  status = napi_get_element(e object, i, &result);
+  status = napi_get_element(e, object, i, &result);
   if (status != napi_ok) {
     break;
   }

Diff for: doc/api/process.md

@@ -489,6 +489,8 @@ $ bash -c 'exec -a customArgv0 ./node'
 added: v7.1.0
 -->
 
+* {Object}
+
 If the Node.js process was spawned with an IPC channel (see the
 [Child Process][] documentation), the `process.channel`
 property is a reference to the IPC channel. If no IPC channel exists, this
@@ -921,7 +923,7 @@ console.log(process.env.test);
 added: v0.7.7
 -->
 
-* {Object}
+* {Array}
 
 The `process.execArgv` property returns the set of Node.js-specific command-line
 options passed when the Node.js process was launched. These options do not
@@ -1250,6 +1252,8 @@ debugger, see [Signal Events][].
 added: v0.1.17
 -->
 
+* {Object}
+
 The `process.mainModule` property provides an alternative way of retrieving
 [`require.main`][]. The difference is that if the main module changes at
 runtime, [`require.main`][] may still refer to the original main module in
@@ -1479,6 +1483,8 @@ changes:
     description: The `lts` property is now supported.
 -->
 
+* {Object}
+
 The `process.release` property returns an Object containing metadata related to
 the current release, including URLs for the source tarball and headers-only
 tarball.

Diff for: lib/fs/promises.js

@@ -157,7 +157,12 @@ async function readFileHandle(filehandle, options) {
       chunks.push(buffer.slice(0, totalRead));
   } while (totalRead === chunkSize);
 
-  return Buffer.concat(chunks);
+  const result = Buffer.concat(chunks);
+  if (options.encoding) {
+    return result.toString(options.encoding);
+  } else {
+    return result;
+  }
 }
 
 // All of the functions are defined as async in order to ensure that errors

Diff for: lib/internal/buffer.js

@@ -481,9 +481,12 @@ function writeU_Int48LE(buf, value, offset, min, max) {
 
   const newVal = Math.floor(value * 2 ** -32);
   buf[offset++] = value;
-  buf[offset++] = (value >>> 8);
-  buf[offset++] = (value >>> 16);
-  buf[offset++] = (value >>> 24);
+  value = value >>> 8;
+  buf[offset++] = value;
+  value = value >>> 8;
+  buf[offset++] = value;
+  value = value >>> 8;
+  buf[offset++] = value;
   buf[offset++] = newVal;
   buf[offset++] = (newVal >>> 8);
   return offset;
@@ -495,9 +498,12 @@ function writeU_Int40LE(buf, value, offset, min, max) {
 
   const newVal = value;
   buf[offset++] = value;
-  buf[offset++] = (value >>> 8);
-  buf[offset++] = (value >>> 16);
-  buf[offset++] = (value >>> 24);
+  value = value >>> 8;
+  buf[offset++] = value;
+  value = value >>> 8;
+  buf[offset++] = value;
+  value = value >>> 8;
+  buf[offset++] = value;
   buf[offset++] = Math.floor(newVal * 2 ** -32);
   return offset;
 }
@@ -507,9 +513,12 @@ function writeU_Int32LE(buf, value, offset, min, max) {
   checkInt(value, min, max, buf, offset, 3);
 
   buf[offset++] = value;
-  buf[offset++] = (value >>> 8);
-  buf[offset++] = (value >>> 16);
-  buf[offset++] = (value >>> 24);
+  value = value >>> 8;
+  buf[offset++] = value;
+  value = value >>> 8;
+  buf[offset++] = value;
+  value = value >>> 8;
+  buf[offset++] = value;
   return offset;
 }
 
@@ -522,8 +531,10 @@ function writeU_Int24LE(buf, value, offset, min, max) {
   checkInt(value, min, max, buf, offset, 2);
 
   buf[offset++] = value;
-  buf[offset++] = (value >>> 8);
-  buf[offset++] = (value >>> 16);
+  value = value >>> 8;
+  buf[offset++] = value;
+  value = value >>> 8;
+  buf[offset++] = value;
   return offset;
 }
 
@@ -582,34 +593,43 @@ function writeU_Int48BE(buf, value, offset, min, max) {
   const newVal = Math.floor(value * 2 ** -32);
   buf[offset++] = (newVal >>> 8);
   buf[offset++] = newVal;
-  buf[offset++] = (value >>> 24);
-  buf[offset++] = (value >>> 16);
-  buf[offset++] = (value >>> 8);
-  buf[offset++] = value;
-  return offset;
+  buf[offset + 3] = value;
+  value = value >>> 8;
+  buf[offset + 2] = value;
+  value = value >>> 8;
+  buf[offset + 1] = value;
+  value = value >>> 8;
+  buf[offset] = value;
+  return offset + 4;
 }
 
 function writeU_Int40BE(buf, value, offset, min, max) {
   value = +value;
   checkInt(value, min, max, buf, offset, 4);
 
   buf[offset++] = Math.floor(value * 2 ** -32);
-  buf[offset++] = (value >>> 24);
-  buf[offset++] = (value >>> 16);
-  buf[offset++] = (value >>> 8);
-  buf[offset++] = value;
-  return offset;
+  buf[offset + 3] = value;
+  value = value >>> 8;
+  buf[offset + 2] = value;
+  value = value >>> 8;
+  buf[offset + 1] = value;
+  value = value >>> 8;
+  buf[offset] = value;
+  return offset + 4;
 }
 
 function writeU_Int32BE(buf, value, offset, min, max) {
   value = +value;
   checkInt(value, min, max, buf, offset, 3);
 
-  buf[offset++] = (value >>> 24);
-  buf[offset++] = (value >>> 16);
-  buf[offset++] = (value >>> 8);
-  buf[offset++] = value;
-  return offset;
+  buf[offset + 3] = value;
+  value = value >>> 8;
+  buf[offset + 2] = value;
+  value = value >>> 8;
+  buf[offset + 1] = value;
+  value = value >>> 8;
+  buf[offset] = value;
+  return offset + 4;
 }
 
 function writeUInt32BE(value, offset) {
@@ -620,10 +640,12 @@ function writeU_Int24BE(buf, value, offset, min, max) {
   value = +value;
   checkInt(value, min, max, buf, offset, 2);
 
-  buf[offset++] = (value >>> 16);
-  buf[offset++] = (value >>> 8);
-  buf[offset++] = value;
-  return offset;
+  buf[offset + 2] = value;
+  value = value >>> 8;
+  buf[offset + 1] = value;
+  value = value >>> 8;
+  buf[offset] = value;
+  return offset + 3;
 }
 
 function writeU_Int16BE(buf, value, offset, min, max) {