From d327893193c68583e05f358929ab8008ed099776 Mon Sep 17 00:00:00 2001 From: Shobhit Chittora Date: Sun, 6 May 2018 13:05:21 +0530 Subject: [PATCH 001/208] doc: refactor mode constants parts in fs.md 1. removed extra mode constants doc. 2. creates bookmark to the common File Access Contants block. PR-URL: https://github.com/nodejs/node/pull/20558 Fixes: https://github.com/nodejs/node/issues/20049 Reviewed-By: Trivikram Kamat Reviewed-By: Vse Mozhet Byt --- doc/api/fs.md | 55 +++++++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 37 deletions(-) diff --git a/doc/api/fs.md b/doc/api/fs.md index 30d6729d48c13d..286ffb3a63fb3a 100644 --- a/doc/api/fs.md +++ b/doc/api/fs.md @@ -746,17 +746,9 @@ changes: Tests a user's permissions for the file or directory specified by `path`. The `mode` argument is an optional integer that specifies the accessibility -checks to be performed. The following constants define the possible values of -`mode`. It is possible to create a mask consisting of the bitwise OR of two or -more values (e.g. `fs.constants.W_OK | fs.constants.R_OK`). - -* `fs.constants.F_OK` - `path` is visible to the calling process. This is useful -for determining if a file exists, but says nothing about `rwx` permissions. -Default if no `mode` is specified. -* `fs.constants.R_OK` - `path` can be read by the calling process. -* `fs.constants.W_OK` - `path` can be written by the calling process. -* `fs.constants.X_OK` - `path` can be executed by the calling process. This has -no effect on Windows (will behave like `fs.constants.F_OK`). +checks to be performed. Check [File Access Constants][] for possible values +of `mode`. It is possible to create a mask consisting of the bitwise OR of +two or more values (e.g. `fs.constants.W_OK | fs.constants.R_OK`). The final argument, `callback`, is a callback function that is invoked with a possible error argument. If any of the accessibility checks fail, the error @@ -889,19 +881,12 @@ changes: * `path` {string|Buffer|URL} * `mode` {integer} **Default:** `fs.constants.F_OK` -Synchronously tests a user's permissions for the file or directory specified by -`path`. The `mode` argument is an optional integer that specifies the -accessibility checks to be performed. The following constants define the -possible values of `mode`. It is possible to create a mask consisting of the -bitwise OR of two or more values (e.g. `fs.constants.W_OK | fs.constants.R_OK`). - -* `fs.constants.F_OK` - `path` is visible to the calling process. This is useful -for determining if a file exists, but says nothing about `rwx` permissions. -Default if no `mode` is specified. -* `fs.constants.R_OK` - `path` can be read by the calling process. -* `fs.constants.W_OK` - `path` can be written by the calling process. -* `fs.constants.X_OK` - `path` can be executed by the calling process. This has -no effect on Windows (will behave like `fs.constants.F_OK`). +Synchronously tests a user's permissions for the file or directory specified +by `path`. The `mode` argument is an optional integer that specifies the +accessibility checks to be performed. Check [File Access Constants][] for +possible values of `mode`. It is possible to create a mask consisting of +the bitwise OR of two or more values +(e.g. `fs.constants.W_OK | fs.constants.R_OK`). If any of the accessibility checks fail, an `Error` will be thrown. Otherwise, the method will return `undefined`. @@ -3679,17 +3664,9 @@ added: v10.0.0 Tests a user's permissions for the file or directory specified by `path`. The `mode` argument is an optional integer that specifies the accessibility -checks to be performed. The following constants define the possible values of -`mode`. It is possible to create a mask consisting of the bitwise OR of two or -more values (e.g. `fs.constants.W_OK | fs.constants.R_OK`). - -* `fs.constants.F_OK` - `path` is visible to the calling process. This is useful -for determining if a file exists, but says nothing about `rwx` permissions. -Default if no `mode` is specified. -* `fs.constants.R_OK` - `path` can be read by the calling process. -* `fs.constants.W_OK` - `path` can be written by the calling process. -* `fs.constants.X_OK` - `path` can be executed by the calling process. This has -no effect on Windows (will behave like `fs.constants.F_OK`). +checks to be performed. Check [File Access Constants][] for possible values +of `mode`. It is possible to create a mask consisting of the bitwise OR of +two or more values (e.g. `fs.constants.W_OK | fs.constants.R_OK`). If the accessibility check is successful, the `Promise` is resolved with no value. If any of the accessibility checks fail, the `Promise` is rejected @@ -4329,7 +4306,9 @@ The following constants are meant for use with [`fs.access()`][]. F_OK - Flag indicating that the file is visible to the calling process. + Flag indicating that the file is visible to the calling process. + This is useful for determining if a file exists, but says nothing + about rwx permissions. Default if no mode is specified. R_OK @@ -4343,7 +4322,8 @@ The following constants are meant for use with [`fs.access()`][]. X_OK Flag indicating that the file can be executed by the calling - process. + process. This has no effect on Windows + (will behave like fs.constants.F_OK). @@ -4706,3 +4686,4 @@ the file contents. [Naming Files, Paths, and Namespaces]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx [MSDN-Using-Streams]: https://msdn.microsoft.com/en-us/library/windows/desktop/bb540537.aspx [support of file system `flags`]: #fs_file_system_flags +[File Access Constants]: #fs_file_access_constants From 4a7bb406fe7b4109786efd14700c0a7117e94803 Mon Sep 17 00:00:00 2001 From: Vse Mozhet Byt Date: Sun, 6 May 2018 03:59:23 +0300 Subject: [PATCH 002/208] doc, tools: unify stability signatures PR-URL: https://github.com/nodejs/node/pull/20552 Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Reviewed-By: Luigi Pinca --- doc/api/documentation.md | 36 ++++++++++++++++++------------------ tools/doc/html.js | 3 +-- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/doc/api/documentation.md b/doc/api/documentation.md index cbc7a34be80e56..a5909e3268d947 100644 --- a/doc/api/documentation.md +++ b/doc/api/documentation.md @@ -34,24 +34,24 @@ and in the process of being redesigned. The stability indices are as follows: -```txt -Stability: 0 - Deprecated. This feature is known to be problematic, and changes -may be planned. Do not rely on it. Use of the feature may cause warnings to be -emitted. Backwards compatibility across major versions should not be expected. -``` - -```txt -Stability: 1 - Experimental. This feature is still under active development and -subject to non-backwards compatible changes, or even removal, in any future -version. Use of the feature is not recommended in production environments. -Experimental features are not subject to the Node.js Semantic Versioning model. -``` - -```txt -Stability: 2 - Stable. The API has proven satisfactory. Compatibility with the -npm ecosystem is a high priority, and will not be broken unless absolutely -necessary. -``` +> Stability: 0 - Deprecated. This feature is known to be problematic, and +> changes may be planned. Do not rely on it. Use of the feature may cause +> warnings to be emitted. Backwards compatibility across major versions should +> not be expected. + + + +> Stability: 1 - Experimental. This feature is still under active development +> and subject to non-backwards compatible changes, or even removal, in any +> future version. Use of the feature is not recommended in production +> environments. Experimental features are not subject to the Node.js Semantic +> Versioning model. + + + +> Stability: 2 - Stable. The API has proven satisfactory. Compatibility with the +> npm ecosystem is a high priority, and will not be broken unless absolutely +> necessary. Caution must be used when making use of `Experimental` features, particularly within modules that may be used as dependencies (or dependencies of diff --git a/tools/doc/html.js b/tools/doc/html.js index 7712290b4c61ed..00fd48d8e6631f 100644 --- a/tools/doc/html.js +++ b/tools/doc/html.js @@ -256,8 +256,7 @@ function preprocessElements(input) { state = null; return; } - if ((tok.type === 'paragraph' && state === 'MAYBE_STABILITY_BQ') || - tok.type === 'code') { + if (tok.type === 'paragraph' && state === 'MAYBE_STABILITY_BQ') { if (tok.text.match(/Stability:.*/g)) { const stabilityMatch = tok.text.match(STABILITY_TEXT_REG_EXP); const stability = Number(stabilityMatch[2]); From b3b267a87ca9fa146faefe396754e9469b2480e5 Mon Sep 17 00:00:00 2001 From: Ujjwal Sharma Date: Tue, 8 May 2018 17:59:14 +0530 Subject: [PATCH 003/208] doc: add params for ClientHttp2Session:altsvc Add parameters for the callback for the ClientHttp2Session:altsvc event inline with the pattern in the rest of the documentation. Refs: https://github.com/nodejs/help/issues/877#issuecomment-381253464 PR-URL: https://github.com/nodejs/node/pull/20598 Reviewed-By: Vse Mozhet Byt Reviewed-By: James M Snell Reviewed-By: Luigi Pinca Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Trivikram Kamat Reviewed-By: Colin Ihrig --- doc/api/http2.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/api/http2.md b/doc/api/http2.md index d737471e8670ee..4f668f5dd15d69 100644 --- a/doc/api/http2.md +++ b/doc/api/http2.md @@ -664,9 +664,9 @@ added: v8.4.0 added: v9.4.0 --> -* `alt`: {string} -* `origin`: {string} -* `streamId`: {number} +* `alt` {string} +* `origin` {string} +* `streamId` {number} The `'altsvc'` event is emitted whenever an `ALTSVC` frame is received by the client. The event is emitted with the `ALTSVC` value, origin, and stream From 88bc6da6e9b07ed0bb28e31b95f675da0124f326 Mon Sep 17 00:00:00 2001 From: Ujjwal Sharma Date: Wed, 9 May 2018 01:16:57 +0530 Subject: [PATCH 004/208] doc: add parameters for Http2Stream:error event Add parameters for the callback for the Http2Stream:error event inline with the pattern in the rest of the documentation. Refs: https://github.com/nodejs/help/issues/877#issuecomment-381253464 PR-URL: https://github.com/nodejs/node/pull/20610 Reviewed-By: Vse Mozhet Byt Reviewed-By: Trivikram Kamat Reviewed-By: Colin Ihrig --- doc/api/http2.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/api/http2.md b/doc/api/http2.md index 4f668f5dd15d69..560e183dca6da1 100644 --- a/doc/api/http2.md +++ b/doc/api/http2.md @@ -846,6 +846,8 @@ the `http2stream.rstCode` property. If the code is any value other than added: v8.4.0 --> +* `error` {Error} + The `'error'` event is emitted when an error occurs during the processing of an `Http2Stream`. From 9177f734e3aa7557bfe8b85d6f4c68e4649be683 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Tue, 8 May 2018 13:17:24 +0200 Subject: [PATCH 005/208] doc: update VM section text This commit updates the VM section with suggestion for a minor improvement (hopefully) of the text. PR-URL: https://github.com/nodejs/node/pull/20595 Reviewed-By: Vse Mozhet Byt Reviewed-By: Gus Caplan Reviewed-By: James M Snell Reviewed-By: Rich Trott Reviewed-By: Luigi Pinca --- doc/api/vm.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/api/vm.md b/doc/api/vm.md index 9e1249dc4ed8bb..cc9b3135381dad 100644 --- a/doc/api/vm.md +++ b/doc/api/vm.md @@ -17,8 +17,8 @@ The sandboxed code uses a different V8 Context, meaning that it has a different global object than the rest of the code. One can provide the context by ["contextifying"][contextified] a sandbox -object. The sandboxed code treats any property on the sandbox like a -global variable. Any changes on global variables caused by the sandboxed +object. The sandboxed code treats any property in the sandbox like a +global variable. Any changes to global variables caused by the sandboxed code are reflected in the sandbox object. ```js From e01e06076342101e2e9a32e5ffbd607f7da03fd8 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 7 May 2018 10:24:42 +0200 Subject: [PATCH 006/208] src: rename handle parameter object This commit renames the handle parameter for the BaseObject constructor to object instead of handle. The motivation for doing this is that when stepping through an inheritance chain it can sometimes be a little confusing when HandleWrap is in involved. HandleWrap has a handle parameter but calls the object that is passed to AsyncWrap object, but then when you end up in BaseObject it is named handle. PR-URL: https://github.com/nodejs/node/pull/20570 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell --- src/base_object-inl.h | 10 +++++----- src/base_object.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/base_object-inl.h b/src/base_object-inl.h index 11ba1c88da0486..786e1f26b48256 100644 --- a/src/base_object-inl.h +++ b/src/base_object-inl.h @@ -31,12 +31,12 @@ namespace node { -BaseObject::BaseObject(Environment* env, v8::Local handle) - : persistent_handle_(env->isolate(), handle), +BaseObject::BaseObject(Environment* env, v8::Local object) + : persistent_handle_(env->isolate(), object), env_(env) { - CHECK_EQ(false, handle.IsEmpty()); - CHECK_GT(handle->InternalFieldCount(), 0); - handle->SetAlignedPointerInInternalField(0, static_cast(this)); + CHECK_EQ(false, object.IsEmpty()); + CHECK_GT(object->InternalFieldCount(), 0); + object->SetAlignedPointerInInternalField(0, static_cast(this)); } diff --git a/src/base_object.h b/src/base_object.h index 7d8281238b1c1d..2a4967c1aaf303 100644 --- a/src/base_object.h +++ b/src/base_object.h @@ -34,9 +34,9 @@ class Environment; class BaseObject { public: - // Associates this object with `handle`. It uses the 0th internal field for + // Associates this object with `object`. It uses the 0th internal field for // that, and in particular aborts if there is no such field. - inline BaseObject(Environment* env, v8::Local handle); + inline BaseObject(Environment* env, v8::Local object); virtual inline ~BaseObject(); // Returns the wrapped object. Returns an empty handle when From 983cb269e0ab74e152ef4ee562fbd512d2636f94 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 7 May 2018 14:06:56 +0200 Subject: [PATCH 007/208] src: don't create Undefined if not needed This commit moves the creation of argv and only creates an undefined value if the passed in status was not 0. The variable name client_handle was already used in this function but I've change that usage so that this variable name matches the onconnection callback functions parameter name clientHandle. PR-URL: https://github.com/nodejs/node/pull/20573 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Gus Caplan Reviewed-By: Anna Henningsen --- src/connection_wrap.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/connection_wrap.cc b/src/connection_wrap.cc index e0052a643b8734..01d0388d4de3ce 100644 --- a/src/connection_wrap.cc +++ b/src/connection_wrap.cc @@ -45,10 +45,7 @@ void ConnectionWrap::OnConnection(uv_stream_t* handle, // uv_close() on the handle. CHECK_EQ(wrap_data->persistent().IsEmpty(), false); - Local argv[] = { - Integer::New(env->isolate(), status), - Undefined(env->isolate()) - }; + Local client_handle; if (status == 0) { // Instantiate the client javascript object and handle. @@ -59,17 +56,20 @@ void ConnectionWrap::OnConnection(uv_stream_t* handle, // Unwrap the client javascript object. WrapType* wrap; ASSIGN_OR_RETURN_UNWRAP(&wrap, client_obj); - uv_stream_t* client_handle = - reinterpret_cast(&wrap->handle_); + uv_stream_t* client = reinterpret_cast(&wrap->handle_); // uv_accept can fail if the new connection has already been closed, in // which case an EAGAIN (resource temporarily unavailable) will be // returned. - if (uv_accept(handle, client_handle)) + if (uv_accept(handle, client)) return; // Successful accept. Call the onconnection callback in JavaScript land. - argv[1] = client_obj; + client_handle = client_obj; + } else { + client_handle = Undefined(env->isolate()); } + + Local argv[] = { Integer::New(env->isolate(), status), client_handle }; wrap_data->MakeCallback(env->onconnection_string(), arraysize(argv), argv); } From 1f34c04bd08b67981db6534fb357fafb1484e068 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 7 May 2018 15:37:57 +0200 Subject: [PATCH 008/208] net: remove typo in setTimeout comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit removes `lear` from the code comment in setTimeout. I'm not 100% sure this is a typo but I've struggled to think what it could mean. Hopefully someone else might be able to shed some light on this. PR-URL: https://github.com/nodejs/node/pull/20576 Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel Reviewed-By: Ruben Bridgewater Reviewed-By: Tobias Nießen Reviewed-By: Anna Henningsen Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig --- lib/net.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/net.js b/lib/net.js index 6c475619117dc5..b4936558a82790 100644 --- a/lib/net.js +++ b/lib/net.js @@ -411,7 +411,7 @@ Socket.prototype.setTimeout = function(msecs, callback) { // Type checking identical to timers.enroll() msecs = validateTimerDuration(msecs); - // Attempt to clear an existing timer lear in both cases - + // Attempt to clear an existing timer in both cases - // even if it will be rescheduled we don't want to leak an existing timer. clearTimeout(this[kTimeout]); From 105f6062024fd5c5604d1d5253a72c53b1f5c529 Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Mon, 7 May 2018 08:36:43 -0500 Subject: [PATCH 009/208] v8: backport 9fb02b526f1cd3b859a530a01adb08bc0d089f4f Refs: https://github.com/v8/v8/commit/9fb02b526f1cd3b859a530a01adb08bc0d089f4f Original commit message: Allow function callbacks to have Proxy as receiver. R=verwaest@chromium.org Bug: v8:5773 Change-Id: Ifd29a1116ee8c86b8d8d24485bbfd19e260ab66b Reviewed-on: chromium-review.googlesource.com/1046088 Commit-Queue: Yang Guo Reviewed-by: Camillo Bruni Cr-Commit-Position: refs/heads/master@{#53015} PR-URL: https://github.com/nodejs/node/pull/20575 Reviewed-By: James M Snell Reviewed-By: Ben Noordhuis --- common.gypi | 2 +- deps/v8/src/builtins/builtins-api.cc | 41 ++++++++++++++-------------- deps/v8/test/cctest/test-api.cc | 28 +++++++++++++++++++ 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/common.gypi b/common.gypi index 3bb10d611fb1d5..adeaf85c12bac1 100644 --- a/common.gypi +++ b/common.gypi @@ -27,7 +27,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.6', + 'v8_embedder_string': '-node.7', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/src/builtins/builtins-api.cc b/deps/v8/src/builtins/builtins-api.cc index 971fb7c678499f..bb66b082f3edf3 100644 --- a/deps/v8/src/builtins/builtins-api.cc +++ b/deps/v8/src/builtins/builtins-api.cc @@ -21,17 +21,21 @@ namespace { // Returns the holder JSObject if the function can legally be called with this // receiver. Returns nullptr if the call is illegal. // TODO(dcarney): CallOptimization duplicates this logic, merge. -JSObject* GetCompatibleReceiver(Isolate* isolate, FunctionTemplateInfo* info, - JSObject* receiver) { +JSReceiver* GetCompatibleReceiver(Isolate* isolate, FunctionTemplateInfo* info, + JSReceiver* receiver) { Object* recv_type = info->signature(); // No signature, return holder. if (!recv_type->IsFunctionTemplateInfo()) return receiver; + // A Proxy cannot have been created from the signature template. + if (!receiver->IsJSObject()) return nullptr; + + JSObject* js_obj_receiver = JSObject::cast(receiver); FunctionTemplateInfo* signature = FunctionTemplateInfo::cast(recv_type); // Check the receiver. Fast path for receivers with no hidden prototypes. - if (signature->IsTemplateFor(receiver)) return receiver; - if (!receiver->map()->has_hidden_prototype()) return nullptr; - for (PrototypeIterator iter(isolate, receiver, kStartAtPrototype, + if (signature->IsTemplateFor(js_obj_receiver)) return receiver; + if (!js_obj_receiver->map()->has_hidden_prototype()) return nullptr; + for (PrototypeIterator iter(isolate, js_obj_receiver, kStartAtPrototype, PrototypeIterator::END_AT_NON_HIDDEN); !iter.IsAtEnd(); iter.Advance()) { JSObject* current = iter.GetCurrent(); @@ -45,8 +49,8 @@ MUST_USE_RESULT MaybeHandle HandleApiCallHelper( Isolate* isolate, Handle function, Handle new_target, Handle fun_data, Handle receiver, BuiltinArguments args) { - Handle js_receiver; - JSObject* raw_holder; + Handle js_receiver; + JSReceiver* raw_holder; if (is_construct) { DCHECK(args.receiver()->IsTheHole(isolate)); if (fun_data->instance_template()->IsUndefined(isolate)) { @@ -68,21 +72,18 @@ MUST_USE_RESULT MaybeHandle HandleApiCallHelper( raw_holder = *js_receiver; } else { DCHECK(receiver->IsJSReceiver()); - - if (!receiver->IsJSObject()) { - // This function cannot be called with the given receiver. Abort! - THROW_NEW_ERROR( - isolate, NewTypeError(MessageTemplate::kIllegalInvocation), Object); - } - - js_receiver = Handle::cast(receiver); + js_receiver = Handle::cast(receiver); if (!fun_data->accept_any_receiver() && - js_receiver->IsAccessCheckNeeded() && - !isolate->MayAccess(handle(isolate->context()), js_receiver)) { - isolate->ReportFailedAccessCheck(js_receiver); - RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object); - return isolate->factory()->undefined_value(); + js_receiver->IsAccessCheckNeeded()) { + // Proxies never need access checks. + DCHECK(js_receiver->IsJSObject()); + Handle js_obj_receiver = Handle::cast(js_receiver); + if (!isolate->MayAccess(handle(isolate->context()), js_obj_receiver)) { + isolate->ReportFailedAccessCheck(js_obj_receiver); + RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object); + return isolate->factory()->undefined_value(); + } } raw_holder = GetCompatibleReceiver(isolate, *fun_data, *js_receiver); diff --git a/deps/v8/test/cctest/test-api.cc b/deps/v8/test/cctest/test-api.cc index fe1aca5a0fb440..40ba60ffb36607 100644 --- a/deps/v8/test/cctest/test-api.cc +++ b/deps/v8/test/cctest/test-api.cc @@ -1088,6 +1088,34 @@ THREADED_PROFILED_TEST(FunctionTemplate) { TestFunctionTemplateAccessor(construct_callback, Return239Callback); } +static void FunctionCallbackForProxyTest( + const v8::FunctionCallbackInfo& info) { + info.GetReturnValue().Set(info.This()); +} + +THREADED_TEST(FunctionTemplateWithProxy) { + LocalContext env; + v8::Isolate* isolate = env->GetIsolate(); + v8::HandleScope scope(isolate); + + v8::Local function_template = + v8::FunctionTemplate::New(isolate, FunctionCallbackForProxyTest); + v8::Local function = + function_template->GetFunction(env.local()).ToLocalChecked(); + CHECK((*env)->Global()->Set(env.local(), v8_str("f"), function).FromJust()); + v8::Local proxy = + CompileRun("var proxy = new Proxy({}, {}); proxy"); + CHECK(proxy->IsProxy()); + + v8::Local result = CompileRun("f(proxy)"); + CHECK(result->Equals(env.local(), (*env)->Global()).FromJust()); + + result = CompileRun("f.call(proxy)"); + CHECK(result->Equals(env.local(), proxy).FromJust()); + + result = CompileRun("Reflect.apply(f, proxy, [1])"); + CHECK(result->Equals(env.local(), proxy).FromJust()); +} static void SimpleCallback(const v8::FunctionCallbackInfo& info) { ApiTestFuzzer::Fuzz(); From 5803973206af7c60c6cbc186afdc38d5c8fae65f Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 5 May 2018 19:25:07 +0200 Subject: [PATCH 010/208] src: minor refactor to string_search.h - Use `std::max` instead of a custom variant - Use member method pointers to avoid an extra layer of indirection - Stop transferring `Vector` into the `node` namespace PR-URL: https://github.com/nodejs/node/pull/20546 Reviewed-By: James M Snell Reviewed-By: Daniel Bevenius Reviewed-By: Tiancheng "Timothy" Gu --- src/string_search.h | 145 +++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 91 deletions(-) diff --git a/src/string_search.h b/src/string_search.h index 51f72062a99466..6a45eb366623d9 100644 --- a/src/string_search.h +++ b/src/string_search.h @@ -9,18 +9,11 @@ #include "node_internals.h" #include +#include namespace node { namespace stringsearch { - -// Returns the maximum of the two parameters. -template -T Max(T a, T b) { - return a < b ? b : a; -} - - static const uint32_t kMaxOneByteCharCodeU = 0xff; template @@ -98,7 +91,9 @@ class StringSearchBase { template class StringSearch : private StringSearchBase { public: - explicit StringSearch(Vector pattern) + typedef stringsearch::Vector Vector; + + explicit StringSearch(Vector pattern) : pattern_(pattern), start_(0) { if (pattern.length() >= kBMMaxShift) { start_ = pattern.length() - kBMMaxShift; @@ -108,17 +103,17 @@ class StringSearch : private StringSearchBase { CHECK_GT(pattern_length, 0); if (pattern_length < kBMMinPatternLength) { if (pattern_length == 1) { - strategy_ = &SingleCharSearch; + strategy_ = &StringSearch::SingleCharSearch; return; } - strategy_ = &LinearSearch; + strategy_ = &StringSearch::LinearSearch; return; } - strategy_ = &InitialSearch; + strategy_ = &StringSearch::InitialSearch; } - size_t Search(Vector subject, size_t index) { - return strategy_(this, subject, index); + size_t Search(Vector subject, size_t index) { + return (this->*strategy_)(subject, index); } static inline int AlphabetSize() { @@ -136,31 +131,12 @@ class StringSearch : private StringSearchBase { } private: - typedef size_t (*SearchFunction)( - StringSearch*, - Vector, - size_t); - - static size_t SingleCharSearch(StringSearch* search, - Vector subject, - size_t start_index); - - static size_t LinearSearch(StringSearch* search, - Vector subject, - size_t start_index); - - static size_t InitialSearch(StringSearch* search, - Vector subject, - size_t start_index); - - static size_t BoyerMooreHorspoolSearch( - StringSearch* search, - Vector subject, - size_t start_index); - - static size_t BoyerMooreSearch(StringSearch* search, - Vector subject, - size_t start_index); + typedef size_t (StringSearch::*SearchFunction)(Vector, size_t); + size_t SingleCharSearch(Vector subject, size_t start_index); + size_t LinearSearch(Vector subject, size_t start_index); + size_t InitialSearch(Vector subject, size_t start_index); + size_t BoyerMooreHorspoolSearch(Vector subject, size_t start_index); + size_t BoyerMooreSearch(Vector subject, size_t start_index); void PopulateBoyerMooreHorspoolTable(); @@ -197,7 +173,7 @@ class StringSearch : private StringSearchBase { } // The pattern to search for. - Vector pattern_; + Vector pattern_; // Pointer to implementation of the search. SearchFunction strategy_; // Cache value of Max(0, pattern_length() - kBMMaxShift) @@ -213,8 +189,8 @@ inline T AlignDown(T value, U alignment) { inline uint8_t GetHighestValueByte(uint16_t character) { - return Max(static_cast(character & 0xFF), - static_cast(character >> 8)); + return std::max(static_cast(character & 0xFF), + static_cast(character >> 8)); } @@ -319,11 +295,10 @@ inline size_t FindFirstCharacter(Vector pattern, template size_t StringSearch::SingleCharSearch( - StringSearch* search, - Vector subject, + Vector subject, size_t index) { - CHECK_EQ(1, search->pattern_.length()); - return FindFirstCharacter(search->pattern_, subject, index); + CHECK_EQ(1, pattern_.length()); + return FindFirstCharacter(pattern_, subject, index); } //--------------------------------------------------------------------- @@ -333,22 +308,19 @@ size_t StringSearch::SingleCharSearch( // Simple linear search for short patterns. Never bails out. template size_t StringSearch::LinearSearch( - StringSearch* search, - Vector subject, + Vector subject, size_t index) { - Vector pattern = search->pattern_; - CHECK_GT(pattern.length(), 1); - const size_t pattern_length = pattern.length(); - const size_t n = subject.length() - pattern_length; + CHECK_GT(pattern_.length(), 1); + const size_t n = subject.length() - pattern_.length(); for (size_t i = index; i <= n; i++) { - i = FindFirstCharacter(pattern, subject, i); + i = FindFirstCharacter(pattern_, subject, i); if (i == subject.length()) return subject.length(); CHECK_LE(i, n); bool matches = true; - for (size_t j = 1; j < pattern_length; j++) { - if (pattern[j] != subject[i + j]) { + for (size_t j = 1; j < pattern_.length(); j++) { + if (pattern_[j] != subject[i + j]) { matches = false; break; } @@ -366,19 +338,17 @@ size_t StringSearch::LinearSearch( template size_t StringSearch::BoyerMooreSearch( - StringSearch* search, - Vector subject, + Vector subject, size_t start_index) { - Vector pattern = search->pattern_; const size_t subject_length = subject.length(); - const size_t pattern_length = pattern.length(); + const size_t pattern_length = pattern_.length(); // Only preprocess at most kBMMaxShift last characters of pattern. - size_t start = search->start_; + size_t start = start_; - int* bad_char_occurrence = search->bad_char_table(); - int* good_suffix_shift = search->good_suffix_shift_table(); + int* bad_char_occurrence = bad_char_table(); + int* good_suffix_shift = good_suffix_shift_table(); - Char last_char = pattern[pattern_length - 1]; + Char last_char = pattern_[pattern_length - 1]; size_t index = start_index; // Continue search from i. while (index <= subject_length - pattern_length) { @@ -391,7 +361,7 @@ size_t StringSearch::BoyerMooreSearch( return subject.length(); } } - while (pattern[j] == (c = subject[index + j])) { + while (pattern_[j] == (c = subject[index + j])) { if (j == 0) { return index; } @@ -420,7 +390,6 @@ size_t StringSearch::BoyerMooreSearch( template void StringSearch::PopulateBoyerMooreTable() { const size_t pattern_length = pattern_.length(); - Vector pattern = pattern_; // Only look at the last kBMMaxShift characters of pattern (from start_ // to pattern_length). const size_t start = start_; @@ -448,8 +417,8 @@ void StringSearch::PopulateBoyerMooreTable() { { size_t i = pattern_length; while (i > start) { - Char c = pattern[i - 1]; - while (suffix <= pattern_length && c != pattern[suffix - 1]) { + Char c = pattern_[i - 1]; + while (suffix <= pattern_length && c != pattern_[suffix - 1]) { if (static_cast(shift_table[suffix]) == length) { shift_table[suffix] = suffix - i; } @@ -458,7 +427,7 @@ void StringSearch::PopulateBoyerMooreTable() { suffix_table[--i] = --suffix; if (suffix == pattern_length) { // No suffix to extend, so we check against last_char only. - while ((i > start) && (pattern[i - 1] != last_char)) { + while ((i > start) && (pattern_[i - 1] != last_char)) { if (static_cast(shift_table[pattern_length]) == length) { shift_table[pattern_length] = pattern_length - i; } @@ -489,17 +458,15 @@ void StringSearch::PopulateBoyerMooreTable() { template size_t StringSearch::BoyerMooreHorspoolSearch( - StringSearch* search, - Vector subject, + Vector subject, size_t start_index) { - Vector pattern = search->pattern_; const size_t subject_length = subject.length(); - const size_t pattern_length = pattern.length(); - int* char_occurrences = search->bad_char_table(); + const size_t pattern_length = pattern_.length(); + int* char_occurrences = bad_char_table(); int64_t badness = -pattern_length; // How bad we are doing without a good-suffix table. - Char last_char = pattern[pattern_length - 1]; + Char last_char = pattern_[pattern_length - 1]; int last_char_shift = pattern_length - 1 - CharOccurrence(char_occurrences, static_cast(last_char)); @@ -519,7 +486,7 @@ size_t StringSearch::BoyerMooreHorspoolSearch( } } j--; - while (pattern[j] == (subject[index + j])) { + while (pattern_[j] == (subject[index + j])) { if (j == 0) { return index; } @@ -532,9 +499,9 @@ size_t StringSearch::BoyerMooreHorspoolSearch( // compared to reading each character exactly once. badness += (pattern_length - j) - last_char_shift; if (badness > 0) { - search->PopulateBoyerMooreTable(); - search->strategy_ = &BoyerMooreSearch; - return BoyerMooreSearch(search, subject, index); + PopulateBoyerMooreTable(); + strategy_ = &StringSearch::BoyerMooreSearch; + return BoyerMooreSearch(subject, index); } } return subject.length(); @@ -575,11 +542,9 @@ void StringSearch::PopulateBoyerMooreHorspoolTable() { // isn't found very early in the subject. Upgrades to BoyerMooreHorspool. template size_t StringSearch::InitialSearch( - StringSearch* search, - Vector subject, + Vector subject, size_t index) { - Vector pattern = search->pattern_; - const size_t pattern_length = pattern.length(); + const size_t pattern_length = pattern_.length(); // Badness is a count of how much work we have done. When we have // done enough work we decide it's probably worth switching to a better // algorithm. @@ -590,13 +555,13 @@ size_t StringSearch::InitialSearch( for (size_t i = index, n = subject.length() - pattern_length; i <= n; i++) { badness++; if (badness <= 0) { - i = FindFirstCharacter(pattern, subject, i); + i = FindFirstCharacter(pattern_, subject, i); if (i == subject.length()) return subject.length(); CHECK_LE(i, n); size_t j = 1; do { - if (pattern[j] != subject[i + j]) { + if (pattern_[j] != subject[i + j]) { break; } j++; @@ -606,9 +571,9 @@ size_t StringSearch::InitialSearch( } badness += j; } else { - search->PopulateBoyerMooreHorspoolTable(); - search->strategy_ = &BoyerMooreHorspoolSearch; - return BoyerMooreHorspoolSearch(search, subject, i); + PopulateBoyerMooreHorspoolTable(); + strategy_ = &StringSearch::BoyerMooreHorspoolSearch; + return BoyerMooreHorspoolSearch(subject, i); } } return subject.length(); @@ -629,7 +594,6 @@ size_t SearchString(Vector subject, } // namespace node namespace node { -using node::stringsearch::Vector; template size_t SearchString(const Char* haystack, @@ -643,9 +607,8 @@ size_t SearchString(const Char* haystack, // code, create two vectors that are reversed views into the input strings. // For example, v_needle[0] would return the *last* character of the needle. // So we're searching for the first instance of rev(needle) in rev(haystack) - Vector v_needle = Vector( - needle, needle_length, is_forward); - Vector v_haystack = Vector( + stringsearch::Vector v_needle(needle, needle_length, is_forward); + stringsearch::Vector v_haystack( haystack, haystack_length, is_forward); size_t diff = haystack_length - needle_length; size_t relative_start_index; From 2df99ac095f056350cf8b954059a6068b6ef41c8 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 4 Sep 2017 22:31:20 +0200 Subject: [PATCH 011/208] src: use lock for c-ares library init/cleanup This helps embedders wishing to use Node.js in a multi-threaded fashion and helps pave the way for thread-based worker support. Thanks to Stephen Belanger for reviewing this commit in its original PR. Refs: https://github.com/ayojs/ayo/pull/82 PR-URL: https://github.com/nodejs/node/pull/20539 Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Colin Ihrig Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell Reviewed-By: Daniel Bevenius --- src/cares_wrap.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index 4df47d75d43ba8..4208c02d4fe445 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -70,6 +70,8 @@ using v8::Value; namespace { +Mutex ares_library_mutex; + inline uint16_t cares_get_16bit(const unsigned char* p) { return static_cast(p[0] << 8U) | (static_cast(p[1])); } @@ -470,6 +472,7 @@ void ChannelWrap::Setup() { int r; if (!library_inited_) { + Mutex::ScopedLock lock(ares_library_mutex); // Multiple calls to ares_library_init() increase a reference counter, // so this is a no-op except for the first call to it. r = ares_library_init(ARES_LIB_INIT_ALL); @@ -483,6 +486,7 @@ void ChannelWrap::Setup() { ARES_OPT_FLAGS | ARES_OPT_SOCK_STATE_CB); if (r != ARES_SUCCESS) { + Mutex::ScopedLock lock(ares_library_mutex); ares_library_cleanup(); return env()->ThrowError(ToErrorCodeString(r)); } @@ -500,6 +504,7 @@ void ChannelWrap::Setup() { ChannelWrap::~ChannelWrap() { if (library_inited_) { + Mutex::ScopedLock lock(ares_library_mutex); // This decreases the reference counter increased by ares_library_init(). ares_library_cleanup(); } From a89cc2886ecec5bd9b8b3f803a6658afb90e21b2 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 5 May 2018 17:47:02 +0200 Subject: [PATCH 012/208] src: protect global state with mutexes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Protect environment variables and inherently per-process state with mutexes, to better accommodate Node’s usage in multi-threading environments. Thanks to Stephen Belanger for reviewing this change in its original PR. Refs: https://github.com/ayojs/ayo/pull/82 PR-URL: https://github.com/nodejs/node/pull/20542 Reviewed-By: Gus Caplan Reviewed-By: James M Snell Reviewed-By: Ben Noordhuis --- src/node.cc | 22 ++++++++++++++++++---- src/node_crypto.cc | 3 +++ src/node_internals.h | 1 + 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/node.cc b/src/node.cc index 693457d3ed0aae..704bdc334b2f9c 100644 --- a/src/node.cc +++ b/src/node.cc @@ -171,6 +171,9 @@ using v8::Value; using AsyncHooks = Environment::AsyncHooks; +static Mutex process_mutex; +static Mutex environ_mutex; + static bool print_eval = false; static bool force_repl = false; static bool syntax_check_only = false; @@ -698,9 +701,12 @@ bool SafeGetenv(const char* key, std::string* text) { goto fail; #endif - if (const char* value = getenv(key)) { - *text = value; - return true; + { + Mutex::ScopedLock lock(environ_mutex); + if (const char* value = getenv(key)) { + *text = value; + return true; + } } fail: @@ -1358,6 +1364,7 @@ void AppendExceptionLine(Environment* env, if (!can_set_arrow || (mode == FATAL_ERROR && !err_obj->IsNativeError())) { if (env->printed_error()) return; + Mutex::ScopedLock lock(process_mutex); env->set_printed_error(true); uv_tty_reset_mode(); @@ -2624,7 +2631,6 @@ static void ProcessTitleSetter(Local property, Local value, const PropertyCallbackInfo& info) { node::Utf8Value title(info.GetIsolate(), value); - // TODO(piscisaureus): protect with a lock uv_set_process_title(*title); } @@ -2635,6 +2641,7 @@ static void EnvGetter(Local property, if (property->IsSymbol()) { return info.GetReturnValue().SetUndefined(); } + Mutex::ScopedLock lock(environ_mutex); #ifdef __POSIX__ node::Utf8Value key(isolate, property); const char* val = getenv(*key); @@ -2675,6 +2682,8 @@ static void EnvSetter(Local property, "DEP0104").IsNothing()) return; } + + Mutex::ScopedLock lock(environ_mutex); #ifdef __POSIX__ node::Utf8Value key(info.GetIsolate(), property); node::Utf8Value val(info.GetIsolate(), value); @@ -2695,6 +2704,7 @@ static void EnvSetter(Local property, static void EnvQuery(Local property, const PropertyCallbackInfo& info) { + Mutex::ScopedLock lock(environ_mutex); int32_t rc = -1; // Not found unless proven otherwise. if (property->IsString()) { #ifdef __POSIX__ @@ -2724,6 +2734,7 @@ static void EnvQuery(Local property, static void EnvDeleter(Local property, const PropertyCallbackInfo& info) { + Mutex::ScopedLock lock(environ_mutex); if (property->IsString()) { #ifdef __POSIX__ node::Utf8Value key(info.GetIsolate(), property); @@ -2749,6 +2760,7 @@ static void EnvEnumerator(const PropertyCallbackInfo& info) { Local argv[NODE_PUSH_VAL_TO_ARRAY_MAX]; size_t idx = 0; + Mutex::ScopedLock lock(environ_mutex); #ifdef __POSIX__ int size = 0; while (environ[size]) @@ -2864,6 +2876,7 @@ static Local GetFeatures(Environment* env) { static void DebugPortGetter(Local property, const PropertyCallbackInfo& info) { + Mutex::ScopedLock lock(process_mutex); int port = debug_options.port(); #if HAVE_INSPECTOR if (port == 0) { @@ -2879,6 +2892,7 @@ static void DebugPortGetter(Local property, static void DebugPortSetter(Local property, Local value, const PropertyCallbackInfo& info) { + Mutex::ScopedLock lock(process_mutex); debug_options.set_port(value->Int32Value()); } diff --git a/src/node_crypto.cc b/src/node_crypto.cc index d5f27994307696..4d07546e0a213e 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -715,6 +715,9 @@ void SecureContext::SetCert(const FunctionCallbackInfo& args) { static X509_STORE* NewRootCertStore() { static std::vector root_certs_vector; + static Mutex root_certs_vector_mutex; + Mutex::ScopedLock lock(root_certs_vector_mutex); + if (root_certs_vector.empty()) { for (size_t i = 0; i < arraysize(root_certs); i++) { BIO* bp = NodeBIO::NewFixed(root_certs[i], strlen(root_certs[i])); diff --git a/src/node_internals.h b/src/node_internals.h index e5ea575ebc5981..e15df78ffdfee3 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -25,6 +25,7 @@ #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS #include "node.h" +#include "node_mutex.h" #include "node_persistent.h" #include "util-inl.h" #include "env-inl.h" From 4873fbaf63200ac39202a1344b62faf10f1982d6 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 5 May 2018 18:27:50 +0200 Subject: [PATCH 013/208] src: remove unused freelist.h header Always easy enough to re-introduce if we do need it. PR-URL: https://github.com/nodejs/node/pull/20544 Reviewed-By: Colin Ihrig Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell Reviewed-By: Daniel Bevenius Reviewed-By: Matheus Marchini Reviewed-By: Tiancheng "Timothy" Gu --- src/freelist.h | 92 -------------------------------------------------- 1 file changed, 92 deletions(-) delete mode 100644 src/freelist.h diff --git a/src/freelist.h b/src/freelist.h deleted file mode 100644 index 7dff56a35d348a..00000000000000 --- a/src/freelist.h +++ /dev/null @@ -1,92 +0,0 @@ -#ifndef SRC_FREELIST_H_ -#define SRC_FREELIST_H_ - -#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS - -#include "util.h" - -namespace node { - -struct DefaultFreelistTraits; - -template -class Freelist { - public: - typedef struct list_item { - T* item = nullptr; - list_item* next = nullptr; - } list_item; - - Freelist() {} - ~Freelist() { - while (head_ != nullptr) { - list_item* item = head_; - head_ = item->next; - FreelistTraits::Free(item->item); - free(item); - } - } - - void push(T* item) { - if (size_ > kMaximumLength) { - FreelistTraits::Free(item); - } else { - size_++; - FreelistTraits::Reset(item); - list_item* li = Calloc(1); - li->item = item; - if (head_ == nullptr) { - head_ = li; - tail_ = li; - } else { - tail_->next = li; - tail_ = li; - } - } - } - - T* pop() { - if (head_ != nullptr) { - size_--; - list_item* cur = head_; - T* item = cur->item; - head_ = cur->next; - free(cur); - return item; - } else { - return FreelistTraits::template Alloc(); - } - } - - private: - size_t size_ = 0; - list_item* head_ = nullptr; - list_item* tail_ = nullptr; -}; - -struct DefaultFreelistTraits { - template - static T* Alloc() { - return ::new (Malloc(1)) T(); - } - - template - static void Free(T* item) { - item->~T(); - free(item); - } - - template - static void Reset(T* item) { - item->~T(); - ::new (item) T(); - } -}; - -} // namespace node - -#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS - -#endif // SRC_FREELIST_H_ From 8604481b2e079ed224f9d4e97445437dbf484290 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Tue, 8 May 2018 12:24:02 +0200 Subject: [PATCH 014/208] vm: move emitExperimentalWarning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit moves emitExperimentalWarning into the second object destructoring of require internal/util. PR-URL: https://github.com/nodejs/node/pull/20593 Reviewed-By: Michaël Zasso Reviewed-By: Сковорода Никита Андреевич Reviewed-By: Gus Caplan Reviewed-By: Colin Ihrig Reviewed-By: Ruben Bridgewater Reviewed-By: James M Snell Reviewed-By: Jon Moss Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Anna Henningsen --- lib/internal/vm/module.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/vm/module.js b/lib/internal/vm/module.js index 7284c8bd619901..0c9ec87a07b02f 100644 --- a/lib/internal/vm/module.js +++ b/lib/internal/vm/module.js @@ -1,7 +1,6 @@ 'use strict'; const { internalBinding } = require('internal/bootstrap/loaders'); -const { emitExperimentalWarning } = require('internal/util'); const { URL } = require('internal/url'); const { isContext } = process.binding('contextify'); const { @@ -17,6 +16,7 @@ const { const { getConstructorOf, customInspectSymbol, + emitExperimentalWarning } = require('internal/util'); const { SafePromise } = require('internal/safe_globals'); From d568952b8c8b3a7a827a6230d8357add3abc29c3 Mon Sep 17 00:00:00 2001 From: Gabriel Schulhof Date: Wed, 9 May 2018 10:24:01 -0400 Subject: [PATCH 015/208] doc: fix missing napi_get_typedarray_info() param Also, make the type name notation more consistent. PR-URL: https://github.com/nodejs/node/pull/20631 Reviewed-By: James M Snell Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Colin Ihrig Reviewed-By: Vse Mozhet Byt --- doc/api/n-api.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/api/n-api.md b/doc/api/n-api.md index 17958c8daf255e..739213c155755a 100644 --- a/doc/api/n-api.md +++ b/doc/api/n-api.md @@ -1697,8 +1697,9 @@ napi_status napi_get_typedarray_info(napi_env env, - `[in] typedarray`: `napi_value` representing the `TypedArray` whose properties to query. - `[out] type`: Scalar datatype of the elements within the `TypedArray`. -- `[out] length`: `Number` of elements in the `TypedArray`. -- `[out] data`: The data buffer underlying the typed array. +- `[out] length`: The number of elements in the `TypedArray`. +- `[out] data`: The data buffer underlying the `TypedArray`. +- `[out] arraybuffer`: The `ArrayBuffer` underlying the `TypedArray`. - `[out] byte_offset`: The byte offset within the data buffer from which to start projecting the `TypedArray`. From c546746396e74395d64eb96e21c2d6bb63b236a3 Mon Sep 17 00:00:00 2001 From: cjihrig Date: Tue, 8 May 2018 22:30:16 -0400 Subject: [PATCH 016/208] doc: add util.types.isBig{Int,Uint}64Array() These methods are exposed, even though the BigInt64Array and BigUint64Array types are currently behind the --harmony-bigint command line flag. PR-URL: https://github.com/nodejs/node/pull/20615 Fixes: https://github.com/nodejs/node/issues/20602 Reviewed-By: Gus Caplan Reviewed-By: James M Snell Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Vse Mozhet Byt Reviewed-By: Anna Henningsen --- doc/api/util.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/doc/api/util.md b/doc/api/util.md index 380b2fd4089759..553e1e38c14db5 100644 --- a/doc/api/util.md +++ b/doc/api/util.md @@ -1009,6 +1009,44 @@ util.types.isAsyncFunction(function foo() {}); // Returns false util.types.isAsyncFunction(async function foo() {}); // Returns true ``` +### util.types.isBigInt64Array(value) + + +* Returns: {boolean} + +Returns `true` if the value is a `BigInt64Array` instance. The +`--harmony-bigint` command line flag is required in order to use the +`BigInt64Array` type, but it is not required in order to use +`isBigInt64Array()`. + +For example: + +```js +util.types.isBigInt64Array(new BigInt64Array()); // Returns true +util.types.isBigInt64Array(new BigUint64Array()); // Returns false +``` + +### util.types.isBigUint64Array(value) + + +* Returns: {boolean} + +Returns `true` if the value is a `BigUint64Array` instance. The +`--harmony-bigint` command line flag is required in order to use the +`BigUint64Array` type, but it is not required in order to use +`isBigUint64Array()`. + +For example: + +```js +util.types.isBigUint64Array(new BigInt64Array()); // Returns false +util.types.isBigUint64Array(new BigUint64Array()); // Returns true +``` + ### util.types.isBooleanObject(value) -* `value` {any} -* `message` {any} +* `value` {any} The input that is checked for being truthy. +* `message` {string|Error} An alias of [`assert.ok()`][]. @@ -181,7 +181,7 @@ changes: --> * `actual` {any} * `expected` {any} -* `message` {any} +* `message` {string|Error} **Strict mode** @@ -235,18 +235,18 @@ const obj3 = { const obj4 = Object.create(obj1); assert.deepEqual(obj1, obj1); -// OK, object is equal to itself +// OK +// Values of b are different: assert.deepEqual(obj1, obj2); // AssertionError: { a: { b: 1 } } deepEqual { a: { b: 2 } } -// values of b are different assert.deepEqual(obj1, obj3); -// OK, objects are equal +// OK +// Prototypes are ignored: assert.deepEqual(obj1, obj4); // AssertionError: { a: { b: 1 } } deepEqual {} -// Prototypes are ignored ``` If the values are not equal, an `AssertionError` is thrown with a `message` @@ -285,7 +285,7 @@ changes: --> * `actual` {any} * `expected` {any} -* `message` {any} +* `message` {string|Error} Tests for deep equality between the `actual` and `expected` parameters. "Deep" equality means that the enumerable "own" properties of child objects @@ -406,7 +406,7 @@ added: v10.0.0 --> * `block` {Function|Promise} * `error` {RegExp|Function} -* `message` {any} +* `message` {string|Error} Awaits the `block` promise or, if `block` is a function, immediately calls the function and awaits the returned promise to complete. It will then check that @@ -460,7 +460,7 @@ changes: --> * `block` {Function} * `error` {RegExp|Function} -* `message` {any} +* `message` {string|Error} Asserts that the function `block` does not throw an error. @@ -528,7 +528,7 @@ added: v0.1.21 --> * `actual` {any} * `expected` {any} -* `message` {any} +* `message` {string|Error} **Strict mode** @@ -565,7 +565,7 @@ parameter is an instance of an [`Error`][] then it will be thrown instead of the -* `message` {any} **Default:** `'Failed'` +* `message` {string|Error} **Default:** `'Failed'` Throws an `AssertionError` with the provided error message or a default error message. If the `message` parameter is an instance of an [`Error`][] then it @@ -598,7 +598,7 @@ changes: --> * `actual` {any} * `expected` {any} -* `message` {any} +* `message` {string|Error} * `operator` {string} **Default:** `'!='` * `stackStartFunction` {Function} **Default:** `assert.fail` @@ -659,8 +659,8 @@ changes: an `AssertionError` that contains the full stack trace. - version: v10.0.0 pr-url: https://github.com/nodejs/node/pull/18247 - description: Value may now only be `undefined` or `null`. Before any truthy - input was accepted. + description: Value may now only be `undefined` or `null`. Before all falsy + values were handled the same as `null` and did not throw. --> * `value` {any} @@ -717,7 +717,7 @@ changes: --> * `actual` {any} * `expected` {any} -* `message` {any} +* `message` {string|Error} **Strict mode** @@ -753,13 +753,13 @@ assert.notDeepEqual(obj1, obj1); // AssertionError: { a: { b: 1 } } notDeepEqual { a: { b: 1 } } assert.notDeepEqual(obj1, obj2); -// OK: obj1 and obj2 are not deeply equal +// OK assert.notDeepEqual(obj1, obj3); // AssertionError: { a: { b: 1 } } notDeepEqual { a: { b: 1 } } assert.notDeepEqual(obj1, obj4); -// OK: obj1 and obj4 are not deeply equal +// OK ``` If the values are deeply equal, an `AssertionError` is thrown with a `message` @@ -798,7 +798,7 @@ changes: --> * `actual` {any} * `expected` {any} -* `message` {any} +* `message` {string|Error} Tests for deep strict inequality. Opposite of [`assert.deepStrictEqual()`][]. @@ -821,7 +821,7 @@ added: v0.1.21 --> * `actual` {any} * `expected` {any} -* `message` {any} +* `message` {string|Error} **Strict mode** @@ -863,7 +863,7 @@ changes: --> * `actual` {any} * `expected` {any} -* `message` {any} +* `message` {string|Error} Tests strict inequality between the `actual` and `expected` parameters as determined by the [SameValue Comparison][]. @@ -897,7 +897,7 @@ changes: error message. --> * `value` {any} -* `message` {any} +* `message` {string|Error} Tests if `value` is truthy. It is equivalent to `assert.equal(!!value, true, message)`. @@ -960,7 +960,7 @@ added: v10.0.0 --> * `block` {Function|Promise} * `error` {RegExp|Function|Object|Error} -* `message` {any} +* `message` {string|Error} Awaits the `block` promise or, if `block` is a function, immediately calls the function and awaits the returned promise to complete. It will then check that @@ -1022,7 +1022,7 @@ changes: --> * `actual` {any} * `expected` {any} -* `message` {any} +* `message` {string|Error} Tests strict equality between the `actual` and `expected` parameters as determined by the [SameValue Comparison][]. @@ -1065,7 +1065,7 @@ changes: --> * `block` {Function} * `error` {RegExp|Function|Object|Error} -* `message` {any} +* `message` {string|Error} Expects the function `block` to throw an error. From 5d06c1e1ae53a11d91e0b3ef0687b384e5f3c3f8 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Wed, 2 May 2018 16:21:40 +0200 Subject: [PATCH 024/208] assert: move AssertionError into own file This moves the `assert` parts from `internal/errors` into an own file. `internal/errors` got bigger and bigger and it was difficult to keep a good overview of what was going on. While doing so it also removes the `internalAssert` function and just lazy loads `assert`. PR-URL: https://github.com/nodejs/node/pull/20486 Reviewed-By: James M Snell Reviewed-By: Joyee Cheung Reviewed-By: Trivikram Kamat --- lib/assert.js | 15 +- lib/internal/assert.js | 275 ++++++++++++++++++++++++++++++ lib/internal/errors.js | 314 ++--------------------------------- node.gyp | 1 + test/parallel/test-assert.js | 2 +- 5 files changed, 301 insertions(+), 306 deletions(-) create mode 100644 lib/internal/assert.js diff --git a/lib/assert.js b/lib/assert.js index ac9fd30793aaf7..27e71c2751ed74 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -25,15 +25,12 @@ const { isDeepEqual, isDeepStrictEqual } = require('internal/util/comparisons'); -const { - AssertionError, - errorCache, - codes: { - ERR_AMBIGUOUS_ARGUMENT, - ERR_INVALID_ARG_TYPE, - ERR_INVALID_RETURN_VALUE - } -} = require('internal/errors'); +const { codes: { + ERR_AMBIGUOUS_ARGUMENT, + ERR_INVALID_ARG_TYPE, + ERR_INVALID_RETURN_VALUE +} } = require('internal/errors'); +const { AssertionError, errorCache } = require('internal/assert'); const { openSync, closeSync, readSync } = require('fs'); const { inspect, types: { isPromise, isRegExp } } = require('util'); const { EOL } = require('os'); diff --git a/lib/internal/assert.js b/lib/internal/assert.js new file mode 100644 index 00000000000000..990065a9378f14 --- /dev/null +++ b/lib/internal/assert.js @@ -0,0 +1,275 @@ +'use strict'; + +const { inspect } = require('util'); +const { codes: { + ERR_INVALID_ARG_TYPE +} } = require('internal/errors'); + +let blue = ''; +let green = ''; +let red = ''; +let white = ''; + +const READABLE_OPERATOR = { + deepStrictEqual: 'Input A expected to strictly deep-equal input B', + notDeepStrictEqual: 'Input A expected to strictly not deep-equal input B', + strictEqual: 'Input A expected to strictly equal input B', + notStrictEqual: 'Input A expected to strictly not equal input B' +}; + +function copyError(source) { + const keys = Object.keys(source); + const target = Object.create(Object.getPrototypeOf(source)); + for (const key of keys) { + target[key] = source[key]; + } + Object.defineProperty(target, 'message', { value: source.message }); + return target; +} + +function inspectValue(val) { + // The util.inspect default values could be changed. This makes sure the + // error messages contain the necessary information nevertheless. + return inspect( + val, + { + compact: false, + customInspect: false, + depth: 1000, + maxArrayLength: Infinity, + // Assert compares only enumerable properties (with a few exceptions). + showHidden: false, + // Having a long line as error is better than wrapping the line for + // comparison. + breakLength: Infinity, + // Assert does not detect proxies currently. + showProxy: false + } + ).split('\n'); +} + +function createErrDiff(actual, expected, operator) { + var other = ''; + var res = ''; + var lastPos = 0; + var end = ''; + var skipped = false; + const actualLines = inspectValue(actual); + const expectedLines = inspectValue(expected); + const msg = READABLE_OPERATOR[operator] + + `:\n${green}+ expected${white} ${red}- actual${white}`; + const skippedMsg = ` ${blue}...${white} Lines skipped`; + + // Remove all ending lines that match (this optimizes the output for + // readability by reducing the number of total changed lines). + var a = actualLines[actualLines.length - 1]; + var b = expectedLines[expectedLines.length - 1]; + var i = 0; + while (a === b) { + if (i++ < 2) { + end = `\n ${a}${end}`; + } else { + other = a; + } + actualLines.pop(); + expectedLines.pop(); + if (actualLines.length === 0 || expectedLines.length === 0) + break; + a = actualLines[actualLines.length - 1]; + b = expectedLines[expectedLines.length - 1]; + } + if (i > 3) { + end = `\n${blue}...${white}${end}`; + skipped = true; + } + if (other !== '') { + end = `\n ${other}${end}`; + other = ''; + } + + const maxLines = Math.max(actualLines.length, expectedLines.length); + var printedLines = 0; + var identical = 0; + for (i = 0; i < maxLines; i++) { + // Only extra expected lines exist + const cur = i - lastPos; + if (actualLines.length < i + 1) { + if (cur > 1 && i > 2) { + if (cur > 4) { + res += `\n${blue}...${white}`; + skipped = true; + } else if (cur > 3) { + res += `\n ${expectedLines[i - 2]}`; + printedLines++; + } + res += `\n ${expectedLines[i - 1]}`; + printedLines++; + } + lastPos = i; + other += `\n${green}+${white} ${expectedLines[i]}`; + printedLines++; + // Only extra actual lines exist + } else if (expectedLines.length < i + 1) { + if (cur > 1 && i > 2) { + if (cur > 4) { + res += `\n${blue}...${white}`; + skipped = true; + } else if (cur > 3) { + res += `\n ${actualLines[i - 2]}`; + printedLines++; + } + res += `\n ${actualLines[i - 1]}`; + printedLines++; + } + lastPos = i; + res += `\n${red}-${white} ${actualLines[i]}`; + printedLines++; + // Lines diverge + } else if (actualLines[i] !== expectedLines[i]) { + if (cur > 1 && i > 2) { + if (cur > 4) { + res += `\n${blue}...${white}`; + skipped = true; + } else if (cur > 3) { + res += `\n ${actualLines[i - 2]}`; + printedLines++; + } + res += `\n ${actualLines[i - 1]}`; + printedLines++; + } + lastPos = i; + res += `\n${red}-${white} ${actualLines[i]}`; + other += `\n${green}+${white} ${expectedLines[i]}`; + printedLines += 2; + // Lines are identical + } else { + res += other; + other = ''; + if (cur === 1 || i === 0) { + res += `\n ${actualLines[i]}`; + printedLines++; + } + identical++; + } + // Inspected object to big (Show ~20 rows max) + if (printedLines > 20 && i < maxLines - 2) { + return `${msg}${skippedMsg}\n${res}\n${blue}...${white}${other}\n` + + `${blue}...${white}`; + } + } + + // Strict equal with identical objects that are not identical by reference. + if (identical === maxLines) { + // E.g., assert.deepStrictEqual(Symbol(), Symbol()) + const base = operator === 'strictEqual' ? + 'Input objects identical but not reference equal:' : + 'Input objects not identical:'; + + // We have to get the result again. The lines were all removed before. + const actualLines = inspectValue(actual); + + // Only remove lines in case it makes sense to collapse those. + // TODO: Accept env to always show the full error. + if (actualLines.length > 30) { + actualLines[26] = `${blue}...${white}`; + while (actualLines.length > 27) { + actualLines.pop(); + } + } + + return `${base}\n\n${actualLines.join('\n')}\n`; + } + return `${msg}${skipped ? skippedMsg : ''}\n${res}${other}${end}`; +} + +class AssertionError extends Error { + constructor(options) { + if (typeof options !== 'object' || options === null) { + throw new ERR_INVALID_ARG_TYPE('options', 'Object', options); + } + var { + actual, + expected, + message, + operator, + stackStartFn + } = options; + + if (message != null) { + super(message); + } else { + if (process.stdout.isTTY) { + // Reset on each call to make sure we handle dynamically set environment + // variables correct. + if (process.stdout.getColorDepth() !== 1) { + blue = '\u001b[34m'; + green = '\u001b[32m'; + white = '\u001b[39m'; + red = '\u001b[31m'; + } else { + blue = ''; + green = ''; + white = ''; + red = ''; + } + } + // Prevent the error stack from being visible by duplicating the error + // in a very close way to the original in case both sides are actually + // instances of Error. + if (typeof actual === 'object' && actual !== null && + typeof expected === 'object' && expected !== null && + 'stack' in actual && actual instanceof Error && + 'stack' in expected && expected instanceof Error) { + actual = copyError(actual); + expected = copyError(expected); + } + + if (operator === 'deepStrictEqual' || operator === 'strictEqual') { + super(createErrDiff(actual, expected, operator)); + } else if (operator === 'notDeepStrictEqual' || + operator === 'notStrictEqual') { + // In case the objects are equal but the operator requires unequal, show + // the first object and say A equals B + const res = inspectValue(actual); + const base = `Identical input passed to ${operator}:`; + + // Only remove lines in case it makes sense to collapse those. + // TODO: Accept env to always show the full error. + if (res.length > 30) { + res[26] = `${blue}...${white}`; + while (res.length > 27) { + res.pop(); + } + } + + // Only print a single input. + if (res.length === 1) { + super(`${base} ${res[0]}`); + } else { + super(`${base}\n\n${res.join('\n')}\n`); + } + } else { + let res = inspect(actual); + let other = inspect(expected); + if (res.length > 128) + res = `${res.slice(0, 125)}...`; + if (other.length > 128) + other = `${other.slice(0, 125)}...`; + super(`${res} ${operator} ${other}`); + } + } + + this.generatedMessage = !message; + this.name = 'AssertionError [ERR_ASSERTION]'; + this.code = 'ERR_ASSERTION'; + this.actual = actual; + this.expected = expected; + this.operator = operator; + Error.captureStackTrace(this, stackStartFn); + } +} + +module.exports = { + AssertionError, + errorCache: new Map() +}; diff --git a/lib/internal/errors.js b/lib/internal/errors.js index fc306e256c1f1a..0a46e2e7a9946c 100644 --- a/lib/internal/errors.js +++ b/lib/internal/errors.js @@ -15,18 +15,6 @@ const kInfo = Symbol('info'); const messages = new Map(); const codes = {}; -let blue = ''; -let green = ''; -let red = ''; -let white = ''; - -const READABLE_OPERATOR = { - deepStrictEqual: 'Input A expected to strictly deep-equal input B', - notDeepStrictEqual: 'Input A expected to strictly not deep-equal input B', - strictEqual: 'Input A expected to strictly equal input B', - notStrictEqual: 'Input A expected to strictly not equal input B' -}; - const { errmap, UV_EAI_MEMORY, @@ -37,10 +25,10 @@ const { kMaxLength } = process.binding('buffer'); const { defineProperty } = Object; // Lazily loaded -var util; -var buffer; +let util; +let assert; -var internalUtil = null; +let internalUtil = null; function lazyInternalUtil() { if (!internalUtil) { internalUtil = require('internal/util'); @@ -48,35 +36,11 @@ function lazyInternalUtil() { return internalUtil; } -function copyError(source) { - const keys = Object.keys(source); - const target = Object.create(Object.getPrototypeOf(source)); - for (const key of keys) { - target[key] = source[key]; - } - Object.defineProperty(target, 'message', { value: source.message }); - return target; -} - -function inspectValue(val) { - // The util.inspect default values could be changed. This makes sure the - // error messages contain the necessary information nevertheless. - return util.inspect( - val, - { - compact: false, - customInspect: false, - depth: 1000, - maxArrayLength: Infinity, - // Assert compares only enumerable properties (with a few exceptions). - showHidden: false, - // Having a long line as error is better than wrapping the line for - // comparison. - breakLength: Infinity, - // Assert does not detect proxies currently. - showProxy: false - } - ).split('\n'); +let buffer; +function lazyBuffer() { + if (buffer === undefined) + buffer = require('buffer').Buffer; + return buffer; } // A specialized Error that includes an additional info property with @@ -241,254 +205,14 @@ function E(sym, val, def, ...otherClasses) { codes[sym] = def; } -function lazyBuffer() { - if (buffer === undefined) - buffer = require('buffer').Buffer; - return buffer; -} - -function createErrDiff(actual, expected, operator) { - var other = ''; - var res = ''; - var lastPos = 0; - var end = ''; - var skipped = false; - if (util === undefined) util = require('util'); - const actualLines = inspectValue(actual); - const expectedLines = inspectValue(expected); - const msg = READABLE_OPERATOR[operator] + - `:\n${green}+ expected${white} ${red}- actual${white}`; - const skippedMsg = ` ${blue}...${white} Lines skipped`; - - // Remove all ending lines that match (this optimizes the output for - // readability by reducing the number of total changed lines). - var a = actualLines[actualLines.length - 1]; - var b = expectedLines[expectedLines.length - 1]; - var i = 0; - while (a === b) { - if (i++ < 2) { - end = `\n ${a}${end}`; - } else { - other = a; - } - actualLines.pop(); - expectedLines.pop(); - if (actualLines.length === 0 || expectedLines.length === 0) - break; - a = actualLines[actualLines.length - 1]; - b = expectedLines[expectedLines.length - 1]; - } - if (i > 3) { - end = `\n${blue}...${white}${end}`; - skipped = true; - } - if (other !== '') { - end = `\n ${other}${end}`; - other = ''; - } - - const maxLines = Math.max(actualLines.length, expectedLines.length); - var printedLines = 0; - var identical = 0; - for (i = 0; i < maxLines; i++) { - // Only extra expected lines exist - const cur = i - lastPos; - if (actualLines.length < i + 1) { - if (cur > 1 && i > 2) { - if (cur > 4) { - res += `\n${blue}...${white}`; - skipped = true; - } else if (cur > 3) { - res += `\n ${expectedLines[i - 2]}`; - printedLines++; - } - res += `\n ${expectedLines[i - 1]}`; - printedLines++; - } - lastPos = i; - other += `\n${green}+${white} ${expectedLines[i]}`; - printedLines++; - // Only extra actual lines exist - } else if (expectedLines.length < i + 1) { - if (cur > 1 && i > 2) { - if (cur > 4) { - res += `\n${blue}...${white}`; - skipped = true; - } else if (cur > 3) { - res += `\n ${actualLines[i - 2]}`; - printedLines++; - } - res += `\n ${actualLines[i - 1]}`; - printedLines++; - } - lastPos = i; - res += `\n${red}-${white} ${actualLines[i]}`; - printedLines++; - // Lines diverge - } else if (actualLines[i] !== expectedLines[i]) { - if (cur > 1 && i > 2) { - if (cur > 4) { - res += `\n${blue}...${white}`; - skipped = true; - } else if (cur > 3) { - res += `\n ${actualLines[i - 2]}`; - printedLines++; - } - res += `\n ${actualLines[i - 1]}`; - printedLines++; - } - lastPos = i; - res += `\n${red}-${white} ${actualLines[i]}`; - other += `\n${green}+${white} ${expectedLines[i]}`; - printedLines += 2; - // Lines are identical - } else { - res += other; - other = ''; - if (cur === 1 || i === 0) { - res += `\n ${actualLines[i]}`; - printedLines++; - } - identical++; - } - // Inspected object to big (Show ~20 rows max) - if (printedLines > 20 && i < maxLines - 2) { - return `${msg}${skippedMsg}\n${res}\n${blue}...${white}${other}\n` + - `${blue}...${white}`; - } - } - - // Strict equal with identical objects that are not identical by reference. - if (identical === maxLines) { - // E.g., assert.deepStrictEqual(Symbol(), Symbol()) - const base = operator === 'strictEqual' ? - 'Input objects identical but not reference equal:' : - 'Input objects not identical:'; - - // We have to get the result again. The lines were all removed before. - const actualLines = inspectValue(actual); - - // Only remove lines in case it makes sense to collapse those. - // TODO: Accept env to always show the full error. - if (actualLines.length > 30) { - actualLines[26] = `${blue}...${white}`; - while (actualLines.length > 27) { - actualLines.pop(); - } - } - - return `${base}\n\n${actualLines.join('\n')}\n`; - } - return `${msg}${skipped ? skippedMsg : ''}\n${res}${other}${end}`; -} - -class AssertionError extends Error { - constructor(options) { - if (typeof options !== 'object' || options === null) { - throw new codes.ERR_INVALID_ARG_TYPE('options', 'Object', options); - } - var { - actual, - expected, - message, - operator, - stackStartFn - } = options; - - if (message != null) { - super(message); - } else { - if (process.stdout.isTTY) { - // Reset on each call to make sure we handle dynamically set environment - // variables correct. - if (process.stdout.getColorDepth() !== 1) { - blue = '\u001b[34m'; - green = '\u001b[32m'; - white = '\u001b[39m'; - red = '\u001b[31m'; - } else { - blue = ''; - green = ''; - white = ''; - red = ''; - } - } - if (util === undefined) util = require('util'); - // Prevent the error stack from being visible by duplicating the error - // in a very close way to the original in case both sides are actually - // instances of Error. - if (typeof actual === 'object' && actual !== null && - typeof expected === 'object' && expected !== null && - 'stack' in actual && actual instanceof Error && - 'stack' in expected && expected instanceof Error) { - actual = copyError(actual); - expected = copyError(expected); - } - - if (operator === 'deepStrictEqual' || operator === 'strictEqual') { - super(createErrDiff(actual, expected, operator)); - } else if (operator === 'notDeepStrictEqual' || - operator === 'notStrictEqual') { - // In case the objects are equal but the operator requires unequal, show - // the first object and say A equals B - const res = inspectValue(actual); - const base = `Identical input passed to ${operator}:`; - - // Only remove lines in case it makes sense to collapse those. - // TODO: Accept env to always show the full error. - if (res.length > 30) { - res[26] = `${blue}...${white}`; - while (res.length > 27) { - res.pop(); - } - } - - // Only print a single input. - if (res.length === 1) { - super(`${base} ${res[0]}`); - } else { - super(`${base}\n\n${res.join('\n')}\n`); - } - } else { - let res = util.inspect(actual); - let other = util.inspect(expected); - if (res.length > 128) - res = `${res.slice(0, 125)}...`; - if (other.length > 128) - other = `${other.slice(0, 125)}...`; - super(`${res} ${operator} ${other}`); - } - } - - this.generatedMessage = !message; - this.name = 'AssertionError [ERR_ASSERTION]'; - this.code = 'ERR_ASSERTION'; - this.actual = actual; - this.expected = expected; - this.operator = operator; - Error.captureStackTrace(this, stackStartFn); - } -} - -// This is defined here instead of using the assert module to avoid a -// circular dependency. The effect is largely the same. -function internalAssert(condition, message) { - if (!condition) { - throw new AssertionError({ - message, - actual: false, - expected: true, - operator: '==' - }); - } -} - function getMessage(key, args) { const msg = messages.get(key); + if (util === undefined) util = require('util'); + if (assert === undefined) assert = require('assert'); if (typeof msg === 'function') { - internalAssert( + assert( msg.length <= args.length, // Default options do not count. `Code: ${key}; The provided arguments length (${args.length}) does not ` + `match the required ones (${msg.length}).` @@ -497,7 +221,7 @@ function getMessage(key, args) { } const expectedLength = (msg.match(/%[dfijoOs]/g) || []).length; - internalAssert( + assert( expectedLength === args.length, `Code: ${key}; The provided arguments length (${args.length}) does not ` + `match the required ones (${expectedLength}).` @@ -693,11 +417,9 @@ module.exports = { uvException, isStackOverflowError, getMessage, - AssertionError, SystemError, codes, - E, // This is exported only to facilitate testing. - errorCache: new Map() // This is in here only to facilitate testing. + E // This is exported only to facilitate testing. }; // To declare an error message, use the E(sym, val, def) function above. The sym @@ -1045,7 +767,7 @@ E('ERR_VM_MODULE_STATUS', 'Module status %s', Error); E('ERR_ZLIB_INITIALIZATION_FAILED', 'Initialization failed', Error); function invalidArgType(name, expected, actual) { - internalAssert(typeof name === 'string', 'name must be a string'); + assert(typeof name === 'string', "'name' must be a string"); // determiner: 'must be' or 'must not be' let determiner; @@ -1071,7 +793,7 @@ function invalidArgType(name, expected, actual) { } function missingArgs(...args) { - internalAssert(args.length > 0, 'At least one arg needs to be specified'); + assert(args.length > 0, 'At least one arg needs to be specified'); let msg = 'The '; const len = args.length; args = args.map((a) => `"${a}"`); @@ -1091,11 +813,11 @@ function missingArgs(...args) { } function oneOf(expected, thing) { - internalAssert(typeof thing === 'string', '`thing` has to be of type string'); + assert(typeof thing === 'string', '`thing` has to be of type string'); if (Array.isArray(expected)) { const len = expected.length; - internalAssert(len > 0, - 'At least one expected value needs to be specified'); + assert(len > 0, + 'At least one expected value needs to be specified'); expected = expected.map((i) => String(i)); if (len > 2) { return `one of ${thing} ${expected.slice(0, len - 1).join(', ')}, or ` + diff --git a/node.gyp b/node.gyp index 851fdb8c04cc81..621669e514f139 100644 --- a/node.gyp +++ b/node.gyp @@ -79,6 +79,7 @@ 'lib/v8.js', 'lib/vm.js', 'lib/zlib.js', + 'lib/internal/assert.js', 'lib/internal/async_hooks.js', 'lib/internal/buffer.js', 'lib/internal/cli_table.js', diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js index cbcda17ab7188d..cab6fb33e1887a 100644 --- a/test/parallel/test-assert.js +++ b/test/parallel/test-assert.js @@ -29,7 +29,7 @@ const common = require('../common'); const assert = require('assert'); const { EOL } = require('os'); const EventEmitter = require('events'); -const { errorCache } = require('internal/errors'); +const { errorCache } = require('internal/assert'); const { writeFileSync, unlinkSync } = require('fs'); const { inspect } = require('util'); const a = assert; From c24443670785ff98b9a9ecc19fbf53cf6d020c72 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Wed, 2 May 2018 16:30:54 +0200 Subject: [PATCH 025/208] errors: move functions to error code This makes sure the functions are actually directly beneath the specification of an error code. That way it is not necessary to jump around when looking at the functionality. PR-URL: https://github.com/nodejs/node/pull/20486 Reviewed-By: James M Snell Reviewed-By: Joyee Cheung Reviewed-By: Trivikram Kamat --- lib/internal/errors.js | 189 ++++++++++++++++++++--------------------- 1 file changed, 92 insertions(+), 97 deletions(-) diff --git a/lib/internal/errors.js b/lib/internal/errors.js index 0a46e2e7a9946c..b9db40abd3b4c9 100644 --- a/lib/internal/errors.js +++ b/lib/internal/errors.js @@ -410,6 +410,26 @@ function isStackOverflowError(err) { err.message === maxStack_ErrorMessage; } +function oneOf(expected, thing) { + assert(typeof thing === 'string', '`thing` has to be of type string'); + if (Array.isArray(expected)) { + const len = expected.length; + assert(len > 0, + 'At least one expected value needs to be specified'); + expected = expected.map((i) => String(i)); + if (len > 2) { + return `one of ${thing} ${expected.slice(0, len - 1).join(', ')}, or ` + + expected[len - 1]; + } else if (len === 2) { + return `one of ${thing} ${expected[0]} or ${expected[1]}`; + } else { + return `of ${thing} ${expected[0]}`; + } + } else { + return `of ${thing} ${String(expected)}`; + } +} + module.exports = { dnsException, errnoException, @@ -444,7 +464,15 @@ E('ERR_ARG_NOT_ITERABLE', '%s must be iterable', TypeError); E('ERR_ASSERTION', '%s', Error); E('ERR_ASYNC_CALLBACK', '%s must be a function', TypeError); E('ERR_ASYNC_TYPE', 'Invalid name for async "type": %s', TypeError); -E('ERR_BUFFER_OUT_OF_BOUNDS', bufferOutOfBounds, RangeError); +E('ERR_BUFFER_OUT_OF_BOUNDS', + // Using a default argument here is important so the argument is not counted + // towards `Function#length`. + (name = undefined) => { + if (name) { + return `"${name}" is outside of buffer bounds`; + } + return 'Attempt to write outside buffer bounds'; + }, RangeError); E('ERR_BUFFER_TOO_LARGE', `Cannot create a Buffer larger than 0x${kMaxLength.toString(16)} bytes`, RangeError); @@ -582,7 +610,32 @@ E('ERR_INSPECTOR_CLOSED', 'Session was closed', Error); E('ERR_INSPECTOR_NOT_AVAILABLE', 'Inspector is not available', Error); E('ERR_INSPECTOR_NOT_CONNECTED', 'Session is not connected', Error); E('ERR_INVALID_ADDRESS_FAMILY', 'Invalid address family: %s', RangeError); -E('ERR_INVALID_ARG_TYPE', invalidArgType, TypeError); +E('ERR_INVALID_ARG_TYPE', + (name, expected, actual) => { + assert(typeof name === 'string', "'name' must be a string"); + + // determiner: 'must be' or 'must not be' + let determiner; + if (typeof expected === 'string' && expected.startsWith('not ')) { + determiner = 'must not be'; + expected = expected.replace(/^not /, ''); + } else { + determiner = 'must be'; + } + + let msg; + if (name.endsWith(' argument')) { + // For cases like 'first argument' + msg = `The ${name} ${determiner} ${oneOf(expected, 'type')}`; + } else { + const type = name.includes('.') ? 'property' : 'argument'; + msg = `The "${name}" ${type} ${determiner} ${oneOf(expected, 'type')}`; + } + + // TODO(BridgeAR): Improve the output by showing `null` and similar. + msg += `. Received type ${typeof actual}`; + return msg; + }, TypeError); E('ERR_INVALID_ARG_VALUE', (name, value, reason = 'is invalid') => { let inspected = util.inspect(value); if (inspected.length > 128) { @@ -598,7 +651,16 @@ E('ERR_INVALID_ASYNC_ID', 'Invalid %s value: %s', RangeError); E('ERR_INVALID_BUFFER_SIZE', 'Buffer size must be a multiple of %s', RangeError); E('ERR_INVALID_CALLBACK', 'Callback must be a function', TypeError); -E('ERR_INVALID_CHAR', invalidChar, TypeError); +E('ERR_INVALID_CHAR', + // Using a default argument here is important so the argument is not counted + // towards `Function#length`. + (name, field = undefined) => { + let msg = `Invalid character in ${name}`; + if (field !== undefined) { + msg += ` ["${field}"]`; + } + return msg; + }, TypeError); E('ERR_INVALID_CURSOR_POS', 'Cannot set cursor row without setting its column', TypeError); E('ERR_INVALID_DOMAIN_NAME', 'Unable to determine the domain name', TypeError); @@ -648,7 +710,26 @@ E('ERR_IPC_DISCONNECTED', 'IPC channel is already disconnected', Error); E('ERR_IPC_ONE_PIPE', 'Child process can have only one IPC pipe', Error); E('ERR_IPC_SYNC_FORK', 'IPC cannot be used with synchronous forks', Error); E('ERR_METHOD_NOT_IMPLEMENTED', 'The %s method is not implemented', Error); -E('ERR_MISSING_ARGS', missingArgs, TypeError); +E('ERR_MISSING_ARGS', + (...args) => { + assert(args.length > 0, 'At least one arg needs to be specified'); + let msg = 'The '; + const len = args.length; + args = args.map((a) => `"${a}"`); + switch (len) { + case 1: + msg += `${args[0]} argument`; + break; + case 2: + msg += `${args[0]} and ${args[1]} arguments`; + break; + default: + msg += args.slice(0, len - 1).join(', '); + msg += `, and ${args[len - 1]} arguments`; + break; + } + return `${msg} must be specified`; + }, TypeError); E('ERR_MISSING_MODULE', 'Cannot find module %s', Error); E('ERR_MODULE_RESOLUTION_LEGACY', '%s not found by import in %s.' + @@ -669,7 +750,13 @@ E('ERR_NO_CRYPTO', E('ERR_NO_ICU', '%s is not supported on Node.js compiled without ICU', TypeError); E('ERR_NO_LONGER_SUPPORTED', '%s is no longer supported', Error); -E('ERR_OUT_OF_RANGE', outOfRange, RangeError); +E('ERR_OUT_OF_RANGE', + (name, range, value) => { + let msg = `The value of "${name}" is out of range.`; + if (range !== undefined) msg += ` It must be ${range}.`; + msg += ` Received ${value}`; + return msg; + }, RangeError); E('ERR_REQUIRE_ESM', 'Must use import to load ES Module: %s', Error); E('ERR_SCRIPT_EXECUTION_INTERRUPTED', 'Script execution was interrupted by `SIGINT`.', Error); @@ -765,95 +852,3 @@ E('ERR_VM_MODULE_NOT_MODULE', 'Provided module is not an instance of Module', Error); E('ERR_VM_MODULE_STATUS', 'Module status %s', Error); E('ERR_ZLIB_INITIALIZATION_FAILED', 'Initialization failed', Error); - -function invalidArgType(name, expected, actual) { - assert(typeof name === 'string', "'name' must be a string"); - - // determiner: 'must be' or 'must not be' - let determiner; - if (typeof expected === 'string' && expected.startsWith('not ')) { - determiner = 'must not be'; - expected = expected.replace(/^not /, ''); - } else { - determiner = 'must be'; - } - - let msg; - if (name.endsWith(' argument')) { - // For cases like 'first argument' - msg = `The ${name} ${determiner} ${oneOf(expected, 'type')}`; - } else { - const type = name.includes('.') ? 'property' : 'argument'; - msg = `The "${name}" ${type} ${determiner} ${oneOf(expected, 'type')}`; - } - - // TODO(BridgeAR): Improve the output by showing `null` and similar. - msg += `. Received type ${typeof actual}`; - return msg; -} - -function missingArgs(...args) { - assert(args.length > 0, 'At least one arg needs to be specified'); - let msg = 'The '; - const len = args.length; - args = args.map((a) => `"${a}"`); - switch (len) { - case 1: - msg += `${args[0]} argument`; - break; - case 2: - msg += `${args[0]} and ${args[1]} arguments`; - break; - default: - msg += args.slice(0, len - 1).join(', '); - msg += `, and ${args[len - 1]} arguments`; - break; - } - return `${msg} must be specified`; -} - -function oneOf(expected, thing) { - assert(typeof thing === 'string', '`thing` has to be of type string'); - if (Array.isArray(expected)) { - const len = expected.length; - assert(len > 0, - 'At least one expected value needs to be specified'); - expected = expected.map((i) => String(i)); - if (len > 2) { - return `one of ${thing} ${expected.slice(0, len - 1).join(', ')}, or ` + - expected[len - 1]; - } else if (len === 2) { - return `one of ${thing} ${expected[0]} or ${expected[1]}`; - } else { - return `of ${thing} ${expected[0]}`; - } - } else { - return `of ${thing} ${String(expected)}`; - } -} - -// Using a default argument here is important so the argument is not counted -// towards `Function#length`. -function bufferOutOfBounds(name = undefined) { - if (name) { - return `"${name}" is outside of buffer bounds`; - } - return 'Attempt to write outside buffer bounds'; -} - -// Using a default argument here is important so the argument is not counted -// towards `Function#length`. -function invalidChar(name, field = undefined) { - let msg = `Invalid character in ${name}`; - if (field !== undefined) { - msg += ` ["${field}"]`; - } - return msg; -} - -function outOfRange(name, range, value) { - let msg = `The value of "${name}" is out of range.`; - if (range !== undefined) msg += ` It must be ${range}.`; - msg += ` Received ${value}`; - return msg; -} From e93726ad10ee240c8b86a5522f69144eeb9a06f5 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 9 May 2018 19:52:53 +0200 Subject: [PATCH 026/208] src: fix nullptr dereference for signal during startup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a test failure when running `test/parallel/test-child-process-spawnsync-kill-signal.js` under load. What would happen is that `SignalExit()` tries to shutdown the tracing agent, which might not have been set up by the point that Node.js receives the signal. PR-URL: https://github.com/nodejs/node/pull/20637 Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Tobias Nießen Reviewed-By: Ben Noordhuis --- src/node.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/node.cc b/src/node.cc index 704bdc334b2f9c..bcc3971bbe2fb7 100644 --- a/src/node.cc +++ b/src/node.cc @@ -326,7 +326,8 @@ static struct { } void StopTracingAgent() { - tracing_agent_->Stop(); + if (tracing_agent_) + tracing_agent_->Stop(); } tracing::Agent* GetTracingAgent() const { From bb857d9e71e98614a6ca9efc6363be565dc4df54 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Wed, 2 May 2018 16:59:49 +0200 Subject: [PATCH 027/208] assert: make sure throws is able to handle primitives MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes some possible issues with `assert.throws` and `assert.rejects` in combination with an validation object. It will now properly handle primitive values being thrown as error. It also makes sure the `generatedMessage` property is properly set if `assert.throws` or `assert.rejects` is used in combination with an validation object and improves the error performance in such cases by only creating the error once. In addition it will fix detecting regular expressions from a different context such as n-api that are passed through as validator for `assert.throws` or `assert.rejects`. Until now those were not tested. PR-URL: https://github.com/nodejs/node/pull/20482 Reviewed-By: James M Snell Reviewed-By: Michaël Zasso --- lib/assert.js | 30 +++++++++++++++---- test/message/assert_throws_stack.out | 4 +-- test/parallel/test-assert.js | 45 ++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 7 deletions(-) diff --git a/lib/assert.js b/lib/assert.js index 27e71c2751ed74..8bcdc8cdacb3ee 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -382,16 +382,16 @@ function compareExceptionKey(actual, expected, key, message, keys) { const a = new Comparison(actual, keys); const b = new Comparison(expected, keys, actual); - const tmpLimit = Error.stackTraceLimit; - Error.stackTraceLimit = 0; const err = new AssertionError({ actual: a, expected: b, operator: 'deepStrictEqual', stackStartFn: assert.throws }); - Error.stackTraceLimit = tmpLimit; - message = err.message; + err.actual = actual; + err.expected = expected; + err.operator = 'throws'; + throw err; } innerFail({ actual, @@ -405,7 +405,7 @@ function compareExceptionKey(actual, expected, key, message, keys) { function expectedException(actual, expected, msg) { if (typeof expected !== 'function') { - if (expected instanceof RegExp) + if (isRegExp(expected)) return expected.test(actual); // assert.doesNotThrow does not accept objects. if (arguments.length === 2) { @@ -413,6 +413,26 @@ function expectedException(actual, expected, msg) { 'expected', ['Function', 'RegExp'], expected ); } + + // TODO: Disallow primitives as error argument. + // This is here to prevent a breaking change. + if (typeof expected !== 'object') { + return true; + } + + // Handle primitives properly. + if (typeof actual !== 'object' || actual === null) { + const err = new AssertionError({ + actual, + expected, + message: msg, + operator: 'deepStrictEqual', + stackStartFn: assert.throws + }); + err.operator = 'throws'; + throw err; + } + const keys = Object.keys(expected); // Special handle errors to make sure the name and the message are compared // as well. diff --git a/test/message/assert_throws_stack.out b/test/message/assert_throws_stack.out index 62a25a63673dcf..3d5f4de4cf26a6 100644 --- a/test/message/assert_throws_stack.out +++ b/test/message/assert_throws_stack.out @@ -1,6 +1,6 @@ assert.js:* - throw new AssertionError(obj); - ^ + throw err; + ^ AssertionError [ERR_ASSERTION]: Input A expected to strictly deep-equal input B: + expected - actual diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js index cab6fb33e1887a..dba40c0a0e3c42 100644 --- a/test/parallel/test-assert.js +++ b/test/parallel/test-assert.js @@ -740,7 +740,9 @@ common.expectsError( const frames = err.stack.split('\n'); const [, filename, line, column] = frames[1].match(/\((.+):(\d+):(\d+)\)/); // Reset the cache to check again + const size = errorCache.size; errorCache.delete(`${filename}${line - 1}${column - 1}`); + assert.strictEqual(errorCache.size, size - 1); const data = `${'\n'.repeat(line - 1)}${' '.repeat(column - 1)}` + 'ok(failed(badly));'; try { @@ -849,6 +851,7 @@ common.expectsError( { name: 'AssertionError [ERR_ASSERTION]', code: 'ERR_ASSERTION', + generatedMessage: true, message: `${start}\n${actExp}\n\n` + " Comparison {\n name: 'Error',\n- message: 'foo'" + "\n+ message: ''\n }" @@ -940,3 +943,45 @@ assert.throws( ' }' } ); + +{ + let actual = null; + const expected = { message: 'foo' }; + assert.throws( + () => assert.throws( + () => { throw actual; }, + expected + ), + { + operator: 'throws', + actual, + expected, + generatedMessage: true, + message: `${start}\n${actExp}\n\n` + + '- null\n' + + '+ {\n' + + "+ message: 'foo'\n" + + '+ }' + } + ); + + actual = 'foobar'; + const message = 'message'; + assert.throws( + () => assert.throws( + () => { throw actual; }, + { message: 'foobar' }, + message + ), + { + actual, + message, + operator: 'throws', + generatedMessage: false + } + ); +} + +// TODO: This case is only there to make sure there is no breaking change. +// eslint-disable-next-line no-restricted-syntax, no-throw-literal +assert.throws(() => { throw 4; }, 4); From db457cb6a0b699f2ca16c612546a85c68ac3823f Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 10 May 2018 14:27:56 +0200 Subject: [PATCH 028/208] src: fix typo in util.h comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/20656 Reviewed-By: Michaël Zasso Reviewed-By: James M Snell --- src/util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util.h b/src/util.h index 133899008fb7ce..b2f357b8e87edc 100644 --- a/src/util.h +++ b/src/util.h @@ -211,7 +211,7 @@ inline v8::Local PersistentToLocal( v8::Isolate* isolate, const Persistent& persistent); -// Unchecked conversion from a non-weak Persistent to Local, +// Unchecked conversion from a non-weak Persistent to Local, // use with care! // // Do not call persistent.Reset() while the returned Local is still in From 3929516a6f2747ac50d0f94ccd3a26df9dff3930 Mon Sep 17 00:00:00 2001 From: Vse Mozhet Byt Date: Tue, 8 May 2018 17:49:38 +0300 Subject: [PATCH 029/208] doc: fix nits in doc/api_assets/style.css MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Merge rule sets for identical selectors. 2. Delete impossible selector block: we have only stability indexes 0, 1, and 2, so there can't be `.api_stability_3` class. Refs: nodejs.org/api/documentation.html#documentation_stability_index PR-URL: https://github.com/nodejs/node/pull/20601 Refs: https://nodejs.org/api/documentation.html#documentation_stability_index Reviewed-By: James M Snell Reviewed-By: Luigi Pinca Reviewed-By: Jon Moss Reviewed-By: Trivikram Kamat Reviewed-By: Tobias Nießen --- doc/api_assets/style.css | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/doc/api_assets/style.css b/doc/api_assets/style.css index 1e7baad4ab676c..97ef2a5b892ac4 100644 --- a/doc/api_assets/style.css +++ b/doc/api_assets/style.css @@ -29,6 +29,9 @@ h6 { font-size: 1rem } h1, h2, h3, h4, h5, h6 { margin: 1.5rem 0 1rem; + text-rendering: optimizeLegibility; + font-weight: 700; + position: relative; } pre, tt, code, .pre, span.type, a.type { @@ -183,10 +186,6 @@ ol.version-picker li:last-child a { background-color: #4EBA0F; } -.api_stability_3 { - background-color: #0084B6; -} - .api_metadata { font-size: .85rem; margin-bottom: 1rem; @@ -226,6 +225,8 @@ table { th, td { border: 1px solid #aaa; + padding: .75rem 1rem .75rem 1rem; + vertical-align: top; } th { @@ -259,12 +260,6 @@ dd + dt.pre { margin-top: 1.6rem; } -h1, h2, h3, h4, h5, h6 { - text-rendering: optimizeLegibility; - font-weight: 700; - position: relative; -} - #apicontent { padding-top: 1rem; } @@ -373,9 +368,6 @@ hr { #toc .stability_0::after { background-color: #d50027; color: #fff; -} - -#toc .stability_0::after { content: "deprecated"; margin-left: .25rem; padding: 1px 3px; @@ -493,11 +485,6 @@ span > .mark:hover, span > .mark:focus, span > .mark:active { background: none; } -th, td { - padding: .75rem 1rem .75rem 1rem; - vertical-align: top; -} - th > *:last-child, td > *:last-child { margin-bottom: 0; } From 41e1dc09dedc592b5c6dded64b18bc0fad9b8211 Mon Sep 17 00:00:00 2001 From: Benjamin Coe Date: Fri, 4 May 2018 13:45:57 -0700 Subject: [PATCH 030/208] test: add regression test for #11257 Refs: https://github.com/nodejs/node/issues/11257 PR-URL: https://github.com/nodejs/node/pull/20391 Reviewed-By: Anatoli Papirovski Reviewed-By: James M Snell Reviewed-By: Michael Dawson Reviewed-By: Tiancheng "Timothy" Gu --- test/parallel/test-stdio-pipe-stderr.js | 37 +++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 test/parallel/test-stdio-pipe-stderr.js diff --git a/test/parallel/test-stdio-pipe-stderr.js b/test/parallel/test-stdio-pipe-stderr.js new file mode 100644 index 00000000000000..06e93429d03f6d --- /dev/null +++ b/test/parallel/test-stdio-pipe-stderr.js @@ -0,0 +1,37 @@ +'use strict'; +require('../common'); +const tmpdir = require('../common/tmpdir'); +const assert = require('assert'); +const fs = require('fs'); +const join = require('path').join; +const spawn = require('child_process').spawnSync; + +// Test that invoking node with require, and piping stderr to file, +// does not result in exception, +// see: https://github.com/nodejs/node/issues/11257 + +tmpdir.refresh(); +const fakeModulePath = join(tmpdir.path, 'batman.js'); +const stderrOutputPath = join(tmpdir.path, 'stderr-output.txt'); +// we need to redirect stderr to a file to produce #11257 +const stream = fs.createWriteStream(stderrOutputPath); + +// the error described in #11257 only happens when we require a +// non-built-in module. +fs.writeFileSync(fakeModulePath, '', 'utf8'); + +stream.on('open', () => { + spawn(process.execPath, { + input: `require("${fakeModulePath.replace(/\\/g, '/')}")`, + stdio: ['pipe', 'pipe', stream] + }); + const stderr = fs.readFileSync(stderrOutputPath, 'utf8').trim(); + assert.strictEqual( + stderr, + '', + `piping stderr to file should not result in exception: ${stderr}` + ); + stream.end(); + fs.unlinkSync(stderrOutputPath); + fs.unlinkSync(fakeModulePath); +}); From 56530f084499dba826f93a7b09b8d04ec4cc5df0 Mon Sep 17 00:00:00 2001 From: Jeremiah Senkpiel Date: Wed, 25 Apr 2018 12:45:34 -0400 Subject: [PATCH 031/208] timers: make timer.refresh() a public API Originally added in bb5575aa75fd3071724d5eccde39a3041e1af57a discussions such as https://github.com/nodejs/node/issues/20261 show the usefulness of this API to the Node.js ecosystem. PR-URL: https://github.com/nodejs/node/pull/20298 Reviewed-By: Anatoli Papirovski Reviewed-By: Anna Henningsen Reviewed-By: Rich Trott Reviewed-By: Colin Ihrig Reviewed-By: Ujjwal Sharma Reviewed-By: Trivikram Kamat Reviewed-By: James M Snell Reviewed-By: Tiancheng "Timothy" Gu --- doc/api/timers.md | 15 +++++++++++++++ lib/internal/http2/core.js | 7 +++---- lib/internal/timers.js | 6 +++--- lib/net.js | 5 ++--- test/parallel/test-timers-refresh.js | 25 +++++++++++++++++++++---- 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/doc/api/timers.md b/doc/api/timers.md index 376b5312e5a41a..c573d2afdb9e21 100644 --- a/doc/api/timers.md +++ b/doc/api/timers.md @@ -74,6 +74,21 @@ When called, requests that the Node.js event loop *not* exit so long as the By default, all `Timeout` objects are "ref'ed", making it normally unnecessary to call `timeout.ref()` unless `timeout.unref()` had been called previously. +### timeout.refresh() + + +* Returns: {Timeout} a reference to `timeout` + +Sets the timer's start time to the current time, and reschedules the timer to +call its callback at the previously specified duration adjusted to the current +time. This is useful for refreshing a timer without allocating a new +JavaScript object. + +Using this on a timer that has already called its callback will reactivate the +timer. + ### timeout.unref() + +* Returns: {boolean} + +Returns `true` if the value is an instance of a [Module Namespace Object][]. + +For example: + + +```js +import * as ns from './a.js'; + +util.types.isModuleNamespaceObject(ns); // Returns true +``` + ### util.types.isNativeError(value) diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js index 828370f6eadd01..7dc44d5bbe28fb 100644 --- a/lib/internal/bootstrap/loaders.js +++ b/lib/internal/bootstrap/loaders.js @@ -41,10 +41,26 @@ (function bootstrapInternalLoaders(process, getBinding, getLinkedBinding, getInternalBinding) { + const { + apply: ReflectApply, + deleteProperty: ReflectDeleteProperty, + get: ReflectGet, + getOwnPropertyDescriptor: ReflectGetOwnPropertyDescriptor, + has: ReflectHas, + set: ReflectSet, + } = Reflect; + const { + prototype: { + hasOwnProperty: ObjectHasOwnProperty, + }, + create: ObjectCreate, + defineProperty: ObjectDefineProperty, + keys: ObjectKeys, + } = Object; // Set up process.moduleLoadList const moduleLoadList = []; - Object.defineProperty(process, 'moduleLoadList', { + ObjectDefineProperty(process, 'moduleLoadList', { value: moduleLoadList, configurable: true, enumerable: true, @@ -53,7 +69,7 @@ // Set up process.binding() and process._linkedBinding() { - const bindingObj = Object.create(null); + const bindingObj = ObjectCreate(null); process.binding = function binding(module) { module = String(module); @@ -77,7 +93,7 @@ // Set up internalBinding() in the closure let internalBinding; { - const bindingObj = Object.create(null); + const bindingObj = ObjectCreate(null); internalBinding = function internalBinding(module) { let mod = bindingObj[module]; if (typeof mod !== 'object') { @@ -95,6 +111,8 @@ this.filename = `${id}.js`; this.id = id; this.exports = {}; + this.reflect = undefined; + this.exportKeys = undefined; this.loaded = false; this.loading = false; } @@ -193,6 +211,12 @@ '\n});' ]; + const getOwn = (target, property, receiver) => { + return ReflectApply(ObjectHasOwnProperty, target, [property]) ? + ReflectGet(target, property, receiver) : + undefined; + }; + NativeModule.prototype.compile = function() { let source = NativeModule.getSource(this.id); source = NativeModule.wrap(source); @@ -208,6 +232,60 @@ NativeModule.require; fn(this.exports, requireFn, this, process); + if (config.experimentalModules && !NativeModule.isInternal(this.id)) { + this.exportKeys = ObjectKeys(this.exports); + + const update = (property, value) => { + if (this.reflect !== undefined && + ReflectApply(ObjectHasOwnProperty, + this.reflect.exports, [property])) + this.reflect.exports[property].set(value); + }; + + const handler = { + __proto__: null, + defineProperty: (target, prop, descriptor) => { + // Use `Object.defineProperty` instead of `Reflect.defineProperty` + // to throw the appropriate error if something goes wrong. + ObjectDefineProperty(target, prop, descriptor); + if (typeof descriptor.get === 'function' && + !ReflectHas(handler, 'get')) { + handler.get = (target, prop, receiver) => { + const value = ReflectGet(target, prop, receiver); + if (ReflectApply(ObjectHasOwnProperty, target, [prop])) + update(prop, value); + return value; + }; + } + update(prop, getOwn(target, prop)); + return true; + }, + deleteProperty: (target, prop) => { + if (ReflectDeleteProperty(target, prop)) { + update(prop, undefined); + return true; + } + return false; + }, + set: (target, prop, value, receiver) => { + const descriptor = ReflectGetOwnPropertyDescriptor(target, prop); + if (ReflectSet(target, prop, value, receiver)) { + if (descriptor && typeof descriptor.set === 'function') { + for (const key of this.exportKeys) { + update(key, getOwn(target, key, receiver)); + } + } else { + update(prop, getOwn(target, prop, receiver)); + } + return true; + } + return false; + } + }; + + this.exports = new Proxy(this.exports, handler); + } + this.loaded = true; } finally { this.loading = false; diff --git a/lib/internal/modules/esm/create_dynamic_module.js b/lib/internal/modules/esm/create_dynamic_module.js index e0c97263631432..c01844feb8b654 100644 --- a/lib/internal/modules/esm/create_dynamic_module.js +++ b/lib/internal/modules/esm/create_dynamic_module.js @@ -52,9 +52,10 @@ const createDynamicModule = (exports, url = '', evaluate) => { const module = new ModuleWrap(reexports, `${url}`); module.link(async () => reflectiveModule); module.instantiate(); + reflect.namespace = module.namespace(); return { module, - reflect + reflect, }; }; diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js index d181647c4505e8..4ed6b2c3b023a9 100644 --- a/lib/internal/modules/esm/translators.js +++ b/lib/internal/modules/esm/translators.js @@ -59,11 +59,18 @@ translators.set('cjs', async (url) => { // through normal resolution translators.set('builtin', async (url) => { debug(`Translating BuiltinModule ${url}`); - return createDynamicModule(['default'], url, (reflect) => { - debug(`Loading BuiltinModule ${url}`); - const exports = NativeModule.require(url.slice(5)); - reflect.exports.default.set(exports); - }); + // slice 'node:' scheme + const id = url.slice(5); + NativeModule.require(id); + const module = NativeModule.getCached(id); + return createDynamicModule( + [...module.exportKeys, 'default'], url, (reflect) => { + debug(`Loading BuiltinModule ${url}`); + module.reflect = reflect; + for (const key of module.exportKeys) + reflect.exports[key].set(module.exports[key]); + reflect.exports.default.set(module.exports); + }); }); // Strategy for loading a node native module diff --git a/test/es-module/test-esm-dynamic-import.js b/test/es-module/test-esm-dynamic-import.js index c6daa95f9a6b98..91757172880f67 100644 --- a/test/es-module/test-esm-dynamic-import.js +++ b/test/es-module/test-esm-dynamic-import.js @@ -52,6 +52,7 @@ function expectFsNamespace(result) { Promise.resolve(result) .then(common.mustCall(ns => { assert.strictEqual(typeof ns.default.writeFile, 'function'); + assert.strictEqual(typeof ns.writeFile, 'function'); })); } diff --git a/test/es-module/test-esm-live-binding.mjs b/test/es-module/test-esm-live-binding.mjs new file mode 100644 index 00000000000000..d151e004dff4b2 --- /dev/null +++ b/test/es-module/test-esm-live-binding.mjs @@ -0,0 +1,143 @@ +// Flags: --experimental-modules + +import '../common'; +import assert from 'assert'; + +import fs, { readFile, readFileSync } from 'fs'; +import events, { defaultMaxListeners } from 'events'; +import util from 'util'; + +const readFileDescriptor = Reflect.getOwnPropertyDescriptor(fs, 'readFile'); +const readFileSyncDescriptor = + Reflect.getOwnPropertyDescriptor(fs, 'readFileSync'); + +const s = Symbol(); +const fn = () => s; + +Reflect.deleteProperty(fs, 'readFile'); + +assert.deepStrictEqual([fs.readFile, readFile], [undefined, undefined]); + +fs.readFile = fn; + +assert.deepStrictEqual([fs.readFile(), readFile()], [s, s]); + +Reflect.defineProperty(fs, 'readFile', { + value: fn, + configurable: true, + writable: true, +}); + +assert.deepStrictEqual([fs.readFile(), readFile()], [s, s]); + +Reflect.deleteProperty(fs, 'readFile'); + +assert.deepStrictEqual([fs.readFile, readFile], [undefined, undefined]); + +let count = 0; + +Reflect.defineProperty(fs, 'readFile', { + get() { return count; }, + configurable: true, +}); + +count++; + +assert.deepStrictEqual([readFile, fs.readFile, readFile], [0, 1, 1]); + +let otherValue; + +Reflect.defineProperty(fs, 'readFile', { // eslint-disable-line accessor-pairs + set(value) { + Reflect.deleteProperty(fs, 'readFile'); + otherValue = value; + }, + configurable: true, +}); + +Reflect.defineProperty(fs, 'readFileSync', { + get() { + return otherValue; + }, + configurable: true, +}); + +fs.readFile = 2; + +assert.deepStrictEqual([readFile, readFileSync], [undefined, 2]); + +Reflect.defineProperty(fs, 'readFile', readFileDescriptor); +Reflect.defineProperty(fs, 'readFileSync', readFileSyncDescriptor); + +const originDefaultMaxListeners = events.defaultMaxListeners; +const utilProto = util.__proto__; // eslint-disable-line no-proto + +count = 0; + +Reflect.defineProperty(Function.prototype, 'defaultMaxListeners', { + configurable: true, + enumerable: true, + get: function() { return ++count; }, + set: function(v) { + Reflect.defineProperty(this, 'defaultMaxListeners', { + configurable: true, + enumerable: true, + writable: true, + value: v, + }); + }, +}); + +assert.strictEqual(defaultMaxListeners, originDefaultMaxListeners); +assert.strictEqual(events.defaultMaxListeners, originDefaultMaxListeners); + +assert.strictEqual(++events.defaultMaxListeners, + originDefaultMaxListeners + 1); + +assert.strictEqual(defaultMaxListeners, originDefaultMaxListeners + 1); +assert.strictEqual(Function.prototype.defaultMaxListeners, 1); + +Function.prototype.defaultMaxListeners = 'foo'; + +assert.strictEqual(Function.prototype.defaultMaxListeners, 'foo'); +assert.strictEqual(events.defaultMaxListeners, originDefaultMaxListeners + 1); +assert.strictEqual(defaultMaxListeners, originDefaultMaxListeners + 1); + +count = 0; + +const p = { + get foo() { return ++count; }, + set foo(v) { + Reflect.defineProperty(this, 'foo', { + configurable: true, + enumerable: true, + writable: true, + value: v, + }); + }, +}; + +util.__proto__ = p; // eslint-disable-line no-proto + +assert.strictEqual(util.foo, 1); + +util.foo = 'bar'; + +assert.strictEqual(count, 1); +assert.strictEqual(util.foo, 'bar'); +assert.strictEqual(p.foo, 2); + +p.foo = 'foo'; + +assert.strictEqual(p.foo, 'foo'); + +events.defaultMaxListeners = originDefaultMaxListeners; +util.__proto__ = utilProto; // eslint-disable-line no-proto + +Reflect.deleteProperty(util, 'foo'); +Reflect.deleteProperty(Function.prototype, 'defaultMaxListeners'); + +assert.throws( + () => Object.defineProperty(events, 'defaultMaxListeners', { value: 3 }), + /TypeError: Cannot redefine/ +); diff --git a/test/es-module/test-esm-namespace.mjs b/test/es-module/test-esm-namespace.mjs index 04845e2b3e4da0..dcd159f6c8729a 100644 --- a/test/es-module/test-esm-namespace.mjs +++ b/test/es-module/test-esm-namespace.mjs @@ -2,5 +2,13 @@ import '../common'; import * as fs from 'fs'; import assert from 'assert'; +import Module from 'module'; -assert.deepStrictEqual(Object.keys(fs), ['default']); +const keys = Object.entries( + Object.getOwnPropertyDescriptors(new Module().require('fs'))) + .filter(([name, d]) => d.enumerable) + .map(([name]) => name) + .concat('default') + .sort(); + +assert.deepStrictEqual(Object.keys(fs).sort(), keys); diff --git a/test/fixtures/es-module-loaders/js-loader.mjs b/test/fixtures/es-module-loaders/js-loader.mjs index 2173b0b503ef45..9fa6b9eed4d029 100644 --- a/test/fixtures/es-module-loaders/js-loader.mjs +++ b/test/fixtures/es-module-loaders/js-loader.mjs @@ -1,10 +1,11 @@ -import _url from 'url'; +import { URL } from 'url'; + const builtins = new Set( Object.keys(process.binding('natives')).filter(str => /^(?!(?:internal|node|v8)\/)/.test(str)) ) -const baseURL = new _url.URL('file://'); +const baseURL = new URL('file://'); baseURL.pathname = process.cwd() + '/'; export function resolve (specifier, base = baseURL) { @@ -15,7 +16,7 @@ export function resolve (specifier, base = baseURL) { }; } // load all dependencies as esm, regardless of file extension - const url = new _url.URL(specifier, base).href; + const url = new URL(specifier, base).href; return { url, format: 'esm' From 1d7379d64112dda0ac3163f2bdcb17bfef3728d0 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Thu, 10 May 2018 11:47:15 -0400 Subject: [PATCH 035/208] doc: fix stability text for n-api MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While some places list n-api as stable, the reference in doc/api/addons.md was missed. This fixes that instance. Fixes: https://github.com/nodejs/node/issues/20645 PR-URL: https://github.com/nodejs/node/pull/20659 Reviewed-By: Vse Mozhet Byt Reviewed-By: Luigi Pinca Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Trivikram Kamat Reviewed-By: Anna Henningsen Reviewed-By: Tobias Nießen --- doc/api/addons.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/addons.md b/doc/api/addons.md index a207a71b717604..afbbdd843cb223 100644 --- a/doc/api/addons.md +++ b/doc/api/addons.md @@ -219,7 +219,7 @@ illustration of how it can be used. ## N-API -> Stability: 1 - Experimental +> Stability: 2 - Stable N-API is an API for building native Addons. It is independent from the underlying JavaScript runtime (e.g. V8) and is maintained as part of From e06c5874f6cb0bfe93ffda555136e37ebaacb6a7 Mon Sep 17 00:00:00 2001 From: musgravejw Date: Sat, 5 May 2018 01:43:12 -0400 Subject: [PATCH 036/208] doc: add global node_modules to require.resolve() PR-URL: https://github.com/nodejs/node/pull/20534 Fixes: https://github.com/nodejs/node/issues/18926 Reviewed-By: Benjamin Gruenbaum Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat --- doc/api/modules.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/api/modules.md b/doc/api/modules.md index c9b83859d99079..c46b30560da81f 100644 --- a/doc/api/modules.md +++ b/doc/api/modules.md @@ -175,7 +175,7 @@ LOAD_AS_DIRECTORY(X) 2. LOAD_INDEX(X) LOAD_NODE_MODULES(X, START) -1. let DIRS=NODE_MODULES_PATHS(START) +1. let DIRS = NODE_MODULES_PATHS(START) 2. for each DIR in DIRS: a. LOAD_AS_FILE(DIR/X) b. LOAD_AS_DIRECTORY(DIR/X) @@ -183,7 +183,7 @@ LOAD_NODE_MODULES(X, START) NODE_MODULES_PATHS(START) 1. let PARTS = path split(START) 2. let I = count of PARTS - 1 -3. let DIRS = [] +3. let DIRS = [GLOBAL_FOLDERS] 4. while I >= 0, a. if PARTS[I] = "node_modules" CONTINUE b. DIR = path join(PARTS[0 .. I] + "node_modules") @@ -419,7 +419,7 @@ when people are unaware that `NODE_PATH` must be set. Sometimes a module's dependencies change, causing a different version (or even a different module) to be loaded as the `NODE_PATH` is searched. -Additionally, Node.js will search in the following locations: +Additionally, Node.js will search in the following list of GLOBAL_FOLDERS: * 1: `$HOME/.node_modules` * 2: `$HOME/.node_libraries` @@ -649,9 +649,11 @@ changes: * `request` {string} The module path to resolve. * `options` {Object} * `paths` {string[]} Paths to resolve module location from. If present, these - paths are used instead of the default resolution paths. Note that each of - these paths is used as a starting point for the module resolution algorithm, - meaning that the `node_modules` hierarchy is checked from this location. + paths are used instead of the default resolution paths, with the exception + of [GLOBAL_FOLDERS][] like `$HOME/.node_modules`, which are always + included. Note that each of these paths is used as a starting point for + the module resolution algorithm, meaning that the `node_modules` hierarchy + is checked from this location. * Returns: {string} Use the internal `require()` machinery to look up the location of a module, @@ -891,6 +893,7 @@ const builtin = require('module').builtinModules; [`Error`]: errors.html#errors_class_error [`module` object]: #modules_the_module_object [`path.dirname()`]: path.html#path_path_dirname_path +[GLOBAL_FOLDERS]: #modules_loading_from_the_global_folders [exports shortcut]: #modules_exports_shortcut [module resolution]: #modules_all_together [module wrapper]: #modules_the_module_wrapper From de06115d18720755498fd871bccca837df024acb Mon Sep 17 00:00:00 2001 From: cjihrig Date: Wed, 9 May 2018 12:36:59 -0400 Subject: [PATCH 037/208] fs: make fs.promises non-enumerable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This prevents the experimental feature warning from being emitted in cases where fs.promises is not actually used. PR-URL: https://github.com/nodejs/node/pull/20632 Fixes: https://github.com/nodejs/node/issues/20504 Reviewed-By: Michaël Zasso Reviewed-By: James M Snell Reviewed-By: Сковорода Никита Андреевич Reviewed-By: Joyee Cheung Reviewed-By: Luigi Pinca Reviewed-By: Gus Caplan Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Rich Trott Reviewed-By: Daniel Bevenius --- lib/fs.js | 2 +- test/parallel/test-fs-promises.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/fs.js b/lib/fs.js index e9d878803ddffd..ed2a241e568cf5 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -77,7 +77,7 @@ let warn = true; Object.defineProperty(fs, 'promises', { configurable: true, - enumerable: true, + enumerable: false, get() { if (warn) { warn = false; diff --git a/test/parallel/test-fs-promises.js b/test/parallel/test-fs-promises.js index 43b5da700484ff..8f1d646bb0e01e 100644 --- a/test/parallel/test-fs-promises.js +++ b/test/parallel/test-fs-promises.js @@ -5,7 +5,8 @@ const assert = require('assert'); const tmpdir = require('../common/tmpdir'); const fixtures = require('../common/fixtures'); const path = require('path'); -const fsPromises = require('fs').promises; +const fs = require('fs'); +const fsPromises = fs.promises; const { access, chmod, @@ -38,6 +39,10 @@ const tmpDir = tmpdir.path; common.crashOnUnhandledRejection(); +// fs.promises should not be enumerable as long as it causes a warning to be +// emitted. +assert.strictEqual(Object.keys(fs).includes('promises'), false); + { access(__filename, 'r') .then(common.mustCall()) From de34cfad585c056553530ce60d9c6bd62d66f5d8 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sun, 6 May 2018 18:14:59 +0200 Subject: [PATCH 038/208] test: make sure linked lists are inspectable with defaults Make sure that a long singly-linked list can be passed to `util.inspect()` without causing a stack overflow. PR-URL: https://github.com/nodejs/node/pull/20017 Reviewed-By: Rich Trott Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Colin Ihrig Reviewed-By: Joyee Cheung --- test/parallel/test-util-inspect.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js index 5cd051299d7f06..ad5f738a85976b 100644 --- a/test/parallel/test-util-inspect.js +++ b/test/parallel/test-util-inspect.js @@ -1404,3 +1404,15 @@ util.inspect(process); const args = (function() { return arguments; })('a'); assert.strictEqual(util.inspect(args), "[Arguments] { '0': 'a' }"); } + +{ + // Test that a long linked list can be inspected without throwing an error. + const list = {}; + let head = list; + // The real cutoff value is closer to 1400 stack frames as of May 2018, + // but let's be generous here – even a linked listed of length 100k should be + // inspectable in some way. + for (let i = 0; i < 100000; i++) + head = head.next = {}; + util.inspect(list); +} From b6ea5df08a42bd1d9bf71d3b00ec1c684463a5ec Mon Sep 17 00:00:00 2001 From: David Goldstein Date: Tue, 10 Apr 2018 07:40:56 +0000 Subject: [PATCH 039/208] module: add --preserve-symlinks-main Add `--preserve-symlinks-main` option which behaves like `--preserve-symlinks` but for `require.main`. PR-URL: https://github.com/nodejs/node/pull/19911 Reviewed-By: James M Snell --- doc/api/cli.md | 23 ++++++++ doc/node.1 | 5 +- lib/internal/modules/cjs/loader.js | 17 +++++- lib/internal/modules/esm/default_resolve.js | 3 +- src/node.cc | 16 +++++- src/node_config.cc | 2 + src/node_internals.h | 5 ++ .../test-esm-preserve-symlinks-main.js | 57 +++++++++++++++++++ 8 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 test/es-module/test-esm-preserve-symlinks-main.js diff --git a/doc/api/cli.md b/doc/api/cli.md index 6d055d9d03a6dd..d76c49615c9bca 100644 --- a/doc/api/cli.md +++ b/doc/api/cli.md @@ -217,6 +217,29 @@ are linked from more than one location in the dependency tree (Node.js would see those as two separate modules and would attempt to load the module multiple times, causing an exception to be thrown). +The `--preserve-symlinks` flag does not apply to the main module, which allows +`node --preserve-symlinks node_module/.bin/` to work. To apply the same +behavior for the main module, also use `--preserve-symlinks-main`. + +### `--preserve-symlinks-main` + + +Instructs the module loader to preserve symbolic links when resolving and +caching the main module (`require.main`). + +This flag exists so that the main module can be opted-in to the same behavior +that `--preserve-symlinks` gives to all other imports; they are separate flags, +however, for backward compatibility with older Node.js versions. + +Note that `--preserve-symlinks-main` does not imply `--preserve-symlinks`; it +is expected that `--preserve-symlinks-main` will be used in addition to +`--preserve-symlinks` when it is not desirable to follow symlinks before +resolving relative paths. + +See `--preserve-symlinks` for more information. + ### `--prof-process` > Stability: 0 - Deprecated: Use [`crypto.createCipheriv()`][] instead. @@ -1331,7 +1336,9 @@ Creates and returns a `Cipher` object that uses the given `algorithm` and The `options` argument controls stream behavior and is optional except when a cipher in CCM mode is used (e.g. `'aes-128-ccm'`). In that case, the `authTagLength` option is required and specifies the length of the -authentication tag in bytes, see [CCM mode][]. +authentication tag in bytes, see [CCM mode][]. In GCM mode, the `authTagLength` +option is not required but can be used to set the length of the authentication +tag that will be returned by `getAuthTag()` and defaults to 16 bytes. The `algorithm` is dependent on OpenSSL, examples are `'aes192'`, etc. On recent OpenSSL releases, `openssl list -cipher-algorithms` @@ -1362,6 +1369,10 @@ Adversaries][] for details. +```C +NODE_EXTERN napi_status napi_add_env_cleanup_hook(napi_env env, + void (*fun)(void* arg), + void* arg); +``` + +Registers `fun` as a function to be run with the `arg` parameter once the +current Node.js environment exits. + +A function can safely be specified multiple times with different +`arg` values. In that case, it will be called multiple times as well. +Providing the same `fun` and `arg` values multiple times is not allowed +and will lead the process to abort. + +The hooks will be called in reverse order, i.e. the most recently added one +will be called first. + +Removing this hook can be done by using `napi_remove_env_cleanup_hook`. +Typically, that happens when the resource for which this hook was added +is being torn down anyway. + +#### napi_remove_env_cleanup_hook + +```C +NAPI_EXTERN napi_status napi_remove_env_cleanup_hook(napi_env env, + void (*fun)(void* arg), + void* arg); +``` + +Unregisters `fun` as a function to be run with the `arg` parameter once the +current Node.js environment exits. Both the argument and the function value +need to be exact matches. + +The function must have originally been registered +with `napi_add_env_cleanup_hook`, otherwise the process will abort. + ## Module registration N-API modules are registered in a manner similar to other modules except that instead of using the `NODE_MODULE` macro the following diff --git a/src/env-inl.h b/src/env-inl.h index 6202e50548a3ce..d3c0c211d97328 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -629,6 +629,29 @@ inline void Environment::SetTemplateMethod(v8::Local that, t->SetClassName(name_string); // NODE_SET_METHOD() compatibility. } +void Environment::AddCleanupHook(void (*fn)(void*), void* arg) { + auto insertion_info = cleanup_hooks_.emplace(CleanupHookCallback { + fn, arg, cleanup_hook_counter_++ + }); + // Make sure there was no existing element with these values. + CHECK_EQ(insertion_info.second, true); +} + +void Environment::RemoveCleanupHook(void (*fn)(void*), void* arg) { + CleanupHookCallback search { fn, arg, 0 }; + cleanup_hooks_.erase(search); +} + +size_t Environment::CleanupHookCallback::Hash::operator()( + const CleanupHookCallback& cb) const { + return std::hash()(cb.arg_); +} + +bool Environment::CleanupHookCallback::Equal::operator()( + const CleanupHookCallback& a, const CleanupHookCallback& b) const { + return a.fn_ == b.fn_ && a.arg_ == b.arg_; +} + #define VP(PropertyName, StringValue) V(v8::Private, PropertyName) #define VS(PropertyName, StringValue) V(v8::String, PropertyName) #define V(TypeName, PropertyName) \ diff --git a/src/env.cc b/src/env.cc index 08d719a51011d1..aadb81092e507c 100644 --- a/src/env.cc +++ b/src/env.cc @@ -305,6 +305,35 @@ void Environment::PrintSyncTrace() const { fflush(stderr); } +void Environment::RunCleanup() { + while (!cleanup_hooks_.empty()) { + // Copy into a vector, since we can't sort an unordered_set in-place. + std::vector callbacks( + cleanup_hooks_.begin(), cleanup_hooks_.end()); + // We can't erase the copied elements from `cleanup_hooks_` yet, because we + // need to be able to check whether they were un-scheduled by another hook. + + std::sort(callbacks.begin(), callbacks.end(), + [](const CleanupHookCallback& a, const CleanupHookCallback& b) { + // Sort in descending order so that the most recently inserted callbacks + // are run first. + return a.insertion_order_counter_ > b.insertion_order_counter_; + }); + + for (const CleanupHookCallback& cb : callbacks) { + if (cleanup_hooks_.count(cb) == 0) { + // This hook was removed from the `cleanup_hooks_` set during another + // hook that was run earlier. Nothing to do here. + continue; + } + + cb.fn_(cb.arg_); + cleanup_hooks_.erase(cb); + CleanupHandles(); + } + } +} + void Environment::RunBeforeExitCallbacks() { for (ExitCallback before_exit : before_exit_functions_) { before_exit.cb_(before_exit.arg_); diff --git a/src/env.h b/src/env.h index c0d79883d0ff1c..3acb27c9545525 100644 --- a/src/env.h +++ b/src/env.h @@ -42,6 +42,7 @@ #include #include #include +#include struct nghttp2_rcbuf; @@ -775,6 +776,10 @@ class Environment { v8::Local GetNow(); + inline void AddCleanupHook(void (*fn)(void*), void* arg); + inline void RemoveCleanupHook(void (*fn)(void*), void* arg); + void RunCleanup(); + private: inline void CreateImmediate(native_immediate_callback cb, void* data, @@ -863,6 +868,32 @@ class Environment { void RunAndClearNativeImmediates(); static void CheckImmediate(uv_check_t* handle); + struct CleanupHookCallback { + void (*fn_)(void*); + void* arg_; + + // We keep track of the insertion order for these objects, so that we can + // call the callbacks in reverse order when we are cleaning up. + uint64_t insertion_order_counter_; + + // Only hashes `arg_`, since that is usually enough to identify the hook. + struct Hash { + inline size_t operator()(const CleanupHookCallback& cb) const; + }; + + // Compares by `fn_` and `arg_` being equal. + struct Equal { + inline bool operator()(const CleanupHookCallback& a, + const CleanupHookCallback& b) const; + }; + }; + + // Use an unordered_set, so that we have efficient insertion and removal. + std::unordered_set cleanup_hooks_; + uint64_t cleanup_hook_counter_ = 0; + static void EnvPromiseHook(v8::PromiseHookType type, v8::Local promise, v8::Local parent); diff --git a/src/node.cc b/src/node.cc index 09b1e34664c14c..06acd1c74bc8ed 100644 --- a/src/node.cc +++ b/src/node.cc @@ -908,6 +908,22 @@ void AddPromiseHook(v8::Isolate* isolate, promise_hook_func fn, void* arg) { env->AddPromiseHook(fn, arg); } +void AddEnvironmentCleanupHook(v8::Isolate* isolate, + void (*fun)(void* arg), + void* arg) { + Environment* env = Environment::GetCurrent(isolate); + env->AddCleanupHook(fun, arg); +} + + +void RemoveEnvironmentCleanupHook(v8::Isolate* isolate, + void (*fun)(void* arg), + void* arg) { + Environment* env = Environment::GetCurrent(isolate); + env->RemoveCleanupHook(fun, arg); +} + + CallbackScope::CallbackScope(Isolate* isolate, Local object, async_context asyncContext) @@ -4463,7 +4479,7 @@ Environment* CreateEnvironment(IsolateData* isolate_data, void FreeEnvironment(Environment* env) { - env->CleanupHandles(); + env->RunCleanup(); delete env; } @@ -4561,6 +4577,8 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data, env.set_trace_sync_io(false); const int exit_code = EmitExit(&env); + + env.RunCleanup(); RunAtExit(&env); v8_platform.DrainVMTasks(isolate); diff --git a/src/node.h b/src/node.h index 5a491c1abf5457..23e2e9995ce209 100644 --- a/src/node.h +++ b/src/node.h @@ -583,6 +583,19 @@ NODE_EXTERN void AddPromiseHook(v8::Isolate* isolate, promise_hook_func fn, void* arg); +/* This is a lot like node::AtExit, except that the hooks added via this + * function are run before the AtExit ones and will always be registered + * for the current Environment instance. + * These functions are safe to use in an addon supporting multiple + * threads/isolates. */ +NODE_EXTERN void AddEnvironmentCleanupHook(v8::Isolate* isolate, + void (*fun)(void* arg), + void* arg); + +NODE_EXTERN void RemoveEnvironmentCleanupHook(v8::Isolate* isolate, + void (*fun)(void* arg), + void* arg); + /* Returns the id of the current execution context. If the return value is * zero then no execution has been set. This will happen if the user handles * I/O from native code. */ diff --git a/src/node_api.cc b/src/node_api.cc index 4878cf241edc04..d5437d70d933ed 100644 --- a/src/node_api.cc +++ b/src/node_api.cc @@ -902,6 +902,28 @@ void napi_module_register(napi_module* mod) { node::node_module_register(nm); } +napi_status napi_add_env_cleanup_hook(napi_env env, + void (*fun)(void* arg), + void* arg) { + CHECK_ENV(env); + CHECK_ARG(env, fun); + + node::AddEnvironmentCleanupHook(env->isolate, fun, arg); + + return napi_ok; +} + +napi_status napi_remove_env_cleanup_hook(napi_env env, + void (*fun)(void* arg), + void* arg) { + CHECK_ENV(env); + CHECK_ARG(env, fun); + + node::RemoveEnvironmentCleanupHook(env->isolate, fun, arg); + + return napi_ok; +} + // Warning: Keep in-sync with napi_status enum static const char* error_messages[] = {nullptr, diff --git a/src/node_api.h b/src/node_api.h index b010d32db7b086..91c2775a03ed76 100644 --- a/src/node_api.h +++ b/src/node_api.h @@ -118,6 +118,13 @@ EXTERN_C_START NAPI_EXTERN void napi_module_register(napi_module* mod); +NAPI_EXTERN napi_status napi_add_env_cleanup_hook(napi_env env, + void (*fun)(void* arg), + void* arg); +NAPI_EXTERN napi_status napi_remove_env_cleanup_hook(napi_env env, + void (*fun)(void* arg), + void* arg); + NAPI_EXTERN napi_status napi_get_last_error_info(napi_env env, const napi_extended_error_info** result); diff --git a/test/addons-napi/test_cleanup_hook/binding.cc b/test/addons-napi/test_cleanup_hook/binding.cc new file mode 100644 index 00000000000000..66d53508c69f13 --- /dev/null +++ b/test/addons-napi/test_cleanup_hook/binding.cc @@ -0,0 +1,24 @@ +#include "node_api.h" +#include "uv.h" +#include "../common.h" + +namespace { + +void cleanup(void* arg) { + printf("cleanup(%d)\n", *static_cast(arg)); +} + +int secret = 42; +int wrong_secret = 17; + +napi_value Init(napi_env env, napi_value exports) { + napi_add_env_cleanup_hook(env, cleanup, &wrong_secret); + napi_add_env_cleanup_hook(env, cleanup, &secret); + napi_remove_env_cleanup_hook(env, cleanup, &wrong_secret); + + return nullptr; +} + +} // anonymous namespace + +NAPI_MODULE(NODE_GYP_MODULE_NAME, Init) diff --git a/test/addons-napi/test_cleanup_hook/binding.gyp b/test/addons-napi/test_cleanup_hook/binding.gyp new file mode 100644 index 00000000000000..7ede63d94a0d77 --- /dev/null +++ b/test/addons-napi/test_cleanup_hook/binding.gyp @@ -0,0 +1,9 @@ +{ + 'targets': [ + { + 'target_name': 'binding', + 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], + 'sources': [ 'binding.cc' ] + } + ] +} diff --git a/test/addons-napi/test_cleanup_hook/test.js b/test/addons-napi/test_cleanup_hook/test.js new file mode 100644 index 00000000000000..354f4449045c17 --- /dev/null +++ b/test/addons-napi/test_cleanup_hook/test.js @@ -0,0 +1,12 @@ +'use strict'; +const common = require('../../common'); +const assert = require('assert'); +const child_process = require('child_process'); + +if (process.argv[2] === 'child') { + require(`./build/${common.buildType}/binding`); +} else { + const { stdout } = + child_process.spawnSync(process.execPath, [__filename, 'child']); + assert.strictEqual(stdout.toString().trim(), 'cleanup(42)'); +} From e253edb48a154aeb5464d342b1db5a8e8fda6add Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 4 Sep 2017 22:02:55 +0200 Subject: [PATCH 053/208] src: make CleanupHandles() tear down handles/reqs Previously, handles would not be closed when the current `Environment` stopped, which is acceptable in a single-`Environment`-per-process situation, but would otherwise create memory and file descriptor leaks. Also, introduce a generic way to close handles via the `Environment::CloseHandle()` function, which automatically keeps track of whether a close callback has been called yet or not. Many thanks for Stephen Belanger for reviewing the original version of this commit in the Ayo.js project. Refs: https://github.com/ayojs/ayo/pull/85 PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/cares_wrap.cc | 18 ++++++------------ src/connection_wrap.h | 2 -- src/env-inl.h | 22 ++++++++++++++++++++-- src/env.cc | 20 ++++++++++++-------- src/env.h | 6 +++++- src/fs_event_wrap.cc | 6 ++++-- src/handle_wrap.cc | 37 +++++++++++++++++++++++++------------ src/handle_wrap.h | 6 ++++++ src/node_stat_watcher.cc | 7 +------ src/process_wrap.cc | 2 ++ src/req_wrap-inl.h | 6 ++++++ src/req_wrap.h | 1 + src/tty_wrap.cc | 2 ++ 13 files changed, 90 insertions(+), 45 deletions(-) diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index 4208c02d4fe445..ae253d40ca94b2 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -267,9 +267,8 @@ void ares_poll_cb(uv_poll_t* watcher, int status, int events) { } -void ares_poll_close_cb(uv_handle_t* watcher) { - node_ares_task* task = ContainerOf(&node_ares_task::poll_watcher, - reinterpret_cast(watcher)); +void ares_poll_close_cb(uv_poll_t* watcher) { + node_ares_task* task = ContainerOf(&node_ares_task::poll_watcher, watcher); free(task); } @@ -347,8 +346,7 @@ void ares_sockstate_cb(void* data, "When an ares socket is closed we should have a handle for it"); channel->task_list()->erase(it); - uv_close(reinterpret_cast(&task->poll_watcher), - ares_poll_close_cb); + channel->env()->CloseHandle(&task->poll_watcher, ares_poll_close_cb); if (channel->task_list()->empty()) { uv_timer_stop(channel->timer_handle()); @@ -517,10 +515,7 @@ ChannelWrap::~ChannelWrap() { void ChannelWrap::CleanupTimer() { if (timer_handle_ == nullptr) return; - uv_close(reinterpret_cast(timer_handle_), - [](uv_handle_t* handle) { - delete reinterpret_cast(handle); - }); + env()->CloseHandle(timer_handle_, [](uv_timer_t* handle){ delete handle; }); timer_handle_ = nullptr; } @@ -610,8 +605,7 @@ class QueryWrap : public AsyncWrap { static_cast(this)); } - static void CaresAsyncClose(uv_handle_t* handle) { - uv_async_t* async = reinterpret_cast(handle); + static void CaresAsyncClose(uv_async_t* async) { auto data = static_cast(async->data); delete data->wrap; delete data; @@ -636,7 +630,7 @@ class QueryWrap : public AsyncWrap { free(host); } - uv_close(reinterpret_cast(handle), CaresAsyncClose); + wrap->env()->CloseHandle(handle, CaresAsyncClose); } static void Callback(void *arg, int status, int timeouts, diff --git a/src/connection_wrap.h b/src/connection_wrap.h index afb168c614aa97..72030a00901daf 100644 --- a/src/connection_wrap.h +++ b/src/connection_wrap.h @@ -23,8 +23,6 @@ class ConnectionWrap : public LibuvStreamWrap { ConnectionWrap(Environment* env, v8::Local object, ProviderType provider); - ~ConnectionWrap() { - } UVType handle_; }; diff --git a/src/env-inl.h b/src/env-inl.h index d3c0c211d97328..917ddd1b6bcb75 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -349,8 +349,26 @@ inline void Environment::RegisterHandleCleanup(uv_handle_t* handle, handle_cleanup_queue_.push_back(HandleCleanup{handle, cb, arg}); } -inline void Environment::FinishHandleCleanup(uv_handle_t* handle) { - handle_cleanup_waiting_--; +template +inline void Environment::CloseHandle(T* handle, OnCloseCallback callback) { + handle_cleanup_waiting_++; + static_assert(sizeof(T) >= sizeof(uv_handle_t), "T is a libuv handle"); + static_assert(offsetof(T, data) == offsetof(uv_handle_t, data), + "T is a libuv handle"); + static_assert(offsetof(T, close_cb) == offsetof(uv_handle_t, close_cb), + "T is a libuv handle"); + struct CloseData { + Environment* env; + OnCloseCallback callback; + void* original_data; + }; + handle->data = new CloseData { this, callback, handle->data }; + uv_close(reinterpret_cast(handle), [](uv_handle_t* handle) { + std::unique_ptr data { static_cast(handle->data) }; + data->env->handle_cleanup_waiting_--; + handle->data = data->original_data; + data->callback(reinterpret_cast(handle)); + }); } inline uv_loop_t* Environment::event_loop() const { diff --git a/src/env.cc b/src/env.cc index aadb81092e507c..6526c680ac1792 100644 --- a/src/env.cc +++ b/src/env.cc @@ -209,9 +209,7 @@ void Environment::RegisterHandleCleanups() { void* arg) { handle->data = env; - uv_close(handle, [](uv_handle_t* handle) { - static_cast(handle->data)->FinishHandleCleanup(handle); - }); + env->CloseHandle(handle, [](uv_handle_t* handle) {}); }; RegisterHandleCleanup( @@ -233,13 +231,17 @@ void Environment::RegisterHandleCleanups() { } void Environment::CleanupHandles() { - for (HandleCleanup& hc : handle_cleanup_queue_) { - handle_cleanup_waiting_++; + for (ReqWrap* request : req_wrap_queue_) + request->Cancel(); + + for (HandleWrap* handle : handle_wrap_queue_) + handle->Close(); + + for (HandleCleanup& hc : handle_cleanup_queue_) hc.cb_(this, hc.handle_, hc.arg_); - } handle_cleanup_queue_.clear(); - while (handle_cleanup_waiting_ != 0) + while (handle_cleanup_waiting_ != 0 || !handle_wrap_queue_.IsEmpty()) uv_run(event_loop(), UV_RUN_ONCE); } @@ -306,6 +308,8 @@ void Environment::PrintSyncTrace() const { } void Environment::RunCleanup() { + CleanupHandles(); + while (!cleanup_hooks_.empty()) { // Copy into a vector, since we can't sort an unordered_set in-place. std::vector callbacks( @@ -329,8 +333,8 @@ void Environment::RunCleanup() { cb.fn_(cb.arg_); cleanup_hooks_.erase(cb); - CleanupHandles(); } + CleanupHandles(); } } diff --git a/src/env.h b/src/env.h index 3acb27c9545525..79351666c1182e 100644 --- a/src/env.h +++ b/src/env.h @@ -577,10 +577,14 @@ class Environment { void RegisterHandleCleanups(); void CleanupHandles(); + + // Register clean-up cb to be called on environment destruction. inline void RegisterHandleCleanup(uv_handle_t* handle, HandleCleanupCb cb, void *arg); - inline void FinishHandleCleanup(uv_handle_t* handle); + + template + inline void CloseHandle(T* handle, OnCloseCallback callback); inline void AssignToContext(v8::Local context, const ContextInfo& info); diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc index ed74f36719db79..579e446fc5c485 100644 --- a/src/fs_event_wrap.cc +++ b/src/fs_event_wrap.cc @@ -78,11 +78,12 @@ FSEventWrap::FSEventWrap(Environment* env, Local object) : HandleWrap(env, object, reinterpret_cast(&handle_), - AsyncWrap::PROVIDER_FSEVENTWRAP) {} + AsyncWrap::PROVIDER_FSEVENTWRAP) { + MarkAsUninitialized(); +} FSEventWrap::~FSEventWrap() { - CHECK_EQ(initialized_, false); } void FSEventWrap::GetInitialized(const FunctionCallbackInfo& args) { @@ -153,6 +154,7 @@ void FSEventWrap::Start(const FunctionCallbackInfo& args) { } err = uv_fs_event_start(&wrap->handle_, OnEvent, *path, flags); + wrap->MarkAsInitialized(); wrap->initialized_ = true; if (err != 0) { diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc index 49bf0c55bea0a1..20356b94a5775a 100644 --- a/src/handle_wrap.cc +++ b/src/handle_wrap.cc @@ -61,29 +61,40 @@ void HandleWrap::HasRef(const FunctionCallbackInfo& args) { void HandleWrap::Close(const FunctionCallbackInfo& args) { - Environment* env = Environment::GetCurrent(args); - HandleWrap* wrap; ASSIGN_OR_RETURN_UNWRAP(&wrap, args.Holder()); - // Guard against uninitialized handle or double close. - if (!IsAlive(wrap)) - return; + wrap->Close(args[0]); +} - if (wrap->state_ != kInitialized) +void HandleWrap::Close(v8::Local close_callback) { + if (state_ != kInitialized) return; - CHECK_EQ(false, wrap->persistent().IsEmpty()); - uv_close(wrap->handle_, OnClose); - wrap->state_ = kClosing; + CHECK_EQ(false, persistent().IsEmpty()); + uv_close(handle_, OnClose); + state_ = kClosing; - if (args[0]->IsFunction()) { - wrap->object()->Set(env->onclose_string(), args[0]); - wrap->state_ = kClosingWithCallback; + if (!close_callback.IsEmpty() && close_callback->IsFunction()) { + object()->Set(env()->context(), env()->onclose_string(), close_callback) + .FromJust(); + state_ = kClosingWithCallback; } } +void HandleWrap::MarkAsInitialized() { + env()->handle_wrap_queue()->PushBack(this); + state_ = kInitialized; +} + + +void HandleWrap::MarkAsUninitialized() { + handle_wrap_queue_.Remove(); + state_ = kClosed; +} + + HandleWrap::HandleWrap(Environment* env, Local object, uv_handle_t* handle, @@ -110,6 +121,8 @@ void HandleWrap::OnClose(uv_handle_t* handle) { const bool have_close_callback = (wrap->state_ == kClosingWithCallback); wrap->state_ = kClosed; + wrap->OnClose(); + if (have_close_callback) wrap->MakeCallback(env->onclose_string(), 0, nullptr); diff --git a/src/handle_wrap.h b/src/handle_wrap.h index e7a335f5140253..fd2d002dce0338 100644 --- a/src/handle_wrap.h +++ b/src/handle_wrap.h @@ -70,11 +70,17 @@ class HandleWrap : public AsyncWrap { inline uv_handle_t* GetHandle() const { return handle_; } + void Close(v8::Local close_callback = v8::Local()); + protected: HandleWrap(Environment* env, v8::Local object, uv_handle_t* handle, AsyncWrap::ProviderType provider); + virtual void OnClose() {} + + void MarkAsInitialized(); + void MarkAsUninitialized(); private: friend class Environment; diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc index a2cfb1088c9d25..d8f8a6a362237d 100644 --- a/src/node_stat_watcher.cc +++ b/src/node_stat_watcher.cc @@ -75,11 +75,6 @@ void StatWatcher::Initialize(Environment* env, Local target) { } -static void Delete(uv_handle_t* handle) { - delete reinterpret_cast(handle); -} - - StatWatcher::StatWatcher(Environment* env, Local wrap) : AsyncWrap(env, wrap, AsyncWrap::PROVIDER_STATWATCHER), watcher_(new uv_fs_poll_t) { @@ -93,7 +88,7 @@ StatWatcher::~StatWatcher() { if (IsActive()) { Stop(); } - uv_close(reinterpret_cast(watcher_), Delete); + env()->CloseHandle(watcher_, [](uv_fs_poll_t* handle) { delete handle; }); } diff --git a/src/process_wrap.cc b/src/process_wrap.cc index 96d60cc900583c..6d421fe7c4d4de 100644 --- a/src/process_wrap.cc +++ b/src/process_wrap.cc @@ -88,6 +88,7 @@ class ProcessWrap : public HandleWrap { object, reinterpret_cast(&process_), AsyncWrap::PROVIDER_PROCESSWRAP) { + MarkAsUninitialized(); } static void ParseStdioOptions(Environment* env, @@ -256,6 +257,7 @@ class ProcessWrap : public HandleWrap { } int err = uv_spawn(env->event_loop(), &wrap->process_, &options); + wrap->MarkAsInitialized(); if (err == 0) { CHECK_EQ(wrap->process_.data, wrap); diff --git a/src/req_wrap-inl.h b/src/req_wrap-inl.h index 11b1389fa0e771..ab5051e41d8e89 100644 --- a/src/req_wrap-inl.h +++ b/src/req_wrap-inl.h @@ -7,6 +7,7 @@ #include "async_wrap-inl.h" #include "env-inl.h" #include "util-inl.h" +#include "uv.h" namespace node { @@ -37,6 +38,11 @@ ReqWrap* ReqWrap::from_req(T* req) { return ContainerOf(&ReqWrap::req_, req); } +template +void ReqWrap::Cancel() { + uv_cancel(reinterpret_cast(&req_)); +} + } // namespace node #endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS diff --git a/src/req_wrap.h b/src/req_wrap.h index 656be38dcea943..4d6a89d743c591 100644 --- a/src/req_wrap.h +++ b/src/req_wrap.h @@ -19,6 +19,7 @@ class ReqWrap : public AsyncWrap { inline ~ReqWrap() override; inline void Dispatched(); // Call this after the req has been dispatched. T* req() { return &req_; } + inline void Cancel(); static ReqWrap* from_req(T* req); diff --git a/src/tty_wrap.cc b/src/tty_wrap.cc index c5abc6bf9b9b91..d01caba4a558f2 100644 --- a/src/tty_wrap.cc +++ b/src/tty_wrap.cc @@ -172,6 +172,8 @@ TTYWrap::TTYWrap(Environment* env, reinterpret_cast(&handle_), AsyncWrap::PROVIDER_TTYWRAP) { *init_err = uv_tty_init(env->event_loop(), &handle_, fd, readable); + if (*init_err != 0) + MarkAsUninitialized(); } } // namespace node From 75aad9069b857a4778250d15f7a4f1ca3dc54467 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 25 Sep 2017 21:16:02 +0200 Subject: [PATCH 054/208] src: unify ReqWrap libuv calling This allows easier tracking of whether there are active `ReqWrap`s. Many thanks for Stephen Belanger for reviewing the original version of this commit in the Ayo.js project. Refs: https://github.com/ayojs/ayo/pull/85 PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/cares_wrap.cc | 24 +++++------ src/node_file.cc | 40 ++++++++--------- src/pipe_wrap.cc | 9 ++-- src/req_wrap-inl.h | 104 +++++++++++++++++++++++++++++++++++++++++++++ src/req_wrap.h | 13 +++++- src/tcp_wrap.cc | 18 ++++---- src/udp_wrap.cc | 13 +++--- 7 files changed, 165 insertions(+), 56 deletions(-) diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index ae253d40ca94b2..f829eb2b01d5c9 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -515,7 +515,7 @@ ChannelWrap::~ChannelWrap() { void ChannelWrap::CleanupTimer() { if (timer_handle_ == nullptr) return; - env()->CloseHandle(timer_handle_, [](uv_timer_t* handle){ delete handle; }); + env()->CloseHandle(timer_handle_, [](uv_timer_t* handle) { delete handle; }); timer_handle_ = nullptr; } @@ -1927,13 +1927,11 @@ void GetAddrInfo(const FunctionCallbackInfo& args) { hints.ai_socktype = SOCK_STREAM; hints.ai_flags = flags; - int err = uv_getaddrinfo(env->event_loop(), - req_wrap->req(), - AfterGetAddrInfo, - *hostname, - nullptr, - &hints); - req_wrap->Dispatched(); + int err = req_wrap->Dispatch(uv_getaddrinfo, + AfterGetAddrInfo, + *hostname, + nullptr, + &hints); if (err) delete req_wrap; @@ -1957,12 +1955,10 @@ void GetNameInfo(const FunctionCallbackInfo& args) { GetNameInfoReqWrap* req_wrap = new GetNameInfoReqWrap(env, req_wrap_obj); - int err = uv_getnameinfo(env->event_loop(), - req_wrap->req(), - AfterGetNameInfo, - (struct sockaddr*)&addr, - NI_NAMEREQD); - req_wrap->Dispatched(); + int err = req_wrap->Dispatch(uv_getnameinfo, + AfterGetNameInfo, + reinterpret_cast(&addr), + NI_NAMEREQD); if (err) delete req_wrap; diff --git a/src/node_file.cc b/src/node_file.cc index 97b957eed66b31..713dcbf6331898 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -89,6 +89,11 @@ using v8::Value; TRACE_EVENT_END(TRACING_CATEGORY_NODE2(fs, sync), TRACE_NAME(syscall), \ ##__VA_ARGS__); +// We sometimes need to convert a C++ lambda function to a raw C-style function. +// This is helpful, because ReqWrap::Dispatch() does not recognize lambda +// functions, and thus does not wrap them properly. +typedef void(*uv_fs_callback_t)(uv_fs_t*); + // The FileHandle object wraps a file descriptor and will close it on garbage // collection if necessary. If that happens, a process warning will be // emitted (or a fatal exception will occur if the fd cannot be closed.) @@ -216,7 +221,7 @@ inline MaybeLocal FileHandle::ClosePromise() { if (!closed_ && !closing_) { closing_ = true; CloseReq* req = new CloseReq(env(), promise, object()); - auto AfterClose = [](uv_fs_t* req) { + auto AfterClose = uv_fs_callback_t{[](uv_fs_t* req) { CloseReq* close = static_cast(req->data); CHECK_NE(close, nullptr); close->file_handle()->AfterClose(); @@ -227,9 +232,8 @@ inline MaybeLocal FileHandle::ClosePromise() { close->Resolve(); } delete close; - }; - req->Dispatched(); - int ret = uv_fs_close(env()->event_loop(), req->req(), fd_, AfterClose); + }}; + int ret = req->Dispatch(uv_fs_close, fd_, AfterClose); if (ret < 0) { req->Reject(UVException(isolate, ret, "close")); delete req; @@ -309,17 +313,15 @@ int FileHandle::ReadStart() { recommended_read = read_length_; read_wrap->buffer_ = EmitAlloc(recommended_read); - read_wrap->Dispatched(); current_read_ = std::move(read_wrap); - uv_fs_read(env()->event_loop(), - current_read_->req(), - fd_, - ¤t_read_->buffer_, - 1, - read_offset_, - [](uv_fs_t* req) { + current_read_->Dispatch(uv_fs_read, + fd_, + ¤t_read_->buffer_, + 1, + read_offset_, + uv_fs_callback_t{[](uv_fs_t* req) { FileHandle* handle; { FileHandleReadWrap* req_wrap = FileHandleReadWrap::from_req(req); @@ -342,8 +344,10 @@ int FileHandle::ReadStart() { // once we’re exiting the current scope. constexpr size_t wanted_freelist_fill = 100; auto& freelist = handle->env()->file_handle_read_wrap_freelist(); - if (freelist.size() < wanted_freelist_fill) + if (freelist.size() < wanted_freelist_fill) { + read_wrap->Reset(); freelist.emplace_back(std::move(read_wrap)); + } if (result >= 0) { // Read at most as many bytes as we originally planned to. @@ -370,7 +374,7 @@ int FileHandle::ReadStart() { // Start over, if EmitRead() didn’t tell us to stop. if (handle->reading_) handle->ReadStart(); - }); + }}); return 0; } @@ -389,8 +393,7 @@ ShutdownWrap* FileHandle::CreateShutdownWrap(Local object) { int FileHandle::DoShutdown(ShutdownWrap* req_wrap) { FileHandleCloseWrap* wrap = static_cast(req_wrap); closing_ = true; - wrap->Dispatched(); - uv_fs_close(env()->event_loop(), wrap->req(), fd_, [](uv_fs_t* req) { + wrap->Dispatch(uv_fs_close, fd_, uv_fs_callback_t{[](uv_fs_t* req) { FileHandleCloseWrap* wrap = static_cast( FileHandleCloseWrap::from_req(req)); FileHandle* handle = static_cast(wrap->stream()); @@ -399,7 +402,7 @@ int FileHandle::DoShutdown(ShutdownWrap* req_wrap) { int result = req->result; uv_fs_req_cleanup(req); wrap->Done(result); - }); + }}); return 0; } @@ -616,8 +619,7 @@ inline FSReqBase* AsyncDestCall(Environment* env, enum encoding enc, uv_fs_cb after, Func fn, Args... fn_args) { CHECK_NE(req_wrap, nullptr); req_wrap->Init(syscall, dest, len, enc); - int err = fn(env->event_loop(), req_wrap->req(), fn_args..., after); - req_wrap->Dispatched(); + int err = req_wrap->Dispatch(fn, fn_args..., after); if (err < 0) { uv_fs_t* uv_req = req_wrap->req(); uv_req->result = err; diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc index da7cb9e3ab55ba..7ec5bdf15be9cc 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -224,11 +224,10 @@ void PipeWrap::Connect(const FunctionCallbackInfo& args) { ConnectWrap* req_wrap = new ConnectWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_PIPECONNECTWRAP); - uv_pipe_connect(req_wrap->req(), - &wrap->handle_, - *name, - AfterConnect); - req_wrap->Dispatched(); + req_wrap->Dispatch(uv_pipe_connect, + &wrap->handle_, + *name, + AfterConnect); args.GetReturnValue().Set(0); // uv_pipe_connect() doesn't return errors. } diff --git a/src/req_wrap-inl.h b/src/req_wrap-inl.h index ab5051e41d8e89..54abf74430f6af 100644 --- a/src/req_wrap-inl.h +++ b/src/req_wrap-inl.h @@ -43,6 +43,110 @@ void ReqWrap::Cancel() { uv_cancel(reinterpret_cast(&req_)); } +// Below is dark template magic designed to invoke libuv functions that +// initialize uv_req_t instances in a unified fashion, to allow easier +// tracking of active/inactive requests. + +// Invoke a generic libuv function that initializes uv_req_t instances. +// This is, unfortunately, necessary since they come in three different +// variants that can not all be invoked in the same way: +// - int uv_foo(uv_loop_t* loop, uv_req_t* request, ...); +// - int uv_foo(uv_req_t* request, ...); +// - void uv_foo(uv_req_t* request, ...); +template +struct CallLibuvFunction; + +// Detect `int uv_foo(uv_loop_t* loop, uv_req_t* request, ...);`. +template +struct CallLibuvFunction { + using T = int(*)(uv_loop_t*, ReqT*, Args...); + template + static int Call(T fn, uv_loop_t* loop, ReqT* req, PassedArgs... args) { + return fn(loop, req, args...); + } +}; + +// Detect `int uv_foo(uv_req_t* request, ...);`. +template +struct CallLibuvFunction { + using T = int(*)(ReqT*, Args...); + template + static int Call(T fn, uv_loop_t* loop, ReqT* req, PassedArgs... args) { + return fn(req, args...); + } +}; + +// Detect `void uv_foo(uv_req_t* request, ...);`. +template +struct CallLibuvFunction { + using T = void(*)(ReqT*, Args...); + template + static int Call(T fn, uv_loop_t* loop, ReqT* req, PassedArgs... args) { + fn(req, args...); + return 0; + } +}; + +// This is slightly darker magic: This template is 'applied' to each parameter +// passed to the libuv function. If the parameter type (aka `T`) is a +// function type, it is assumed that this it is the request callback, and a +// wrapper that calls the original callback is created. +// If not, the parameter is passed through verbatim. +template +struct MakeLibuvRequestCallback { + static T For(ReqWrap* req_wrap, T v) { + static_assert(!std::is_function::value, + "MakeLibuvRequestCallback missed a callback"); + return v; + } +}; + +// Match the `void callback(uv_req_t*, ...);` signature that all libuv +// callbacks use. +template +struct MakeLibuvRequestCallback { + using F = void(*)(ReqT* req, Args... args); + + static void Wrapper(ReqT* req, Args... args) { + ReqWrap* req_wrap = ContainerOf(&ReqWrap::req_, req); + F original_callback = reinterpret_cast(req_wrap->original_callback_); + original_callback(req, args...); + } + + static F For(ReqWrap* req_wrap, F v) { + CHECK_EQ(req_wrap->original_callback_, nullptr); + req_wrap->original_callback_ = + reinterpret_cast::callback_t>(v); + return Wrapper; + } +}; + +template +template +int ReqWrap::Dispatch(LibuvFunction fn, Args... args) { + Dispatched(); + + // This expands as: + // + // return fn(env()->event_loop(), req(), arg1, arg2, Wrapper, arg3, ...) + // ^ ^ ^ + // | | | + // \-- Omitted if `fn` has no | | + // first `uv_loop_t*` argument | | + // | | + // A function callback whose first argument | | + // matches the libuv request type is replaced ---/ | + // by the `Wrapper` method defined above | + // | + // Other (non-function) arguments are passed -----/ + // through verbatim + return CallLibuvFunction::Call( + fn, + env()->event_loop(), + req(), + MakeLibuvRequestCallback::For(this, args)...); +} + } // namespace node #endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS diff --git a/src/req_wrap.h b/src/req_wrap.h index 4d6a89d743c591..d181817218227b 100644 --- a/src/req_wrap.h +++ b/src/req_wrap.h @@ -17,17 +17,28 @@ class ReqWrap : public AsyncWrap { v8::Local object, AsyncWrap::ProviderType provider); inline ~ReqWrap() override; - inline void Dispatched(); // Call this after the req has been dispatched. + // Call this after the req has been dispatched, if that did not already + // happen by using Dispatch(). + inline void Dispatched(); T* req() { return &req_; } inline void Cancel(); static ReqWrap* from_req(T* req); + template + inline int Dispatch(LibuvFunction fn, Args... args); + private: friend class Environment; friend int GenDebugSymbols(); + template + friend struct MakeLibuvRequestCallback; + ListNode req_wrap_queue_; + typedef void (*callback_t)(); + callback_t original_callback_ = nullptr; + protected: // req_wrap_queue_ needs to be at a fixed offset from the start of the class // because it is used by ContainerOf to calculate the address of the embedding diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc index 3ccd157159c287..70c60fa47cc68f 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -287,11 +287,10 @@ void TCPWrap::Connect(const FunctionCallbackInfo& args) { AsyncHooks::DefaultTriggerAsyncIdScope trigger_scope(wrap); ConnectWrap* req_wrap = new ConnectWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_TCPCONNECTWRAP); - err = uv_tcp_connect(req_wrap->req(), - &wrap->handle_, - reinterpret_cast(&addr), - AfterConnect); - req_wrap->Dispatched(); + err = req_wrap->Dispatch(uv_tcp_connect, + &wrap->handle_, + reinterpret_cast(&addr), + AfterConnect); if (err) delete req_wrap; } @@ -323,11 +322,10 @@ void TCPWrap::Connect6(const FunctionCallbackInfo& args) { AsyncHooks::DefaultTriggerAsyncIdScope trigger_scope(wrap); ConnectWrap* req_wrap = new ConnectWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_TCPCONNECTWRAP); - err = uv_tcp_connect(req_wrap->req(), - &wrap->handle_, - reinterpret_cast(&addr), - AfterConnect); - req_wrap->Dispatched(); + err = req_wrap->Dispatch(uv_tcp_connect, + &wrap->handle_, + reinterpret_cast(&addr), + AfterConnect); if (err) delete req_wrap; } diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc index 414fe07eab6da8..1d1ded449bd221 100644 --- a/src/udp_wrap.cc +++ b/src/udp_wrap.cc @@ -380,15 +380,14 @@ void UDPWrap::DoSend(const FunctionCallbackInfo& args, int family) { } if (err == 0) { - err = uv_udp_send(req_wrap->req(), - &wrap->handle_, - *bufs, - count, - reinterpret_cast(&addr), - OnSend); + err = req_wrap->Dispatch(uv_udp_send, + &wrap->handle_, + *bufs, + count, + reinterpret_cast(&addr), + OnSend); } - req_wrap->Dispatched(); if (err) delete req_wrap; From 89954087482d0e42c94cb90796ef4e5fa0de87fe Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 25 Sep 2017 22:53:17 +0200 Subject: [PATCH 055/208] src: keep track of open requests Workers cannot shut down while requests are open, so keep a counter that is increased whenever libuv requests are made and decreased whenever their callback is called. This also applies to other embedders, who may want to shut down an `Environment` instance early. Many thanks for Stephen Belanger for reviewing the original version of this commit in the Ayo.js project. Fixes: https://github.com/nodejs/node/issues/20517 Refs: https://github.com/ayojs/ayo/pull/85 PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/env-inl.h | 9 +++++++++ src/env.cc | 6 ++++-- src/env.h | 6 +++++- src/node_api.cc | 5 +++++ src/node_crypto.cc | 13 +++++++++++-- src/node_zlib.cc | 13 ++++++++++--- src/req_wrap-inl.h | 43 ++++++++++++++++++++++++++++--------------- src/req_wrap.h | 2 ++ src/util.h | 10 +++++++++- 9 files changed, 83 insertions(+), 24 deletions(-) diff --git a/src/env-inl.h b/src/env-inl.h index 917ddd1b6bcb75..f115656353cff3 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -371,6 +371,15 @@ inline void Environment::CloseHandle(T* handle, OnCloseCallback callback) { }); } +void Environment::IncreaseWaitingRequestCounter() { + request_waiting_++; +} + +void Environment::DecreaseWaitingRequestCounter() { + request_waiting_--; + CHECK_GE(request_waiting_, 0); +} + inline uv_loop_t* Environment::event_loop() const { return isolate_data()->event_loop(); } diff --git a/src/env.cc b/src/env.cc index 6526c680ac1792..e5b9c0fd6aad4e 100644 --- a/src/env.cc +++ b/src/env.cc @@ -107,7 +107,6 @@ Environment::Environment(IsolateData* isolate_data, #if HAVE_INSPECTOR inspector_agent_(new inspector::Agent(this)), #endif - handle_cleanup_waiting_(0), http_parser_buffer_(nullptr), fs_stats_field_array_(isolate_, kFsStatsFieldsLength * 2), context_(context->GetIsolate(), context) { @@ -241,8 +240,11 @@ void Environment::CleanupHandles() { hc.cb_(this, hc.handle_, hc.arg_); handle_cleanup_queue_.clear(); - while (handle_cleanup_waiting_ != 0 || !handle_wrap_queue_.IsEmpty()) + while (handle_cleanup_waiting_ != 0 || + request_waiting_ != 0 || + !handle_wrap_queue_.IsEmpty()) { uv_run(event_loop(), UV_RUN_ONCE); + } } void Environment::StartProfilerIdleNotifier() { diff --git a/src/env.h b/src/env.h index 79351666c1182e..de3014249ea852 100644 --- a/src/env.h +++ b/src/env.h @@ -601,6 +601,9 @@ class Environment { inline uv_check_t* immediate_check_handle(); inline uv_idle_t* immediate_idle_handle(); + inline void IncreaseWaitingRequestCounter(); + inline void DecreaseWaitingRequestCounter(); + inline AsyncHooks* async_hooks(); inline ImmediateInfo* immediate_info(); inline TickInfo* tick_info(); @@ -833,7 +836,8 @@ class Environment { HandleWrapQueue handle_wrap_queue_; ReqWrapQueue req_wrap_queue_; std::list handle_cleanup_queue_; - int handle_cleanup_waiting_; + int handle_cleanup_waiting_ = 0; + int request_waiting_ = 0; double* heap_statistics_buffer_ = nullptr; double* heap_space_statistics_buffer_ = nullptr; diff --git a/src/node_api.cc b/src/node_api.cc index d5437d70d933ed..91a47a12d92751 100644 --- a/src/node_api.cc +++ b/src/node_api.cc @@ -3388,6 +3388,9 @@ class Work : public node::AsyncResource { // Establish a handle scope here so that every callback doesn't have to. // Also it is needed for the exception-handling below. v8::HandleScope scope(env->isolate); + node::Environment* env_ = node::Environment::GetCurrent(env->isolate); + env_->DecreaseWaitingRequestCounter(); + CallbackScope callback_scope(work); NAPI_CALL_INTO_MODULE(env, @@ -3488,6 +3491,8 @@ napi_status napi_queue_async_work(napi_env env, napi_async_work work) { uvimpl::Work* w = reinterpret_cast(work); + node::Environment* env_ = node::Environment::GetCurrent(env->isolate); + env_->IncreaseWaitingRequestCounter(); CALL_UV(env, uv_queue_work(event_loop, w->Request(), uvimpl::Work::ExecuteCallback, diff --git a/src/node_crypto.cc b/src/node_crypto.cc index a80bd95956fa30..f818f9ee4b1ef0 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -4645,9 +4645,12 @@ void PBKDF2Request::After() { void PBKDF2Request::After(uv_work_t* work_req, int status) { - CHECK_EQ(status, 0); std::unique_ptr req( ContainerOf(&PBKDF2Request::work_req_, work_req)); + req->env()->DecreaseWaitingRequestCounter(); + if (status == UV_ECANCELED) + return; + CHECK_EQ(status, 0); req->After(); } @@ -4698,6 +4701,7 @@ void PBKDF2(const FunctionCallbackInfo& args) { if (args[5]->IsFunction()) { obj->Set(env->context(), env->ondone_string(), args[5]).FromJust(); + env->IncreaseWaitingRequestCounter(); uv_queue_work(env->event_loop(), req.release()->work_req(), PBKDF2Request::Work, @@ -4837,10 +4841,13 @@ void RandomBytesCheck(RandomBytesRequest* req, Local (*argv)[2]) { void RandomBytesAfter(uv_work_t* work_req, int status) { - CHECK_EQ(status, 0); std::unique_ptr req( ContainerOf(&RandomBytesRequest::work_req_, work_req)); Environment* env = req->env(); + env->DecreaseWaitingRequestCounter(); + if (status == UV_ECANCELED) + return; + CHECK_EQ(status, 0); HandleScope handle_scope(env->isolate()); Context::Scope context_scope(env->context()); Local argv[2]; @@ -4880,6 +4887,7 @@ void RandomBytes(const FunctionCallbackInfo& args) { if (args[1]->IsFunction()) { obj->Set(env->context(), env->ondone_string(), args[1]).FromJust(); + env->IncreaseWaitingRequestCounter(); uv_queue_work(env->event_loop(), req.release()->work_req(), RandomBytesWork, @@ -4919,6 +4927,7 @@ void RandomBytesBuffer(const FunctionCallbackInfo& args) { if (args[3]->IsFunction()) { obj->Set(env->context(), env->ondone_string(), args[3]).FromJust(); + env->IncreaseWaitingRequestCounter(); uv_queue_work(env->event_loop(), req.release()->work_req(), RandomBytesWork, diff --git a/src/node_zlib.cc b/src/node_zlib.cc index ec447638e2ae62..3249905dfbfaf9 100644 --- a/src/node_zlib.cc +++ b/src/node_zlib.cc @@ -214,6 +214,7 @@ class ZCtx : public AsyncWrap { } // async version + env->IncreaseWaitingRequestCounter(); uv_queue_work(env->event_loop(), work_req, ZCtx::Process, ZCtx::After); } @@ -361,10 +362,17 @@ class ZCtx : public AsyncWrap { // v8 land! static void After(uv_work_t* work_req, int status) { - CHECK_EQ(status, 0); - ZCtx* ctx = ContainerOf(&ZCtx::work_req_, work_req); Environment* env = ctx->env(); + ctx->write_in_progress_ = false; + + env->DecreaseWaitingRequestCounter(); + if (status == UV_ECANCELED) { + ctx->Close(); + return; + } + + CHECK_EQ(status, 0); HandleScope handle_scope(env->isolate()); Context::Scope context_scope(env->context()); @@ -374,7 +382,6 @@ class ZCtx : public AsyncWrap { ctx->write_result_[0] = ctx->strm_.avail_out; ctx->write_result_[1] = ctx->strm_.avail_in; - ctx->write_in_progress_ = false; // call the write() cb Local cb = PersistentToLocal(env->isolate(), diff --git a/src/req_wrap-inl.h b/src/req_wrap-inl.h index 54abf74430f6af..e3b26c1f5c6030 100644 --- a/src/req_wrap-inl.h +++ b/src/req_wrap-inl.h @@ -20,6 +20,8 @@ ReqWrap::ReqWrap(Environment* env, // FIXME(bnoordhuis) The fact that a reinterpret_cast is needed is // arguably a good indicator that there should be more than one queue. env->req_wrap_queue()->PushBack(reinterpret_cast*>(this)); + + Reset(); } template @@ -33,6 +35,12 @@ void ReqWrap::Dispatched() { req_.data = this; } +template +void ReqWrap::Reset() { + original_callback_ = nullptr; + req_.data = nullptr; +} + template ReqWrap* ReqWrap::from_req(T* req) { return ContainerOf(&ReqWrap::req_, req); @@ -40,7 +48,8 @@ ReqWrap* ReqWrap::from_req(T* req) { template void ReqWrap::Cancel() { - uv_cancel(reinterpret_cast(&req_)); + if (req_.data == this) // Only cancel if already dispatched. + uv_cancel(reinterpret_cast(&req_)); } // Below is dark template magic designed to invoke libuv functions that @@ -95,7 +104,7 @@ struct CallLibuvFunction { template struct MakeLibuvRequestCallback { static T For(ReqWrap* req_wrap, T v) { - static_assert(!std::is_function::value, + static_assert(!is_callable::value, "MakeLibuvRequestCallback missed a callback"); return v; } @@ -109,6 +118,7 @@ struct MakeLibuvRequestCallback { static void Wrapper(ReqT* req, Args... args) { ReqWrap* req_wrap = ContainerOf(&ReqWrap::req_, req); + req_wrap->env()->DecreaseWaitingRequestCounter(); F original_callback = reinterpret_cast(req_wrap->original_callback_); original_callback(req, args...); } @@ -128,23 +138,26 @@ int ReqWrap::Dispatch(LibuvFunction fn, Args... args) { // This expands as: // - // return fn(env()->event_loop(), req(), arg1, arg2, Wrapper, arg3, ...) - // ^ ^ ^ - // | | | - // \-- Omitted if `fn` has no | | - // first `uv_loop_t*` argument | | - // | | - // A function callback whose first argument | | - // matches the libuv request type is replaced ---/ | - // by the `Wrapper` method defined above | - // | - // Other (non-function) arguments are passed -----/ - // through verbatim - return CallLibuvFunction::Call( + // int err = fn(env()->event_loop(), req(), arg1, arg2, Wrapper, arg3, ...) + // ^ ^ ^ + // | | | + // \-- Omitted if `fn` has no | | + // first `uv_loop_t*` argument | | + // | | + // A function callback whose first argument | | + // matches the libuv request type is replaced ---/ | + // by the `Wrapper` method defined above | + // | + // Other (non-function) arguments are passed -----/ + // through verbatim + int err = CallLibuvFunction::Call( fn, env()->event_loop(), req(), MakeLibuvRequestCallback::For(this, args)...); + if (err >= 0) + env()->IncreaseWaitingRequestCounter(); + return err; } } // namespace node diff --git a/src/req_wrap.h b/src/req_wrap.h index d181817218227b..8f8d0cf2885594 100644 --- a/src/req_wrap.h +++ b/src/req_wrap.h @@ -20,6 +20,8 @@ class ReqWrap : public AsyncWrap { // Call this after the req has been dispatched, if that did not already // happen by using Dispatch(). inline void Dispatched(); + // Call this after a request has finished, if re-using this object is planned. + inline void Reset(); T* req() { return &req_; } inline void Cancel(); diff --git a/src/util.h b/src/util.h index eb15839241872f..9595ee8f07a1c6 100644 --- a/src/util.h +++ b/src/util.h @@ -447,8 +447,16 @@ struct MallocedBuffer { MallocedBuffer& operator=(const MallocedBuffer&) = delete; }; -} // namespace node +// Test whether some value can be called with (). +template +struct is_callable : std::is_function { }; + +template +struct is_callable::value + >::type> : std::true_type { }; +} // namespace node #endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS From 9e2554ce9879c183b510dc110a0e6916234c4159 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 9 Sep 2017 22:29:08 +0200 Subject: [PATCH 056/208] src: use cleanup hooks to tear down BaseObjects Clean up after `BaseObject` instances when the `Environment` is being shut down. This takes care of closing non-libuv resources like `zlib` instances, which do not require asynchronous shutdown. Many thanks for Stephen Belanger, Timothy Gu and Alexey Orlenko for reviewing the original version of this commit in the Ayo.js project. Refs: https://github.com/ayojs/ayo/pull/88 PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/base_object-inl.h | 9 +++++++++ src/base_object.h | 2 ++ src/env.cc | 6 ++++++ src/inspector_agent.cc | 2 ++ src/node.cc | 3 ++- src/req_wrap-inl.h | 1 - 6 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/base_object-inl.h b/src/base_object-inl.h index 786e1f26b48256..3bd854639b2c6d 100644 --- a/src/base_object-inl.h +++ b/src/base_object-inl.h @@ -37,10 +37,13 @@ BaseObject::BaseObject(Environment* env, v8::Local object) CHECK_EQ(false, object.IsEmpty()); CHECK_GT(object->InternalFieldCount(), 0); object->SetAlignedPointerInInternalField(0, static_cast(this)); + env_->AddCleanupHook(DeleteMe, static_cast(this)); } BaseObject::~BaseObject() { + env_->RemoveCleanupHook(DeleteMe, static_cast(this)); + if (persistent_handle_.IsEmpty()) { // This most likely happened because the weak callback below cleared it. return; @@ -80,6 +83,12 @@ T* BaseObject::FromJSObject(v8::Local object) { } +void BaseObject::DeleteMe(void* data) { + BaseObject* self = static_cast(data); + delete self; +} + + void BaseObject::MakeWeak() { persistent_handle_.SetWeak( this, diff --git a/src/base_object.h b/src/base_object.h index 2a4967c1aaf303..e0b60843401681 100644 --- a/src/base_object.h +++ b/src/base_object.h @@ -71,6 +71,8 @@ class BaseObject { private: BaseObject(); + static inline void DeleteMe(void* data); + // persistent_handle_ needs to be at a fixed offset from the start of the // class because it is used by src/node_postmortem_metadata.cc to calculate // offsets and generate debug symbols for BaseObject, which assumes that the diff --git a/src/env.cc b/src/env.cc index e5b9c0fd6aad4e..ab5de3e2ee1b1d 100644 --- a/src/env.cc +++ b/src/env.cc @@ -133,6 +133,10 @@ Environment::Environment(IsolateData* isolate_data, } Environment::~Environment() { + // Make sure there are no re-used libuv wrapper objects. + // CleanupHandles() should have removed all of them. + CHECK(file_handle_read_wrap_freelist_.empty()); + v8::HandleScope handle_scope(isolate()); #if HAVE_INSPECTOR @@ -245,6 +249,8 @@ void Environment::CleanupHandles() { !handle_wrap_queue_.IsEmpty()) { uv_run(event_loop(), UV_RUN_ONCE); } + + file_handle_read_wrap_freelist_.clear(); } void Environment::StartProfilerIdleNotifier() { diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc index 4e0c04a7b95527..391d3bc037927e 100644 --- a/src/inspector_agent.cc +++ b/src/inspector_agent.cc @@ -576,6 +576,8 @@ std::unique_ptr Agent::Connect( void Agent::WaitForDisconnect() { CHECK_NE(client_, nullptr); + // TODO(addaleax): Maybe this should use an at-exit hook for the Environment + // or something similar? client_->contextDestroyed(parent_env_->context()); if (io_ != nullptr) { io_->WaitForDisconnect(); diff --git a/src/node.cc b/src/node.cc index 06acd1c74bc8ed..70787f2f2f7bc4 100644 --- a/src/node.cc +++ b/src/node.cc @@ -4578,12 +4578,13 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data, const int exit_code = EmitExit(&env); + WaitForInspectorDisconnect(&env); + env.RunCleanup(); RunAtExit(&env); v8_platform.DrainVMTasks(isolate); v8_platform.CancelVMTasks(isolate); - WaitForInspectorDisconnect(&env); #if defined(LEAK_SANITIZER) __lsan_do_leak_check(); #endif diff --git a/src/req_wrap-inl.h b/src/req_wrap-inl.h index e3b26c1f5c6030..7e9e2d9fbbf912 100644 --- a/src/req_wrap-inl.h +++ b/src/req_wrap-inl.h @@ -26,7 +26,6 @@ ReqWrap::ReqWrap(Environment* env, template ReqWrap::~ReqWrap() { - CHECK_EQ(req_.data, this); // Assert that someone has called Dispatched(). CHECK_EQ(false, persistent().IsEmpty()); } From 5b0d2e7b19209b7c97ea43076b16764a997b62ae Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 20 Sep 2017 14:43:19 +0200 Subject: [PATCH 057/208] src: add can_call_into_js flag This prevents calls back into JS from the shutdown phase. Many thanks for Stephen Belanger for reviewing the original version of this commit in the Ayo.js project. Refs: https://github.com/ayojs/ayo/pull/82 PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/async_wrap.cc | 7 +++++-- src/env-inl.h | 8 ++++++++ src/env.h | 7 +++++++ src/node.cc | 9 +++++++++ src/node_contextify.cc | 2 ++ 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/async_wrap.cc b/src/async_wrap.cc index f7a6d4e68dd483..b20e2b746f7f89 100644 --- a/src/async_wrap.cc +++ b/src/async_wrap.cc @@ -141,6 +141,7 @@ static void DestroyAsyncIdsCallback(Environment* env, void* data) { do { std::vector destroy_async_id_list; destroy_async_id_list.swap(*env->destroy_async_id_list()); + if (!env->can_call_into_js()) return; for (auto async_id : destroy_async_id_list) { // Want each callback to be cleaned up after itself, instead of cleaning // them all up after the while() loop completes. @@ -166,7 +167,7 @@ void Emit(Environment* env, double async_id, AsyncHooks::Fields type, Local fn) { AsyncHooks* async_hooks = env->async_hooks(); - if (async_hooks->fields()[type] == 0) + if (async_hooks->fields()[type] == 0 || !env->can_call_into_js()) return; v8::HandleScope handle_scope(env->isolate()); @@ -625,8 +626,10 @@ void AsyncWrap::EmitTraceEventDestroy() { } void AsyncWrap::EmitDestroy(Environment* env, double async_id) { - if (env->async_hooks()->fields()[AsyncHooks::kDestroy] == 0) + if (env->async_hooks()->fields()[AsyncHooks::kDestroy] == 0 || + !env->can_call_into_js()) { return; + } if (env->destroy_async_id_list()->empty()) { env->SetUnrefImmediate(DestroyAsyncIdsCallback, nullptr); diff --git a/src/env-inl.h b/src/env-inl.h index f115656353cff3..0268879f5c7823 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -559,6 +559,14 @@ void Environment::SetUnrefImmediate(native_immediate_callback cb, CreateImmediate(cb, data, obj, false); } +inline bool Environment::can_call_into_js() const { + return can_call_into_js_; +} + +inline void Environment::set_can_call_into_js(bool can_call_into_js) { + can_call_into_js_ = can_call_into_js; +} + inline performance::performance_state* Environment::performance_state() { return performance_state_.get(); } diff --git a/src/env.h b/src/env.h index de3014249ea852..15d417ba606860 100644 --- a/src/env.h +++ b/src/env.h @@ -679,6 +679,12 @@ class Environment { const char* path = nullptr, const char* dest = nullptr); + // If this flag is set, calls into JS (if they would be observable + // from userland) must be avoided. This flag does not indicate whether + // calling into JS is allowed from a VM perspective at this point. + inline bool can_call_into_js() const; + inline void set_can_call_into_js(bool can_call_into_js); + inline void ThrowError(const char* errmsg); inline void ThrowTypeError(const char* errmsg); inline void ThrowRangeError(const char* errmsg); @@ -821,6 +827,7 @@ class Environment { std::unique_ptr performance_state_; std::unordered_map performance_marks_; + bool can_call_into_js_ = true; #if HAVE_INSPECTOR std::unique_ptr inspector_agent_; diff --git a/src/node.cc b/src/node.cc index 70787f2f2f7bc4..5429015a149c79 100644 --- a/src/node.cc +++ b/src/node.cc @@ -958,6 +958,11 @@ InternalCallbackScope::InternalCallbackScope(Environment* env, CHECK(!object.IsEmpty()); } + if (!env->can_call_into_js()) { + failed_ = true; + return; + } + HandleScope handle_scope(env->isolate()); // If you hit this assertion, you forgot to enter the v8::Context first. CHECK_EQ(Environment::GetCurrent(env->isolate()), env); @@ -1001,6 +1006,7 @@ void InternalCallbackScope::Close() { Environment::TickInfo* tick_info = env_->tick_info(); + if (!env_->can_call_into_js()) return; if (!tick_info->has_scheduled()) { env_->isolate()->RunMicrotasks(); } @@ -1018,6 +1024,8 @@ void InternalCallbackScope::Close() { Local process = env_->process_object(); + if (!env_->can_call_into_js()) return; + if (env_->tick_callback_function()->Call(process, 0, nullptr).IsEmpty()) { env_->tick_info()->set_has_thrown(true); failed_ = true; @@ -4580,6 +4588,7 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data, WaitForInspectorDisconnect(&env); + env.set_can_call_into_js(false); env.RunCleanup(); RunAtExit(&env); diff --git a/src/node_contextify.cc b/src/node_contextify.cc index 6e7027a29ba8a0..da1eecf1666d80 100644 --- a/src/node_contextify.cc +++ b/src/node_contextify.cc @@ -819,6 +819,8 @@ class ContextifyScript : public BaseObject { const bool display_errors, const bool break_on_sigint, const FunctionCallbackInfo& args) { + if (!env->can_call_into_js()) + return false; if (!ContextifyScript::InstanceOf(env, args.Holder())) { env->ThrowTypeError( "Script methods can only be called on script instances."); From f2ad1d5d221912bd2b22b9396c857719269df1c5 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 15 Mar 2018 21:39:57 +0100 Subject: [PATCH 058/208] tools: remove `--quiet` from run-valgrind.py This should no longer be an issue, now that we clean up resources when exiting. PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- tools/run-valgrind.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/run-valgrind.py b/tools/run-valgrind.py index ae1a3194cac4a6..cad3e7ec6954d2 100755 --- a/tools/run-valgrind.py +++ b/tools/run-valgrind.py @@ -37,9 +37,6 @@ 'valgrind', '--error-exitcode=1', '--smc-check=all', - # Node.js does not clean up on exit so don't complain about - # memory leaks but do complain about invalid memory access. - '--quiet', ] if len(sys.argv) < 2: From c8fe8e8f5d37091ae078ea6dd5042229e77f2c05 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 17 Mar 2018 22:14:51 +0100 Subject: [PATCH 059/208] process: create stdin with `manualStart: true` Otherwise Node.js will try to read data from the handle. This causes issues when Node.js is already reading from the same handle, but a different associated stream (e.g. a possible IPC channel). PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- lib/internal/process/stdio.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/internal/process/stdio.js b/lib/internal/process/stdio.js index 75ede6a8e7e157..9a16a5ab15f166 100644 --- a/lib/internal/process/stdio.js +++ b/lib/internal/process/stdio.js @@ -77,13 +77,15 @@ function setupStdio() { stdin = new net.Socket({ handle: process.channel, readable: true, - writable: false + writable: false, + manualStart: true }); } else { stdin = new net.Socket({ fd: fd, readable: true, - writable: false + writable: false, + manualStart: true }); } // Make sure the stdin can't be `.end()`-ed From 97d939a5f0ce17d5bbd936a7ec2f0c826ccb4457 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 17 Mar 2018 22:34:38 +0100 Subject: [PATCH 060/208] src: store fd for libuv streams on Windows On Windows, we can't just look up a FD for libuv streams and return it in `GetFD()`. However, we do sometimes construct streams from their FDs; in those cases, it should be okay to store the value on a class field. PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/pipe_wrap.cc | 1 + src/stream_wrap.cc | 6 ++++-- src/stream_wrap.h | 18 ++++++++++++++++++ src/tcp_wrap.cc | 1 + src/tty_wrap.cc | 1 + 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc index 7ec5bdf15be9cc..f3a88a2ecc80c3 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -204,6 +204,7 @@ void PipeWrap::Open(const FunctionCallbackInfo& args) { int fd = args[0]->Int32Value(); int err = uv_pipe_open(&wrap->handle_, fd); + wrap->set_fd(fd); if (err != 0) env->isolate()->ThrowException(UVException(err, "uv_pipe_open")); diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc index ad708c9ed28def..0e700ba39a6b95 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -115,12 +115,14 @@ void LibuvStreamWrap::AddMethods(Environment* env, int LibuvStreamWrap::GetFD() { +#ifdef _WIN32 + return fd_; +#else int fd = -1; -#if !defined(_WIN32) if (stream() != nullptr) uv_fileno(reinterpret_cast(stream()), &fd); -#endif return fd; +#endif } diff --git a/src/stream_wrap.h b/src/stream_wrap.h index a97e8ba10f91d5..7847ebe754614a 100644 --- a/src/stream_wrap.h +++ b/src/stream_wrap.h @@ -88,6 +88,14 @@ class LibuvStreamWrap : public HandleWrap, public StreamBase { v8::Local target, int flags = StreamBase::kFlagNone); + protected: + inline void set_fd(int fd) { +#ifdef _WIN32 + fd_ = fd; +#endif + } + + private: static void GetWriteQueueSize( const v8::FunctionCallbackInfo& info); @@ -101,6 +109,16 @@ class LibuvStreamWrap : public HandleWrap, public StreamBase { static void AfterUvShutdown(uv_shutdown_t* req, int status); uv_stream_t* const stream_; + +#ifdef _WIN32 + // We don't always have an FD that we could look up on the stream_ + // object itself on Windows. However, for some cases, we open handles + // using FDs; In that case, we can store and provide the value. + // This became necessary because it allows to detect situations + // where multiple handles refer to the same stdio FDs (in particular, + // a possible IPC channel and a regular process.std??? stream). + int fd_ = -1; +#endif }; diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc index 70c60fa47cc68f..8200353b17bf99 100644 --- a/src/tcp_wrap.cc +++ b/src/tcp_wrap.cc @@ -212,6 +212,7 @@ void TCPWrap::Open(const FunctionCallbackInfo& args) { args.GetReturnValue().Set(UV_EBADF)); int fd = static_cast(args[0]->IntegerValue()); uv_tcp_open(&wrap->handle_, fd); + wrap->set_fd(fd); } diff --git a/src/tty_wrap.cc b/src/tty_wrap.cc index d01caba4a558f2..cd8589cc7fc2e7 100644 --- a/src/tty_wrap.cc +++ b/src/tty_wrap.cc @@ -172,6 +172,7 @@ TTYWrap::TTYWrap(Environment* env, reinterpret_cast(&handle_), AsyncWrap::PROVIDER_TTYWRAP) { *init_err = uv_tty_init(env->event_loop(), &handle_, fd, readable); + set_fd(fd); if (*init_err != 0) MarkAsUninitialized(); } From 9e1dcdc5bd9cd7128c61e8c721fc8ae9d97c272c Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 27 Apr 2018 00:16:09 +0200 Subject: [PATCH 061/208] src: remove NodeCategorySet destructor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This currently crashes during environment cleanup because the object would be torn down while there are enabled categories. I’m not sure about the exact semantics here, but since the object cannot be garbage collected at this point anyway because it’s `Persistent` handle is strong, removing the destructor at least doesn’t make anything worse than it is right now (i.e. the destructor would never have been called before anyway). PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/node_trace_events.cc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/node_trace_events.cc b/src/node_trace_events.cc index 0c0699f7be9e1f..363d046de1e947 100644 --- a/src/node_trace_events.cc +++ b/src/node_trace_events.cc @@ -21,11 +21,6 @@ using v8::Value; class NodeCategorySet : public BaseObject { public: - ~NodeCategorySet() override { - // Verify that the thing was properly disabled before gc - CHECK_NE(enabled_, true); - } - static void New(const FunctionCallbackInfo& args); static void Enable(const FunctionCallbackInfo& args); static void Disable(const FunctionCallbackInfo& args); From 61415dccc4ba9ecba45dafad1d2612279f389617 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 24 Mar 2018 23:11:10 +0100 Subject: [PATCH 062/208] lib: defer pausing stdin to the next tick This is done to match the stream implementation, which also only actually stops reading in the next tick after the `'pause'` event is emitted. PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- lib/internal/process/stdio.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/internal/process/stdio.js b/lib/internal/process/stdio.js index 9a16a5ab15f166..ce84142938f066 100644 --- a/lib/internal/process/stdio.js +++ b/lib/internal/process/stdio.js @@ -109,15 +109,22 @@ function setupStdio() { stdin._handle.readStop(); } - // if the user calls stdin.pause(), then we need to stop reading - // immediately, so that the process can close down. + // If the user calls stdin.pause(), then we need to stop reading + // once the stream implementation does so (one nextTick later), + // so that the process can close down. stdin.on('pause', () => { + process.nextTick(onpause); + }); + + function onpause() { if (!stdin._handle) return; - stdin._readableState.reading = false; - stdin._handle.reading = false; - stdin._handle.readStop(); - }); + if (stdin._handle.reading && !stdin._readableState.flowing) { + stdin._readableState.reading = false; + stdin._handle.reading = false; + stdin._handle.readStop(); + } + } return stdin; } From 7153bec9552438227e76dc1f51e84fb34ec841ff Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 24 Mar 2018 23:12:22 +0100 Subject: [PATCH 063/208] src: always call ReadStop() before Close() For libuv-backed streams, always explicitly stop reading before closing the handle. PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/handle_wrap.h | 3 ++- src/stream_wrap.cc | 5 +++++ src/stream_wrap.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/handle_wrap.h b/src/handle_wrap.h index fd2d002dce0338..b2b09f5010d1f7 100644 --- a/src/handle_wrap.h +++ b/src/handle_wrap.h @@ -70,7 +70,8 @@ class HandleWrap : public AsyncWrap { inline uv_handle_t* GetHandle() const { return handle_; } - void Close(v8::Local close_callback = v8::Local()); + virtual void Close( + v8::Local close_callback = v8::Local()); protected: HandleWrap(Environment* env, diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc index 0e700ba39a6b95..cdcbe574f9ae5f 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -373,6 +373,11 @@ void LibuvStreamWrap::AfterUvWrite(uv_write_t* req, int status) { req_wrap->Done(status); } +void LibuvStreamWrap::Close(v8::Local close_callback) { + ReadStop(); + HandleWrap::Close(close_callback); +} + } // namespace node NODE_BUILTIN_MODULE_CONTEXT_AWARE(stream_wrap, diff --git a/src/stream_wrap.h b/src/stream_wrap.h index 7847ebe754614a..94a161b6d54e07 100644 --- a/src/stream_wrap.h +++ b/src/stream_wrap.h @@ -76,6 +76,8 @@ class LibuvStreamWrap : public HandleWrap, public StreamBase { ShutdownWrap* CreateShutdownWrap(v8::Local object) override; WriteWrap* CreateWriteWrap(v8::Local object) override; + void Close(v8::Local close_callback) override; + protected: LibuvStreamWrap(Environment* env, v8::Local object, From 2347ce8870c2cf4bb953f69277fa8618a1f4ed5b Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 9 May 2018 17:40:24 +0200 Subject: [PATCH 064/208] src: unify thread pool work Instead of using the libuv mechanism directly, provide an internal `ThreadPoolWork` wrapper that takes care of increasing/decreasing the waiting request counter. PR-URL: https://github.com/nodejs/node/pull/19377 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/node_api.cc | 73 +++++++++++++------------------- src/node_crypto.cc | 99 ++++++++++++++------------------------------ src/node_internals.h | 35 ++++++++++++++++ src/node_zlib.cc | 29 ++++++------- 4 files changed, 108 insertions(+), 128 deletions(-) diff --git a/src/node_api.cc b/src/node_api.cc index 91a47a12d92751..b456ade2d4ca74 100644 --- a/src/node_api.cc +++ b/src/node_api.cc @@ -3338,7 +3338,7 @@ static napi_status ConvertUVErrorCode(int code) { } // Wrapper around uv_work_t which calls user-provided callbacks. -class Work : public node::AsyncResource { +class Work : public node::AsyncResource, public node::ThreadPoolWork { private: explicit Work(napi_env env, v8::Local async_resource, @@ -3349,15 +3349,14 @@ class Work : public node::AsyncResource { : AsyncResource(env->isolate, async_resource, *v8::String::Utf8Value(env->isolate, async_resource_name)), - _env(env), - _data(data), - _execute(execute), - _complete(complete) { - memset(&_request, 0, sizeof(_request)); - _request.data = this; + ThreadPoolWork(node::Environment::GetCurrent(env->isolate)), + _env(env), + _data(data), + _execute(execute), + _complete(complete) { } - ~Work() { } + virtual ~Work() { } public: static Work* New(napi_env env, @@ -3374,47 +3373,36 @@ class Work : public node::AsyncResource { delete work; } - static void ExecuteCallback(uv_work_t* req) { - Work* work = static_cast(req->data); - work->_execute(work->_env, work->_data); + void DoThreadPoolWork() override { + _execute(_env, _data); } - static void CompleteCallback(uv_work_t* req, int status) { - Work* work = static_cast(req->data); + void AfterThreadPoolWork(int status) { + if (_complete == nullptr) + return; - if (work->_complete != nullptr) { - napi_env env = work->_env; + // Establish a handle scope here so that every callback doesn't have to. + // Also it is needed for the exception-handling below. + v8::HandleScope scope(_env->isolate); - // Establish a handle scope here so that every callback doesn't have to. - // Also it is needed for the exception-handling below. - v8::HandleScope scope(env->isolate); - node::Environment* env_ = node::Environment::GetCurrent(env->isolate); - env_->DecreaseWaitingRequestCounter(); + CallbackScope callback_scope(this); - CallbackScope callback_scope(work); + NAPI_CALL_INTO_MODULE(_env, + _complete(_env, ConvertUVErrorCode(status), _data), + [this] (v8::Local local_err) { + // If there was an unhandled exception in the complete callback, + // report it as a fatal exception. (There is no JavaScript on the + // callstack that can possibly handle it.) + v8impl::trigger_fatal_exception(_env, local_err); + }); - NAPI_CALL_INTO_MODULE(env, - work->_complete(env, ConvertUVErrorCode(status), work->_data), - [env] (v8::Local local_err) { - // If there was an unhandled exception in the complete callback, - // report it as a fatal exception. (There is no JavaScript on the - // callstack that can possibly handle it.) - v8impl::trigger_fatal_exception(env, local_err); - }); - - // Note: Don't access `work` after this point because it was - // likely deleted by the complete callback. - } - } - - uv_work_t* Request() { - return &_request; + // Note: Don't access `work` after this point because it was + // likely deleted by the complete callback. } private: napi_env _env; void* _data; - uv_work_t _request; napi_async_execute_callback _execute; napi_async_complete_callback _complete; }; @@ -3491,12 +3479,7 @@ napi_status napi_queue_async_work(napi_env env, napi_async_work work) { uvimpl::Work* w = reinterpret_cast(work); - node::Environment* env_ = node::Environment::GetCurrent(env->isolate); - env_->IncreaseWaitingRequestCounter(); - CALL_UV(env, uv_queue_work(event_loop, - w->Request(), - uvimpl::Work::ExecuteCallback, - uvimpl::Work::CompleteCallback)); + w->ScheduleWork(); return napi_clear_last_error(env); } @@ -3507,7 +3490,7 @@ napi_status napi_cancel_async_work(napi_env env, napi_async_work work) { uvimpl::Work* w = reinterpret_cast(work); - CALL_UV(env, uv_cancel(reinterpret_cast(w->Request()))); + CALL_UV(env, w->CancelWork()); return napi_clear_last_error(env); } diff --git a/src/node_crypto.cc b/src/node_crypto.cc index f818f9ee4b1ef0..25b47b798d8c9f 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -4562,7 +4562,7 @@ bool ECDH::IsKeyPairValid() { } -class PBKDF2Request : public AsyncWrap { +class PBKDF2Request : public AsyncWrap, public ThreadPoolWork { public: PBKDF2Request(Environment* env, Local object, @@ -4572,6 +4572,7 @@ class PBKDF2Request : public AsyncWrap { int keylen, int iteration_count) : AsyncWrap(env, object, AsyncWrap::PROVIDER_PBKDF2REQUEST), + ThreadPoolWork(env), digest_(digest), success_(false), pass_(std::move(pass)), @@ -4580,21 +4581,14 @@ class PBKDF2Request : public AsyncWrap { iteration_count_(iteration_count) { } - uv_work_t* work_req() { - return &work_req_; - } - size_t self_size() const override { return sizeof(*this); } - static void Work(uv_work_t* work_req); - void Work(); + void DoThreadPoolWork() override; + void AfterThreadPoolWork(int status) override; - static void After(uv_work_t* work_req, int status); void After(Local (*argv)[2]); - void After(); private: - uv_work_t work_req_; const EVP_MD* digest_; bool success_; MallocedBuffer pass_; @@ -4604,7 +4598,7 @@ class PBKDF2Request : public AsyncWrap { }; -void PBKDF2Request::Work() { +void PBKDF2Request::DoThreadPoolWork() { success_ = PKCS5_PBKDF2_HMAC( pass_.data, pass_.size, @@ -4617,12 +4611,6 @@ void PBKDF2Request::Work() { } -void PBKDF2Request::Work(uv_work_t* work_req) { - PBKDF2Request* req = ContainerOf(&PBKDF2Request::work_req_, work_req); - req->Work(); -} - - void PBKDF2Request::After(Local (*argv)[2]) { if (success_) { (*argv)[0] = Null(env()->isolate()); @@ -4635,7 +4623,12 @@ void PBKDF2Request::After(Local (*argv)[2]) { } -void PBKDF2Request::After() { +void PBKDF2Request::AfterThreadPoolWork(int status) { + std::unique_ptr req(this); + if (status == UV_ECANCELED) + return; + CHECK_EQ(status, 0); + HandleScope handle_scope(env()->isolate()); Context::Scope context_scope(env()->context()); Local argv[2]; @@ -4644,17 +4637,6 @@ void PBKDF2Request::After() { } -void PBKDF2Request::After(uv_work_t* work_req, int status) { - std::unique_ptr req( - ContainerOf(&PBKDF2Request::work_req_, work_req)); - req->env()->DecreaseWaitingRequestCounter(); - if (status == UV_ECANCELED) - return; - CHECK_EQ(status, 0); - req->After(); -} - - void PBKDF2(const FunctionCallbackInfo& args) { Environment* env = Environment::GetCurrent(args); @@ -4701,14 +4683,10 @@ void PBKDF2(const FunctionCallbackInfo& args) { if (args[5]->IsFunction()) { obj->Set(env->context(), env->ondone_string(), args[5]).FromJust(); - env->IncreaseWaitingRequestCounter(); - uv_queue_work(env->event_loop(), - req.release()->work_req(), - PBKDF2Request::Work, - PBKDF2Request::After); + req.release()->ScheduleWork(); } else { env->PrintSyncTrace(); - req->Work(); + req->DoThreadPoolWork(); Local argv[2]; req->After(&argv); @@ -4721,7 +4699,7 @@ void PBKDF2(const FunctionCallbackInfo& args) { // Only instantiate within a valid HandleScope. -class RandomBytesRequest : public AsyncWrap { +class RandomBytesRequest : public AsyncWrap, public ThreadPoolWork { public: enum FreeMode { FREE_DATA, DONT_FREE_DATA }; @@ -4731,16 +4709,13 @@ class RandomBytesRequest : public AsyncWrap { char* data, FreeMode free_mode) : AsyncWrap(env, object, AsyncWrap::PROVIDER_RANDOMBYTESREQUEST), + ThreadPoolWork(env), error_(0), size_(size), data_(data), free_mode_(free_mode) { } - uv_work_t* work_req() { - return &work_req_; - } - inline size_t size() const { return size_; } @@ -4778,7 +4753,8 @@ class RandomBytesRequest : public AsyncWrap { size_t self_size() const override { return sizeof(*this); } - uv_work_t work_req_; + void DoThreadPoolWork() override; + void AfterThreadPoolWork(int status) override; private: unsigned long error_; // NOLINT(runtime/int) @@ -4788,21 +4764,17 @@ class RandomBytesRequest : public AsyncWrap { }; -void RandomBytesWork(uv_work_t* work_req) { - RandomBytesRequest* req = - ContainerOf(&RandomBytesRequest::work_req_, work_req); - +void RandomBytesRequest::DoThreadPoolWork() { // Ensure that OpenSSL's PRNG is properly seeded. CheckEntropy(); - const int r = RAND_bytes(reinterpret_cast(req->data()), - req->size()); + const int r = RAND_bytes(reinterpret_cast(data_), size_); // RAND_bytes() returns 0 on error. if (r == 0) { - req->set_error(ERR_get_error()); // NOLINT(runtime/int) + set_error(ERR_get_error()); // NOLINT(runtime/int) } else if (r == -1) { - req->set_error(static_cast(-1)); // NOLINT(runtime/int) + set_error(static_cast(-1)); // NOLINT(runtime/int) } } @@ -4840,19 +4812,16 @@ void RandomBytesCheck(RandomBytesRequest* req, Local (*argv)[2]) { } -void RandomBytesAfter(uv_work_t* work_req, int status) { - std::unique_ptr req( - ContainerOf(&RandomBytesRequest::work_req_, work_req)); - Environment* env = req->env(); - env->DecreaseWaitingRequestCounter(); +void RandomBytesRequest::AfterThreadPoolWork(int status) { + std::unique_ptr req(this); if (status == UV_ECANCELED) return; CHECK_EQ(status, 0); - HandleScope handle_scope(env->isolate()); - Context::Scope context_scope(env->context()); + HandleScope handle_scope(env()->isolate()); + Context::Scope context_scope(env()->context()); Local argv[2]; - RandomBytesCheck(req.get(), &argv); - req->MakeCallback(env->ondone_string(), arraysize(argv), argv); + RandomBytesCheck(this, &argv); + MakeCallback(env()->ondone_string(), arraysize(argv), argv); } @@ -4860,7 +4829,7 @@ void RandomBytesProcessSync(Environment* env, std::unique_ptr req, Local (*argv)[2]) { env->PrintSyncTrace(); - RandomBytesWork(req->work_req()); + req->DoThreadPoolWork(); RandomBytesCheck(req.get(), argv); if (!(*argv)[0]->IsNull()) @@ -4887,11 +4856,7 @@ void RandomBytes(const FunctionCallbackInfo& args) { if (args[1]->IsFunction()) { obj->Set(env->context(), env->ondone_string(), args[1]).FromJust(); - env->IncreaseWaitingRequestCounter(); - uv_queue_work(env->event_loop(), - req.release()->work_req(), - RandomBytesWork, - RandomBytesAfter); + req.release()->ScheduleWork(); args.GetReturnValue().Set(obj); } else { Local argv[2]; @@ -4927,11 +4892,7 @@ void RandomBytesBuffer(const FunctionCallbackInfo& args) { if (args[3]->IsFunction()) { obj->Set(env->context(), env->ondone_string(), args[3]).FromJust(); - env->IncreaseWaitingRequestCounter(); - uv_queue_work(env->event_loop(), - req.release()->work_req(), - RandomBytesWork, - RandomBytesAfter); + req.release()->ScheduleWork(); args.GetReturnValue().Set(obj); } else { Local argv[2]; diff --git a/src/node_internals.h b/src/node_internals.h index d52d38aa138ca1..c10369c5631dd6 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -508,6 +508,41 @@ class InternalCallbackScope { bool closed_ = false; }; +class ThreadPoolWork { + public: + explicit inline ThreadPoolWork(Environment* env) : env_(env) {} + inline void ScheduleWork(); + inline int CancelWork(); + + virtual void DoThreadPoolWork() = 0; + virtual void AfterThreadPoolWork(int status) = 0; + + private: + Environment* env_; + uv_work_t work_req_; +}; + +void ThreadPoolWork::ScheduleWork() { + env_->IncreaseWaitingRequestCounter(); + int status = uv_queue_work( + env_->event_loop(), + &work_req_, + [](uv_work_t* req) { + ThreadPoolWork* self = ContainerOf(&ThreadPoolWork::work_req_, req); + self->DoThreadPoolWork(); + }, + [](uv_work_t* req, int status) { + ThreadPoolWork* self = ContainerOf(&ThreadPoolWork::work_req_, req); + self->env_->DecreaseWaitingRequestCounter(); + self->AfterThreadPoolWork(status); + }); + CHECK_EQ(status, 0); +} + +int ThreadPoolWork::CancelWork() { + return uv_cancel(reinterpret_cast(&work_req_)); +} + static inline const char *errno_string(int errorno) { #define ERRNO_CASE(e) case e: return #e; switch (errorno) { diff --git a/src/node_zlib.cc b/src/node_zlib.cc index 3249905dfbfaf9..c77e6d3297df5d 100644 --- a/src/node_zlib.cc +++ b/src/node_zlib.cc @@ -70,10 +70,11 @@ enum node_zlib_mode { /** * Deflate/Inflate */ -class ZCtx : public AsyncWrap { +class ZCtx : public AsyncWrap, public ThreadPoolWork { public: ZCtx(Environment* env, Local wrap, node_zlib_mode mode) : AsyncWrap(env, wrap, AsyncWrap::PROVIDER_ZLIB), + ThreadPoolWork(env), dictionary_(nullptr), dictionary_len_(0), err_(0), @@ -191,9 +192,6 @@ class ZCtx : public AsyncWrap { CHECK(Buffer::IsWithinBounds(out_off, out_len, Buffer::Length(out_buf))); out = reinterpret_cast(Buffer::Data(out_buf) + out_off); - // build up the work request - uv_work_t* work_req = &(ctx->work_req_); - ctx->strm_.avail_in = in_len; ctx->strm_.next_in = in; ctx->strm_.avail_out = out_len; @@ -203,7 +201,7 @@ class ZCtx : public AsyncWrap { if (!async) { // sync version env->PrintSyncTrace(); - Process(work_req); + ctx->DoThreadPoolWork(); if (CheckError(ctx)) { ctx->write_result_[0] = ctx->strm_.avail_out; ctx->write_result_[1] = ctx->strm_.avail_in; @@ -214,18 +212,24 @@ class ZCtx : public AsyncWrap { } // async version - env->IncreaseWaitingRequestCounter(); - uv_queue_work(env->event_loop(), work_req, ZCtx::Process, ZCtx::After); + ctx->ScheduleWork(); } + // TODO(addaleax): Make these methods non-static. It's a significant bunch + // of churn that's better left for a separate PR. + void DoThreadPoolWork() { + Process(this); + } + + void AfterThreadPoolWork(int status) { + After(this, status); + } // thread pool! // This function may be called multiple times on the uv_work pool // for a single write() call, until all of the input bytes have // been consumed. - static void Process(uv_work_t* work_req) { - ZCtx *ctx = ContainerOf(&ZCtx::work_req_, work_req); - + static void Process(ZCtx* ctx) { const Bytef* next_expected_header_byte = nullptr; // If the avail_out is left at 0, then it means that it ran out @@ -361,12 +365,10 @@ class ZCtx : public AsyncWrap { // v8 land! - static void After(uv_work_t* work_req, int status) { - ZCtx* ctx = ContainerOf(&ZCtx::work_req_, work_req); + static void After(ZCtx* ctx, int status) { Environment* env = ctx->env(); ctx->write_in_progress_ = false; - env->DecreaseWaitingRequestCounter(); if (status == UV_ECANCELED) { ctx->Close(); return; @@ -685,7 +687,6 @@ class ZCtx : public AsyncWrap { int strategy_; z_stream strm_; int windowBits_; - uv_work_t work_req_; bool write_in_progress_; bool pending_close_; unsigned int refs_; From 57dfd64f8ff10594423948e69212479b99b4685e Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 10 May 2018 19:24:16 +0200 Subject: [PATCH 065/208] src: add missing override to ThreadPoolWork funcs Currently the following warnings are displayed when compiling: ../src/node_api.cc:3380:8: warning: 'AfterThreadPoolWork' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] void AfterThreadPoolWork(int status) { ^ ../src/node_internals.h:513:16: note: overridden virtual function is here virtual void AfterThreadPoolWork(int status) = 0; ^ 1 warning generated. ../src/node_zlib.cc:220:8: warning: 'DoThreadPoolWork' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] void DoThreadPoolWork() { ^ ../src/node_internals.h:512:16: note: overridden virtual function is here virtual void DoThreadPoolWork() = 0; ^ ../src/node_zlib.cc:224:8: warning: 'AfterThreadPoolWork' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] void AfterThreadPoolWork(int status) { ^ ../src/node_internals.h:513:16: note: overridden virtual function is here virtual void AfterThreadPoolWork(int status) = 0; ^ 2 warnings generated. This commit adds override to the functions. PR-URL: https://github.com/nodejs/node/pull/20663 Reviewed-By: Anna Henningsen Reviewed-By: Michael Dawson --- src/node_api.cc | 2 +- src/node_zlib.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/node_api.cc b/src/node_api.cc index b456ade2d4ca74..fb3ea5df2ce006 100644 --- a/src/node_api.cc +++ b/src/node_api.cc @@ -3377,7 +3377,7 @@ class Work : public node::AsyncResource, public node::ThreadPoolWork { _execute(_env, _data); } - void AfterThreadPoolWork(int status) { + void AfterThreadPoolWork(int status) override { if (_complete == nullptr) return; diff --git a/src/node_zlib.cc b/src/node_zlib.cc index c77e6d3297df5d..ac5083862de4e3 100644 --- a/src/node_zlib.cc +++ b/src/node_zlib.cc @@ -217,11 +217,11 @@ class ZCtx : public AsyncWrap, public ThreadPoolWork { // TODO(addaleax): Make these methods non-static. It's a significant bunch // of churn that's better left for a separate PR. - void DoThreadPoolWork() { + void DoThreadPoolWork() override { Process(this); } - void AfterThreadPoolWork(int status) { + void AfterThreadPoolWork(int status) override { After(this, status); } From 87f3f5af2e03e1291019701670b80287d3c368db Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 10 May 2018 22:18:36 +0200 Subject: [PATCH 066/208] test: plug AliasedBuffer cctest memory leak No need to heap-allocate values here. PR-URL: https://github.com/nodejs/node/pull/20665 Reviewed-By: James M Snell Reviewed-By: Ben Noordhuis Reviewed-By: Colin Ihrig Reviewed-By: Daniel Bevenius --- test/cctest/test_aliased_buffer.cc | 79 ++++++++++++++---------------- 1 file changed, 37 insertions(+), 42 deletions(-) diff --git a/test/cctest/test_aliased_buffer.cc b/test/cctest/test_aliased_buffer.cc index 7afa466133b757..b2f29d3b7cb1ab 100644 --- a/test/cctest/test_aliased_buffer.cc +++ b/test/cctest/test_aliased_buffer.cc @@ -8,28 +8,26 @@ using node::AliasedBuffer; class AliasBufferTest : public NodeTestFixture {}; template -void CreateOracleValues(NativeT* buf, size_t count) { - for (size_t i = 0, j = count; i < count; i++, j--) { - buf[i] = static_cast(j); +void CreateOracleValues(std::vector* buf) { + for (size_t i = 0, j = buf->size(); i < buf->size(); i++, j--) { + (*buf)[i] = static_cast(j); } } template void WriteViaOperator(AliasedBuffer* aliasedBuffer, - size_t size, - NativeT* oracle) { + const std::vector& oracle) { // write through the API - for (size_t i = 0; i < size; i++) { + for (size_t i = 0; i < oracle.size(); i++) { (*aliasedBuffer)[i] = oracle[i]; } } template void WriteViaSetValue(AliasedBuffer* aliasedBuffer, - size_t size, - NativeT* oracle) { + const std::vector& oracle) { // write through the API - for (size_t i = 0; i < size; i++) { + for (size_t i = 0; i < oracle.size(); i++) { aliasedBuffer->SetValue(i, oracle[i]); } } @@ -38,10 +36,9 @@ template void ReadAndValidate(v8::Isolate* isolate, v8::Local context, AliasedBuffer* aliasedBuffer, - size_t size, - NativeT* oracle) { + const std::vector& oracle) { // read through the API - for (size_t i = 0; i < size; i++) { + for (size_t i = 0; i < oracle.size(); i++) { NativeT v1 = (*aliasedBuffer)[i]; NativeT v2 = aliasedBuffer->GetValue(i); EXPECT_TRUE(v1 == oracle[i]); @@ -49,16 +46,16 @@ void ReadAndValidate(v8::Isolate* isolate, } // validate size of JS Buffer - EXPECT_TRUE(aliasedBuffer->GetJSArray()->Length() == size); + EXPECT_TRUE(aliasedBuffer->GetJSArray()->Length() == oracle.size()); EXPECT_TRUE( aliasedBuffer->GetJSArray()->ByteLength() == - (size * sizeof(NativeT))); + (oracle.size() * sizeof(NativeT))); // validate operator * and GetBuffer are the same EXPECT_TRUE(aliasedBuffer->GetNativeBuffer() == *(*aliasedBuffer)); // read through the JS API - for (size_t i = 0; i < size; i++) { + for (size_t i = 0; i < oracle.size(); i++) { v8::Local v8TypedArray = aliasedBuffer->GetJSArray(); v8::MaybeLocal v = v8TypedArray->Get(context, i); EXPECT_TRUE(v.IsEmpty() == false); @@ -80,21 +77,19 @@ void ReadWriteTest(v8::Isolate* isolate) { const size_t size = 100; AliasedBuffer ab(isolate, size); - NativeT* oracle = new NativeT[size]; - CreateOracleValues(oracle, size); - WriteViaOperator(&ab, size, oracle); - ReadAndValidate(isolate, context, &ab, size, oracle); + std::vector oracle(size); + CreateOracleValues(&oracle); + WriteViaOperator(&ab, oracle); + ReadAndValidate(isolate, context, &ab, oracle); - WriteViaSetValue(&ab, size, oracle); + WriteViaSetValue(&ab, oracle); // validate copy constructor { AliasedBuffer ab2(ab); - ReadAndValidate(isolate, context, &ab2, size, oracle); + ReadAndValidate(isolate, context, &ab2, oracle); } - ReadAndValidate(isolate, context, &ab, size, oracle); - - delete[] oracle; + ReadAndValidate(isolate, context, &ab, oracle); } template< @@ -124,28 +119,28 @@ void SharedBufferTest( AliasedBuffer ab_C( isolate, sizeInBytes_A + sizeInBytes_B, count_C, rootBuffer); - NativeT_A* oracle_A = new NativeT_A[count_A]; - NativeT_B* oracle_B = new NativeT_B[count_B]; - NativeT_C* oracle_C = new NativeT_C[count_C]; - CreateOracleValues(oracle_A, count_A); - CreateOracleValues(oracle_B, count_B); - CreateOracleValues(oracle_C, count_C); + std::vector oracle_A(count_A); + std::vector oracle_B(count_B); + std::vector oracle_C(count_C); + CreateOracleValues(&oracle_A); + CreateOracleValues(&oracle_B); + CreateOracleValues(&oracle_C); - WriteViaOperator(&ab_A, count_A, oracle_A); - WriteViaOperator(&ab_B, count_B, oracle_B); - WriteViaOperator(&ab_C, count_C, oracle_C); + WriteViaOperator(&ab_A, oracle_A); + WriteViaOperator(&ab_B, oracle_B); + WriteViaOperator(&ab_C, oracle_C); - ReadAndValidate(isolate, context, &ab_A, count_A, oracle_A); - ReadAndValidate(isolate, context, &ab_B, count_B, oracle_B); - ReadAndValidate(isolate, context, &ab_C, count_C, oracle_C); + ReadAndValidate(isolate, context, &ab_A, oracle_A); + ReadAndValidate(isolate, context, &ab_B, oracle_B); + ReadAndValidate(isolate, context, &ab_C, oracle_C); - WriteViaSetValue(&ab_A, count_A, oracle_A); - WriteViaSetValue(&ab_B, count_B, oracle_B); - WriteViaSetValue(&ab_C, count_C, oracle_C); + WriteViaSetValue(&ab_A, oracle_A); + WriteViaSetValue(&ab_B, oracle_B); + WriteViaSetValue(&ab_C, oracle_C); - ReadAndValidate(isolate, context, &ab_A, count_A, oracle_A); - ReadAndValidate(isolate, context, &ab_B, count_B, oracle_B); - ReadAndValidate(isolate, context, &ab_C, count_C, oracle_C); + ReadAndValidate(isolate, context, &ab_A, oracle_A); + ReadAndValidate(isolate, context, &ab_B, oracle_B); + ReadAndValidate(isolate, context, &ab_C, oracle_C); } TEST_F(AliasBufferTest, Uint8Array) { From b10823506dcfa9bf966acb00b1738a02da60d8dc Mon Sep 17 00:00:00 2001 From: James M Snell Date: Sat, 5 May 2018 21:34:50 -0700 Subject: [PATCH 067/208] meta: add initial CODEOWNERS file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/20554 Reviewed-By: Gus Caplan Reviewed-By: Trivikram Kamat Reviewed-By: Michaël Zasso Reviewed-By: Matheus Marchini --- .github/CODEOWNERS | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000000000..fcf8667c7e6431 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,86 @@ +# Remember: order matters. Subsequent rules will override prior rules. + +*addons* @nodejs/addon-api +*assert* @nodejs/testing +*async_hook* @nodejs/async_hooks @nodejs/diagnostics +*async_wrap* @nodejs/async_hooks +*buffer* @nodejs/buffer +*child_process* @nodejs/child_process +*cluster* @nodejs/cluster +*crypto* @nodejs/crypto +*eslint* @nodejs/linting +*fs* @nodejs/fs +*tls* @nodejs/tls @nodejs/crypto +*dgram* @nodejs/dgram +*domain* @nodejs/domains +*http* @nodejs/http +*http2* @nodejs/http2 +*https* @nodejs/http @nodejs/crypto @nodejs/tls @nodejs/http2 +*inspector* @nodejs/V8-inspector +*net* @nodejs/streams +*node_api* @nodejs/n-api +*repl* @nodejs/repl +*stream* @nodejs/streams +*timer* @nodejs/timers +*trace_events* @nodejs/trace-events +*url* @nodejs/url +*util* @nodejs/util +*vm* @nodejs/vm +*zlib* @nodejs/zlib + +*esm* @nodejs/modules +/lib/internal/modules/esm/ @nodejs/modules +/lib/internal/bootstrap/loaders.js @nodejs/modules + +/src/node.cc @nodejs/process +/src/node_file.* @nodejs/fs +/src/node_stat_watcher.* @nodejs/fs +/lib/internal/bootstrap/ @nodejs/process +/lib/internal/process/ @nodejs/process +/test/ @nodejs/testing + +/deps/node-inspect @nodejs/V8-inspector +/deps/gtest/ @nodejs/testing @nodejs/v8 @nodejs/v8-update +/deps/icu/ @nodejs/intl +/deps/http_parser/ @nodejs/http-parser @nodejs/http +/deps/zlib/ @nodejs/zlib +/deps/uv/ @nodejs/libuv +/deps/npm/ @nodejs/npm +/deps/v8/ @nodejs/v8 @nodejs/v8-update +/deps/zlib @nodejs/zlib +/deps/openssl @nodejs/crypto + +/benchmark/ @nodejs/performance @nodejs/benchmarking + +/doc/ @nodejs/documentation +*.md @nodejs/documentation +*.py @nodejs/python +*.gyp @nodejs/gyp + +Makefile @nodejs/build +vcbuild.bat @nodejs/build +BUILDING.md @nodejs/build +configure @nodejs/build +BSDMakefile @nodejs/build +android-configure @nodejs/build + +*aix* @nodejs/platform-aix +*arm* @nodejs/platform-arm +*freebsd* @nodejs/platform-freebsd +*macos* @nodejs/platform-macos +*ppc* @nodejs/platform-ppc +*smartos* @nodejs/platform-smartos +*s390* @nodejs/platform-s390 +*windows* @nodejs/platform-windows + +CODE_OF_CONDUCT.md @nodejs/tsc +COLLABORATOR_GUIDE.md @nodejs/tsc +CONTRIBUTING.md @nodejs/tsc +CPP_STYLE_GUIDE.md @nodejs/tsc +GOVERNANCE.md @nodejs/tsc +LICENSE @nodejs/tsc +README.md @nodejs/tsc + +/src/node_postmortem_metadata.cc @nodejs/diagnostics @nodejs/post-mortem +/src/*.d @nodejs/diagnostics @nodejs/platform-smartos @nodejs/platform-freebsd @nodejs/platform-macos @nodejs/dtrace-mdb +/src/node.stp @nodejs/diagnostics From 512982c0fff6ec645324e99d31e5b3c8b3307b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Thu, 10 May 2018 15:37:13 +0200 Subject: [PATCH 068/208] doc: update AUTHORS list PR-URL: https://github.com/nodejs/node/pull/20658 Reviewed-By: Ruben Bridgewater Reviewed-By: Gus Caplan Reviewed-By: Michael Dawson Reviewed-By: Colin Ihrig Reviewed-By: Daniel Bevenius Reviewed-By: Trivikram Kamat Reviewed-By: James M Snell --- .mailmap | 4 ++++ AUTHORS | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/.mailmap b/.mailmap index 48da4f54b23828..16c9bf1ea21ef6 100644 --- a/.mailmap +++ b/.mailmap @@ -110,6 +110,7 @@ Evan Lucas FangDun Cai Fangdun Cai (Fundon) Fangshi He hefangshi Farid Neshat +Fatah N fatahn Fedor Indutny Felix Böhm Felix Geisendörfer @@ -145,6 +146,7 @@ Imran Iqbal Ionică Bizău Isaac Z. Schlueter Isaac Z. Schlueter +Isuru Siriwardana isurusiri Italo A. Casas Jackson Tian Jake Verbaten @@ -169,6 +171,7 @@ John Barboza jBarz John Barboza jBarz John Gardner Alhadis John McGuirk jmcgui05 +John Musgrave musgravejw Johnny Ray Austin Johnny Ray Jon Tippens legalcodes Jonas Pfenniger @@ -365,6 +368,7 @@ Tom Hughes-Croucher Tom Purcell tpurcell Tom White Tomoki Okahana umatoma +Tracy Hinds Tracy Travis Meisenheimer Trevor Burnham Trivikram Kamat <16024985+trivikr@users.noreply.github.com> diff --git a/AUTHORS b/AUTHORS index dfacc53994b2d8..3a156cbd2cb373 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2139,5 +2139,63 @@ wangzengdi Garwah Lam jaspal-yupana Arian Santrach +Forrest Wolf +Fatah N +Divyanshu Singh +FallenRiteMonk +Rajkumar Purushothaman +Chris Miller +Dave O'Mahony +nodeav <30617226+nodeav@users.noreply.github.com> +Zhenzhen Zhan +Ryusei Yamaguchi +Kohei Hiraga +Nick Filatov +Jesse Gorzinski +Pieter Mees +Malcolm White +Gerhard Stoebich +Matei Copot +ikasumiwt +Gurin, Sebastian +Indranil Dasgupta +Harry Sarson +Snehil Verma +Joseph Gordon +Antoine du HAMEL +Rémi Berson +Alec Larson +Daven Casia +Isuru Siriwardana +Spencer Greene +Palash Nigam +SheetJS +Bryan Azofeifa +Christine E. Taylor +John Musgrave +Dhansuhu Uzumaki +Beni von Cheni +Ilya Sotov +William Cohen +Ajido +Mithun Sasidharan +kailash k yogeshwar +Daniel Hritzkiv +Mark Tiedemann +xsbchen +Kyle Martin +Denis Fäcke +Daylor Yanes +Carrie Coxwell +BeniCheni +Masashi Hirano +Brandon Ruggles +Allen Yonghuang Wang +Yichao 'Peak' Ji +Jesse W. Collins +TSUYUSATO Kitsune +daGo +Lambdac0re +Yulong Wang # Generated by tools/update-authors.sh From e732b4ce5c32467988dadd639a325350b4b96f22 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 11 May 2018 08:27:20 +0200 Subject: [PATCH 069/208] src: use unqualified names in node_contextify.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit removes the usage of qualified names for consistency. PR-URL: https://github.com/nodejs/node/pull/20669 Reviewed-By: Michaël Zasso Reviewed-By: Anna Henningsen Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Colin Ihrig Reviewed-By: Tobias Nießen Reviewed-By: Luigi Pinca Reviewed-By: James M Snell --- src/node_contextify.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/node_contextify.cc b/src/node_contextify.cc index da1eecf1666d80..fa2c86e809542c 100644 --- a/src/node_contextify.cc +++ b/src/node_contextify.cc @@ -63,6 +63,7 @@ using v8::Uint8Array; using v8::UnboundScript; using v8::Value; using v8::WeakCallbackInfo; +using v8::WeakCallbackType; // The vm module executes code in a sandboxed environment with a different // global object than the rest of the code. This is achieved by applying @@ -103,7 +104,7 @@ ContextifyContext::ContextifyContext( // Allocation failure or maximum call stack size reached if (context_.IsEmpty()) return; - context_.SetWeak(this, WeakCallback, v8::WeakCallbackType::kParameter); + context_.SetWeak(this, WeakCallback, WeakCallbackType::kParameter); } @@ -420,7 +421,7 @@ void ContextifyContext::PropertyDefinerCallback( return; Local context = ctx->context(); - v8::Isolate* isolate = context->GetIsolate(); + Isolate* isolate = context->GetIsolate(); auto attributes = PropertyAttribute::None; bool is_declared = @@ -453,13 +454,13 @@ void ContextifyContext::PropertyDefinerCallback( if (desc.has_get() || desc.has_set()) { PropertyDescriptor desc_for_sandbox( - desc.has_get() ? desc.get() : v8::Undefined(isolate).As(), - desc.has_set() ? desc.set() : v8::Undefined(isolate).As()); + desc.has_get() ? desc.get() : Undefined(isolate).As(), + desc.has_set() ? desc.set() : Undefined(isolate).As()); define_prop_on_sandbox(&desc_for_sandbox); } else { Local value = - desc.has_value() ? desc.value() : v8::Undefined(isolate).As(); + desc.has_value() ? desc.value() : Undefined(isolate).As(); if (desc.has_writable()) { PropertyDescriptor desc_for_sandbox(value, desc.writable()); From 9422909e0791462e2b23a33dc46115bc7efcc551 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 11 May 2018 08:43:03 +0200 Subject: [PATCH 070/208] src: remove unused includes from node_contextify.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/20670 Reviewed-By: Michaël Zasso Reviewed-By: Anna Henningsen Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Colin Ihrig Reviewed-By: Luigi Pinca Reviewed-By: James M Snell --- src/node_contextify.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/node_contextify.h b/src/node_contextify.h index 70ce091af3b58e..20bf2dafe2087c 100644 --- a/src/node_contextify.h +++ b/src/node_contextify.h @@ -2,8 +2,6 @@ #define SRC_NODE_CONTEXTIFY_H_ #include "node_internals.h" -#include "node_watchdog.h" -#include "base_object-inl.h" #include "node_context_data.h" namespace node { From 28ecf93dc5f2299aa072577f8d9d9e86d7f0e670 Mon Sep 17 00:00:00 2001 From: Mathias Buus Date: Fri, 6 Apr 2018 17:50:58 +0200 Subject: [PATCH 071/208] http2: destroy the socket properly and add tests Fix a bug where the socket wasn't being correctly destroyed and adjust existing tests, as well as add additional tests. PR-URL: https://github.com/nodejs/node/pull/19852 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Co-authored-by: Matteo Collina --- lib/internal/http2/core.js | 2 +- .../test-http2-many-writes-and-destroy.js | 30 +++++++++++++++++++ test/parallel/test-http2-pipe.js | 1 + .../test-http2-server-close-callback.js | 24 +++++++++++++++ ...est-http2-server-stream-session-destroy.js | 12 ++++++-- test/parallel/test-http2-session-unref.js | 14 ++++++--- .../test-http2-max-session-memory.js | 4 +++ 7 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 test/parallel/test-http2-many-writes-and-destroy.js create mode 100644 test/parallel/test-http2-server-close-callback.js diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index 0efdf9c063bf35..e7dbf9853fd49a 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -1175,7 +1175,7 @@ class Http2Session extends EventEmitter { // Otherwise, destroy immediately. if (!socket.destroyed) { if (!error) { - setImmediate(socket.end.bind(socket)); + setImmediate(socket.destroy.bind(socket)); } else { socket.destroy(error); } diff --git a/test/parallel/test-http2-many-writes-and-destroy.js b/test/parallel/test-http2-many-writes-and-destroy.js new file mode 100644 index 00000000000000..78db76e001cd3a --- /dev/null +++ b/test/parallel/test-http2-many-writes-and-destroy.js @@ -0,0 +1,30 @@ +'use strict'; + +const common = require('../common'); +if (!common.hasCrypto) + common.skip('missing crypto'); +const http2 = require('http2'); + +{ + const server = http2.createServer((req, res) => { + req.pipe(res); + }); + + server.listen(0, () => { + const url = `http://localhost:${server.address().port}`; + const client = http2.connect(url); + const req = client.request({ ':method': 'POST' }); + + for (let i = 0; i < 4000; i++) { + req.write(Buffer.alloc(6)); + } + + req.on('close', common.mustCall(() => { + console.log('(req onclose)'); + server.close(); + client.close(); + })); + + req.once('data', common.mustCall(() => req.destroy())); + }); +} diff --git a/test/parallel/test-http2-pipe.js b/test/parallel/test-http2-pipe.js index 2a759f9848721b..d7dd99df91edb5 100644 --- a/test/parallel/test-http2-pipe.js +++ b/test/parallel/test-http2-pipe.js @@ -33,6 +33,7 @@ server.listen(0, common.mustCall(() => { const client = http2.connect(`http://localhost:${server.address().port}`); const req = client.request({ ':method': 'POST' }); + req.on('response', common.mustCall()); req.resume(); diff --git a/test/parallel/test-http2-server-close-callback.js b/test/parallel/test-http2-server-close-callback.js new file mode 100644 index 00000000000000..66887aa62bebe5 --- /dev/null +++ b/test/parallel/test-http2-server-close-callback.js @@ -0,0 +1,24 @@ +'use strict'; + +const common = require('../common'); +if (!common.hasCrypto) + common.skip('missing crypto'); + +const http2 = require('http2'); + +const server = http2.createServer(); + +server.listen(0, common.mustCall(() => { + const client = http2.connect(`http://localhost:${server.address().port}`); + client.on('error', (err) => { + if (err.code !== 'ECONNRESET') + throw err; + }); +})); + +server.on('session', common.mustCall((s) => { + setImmediate(() => { + server.close(common.mustCall()); + s.destroy(); + }); +})); diff --git a/test/parallel/test-http2-server-stream-session-destroy.js b/test/parallel/test-http2-server-stream-session-destroy.js index 989c72ec959679..ef4f42fe39bc3a 100644 --- a/test/parallel/test-http2-server-stream-session-destroy.js +++ b/test/parallel/test-http2-server-stream-session-destroy.js @@ -44,10 +44,16 @@ server.on('stream', common.mustCall((stream) => { server.listen(0, common.mustCall(() => { const client = h2.connect(`http://localhost:${server.address().port}`); - client.on('error', () => {}); + client.on('error', (err) => { + if (err.code !== 'ECONNRESET') + throw err; + }); const req = client.request(); req.resume(); req.on('end', common.mustCall()); - req.on('close', common.mustCall(() => server.close())); - req.on('error', () => {}); + req.on('close', common.mustCall(() => server.close(common.mustCall()))); + req.on('error', (err) => { + if (err.code !== 'ECONNRESET') + throw err; + }); })); diff --git a/test/parallel/test-http2-session-unref.js b/test/parallel/test-http2-session-unref.js index e63cd0d208e32b..f946c2d3377b87 100644 --- a/test/parallel/test-http2-session-unref.js +++ b/test/parallel/test-http2-session-unref.js @@ -34,8 +34,11 @@ server.listen(0, common.mustCall(() => { // unref destroyed client { const client = http2.connect(`http://localhost:${port}`); - client.destroy(); - client.unref(); + + client.on('connect', common.mustCall(() => { + client.destroy(); + client.unref(); + })); } // unref destroyed client @@ -43,8 +46,11 @@ server.listen(0, common.mustCall(() => { const client = http2.connect(`http://localhost:${port}`, { createConnection: common.mustCall(() => clientSide) }); - client.destroy(); - client.unref(); + + client.on('connect', common.mustCall(() => { + client.destroy(); + client.unref(); + })); } })); server.emit('connection', serverSide); diff --git a/test/sequential/test-http2-max-session-memory.js b/test/sequential/test-http2-max-session-memory.js index d6d3bf935db801..644a20a3c88a50 100644 --- a/test/sequential/test-http2-max-session-memory.js +++ b/test/sequential/test-http2-max-session-memory.js @@ -13,6 +13,10 @@ const largeBuffer = Buffer.alloc(1e6); const server = http2.createServer({ maxSessionMemory: 1 }); server.on('stream', common.mustCall((stream) => { + stream.on('error', (err) => { + if (err.code !== 'ECONNRESET') + throw err; + }); stream.respond(); stream.end(largeBuffer); })); From ebc1b77e5a3f631711ff5765bc575b903bfde360 Mon Sep 17 00:00:00 2001 From: Jackson Tian Date: Wed, 9 May 2018 01:24:44 +0800 Subject: [PATCH 072/208] stream: no need to initial er with false initial `er` with false is unnecessarily. PR-URL: https://github.com/nodejs/node/pull/20607 Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig Reviewed-By: Weijia Wang Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat --- lib/_stream_writable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js index d21daf0541d339..fff47a703fe252 100644 --- a/lib/_stream_writable.js +++ b/lib/_stream_writable.js @@ -251,7 +251,7 @@ function writeAfterEnd(stream, cb) { // and undefined/non-string values are only allowed in object mode. function validChunk(stream, state, chunk, cb) { var valid = true; - var er = false; + var er; if (chunk === null) { er = new ERR_STREAM_NULL_VALUES(); From 2db83fdc0c3feca60a9dadacaf4fbc1e5e6c6cf9 Mon Sep 17 00:00:00 2001 From: Francesco Falanga Date: Sun, 13 May 2018 18:29:25 +0200 Subject: [PATCH 073/208] test: remove deepStrictEqual() third argument The call to assert.deepStrictEqual() has a string literal for its third argument. Unfortunately, a side effect of that is that the values of the first two arguments are not displayed if there is an AssertionError. That information is useful for debugging. PR-URL: https://github.com/nodejs/node/pull/20702 Reviewed-By: Colin Ihrig Reviewed-By: Ruben Bridgewater Reviewed-By: Rich Trott Reviewed-By: Trivikram Kamat Reviewed-By: Anna Henningsen --- test/parallel/test-net-socket-local-address.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-net-socket-local-address.js b/test/parallel/test-net-socket-local-address.js index c4f11db76bc4f2..1aa51e0c5c1d87 100644 --- a/test/parallel/test-net-socket-local-address.js +++ b/test/parallel/test-net-socket-local-address.js @@ -17,8 +17,8 @@ const server = net.createServer((socket) => { }); server.on('close', common.mustCall(() => { - assert.deepStrictEqual(clientLocalPorts, serverRemotePorts, - 'client and server should agree on the ports used'); + // client and server should agree on the ports used + assert.deepStrictEqual(clientLocalPorts, serverRemotePorts); assert.strictEqual(2, conns); })); From 8029a2473e032c5006d2dfc3044bdce1b221dee4 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Tue, 8 May 2018 21:56:24 +0200 Subject: [PATCH 074/208] http: always emit close on req and res PR-URL: https://github.com/nodejs/node/pull/20611 Fixes: https://github.com/nodejs/node/issues/20600 Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat --- lib/_http_server.js | 2 ++ test/parallel/test-http-req-res-close.js | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 test/parallel/test-http-req-res-close.js diff --git a/lib/_http_server.js b/lib/_http_server.js index 9c8b5cb8fbfe8e..928b57b3719684 100644 --- a/lib/_http_server.js +++ b/lib/_http_server.js @@ -561,6 +561,8 @@ function resOnFinish(req, res, socket, state, server) { req._dump(); res.detachSocket(socket); + req.emit('close'); + res.emit('close'); if (res._last) { if (typeof socket.destroySoon === 'function') { diff --git a/test/parallel/test-http-req-res-close.js b/test/parallel/test-http-req-res-close.js new file mode 100644 index 00000000000000..240134cb5d0902 --- /dev/null +++ b/test/parallel/test-http-req-res-close.js @@ -0,0 +1,16 @@ +'use strict'; + +const common = require('../common'); +const http = require('http'); + +const server = http.Server(common.mustCall((req, res) => { + res.end(); + res.on('finish', common.mustCall()); + res.on('close', common.mustCall()); + req.on('close', common.mustCall()); + res.socket.on('close', () => server.close()); +})); + +server.listen(0, common.mustCall(() => { + http.get({ port: server.address().port }, common.mustCall()); +})); From 30aceedba678a2e5c38de1999cf6ab821d5f1b6e Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 11 May 2018 09:20:26 +0200 Subject: [PATCH 075/208] src: make env_ and context_ private MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit makes the currently protected members env_ and context_ private in node_contextify.h. PR-URL: https://github.com/nodejs/node/pull/20671 Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Tobias Nießen Reviewed-By: James M Snell --- src/node_contextify.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/node_contextify.h b/src/node_contextify.h index 20bf2dafe2087c..2ebfef7f27374d 100644 --- a/src/node_contextify.h +++ b/src/node_contextify.h @@ -15,10 +15,6 @@ struct ContextOptions { }; class ContextifyContext { - protected: - Environment* const env_; - Persistent context_; - public: ContextifyContext(Environment* env, v8::Local sandbox_obj, @@ -97,6 +93,8 @@ class ContextifyContext { static void IndexedPropertyDeleterCallback( uint32_t index, const v8::PropertyCallbackInfo& args); + Environment* const env_; + Persistent context_; }; } // namespace contextify From 4c6bfbdbb4b00f2bee94869ee13a78084010880d Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Mon, 23 Apr 2018 14:42:19 -0200 Subject: [PATCH 076/208] http: fix client response close & aborted Fixes: https://github.com/nodejs/node/issues/20102 Fixes: https://github.com/nodejs/node/issues/20101 Fixes: https://github.com/nodejs/node/issues/1735 - Response should always emit close. - Response should always emit aborted if aborted. - Response should always emit close after request has emitted close. PR-URL: https://github.com/nodejs/node/pull/20075 Fixes: https://github.com/nodejs/node/issues/17352 Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat --- lib/_http_client.js | 39 ++++++++----- test/parallel/test-http-response-close.js | 71 +++++++++++++++-------- 2 files changed, 69 insertions(+), 41 deletions(-) diff --git a/lib/_http_client.js b/lib/_http_client.js index 04880182dace91..3e9c6e994cd01b 100644 --- a/lib/_http_client.js +++ b/lib/_http_client.js @@ -328,26 +328,33 @@ function socketCloseListener() { // NOTE: It's important to get parser here, because it could be freed by // the `socketOnData`. - var parser = socket.parser; - if (req.res && req.res.readable) { + const parser = socket.parser; + const res = req.res; + if (res) { // Socket closed before we emitted 'end' below. - if (!req.res.complete) { - req.res.aborted = true; - req.res.emit('aborted'); + if (!res.complete) { + res.aborted = true; + res.emit('aborted'); } - var res = req.res; - res.on('end', function() { + req.emit('close'); + if (res.readable) { + res.on('end', function() { + this.emit('close'); + }); + res.push(null); + } else { res.emit('close'); - }); - res.push(null); - } else if (!req.res && !req.socket._hadError) { - // This socket error fired before we started to - // receive a response. The error needs to - // fire on the request. - req.socket._hadError = true; - req.emit('error', createHangUpError()); + } + } else { + if (!req.socket._hadError) { + // This socket error fired before we started to + // receive a response. The error needs to + // fire on the request. + req.socket._hadError = true; + req.emit('error', createHangUpError()); + } + req.emit('close'); } - req.emit('close'); // Too bad. That output wasn't getting written. // This is pretty terrible that it doesn't raise an error. diff --git a/test/parallel/test-http-response-close.js b/test/parallel/test-http-response-close.js index c58a5884d59d1a..4c36003357980b 100644 --- a/test/parallel/test-http-response-close.js +++ b/test/parallel/test-http-response-close.js @@ -23,29 +23,50 @@ const common = require('../common'); const http = require('http'); -const server = http.createServer(common.mustCall(function(req, res) { - res.writeHead(200); - res.write('a'); +{ + const server = http.createServer( + common.mustCall((req, res) => { + res.writeHead(200); + res.write('a'); + }) + ); + server.listen( + 0, + common.mustCall(() => { + http.get( + { port: server.address().port }, + common.mustCall((res) => { + res.on('data', common.mustCall(() => { + res.destroy(); + })); + res.on('close', common.mustCall(() => { + server.close(); + })); + }) + ); + }) + ); +} - req.on('close', common.mustCall(function() { - console.error('request aborted'); - })); - res.on('close', common.mustCall(function() { - console.error('response aborted'); - })); -})); -server.listen(0); - -server.on('listening', function() { - console.error('make req'); - http.get({ - port: this.address().port - }, function(res) { - console.error('got res'); - res.on('data', function(data) { - console.error('destroy res'); - res.destroy(); - server.close(); - }); - }); -}); +{ + const server = http.createServer( + common.mustCall((req, res) => { + res.writeHead(200); + res.end('a'); + }) + ); + server.listen( + 0, + common.mustCall(() => { + http.get( + { port: server.address().port }, + common.mustCall((res) => { + res.on('close', common.mustCall(() => { + server.close(); + })); + res.resume(); + }) + ); + }) + ); +} From 7a980086c84852049606e81c3715ecd076b74a3a Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Sat, 28 Apr 2018 00:21:46 +0800 Subject: [PATCH 077/208] build: always use BUILDTYPE binary to run JS tests PR-URL: https://github.com/nodejs/node/pull/20362 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Richard Lau Reviewed-By: Ruben Bridgewater Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat --- Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 02d97b633d87d6..e74f29b84dde6b 100644 --- a/Makefile +++ b/Makefile @@ -234,7 +234,7 @@ v8: .PHONY: jstest jstest: build-addons build-addons-napi ## Runs addon tests and JS tests - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release \ + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \ $(CI_JS_SUITES) \ $(CI_NATIVE_SUITES) @@ -269,13 +269,13 @@ test-cov: all $(MAKE) lint test-parallel: all - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release parallel + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) parallel test-valgrind: all - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release --valgrind sequential parallel message + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --valgrind sequential parallel message test-check-deopts: all - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release --check-deopts parallel sequential + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --check-deopts parallel sequential benchmark/misc/function_call/build/Release/binding.node: all \ benchmark/misc/function_call/binding.cc \ @@ -398,7 +398,7 @@ clear-stalled: .PHONY: test-gc test-gc: all test/gc/build/Release/binding.node - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release gc + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) gc .PHONY: test-gc-clean test-gc-clean: @@ -425,7 +425,7 @@ CI_DOC := doctool test-ci-native: LOGLEVEL := info test-ci-native: | test/addons/.buildstamp test/addons-napi/.buildstamp $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ - --mode=release --flaky-tests=$(FLAKY_TESTS) \ + --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_NATIVE_SUITES) .PHONY: test-ci-js @@ -433,7 +433,7 @@ test-ci-native: | test/addons/.buildstamp test/addons-napi/.buildstamp # Related CI job: node-test-commit-arm-fanned test-ci-js: | clear-stalled $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ - --mode=release --flaky-tests=$(FLAKY_TESTS) \ + --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_JS_SUITES) # Clean up any leftover processes, error if found. ps awwx | grep Release/node | grep -v grep | cat @@ -448,7 +448,7 @@ test-ci: LOGLEVEL := info test-ci: | clear-stalled build-addons build-addons-napi doc-only out/Release/cctest --gtest_output=tap:cctest.tap $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ - --mode=release --flaky-tests=$(FLAKY_TESTS) \ + --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC) # Clean up any leftover processes, error if found. ps awwx | grep Release/node | grep -v grep | cat @@ -475,7 +475,7 @@ run-ci: build-ci $(MAKE) test-ci test-release: test-build - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test-debug: test-build $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=debug @@ -521,7 +521,7 @@ test-npm-publish: $(NODE_EXE) .PHONY: test-addons-napi test-addons-napi: test-build-addons-napi - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release addons-napi + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) addons-napi .PHONY: test-addons-napi-clean test-addons-napi-clean: @@ -530,7 +530,7 @@ test-addons-napi-clean: .PHONY: test-addons test-addons: test-build test-addons-napi - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release addons + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) addons .PHONY: test-addons-clean test-addons-clean: @@ -541,19 +541,19 @@ test-addons-clean: test-timers: $(MAKE) --directory=tools faketime - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release timers + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) timers test-timers-clean: $(MAKE) --directory=tools clean test-async-hooks: - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release async-hooks + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) async-hooks test-with-async-hooks: $(MAKE) build-addons $(MAKE) build-addons-napi $(MAKE) cctest - NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release \ + NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \ $(CI_JS_SUITES) \ $(CI_NATIVE_SUITES) From 0aab92f6b2ef1751a1de04dc7fd159916761ad0d Mon Sep 17 00:00:00 2001 From: Maya Lekova Date: Wed, 9 May 2018 15:05:51 +0200 Subject: [PATCH 078/208] test: add test for async hooks parity for async/await Add a basic test ensuring parity between before-after and init-promiseResolve hooks when using async/await. Add ability to initHooks and to checkInvocations utilities to transmit promiseResolve hook as well. See: https://github.com/nodejs/node/issues/20516 PR-URL: https://github.com/nodejs/node/pull/20626 Refs: https://github.com/nodejs/node/issues/20516 Reviewed-By: James M Snell Reviewed-By: Matteo Collina Reviewed-By: Benjamin Gruenbaum Reviewed-By: Benedikt Meurer --- test/async-hooks/hook-checks.js | 2 +- test/async-hooks/init-hooks.js | 15 ++++- test/async-hooks/test-async-await.js | 91 ++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 test/async-hooks/test-async-await.js diff --git a/test/async-hooks/hook-checks.js b/test/async-hooks/hook-checks.js index 2abed61555a158..44970378131c4a 100644 --- a/test/async-hooks/hook-checks.js +++ b/test/async-hooks/hook-checks.js @@ -25,7 +25,7 @@ exports.checkInvocations = function checkInvocations(activity, hooks, stage) { ); // Check that actual invocations for all hooks match the expected invocations - [ 'init', 'before', 'after', 'destroy' ].forEach(checkHook); + [ 'init', 'before', 'after', 'destroy', 'promiseResolve' ].forEach(checkHook); function checkHook(k) { const val = hooks[k]; diff --git a/test/async-hooks/init-hooks.js b/test/async-hooks/init-hooks.js index e43761df623dc4..509f443b29a671 100644 --- a/test/async-hooks/init-hooks.js +++ b/test/async-hooks/init-hooks.js @@ -25,6 +25,7 @@ class ActivityCollector { onbefore, onafter, ondestroy, + onpromiseResolve, logid = null, logtype = null } = {}) { @@ -39,13 +40,16 @@ class ActivityCollector { this.onbefore = typeof onbefore === 'function' ? onbefore : noop; this.onafter = typeof onafter === 'function' ? onafter : noop; this.ondestroy = typeof ondestroy === 'function' ? ondestroy : noop; + this.onpromiseResolve = typeof onpromiseResolve === 'function' ? + onpromiseResolve : noop; // Create the hook with which we'll collect activity data this._asyncHook = async_hooks.createHook({ init: this._init.bind(this), before: this._before.bind(this), after: this._after.bind(this), - destroy: this._destroy.bind(this) + destroy: this._destroy.bind(this), + promiseResolve: this._promiseResolve.bind(this) }); } @@ -206,6 +210,13 @@ class ActivityCollector { this.ondestroy(uid); } + _promiseResolve(uid) { + const h = this._getActivity(uid, 'promiseResolve'); + this._stamp(h, 'promiseResolve'); + this._maybeLog(uid, h && h.type, 'promiseResolve'); + this.onpromiseResolve(uid); + } + _maybeLog(uid, type, name) { if (this._logid && (type == null || this._logtype == null || this._logtype === type)) { @@ -219,6 +230,7 @@ exports = module.exports = function initHooks({ onbefore, onafter, ondestroy, + onpromiseResolve, allowNoInit, logid, logtype @@ -228,6 +240,7 @@ exports = module.exports = function initHooks({ onbefore, onafter, ondestroy, + onpromiseResolve, allowNoInit, logid, logtype diff --git a/test/async-hooks/test-async-await.js b/test/async-hooks/test-async-await.js new file mode 100644 index 00000000000000..7f88cd9b18176f --- /dev/null +++ b/test/async-hooks/test-async-await.js @@ -0,0 +1,91 @@ +'use strict'; +const common = require('../common'); + +// This test ensures async hooks are being properly called +// when using async-await mechanics. This involves: +// 1. Checking that all initialized promises are being resolved +// 2. Checking that for each 'before' corresponding hook 'after' hook is called + +const assert = require('assert'); +const initHooks = require('./init-hooks'); + +const util = require('util'); + +const sleep = util.promisify(setTimeout); +// either 'inited' or 'resolved' +const promisesInitState = new Map(); +// either 'before' or 'after' AND asyncId must be present in the other map +const promisesExecutionState = new Map(); + +const hooks = initHooks({ + oninit, + onbefore, + onafter, + ondestroy: null, // Intentionally not tested, since it will be removed soon + onpromiseResolve +}); +hooks.enable(); + +function oninit(asyncId, type, triggerAsyncId, resource) { + if (type === 'PROMISE') { + promisesInitState.set(asyncId, 'inited'); + } +} + +function onbefore(asyncId) { + if (!promisesInitState.has(asyncId)) { + return; + } + promisesExecutionState.set(asyncId, 'before'); +} + +function onafter(asyncId) { + if (!promisesInitState.has(asyncId)) { + return; + } + + assert.strictEqual(promisesExecutionState.get(asyncId), 'before', + 'after hook called for promise without prior call' + + 'to before hook'); + assert.strictEqual(promisesInitState.get(asyncId), 'resolved', + 'after hook called for promise without prior call' + + 'to resolve hook'); + promisesExecutionState.set(asyncId, 'after'); +} + +function onpromiseResolve(asyncId) { + assert(promisesInitState.has(asyncId), + 'resolve hook called for promise without prior call to init hook'); + + promisesInitState.set(asyncId, 'resolved'); +} + +const timeout = common.platformTimeout(10); + +function checkPromisesInitState() { + for (const initState of promisesInitState.values()) { + assert.strictEqual(initState, 'resolved', + 'promise initialized without being resolved'); + } +} + +function checkPromisesExecutionState() { + for (const executionState of promisesExecutionState.values()) { + assert.strictEqual(executionState, 'after', + 'mismatch between before and after hook calls'); + } +} + +process.on('beforeExit', common.mustCall(() => { + hooks.disable(); + hooks.sanityCheck('PROMISE'); + + checkPromisesInitState(); + checkPromisesExecutionState(); +})); + +async function asyncFunc() { + await sleep(timeout); +} + +asyncFunc(); From d11a4358754d9c8bf53e53714222251154f9c351 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 14 May 2018 12:18:31 +0200 Subject: [PATCH 079/208] doc: fix typo in dns docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/20711 Reviewed-By: Tobias Nießen Reviewed-By: Yuta Hiroto Reviewed-By: Khaidi Chu Reviewed-By: Ruben Bridgewater Reviewed-By: Daniel Bevenius Reviewed-By: Trivikram Kamat Reviewed-By: Michael Dawson --- doc/api/dns.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/dns.md b/doc/api/dns.md index e8932be9e387cd..74504910c24107 100644 --- a/doc/api/dns.md +++ b/doc/api/dns.md @@ -66,7 +66,7 @@ An independent resolver for DNS requests. Note that creating a new resolver uses the default server settings. Setting the servers used for a resolver using [`resolver.setServers()`][`dns.setServers()`] does not affect -other resolver: +other resolvers: ```js const { Resolver } = require('dns'); From 7bff6d15b2e7bd04921a007e96988f238386319b Mon Sep 17 00:00:00 2001 From: Vse Mozhet Byt Date: Wed, 25 Apr 2018 18:24:27 +0300 Subject: [PATCH 080/208] tools: overhaul tools/doc/html.js PR-URL: https://github.com/nodejs/node/pull/20613 Reviewed-By: Trivikram Kamat --- tools/doc/html.js | 520 +++++++++++++++++++--------------------------- 1 file changed, 213 insertions(+), 307 deletions(-) diff --git a/tools/doc/html.js b/tools/doc/html.js index 00fd48d8e6631f..60cacd5b791bcb 100644 --- a/tools/doc/html.js +++ b/tools/doc/html.js @@ -29,17 +29,10 @@ const typeParser = require('./type-parser.js'); module.exports = toHTML; -const STABILITY_TEXT_REG_EXP = /(.*:)\s*(\d)([\s\S]*)/; -const DOC_CREATED_REG_EXP = //; - -// Customized heading without id attribute. +// Make `marked` to not automatically insert id attributes in headings. const renderer = new marked.Renderer(); -renderer.heading = function(text, level) { - return `${text}\n`; -}; -marked.setOptions({ - renderer: renderer -}); +renderer.heading = (text, level) => `${text}\n`; +marked.setOptions({ renderer }); const docPath = path.resolve(__dirname, '..', '..', 'doc'); @@ -47,91 +40,39 @@ const gtocPath = path.join(docPath, 'api', '_toc.md'); const gtocMD = fs.readFileSync(gtocPath, 'utf8').replace(/^@\/\/.*$/gm, ''); const gtocHTML = marked(gtocMD).replace( / ` ` type === 'heading'); + const section = firstHeading ? firstHeading.text : 'Index'; - parseText(lexed); - lexed = preprocessElements(lexed); - - // Generate the table of contents. - // This mutates the lexed contents in-place. - buildToc(lexed, filename, function(er, toc) { - if (er) return cb(er); - - const id = toID(path.basename(filename)); - - template = template.replace(/__ID__/g, id); - template = template.replace(/__FILENAME__/g, filename); - template = template.replace(/__SECTION__/g, section || 'Index'); - template = template.replace(/__VERSION__/g, nodeVersion); - template = template.replace(/__TOC__/g, toc); - template = template.replace( - /__GTOC__/g, - gtocHTML.replace(`class="nav-${id}`, `class="nav-${id} active`) - ); - - if (opts.analytics) { - template = template.replace( - '', - analyticsScript(opts.analytics) - ); - } + preprocessText(lexed); + preprocessElements(lexed); - template = template.replace(/__ALTDOCS__/, altDocs(filename)); + // Generate the table of contents. This mutates the lexed contents in-place. + const toc = buildToc(lexed, filename); - // Content has to be the last thing we do with the lexed tokens, - // because it's destructive. - const content = marked.parser(lexed); - template = template.replace(/__CONTENT__/g, content); + const id = filename.replace(/\W+/g, '-'); - cb(null, template); - }); -} + let HTML = template.replace('__ID__', id) + .replace(/__FILENAME__/g, filename) + .replace('__SECTION__', section) + .replace(/__VERSION__/g, nodeVersion) + .replace('__TOC__', toc) + .replace('__GTOC__', gtocHTML.replace( + `class="nav-${id}`, `class="nav-${id} active`)); -function analyticsScript(analytics) { - return ` + if (analytics) { + HTML = HTML.replace('', ` - `; -} - -// Replace placeholders in text tokens. -function replaceInText(text) { - return linkJsTypeDocs(linkManPages(text)); -} - -function altDocs(filename) { - if (!docCreated) { - console.error(`Failed to add alternative version links to ${filename}`); - return ''; - } - - function lte(v) { - const ns = v.num.split('.'); - if (docCreated[1] > +ns[0]) - return false; - if (docCreated[1] < +ns[0]) - return true; - return docCreated[2] <= +ns[1]; + `); } - const versions = [ - { num: '10.x' }, - { num: '9.x' }, - { num: '8.x', lts: true }, - { num: '7.x' }, - { num: '6.x', lts: true }, - { num: '5.x' }, - { num: '4.x', lts: true }, - { num: '0.12.x' }, - { num: '0.10.x' } - ]; - - const host = 'https://nodejs.org'; - const href = (v) => `${host}/docs/latest-v${v.num}/api/${filename}.html`; - - function li(v) { - let html = `
  • ${v.num}`; - - if (v.lts) - html += ' LTS'; - - return html + '
    • '; + const docCreated = input.match( + //); + if (docCreated) { + HTML = HTML.replace('__ALTDOCS__', altDocs(filename, docCreated)); + } else { + console.error(`Failed to add alternative version links to ${filename}`); + HTML = HTML.replace('__ALTDOCS__', ''); } - const lis = versions.filter(lte).map(li).join('\n'); + // Content insertion has to be the last thing we do with the lexed tokens, + // because it's destructive. + HTML = HTML.replace('__CONTENT__', marked.parser(lexed)); - if (!lis.length) - return ''; - - return ` -
  • - View another version ▼ -
      ${lis}
    -
    • - `; + cb(null, HTML); } // Handle general body-text replacements. // For example, link man page references to the actual page. -function parseText(lexed) { - lexed.forEach(function(tok) { - if (tok.type === 'table') { - if (tok.cells) { - tok.cells.forEach((row, x) => { - row.forEach((_, y) => { - if (tok.cells[x] && tok.cells[x][y]) { - tok.cells[x][y] = replaceInText(tok.cells[x][y]); - } - }); - }); +function preprocessText(lexed) { + lexed.forEach((token) => { + if (token.type === 'table') { + if (token.header) { + token.header = token.header.map(replaceInText); } - if (tok.header) { - tok.header.forEach((_, i) => { - if (tok.header[i]) { - tok.header[i] = replaceInText(tok.header[i]); - } + if (token.cells) { + token.cells.forEach((row, i) => { + token.cells[i] = row.map(replaceInText); }); } - } else if (tok.text && tok.type !== 'code') { - tok.text = replaceInText(tok.text); + } else if (token.text && token.type !== 'code') { + token.text = replaceInText(token.text); } }); } +// Replace placeholders in text tokens. +function replaceInText(text) { + if (text === '') return text; + return linkJsTypeDocs(linkManPages(text)); +} + +// Syscalls which appear in the docs, but which only exist in BSD / macOS. +const BSD_ONLY_SYSCALLS = new Set(['lchmod']); +const MAN_PAGE = /(^|\s)([a-z.]+)\((\d)([a-z]?)\)/gm; + +// Handle references to man pages, eg "open(2)" or "lchmod(2)". +// Returns modified text, with such refs replaced with HTML links, for example +// 'open(2)'. +function linkManPages(text) { + return text.replace( + MAN_PAGE, (match, beginning, name, number, optionalCharacter) => { + // Name consists of lowercase letters, + // number is a single digit with an optional lowercase letter. + const displayAs = `${name}(${number}${optionalCharacter})`; + + if (BSD_ONLY_SYSCALLS.has(name)) { + return `${beginning}${displayAs}`; + } + return `${beginning}${displayAs}`; + }); +} + +const TYPE_SIGNATURE = /\{[^}]+\}/g; +function linkJsTypeDocs(text) { + const parts = text.split('`'); + + // Handle types, for example the source Markdown might say + // "This argument should be a {number} or {string}". + for (let i = 0; i < parts.length; i += 2) { + const typeMatches = parts[i].match(TYPE_SIGNATURE); + if (typeMatches) { + typeMatches.forEach((typeMatch) => { + parts[i] = parts[i].replace(typeMatch, typeParser.toLink(typeMatch)); + }); + } + } + + return parts.join('`'); +} + // Preprocess stability blockquotes and YAML blocks. -function preprocessElements(input) { - var state = null; - const output = []; +function preprocessElements(lexed) { + const STABILITY_RE = /(.*:)\s*(\d)([\s\S]*)/; + let state = null; let headingIndex = -1; let heading = null; - output.links = input.links; - input.forEach(function(tok, index) { - if (tok.type === 'heading') { + lexed.forEach((token, index) => { + if (token.type === 'heading') { headingIndex = index; - heading = tok; + heading = token; } - if (tok.type === 'html' && common.isYAMLBlock(tok.text)) { - tok.text = parseYAML(tok.text); + if (token.type === 'html' && common.isYAMLBlock(token.text)) { + token.text = parseYAML(token.text); } - if (tok.type === 'blockquote_start') { + if (token.type === 'blockquote_start') { state = 'MAYBE_STABILITY_BQ'; - return; + lexed[index] = { type: 'space' }; } - if (tok.type === 'blockquote_end' && state === 'MAYBE_STABILITY_BQ') { + if (token.type === 'blockquote_end' && state === 'MAYBE_STABILITY_BQ') { state = null; - return; + lexed[index] = { type: 'space' }; } - if (tok.type === 'paragraph' && state === 'MAYBE_STABILITY_BQ') { - if (tok.text.match(/Stability:.*/g)) { - const stabilityMatch = tok.text.match(STABILITY_TEXT_REG_EXP); - const stability = Number(stabilityMatch[2]); + if (token.type === 'paragraph' && state === 'MAYBE_STABILITY_BQ') { + if (token.text.includes('Stability:')) { + const [, prefix, number, explication] = token.text.match(STABILITY_RE); const isStabilityIndex = index - 2 === headingIndex || // General. index - 3 === headingIndex; // With api_metadata block. if (heading && isStabilityIndex) { - heading.stability = stability; + heading.stability = number; headingIndex = -1; heading = null; } - tok.text = parseAPIHeader(tok.text).replace(/\n/g, ' '); - output.push({ type: 'html', text: tok.text }); - return; + token.text = `
    ` + + '' + + `${prefix} ${number}${explication}
    ` + .replace(/\n/g, ' '); + lexed[index] = { type: 'html', text: token.text }; } else if (state === 'MAYBE_STABILITY_BQ') { - output.push({ type: 'blockquote_start' }); state = null; + lexed[index - 1] = { type: 'blockquote_start' }; } } - output.push(tok); }); - - return output; } function parseYAML(text) { const meta = common.extractAndParseYAML(text); - const html = ['
    ']; + let html = '
    \n'; const added = { description: '' }; const deprecated = { description: '' }; @@ -302,159 +237,130 @@ function parseYAML(text) { } if (meta.changes.length > 0) { - let changes = meta.changes.slice(); - if (added.description) changes.push(added); - if (deprecated.description) changes.push(deprecated); + if (added.description) meta.changes.push(added); + if (deprecated.description) meta.changes.push(deprecated); - changes = changes.sort((a, b) => versionSort(a.version, b.version)); + meta.changes.sort((a, b) => versionSort(a.version, b.version)); - html.push('
    History'); - html.push(''); - html.push(''); + html += '
    History\n' + + '
    VersionChanges
    \n\n'; - changes.forEach((change) => { - html.push(``); - html.push(``); + meta.changes.forEach((change) => { + html += `\n` + + `\n`; }); - html.push('
    VersionChanges
    ${change.version}${marked(change.description)}
    ${change.version}${marked(change.description)}
    '); - html.push('
    '); + html += '\n\n'; } else { - html.push(`${added.description}${deprecated.description}`); - } - - html.push('
    '); - return html.join('\n'); -} - -// Syscalls which appear in the docs, but which only exist in BSD / macOS. -const BSD_ONLY_SYSCALLS = new Set(['lchmod']); - -// Handle references to man pages, eg "open(2)" or "lchmod(2)". -// Returns modified text, with such refs replaced with HTML links, for example -// 'open(2)'. -function linkManPages(text) { - return text.replace( - /(^|\s)([a-z.]+)\((\d)([a-z]?)\)/gm, - (match, beginning, name, number, optionalCharacter) => { - // Name consists of lowercase letters, number is a single digit. - const displayAs = `${name}(${number}${optionalCharacter})`; - if (BSD_ONLY_SYSCALLS.has(name)) { - return `${beginning}${displayAs}`; - } else { - return `${beginning}${displayAs}`; - } - }); -} - -function linkJsTypeDocs(text) { - const parts = text.split('`'); - var i; - var typeMatches; - - // Handle types, for example the source Markdown might say - // "This argument should be a {Number} or {String}". - for (i = 0; i < parts.length; i += 2) { - typeMatches = parts[i].match(/\{([^}]+)\}/g); - if (typeMatches) { - typeMatches.forEach(function(typeMatch) { - parts[i] = parts[i].replace(typeMatch, typeParser.toLink(typeMatch)); - }); - } + html += `${added.description}${deprecated.description}\n`; } - // TODO: maybe put more stuff here? - return parts.join('`'); + html += '
    '; + return html; } -function parseAPIHeader(text) { - const classNames = 'api_stability api_stability_$2'; - const docsUrl = 'documentation.html#documentation_stability_index'; - - text = text.replace( - STABILITY_TEXT_REG_EXP, - `
    $1 $2$3
    ` - ); - return text; -} - -// Section is just the first heading. -function getSection(lexed) { - for (var i = 0, l = lexed.length; i < l; i++) { - var tok = lexed[i]; - if (tok.type === 'heading') return tok.text; - } - return ''; -} - -function getMark(anchor) { - return `#`; +const numberRe = /^\d*/; +function versionSort(a, b) { + a = a.trim(); + b = b.trim(); + let i = 0; // Common prefix length. + while (i < a.length && i < b.length && a[i] === b[i]) i++; + a = a.substr(i); + b = b.substr(i); + return +b.match(numberRe)[0] - +a.match(numberRe)[0]; } -function buildToc(lexed, filename, cb) { - var toc = []; - var depth = 0; - +function buildToc(lexed, filename) { const startIncludeRefRE = /^\s*\s*$/; - const endIncludeRefRE = /^\s*\s*$/; + const endIncludeRefRE = /^\s*\s*$/; const realFilenames = [filename]; - - lexed.forEach(function(tok) { - // Keep track of the current filename along @include directives. - if (tok.type === 'html') { - let match; - if ((match = tok.text.match(startIncludeRefRE)) !== null) - realFilenames.unshift(match[1]); - else if (tok.text.match(endIncludeRefRE)) + const idCounters = Object.create(null); + let toc = ''; + let depth = 0; + + lexed.forEach((token) => { + // Keep track of the current filename along comment wrappers of inclusions. + if (token.type === 'html') { + const [, includedFileName] = token.text.match(startIncludeRefRE) || []; + if (includedFileName !== undefined) + realFilenames.unshift(includedFileName); + else if (endIncludeRefRE.test(token.text)) realFilenames.shift(); } - if (tok.type !== 'heading') return; - if (tok.depth - depth > 1) { - return cb(new Error('Inappropriate heading level\n' + - JSON.stringify(tok))); + if (token.type !== 'heading') return; + + if (token.depth - depth > 1) { + throw new Error(`Inappropriate heading level:\n${JSON.stringify(token)}`); } - depth = tok.depth; + depth = token.depth; const realFilename = path.basename(realFilenames[0], '.md'); - const apiName = tok.text.trim(); - const id = getId(`${realFilename}_${apiName}`); - toc.push(new Array((depth - 1) * 2 + 1).join(' ') + - `* ` + - `${tok.text}`); - tok.text += getMark(id); - if (realFilename === 'errors' && apiName.startsWith('ERR_')) { - tok.text += getMark(apiName); + const headingText = token.text.trim(); + const id = getId(`${realFilename}_${headingText}`, idCounters); + toc += ' '.repeat((depth - 1) * 2) + + `* ` + + `${token.text}\n`; + token.text += `#`; + if (realFilename === 'errors' && headingText.startsWith('ERR_')) { + token.text += `#`; } }); - toc = marked.parse(toc.join('\n')); - cb(null, toc); + return marked(toc); } -const idCounters = {}; -function getId(text) { - text = text.toLowerCase(); - text = text.replace(/[^a-z0-9]+/g, '_'); - text = text.replace(/^_+|_+$/, ''); - text = text.replace(/^([^a-z])/, '_$1'); - if (idCounters.hasOwnProperty(text)) { - text += `_${++idCounters[text]}`; - } else { - idCounters[text] = 0; +const notAlphaNumerics = /[^a-z0-9]+/g; +const edgeUnderscores = /^_+|_+$/g; +const notAlphaStart = /^[^a-z]/; +function getId(text, idCounters) { + text = text.toLowerCase() + .replace(notAlphaNumerics, '_') + .replace(edgeUnderscores, '') + .replace(notAlphaStart, '_$&'); + if (idCounters[text] !== undefined) { + return `${text}_${++idCounters[text]}`; } + idCounters[text] = 0; return text; } -const numberRe = /^(\d*)/; -function versionSort(a, b) { - a = a.trim(); - b = b.trim(); - let i = 0; // Common prefix length. - while (i < a.length && i < b.length && a[i] === b[i]) i++; - a = a.substr(i); - b = b.substr(i); - return +b.match(numberRe)[1] - +a.match(numberRe)[1]; +function altDocs(filename, docCreated) { + const [, docCreatedMajor, docCreatedMinor] = docCreated.map(Number); + const host = 'https://nodejs.org'; + const versions = [ + { num: '10.x' }, + { num: '9.x' }, + { num: '8.x', lts: true }, + { num: '7.x' }, + { num: '6.x', lts: true }, + { num: '5.x' }, + { num: '4.x', lts: true }, + { num: '0.12.x' }, + { num: '0.10.x' } + ]; + + const getHref = (versionNum) => + `${host}/docs/latest-v${versionNum}/api/${filename}.html`; + + const wrapInListItem = (version) => + `
  • ${version.num}` + + `${version.lts ? ' LTS' : ''}
    • `; + + function isDocInVersion(version) { + const [versionMajor, versionMinor] = version.num.split('.').map(Number); + if (docCreatedMajor > versionMajor) return false; + if (docCreatedMajor < versionMajor) return true; + return docCreatedMinor <= versionMinor; + } + + const list = versions.filter(isDocInVersion).map(wrapInListItem).join('\n'); + + return list ? ` +
  • + View another version ▼ +
      ${list}
    +
    • + ` : ''; } From 28b58b56a809ae61ebb89aff9d56dac48194cbbb Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 11 May 2018 15:46:41 +0200 Subject: [PATCH 081/208] =?UTF-8?q?src:=20replace=20`template<`=20?= =?UTF-8?q?=E2=86=92=20`template=20<`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/20675 Reviewed-By: Colin Ihrig Reviewed-By: Ben Noordhuis Reviewed-By: Gus Caplan Reviewed-By: Tobias Nießen Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Reviewed-By: Daniel Bevenius Reviewed-By: Ruben Bridgewater --- src/cares_wrap.cc | 2 +- src/inspector_io.cc | 4 ++-- src/inspector_js_api.cc | 2 +- src/inspector_socket_server.cc | 2 +- src/module_wrap.cc | 2 +- src/node_http2.h | 2 +- src/node_url.cc | 2 +- src/util.h | 6 +++--- test/cctest/test_aliased_buffer.cc | 12 ++++++------ 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index f829eb2b01d5c9..24d424f73221e8 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -722,7 +722,7 @@ class QueryWrap : public AsyncWrap { }; -template +template Local AddrTTLToArray(Environment* env, const T* addrttls, size_t naddrttls) { diff --git a/src/inspector_io.cc b/src/inspector_io.cc index 38d88d7ab890c9..e6ceaf5b736d37 100644 --- a/src/inspector_io.cc +++ b/src/inspector_io.cc @@ -23,7 +23,7 @@ using AsyncAndAgent = std::pair; using v8_inspector::StringBuffer; using v8_inspector::StringView; -template +template using TransportAndIo = std::pair; std::string ScriptPath(uv_loop_t* loop, const std::string& script_name) { @@ -284,7 +284,7 @@ void InspectorIo::IoThreadAsyncCb(uv_async_t* async) { } } -template +template void InspectorIo::ThreadMain() { uv_loop_t loop; loop.data = nullptr; diff --git a/src/inspector_js_api.cc b/src/inspector_js_api.cc index ae353defe8079d..802029ac4f2e5a 100644 --- a/src/inspector_js_api.cc +++ b/src/inspector_js_api.cc @@ -194,7 +194,7 @@ static void* GetAsyncTask(int64_t asyncId) { return reinterpret_cast(asyncId << 1); } -template +template static void InvokeAsyncTaskFnWithId(const FunctionCallbackInfo& args) { Environment* env = Environment::GetCurrent(args); CHECK(args[0]->IsNumber()); diff --git a/src/inspector_socket_server.cc b/src/inspector_socket_server.cc index e890f66a38b53f..42082c9c8495ed 100644 --- a/src/inspector_socket_server.cc +++ b/src/inspector_socket_server.cc @@ -261,7 +261,7 @@ class ServerSocket { private: explicit ServerSocket(InspectorSocketServer* server) : tcp_socket_(uv_tcp_t()), server_(server), port_(-1) {} - template + template static ServerSocket* FromTcpSocket(UvHandle* socket) { return node::ContainerOf(&ServerSocket::tcp_socket_, reinterpret_cast(socket)); diff --git a/src/module_wrap.cc b/src/module_wrap.cc index 060d0db7c7fffe..eb46225a318dca 100644 --- a/src/module_wrap.cc +++ b/src/module_wrap.cc @@ -548,7 +548,7 @@ enum ResolveExtensionsOptions { ONLY_VIA_EXTENSIONS }; -template +template Maybe ResolveExtensions(const URL& search) { if (options == TRY_EXACT_NAME) { std::string filePath = search.ToFilePath(); diff --git a/src/node_http2.h b/src/node_http2.h index f4ac926bb54452..f473e30286bc79 100644 --- a/src/node_http2.h +++ b/src/node_http2.h @@ -1222,7 +1222,7 @@ class ExternalHeader : vec.len); } - template + template static MaybeLocal New(Environment* env, nghttp2_rcbuf* buf) { if (nghttp2_rcbuf_is_static(buf)) { auto& static_str_map = env->isolate_data()->http2_static_strs; diff --git a/src/node_url.cc b/src/node_url.cc index 09199afb141e3f..42ecf47f4c958a 100644 --- a/src/node_url.cc +++ b/src/node_url.cc @@ -988,7 +988,7 @@ void URLHost::ParseHost(const char* input, // Locates the longest sequence of 0 segments in an IPv6 address // in order to use the :: compression when serializing -template +template inline T* FindLongestZeroSequence(T* values, size_t len) { T* start = values; T* end = start + len; diff --git a/src/util.h b/src/util.h index 9595ee8f07a1c6..0e6fd5dd067c73 100644 --- a/src/util.h +++ b/src/util.h @@ -420,7 +420,7 @@ struct OnScopeLeave { }; // Simple RAII wrapper for contiguous data that uses malloc()/free(). -template +template struct MallocedBuffer { T* data; size_t size; @@ -448,10 +448,10 @@ struct MallocedBuffer { }; // Test whether some value can be called with (). -template +template struct is_callable : std::is_function { }; -template +template struct is_callable::value >::type> : std::true_type { }; diff --git a/test/cctest/test_aliased_buffer.cc b/test/cctest/test_aliased_buffer.cc index b2f29d3b7cb1ab..bfbf7294db612b 100644 --- a/test/cctest/test_aliased_buffer.cc +++ b/test/cctest/test_aliased_buffer.cc @@ -7,14 +7,14 @@ using node::AliasedBuffer; class AliasBufferTest : public NodeTestFixture {}; -template +template void CreateOracleValues(std::vector* buf) { for (size_t i = 0, j = buf->size(); i < buf->size(); i++, j--) { (*buf)[i] = static_cast(j); } } -template +template void WriteViaOperator(AliasedBuffer* aliasedBuffer, const std::vector& oracle) { // write through the API @@ -23,7 +23,7 @@ void WriteViaOperator(AliasedBuffer* aliasedBuffer, } } -template +template void WriteViaSetValue(AliasedBuffer* aliasedBuffer, const std::vector& oracle) { // write through the API @@ -32,7 +32,7 @@ void WriteViaSetValue(AliasedBuffer* aliasedBuffer, } } -template +template void ReadAndValidate(v8::Isolate* isolate, v8::Local context, AliasedBuffer* aliasedBuffer, @@ -68,7 +68,7 @@ void ReadAndValidate(v8::Isolate* isolate, } } -template +template void ReadWriteTest(v8::Isolate* isolate) { v8::Isolate::Scope isolate_scope(isolate); v8::HandleScope handle_scope(isolate); @@ -92,7 +92,7 @@ void ReadWriteTest(v8::Isolate* isolate) { ReadAndValidate(isolate, context, &ab, oracle); } -template< +template < class NativeT_A, class V8T_A, class NativeT_B, class V8T_B, class NativeT_C, class V8T_C> From 44960a0d5acb64c9aeef9f6d8089adc3b16e46da Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 11 May 2018 15:43:21 +0200 Subject: [PATCH 082/208] tools: make C++ linter reject `template<` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This one is more or less just for me. :) PR-URL: https://github.com/nodejs/node/pull/20675 Reviewed-By: Colin Ihrig Reviewed-By: Ben Noordhuis Reviewed-By: Gus Caplan Reviewed-By: Tobias Nießen Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Reviewed-By: Daniel Bevenius Reviewed-By: Ruben Bridgewater --- tools/cpplint.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/cpplint.py b/tools/cpplint.py index 460c1ecbfeb02f..ee103ef7161ba1 100644 --- a/tools/cpplint.py +++ b/tools/cpplint.py @@ -4230,6 +4230,10 @@ def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state, error(filename, linenum, 'whitespace/tab', 1, 'Tab found; better to use spaces') + if line.find('template<') != -1: + error(filename, linenum, 'whitespace/template', 1, + 'Leave a single space after template, as in `template <...>`') + # One or three blank spaces at the beginning of the line is weird; it's # hard to reconcile that with 2-space indents. # NOTE: here are the conditions rob pike used for his tests. Mine aren't From 9c1c03e5d42d3379bb8cf83898d2561b83cc4fe8 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 10 May 2018 13:53:18 +0200 Subject: [PATCH 083/208] test: better error message in trace events test PR-URL: https://github.com/nodejs/node/pull/20655 Reviewed-By: Ruben Bridgewater Reviewed-By: James M Snell Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig Reviewed-By: Rich Trott Reviewed-By: Trivikram Kamat --- test/parallel/test-trace-events-async-hooks.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-trace-events-async-hooks.js b/test/parallel/test-trace-events-async-hooks.js index d3c5a0af5b8e50..e0b5e0625bea6f 100644 --- a/test/parallel/test-trace-events-async-hooks.js +++ b/test/parallel/test-trace-events-async-hooks.js @@ -3,6 +3,7 @@ const common = require('../common'); const assert = require('assert'); const cp = require('child_process'); const fs = require('fs'); +const util = require('util'); const CODE = 'setTimeout(() => { for (var i = 0; i < 100000; i++) { "test" + i } }, 1)'; @@ -58,9 +59,9 @@ proc.once('exit', common.mustCall(() => { const initEvents = traces.filter((trace) => { return (trace.ph === 'b' && !trace.name.includes('_CALLBACK')); }); - assert(initEvents.every((trace) => { + assert.ok(initEvents.every((trace) => { return (trace.args.executionAsyncId > 0 && trace.args.triggerAsyncId > 0); - })); + }), `Unexpected initEvents format: ${util.inspect(initEvents)}`); })); })); From b795953b5f041c5c1b209a7738f01bc4e78569de Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 9 May 2018 19:00:57 +0200 Subject: [PATCH 084/208] tools: hide symbols for builtin JS files in binary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not expose symbols like `node::internal_process_next_tick_value`, `node::internal_process_next_tick_key` in the created `node` binary by wrapping them in an anonymous namespace. PR-URL: https://github.com/nodejs/node/pull/20634 Reviewed-By: James M Snell Reviewed-By: Gus Caplan Reviewed-By: Colin Ihrig Reviewed-By: Ben Noordhuis Reviewed-By: Tobias Nießen Reviewed-By: Daniel Bevenius Reviewed-By: Tiancheng "Timothy" Gu --- tools/js2c.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/js2c.py b/tools/js2c.py index bcfc4764a97df5..8685722c13cdc5 100755 --- a/tools/js2c.py +++ b/tools/js2c.py @@ -183,8 +183,12 @@ def ReadMacros(lines): namespace node {{ +namespace {{ + {definitions} +}} // anonymous namespace + v8::Local LoadersBootstrapperSource(Environment* env) {{ return internal_bootstrap_loaders_value.ToStringChecked(env->isolate()); }} From d223e3ca415c0f5b7751cb0fa8f808a318dcd071 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 9 May 2018 18:32:59 +0200 Subject: [PATCH 085/208] src: make `AsyncResource` destructor virtual MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `AsyncResource` is intended to be a base class, and since we don’t know what API consumers will do with it in their own code, it’s good practice to make its destructor virtual. This should not be ABI-breaking since all class methods are inline. PR-URL: https://github.com/nodejs/node/pull/20633 Reviewed-By: James M Snell Reviewed-By: Daniel Bevenius Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Colin Ihrig --- src/node.h | 2 +- test/addons/async-resource/binding.cc | 22 ++++++++++++++++++++++ test/addons/async-resource/test.js | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/node.h b/src/node.h index 23e2e9995ce209..5d6aa8dadfc8c4 100644 --- a/src/node.h +++ b/src/node.h @@ -712,7 +712,7 @@ class AsyncResource { trigger_async_id); } - ~AsyncResource() { + virtual ~AsyncResource() { EmitAsyncDestroy(isolate_, async_context_); } diff --git a/test/addons/async-resource/binding.cc b/test/addons/async-resource/binding.cc index 857d74c2e62206..ab33858c233dd0 100644 --- a/test/addons/async-resource/binding.cc +++ b/test/addons/async-resource/binding.cc @@ -17,6 +17,17 @@ using v8::Object; using v8::String; using v8::Value; +int custom_async_resource_destructor_calls = 0; + +class CustomAsyncResource : public AsyncResource { + public: + CustomAsyncResource(Isolate* isolate, Local resource) + : AsyncResource(isolate, resource, "CustomAsyncResource") {} + ~CustomAsyncResource() { + custom_async_resource_destructor_calls++; + } +}; + void CreateAsyncResource(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); assert(args[0]->IsObject()); @@ -98,6 +109,16 @@ void GetResource(const FunctionCallbackInfo& args) { args.GetReturnValue().Set(r->get_resource()); } +void RunSubclassTest(const FunctionCallbackInfo& args) { + Isolate* isolate = args.GetIsolate(); + Local obj = Object::New(isolate); + + assert(custom_async_resource_destructor_calls == 0); + CustomAsyncResource* resource = new CustomAsyncResource(isolate, obj); + delete static_cast(resource); + assert(custom_async_resource_destructor_calls == 1); +} + void Initialize(Local exports) { NODE_SET_METHOD(exports, "createAsyncResource", CreateAsyncResource); NODE_SET_METHOD(exports, "destroyAsyncResource", DestroyAsyncResource); @@ -107,6 +128,7 @@ void Initialize(Local exports) { NODE_SET_METHOD(exports, "getAsyncId", GetAsyncId); NODE_SET_METHOD(exports, "getTriggerAsyncId", GetTriggerAsyncId); NODE_SET_METHOD(exports, "getResource", GetResource); + NODE_SET_METHOD(exports, "runSubclassTest", RunSubclassTest); } } // anonymous namespace diff --git a/test/addons/async-resource/test.js b/test/addons/async-resource/test.js index f19ad58637f187..c37d4df83d0103 100644 --- a/test/addons/async-resource/test.js +++ b/test/addons/async-resource/test.js @@ -5,6 +5,8 @@ const assert = require('assert'); const binding = require(`./build/${common.buildType}/binding`); const async_hooks = require('async_hooks'); +binding.runSubclassTest(); + const kObjectTag = Symbol('kObjectTag'); const rootAsyncId = async_hooks.executionAsyncId(); From 2a7c863d3d197ce833351411c74cd912846e04c9 Mon Sep 17 00:00:00 2001 From: Vse Mozhet Byt Date: Fri, 11 May 2018 17:04:12 +0300 Subject: [PATCH 086/208] test: modernize and correct test-doctool-html.js PR-URL: https://github.com/nodejs/node/pull/20676 Reviewed-By: Luigi Pinca Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Reviewed-By: Ruben Bridgewater --- test/doctool/test-doctool-html.js | 59 +++++++++++++------------------ 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/test/doctool/test-doctool-html.js b/test/doctool/test-doctool-html.js index 91a18d536a6992..185faa46f71886 100644 --- a/test/doctool/test-doctool-html.js +++ b/test/doctool/test-doctool-html.js @@ -9,16 +9,16 @@ try { } const assert = require('assert'); -const fs = require('fs'); +const { readFile } = require('fs'); const fixtures = require('../common/fixtures'); const processIncludes = require('../../tools/doc/preprocess.js'); -const html = require('../../tools/doc/html.js'); +const toHTML = require('../../tools/doc/html.js'); // Test data is a list of objects with two properties. // The file property is the file path. -// The html property is some html which will be generated by the doctool. -// This html will be stripped of all whitespace because we don't currently -// have an html parser. +// The html property is some HTML which will be generated by the doctool. +// This HTML will be stripped of all whitespace because we don't currently +// have an HTML parser. const testData = [ { file: fixtures.path('sample_document.md'), @@ -32,8 +32,7 @@ const testData = [ 'id="foo_class_method_buffer_from_array"># ' + '' + 'Reference/Global_Objects/Array" class="type"><Array>' }, { file: fixtures.path('doc_with_yaml.md'), @@ -45,42 +44,34 @@ const testData = [ '
    Added in: v1.0.0
    ' + '

    Describe Foobar in more detail here.

    ' + '

    Foobar II#

    ' + - '
    ' + + 'id="foo_foobar_ii">#
    ' + '
    History' + '' + '' + - '' + + '' + '
    VersionChanges
    v5.3.0, v4.2.0

    Added in: v5.3.0, v4.2.0

    ' + - '

    Added in: v5.3.0, v4.2.0

    v4.2.0

    The error parameter can now be' + - 'an arrow function.

    ' + - '
    ' + + 'an arrow function.

    ' + '

    Describe Foobar II in more detail here.' + 'fg(1)

    ' + '

    Deprecated thingy#' + - '

    ' + - '
    Added in: v1.0.0' + + '
    Added in: v1.0.0' + 'Deprecated since: v2.0.0

    Describe ' + 'Deprecated thingy in more detail here.' + 'fg(1p)' + - '

    ' + - '

    Something

    Something#

    ' + ' ' + - '

    Describe Something in more detail here. ' + - '

    ' + '

    Describe Something in more detail here.

    ' }, { file: fixtures.path('doc_with_includes.md'), html: '' + '

    Look here!

    ' + - '' + - '' + + '' + '

    foobar#

    ' + - '

    I exist and am being linked to.

    ' + - '' + '

    I exist and am being linked to.

    ' }, { file: fixtures.path('sample_document.md'), @@ -92,34 +83,34 @@ const testData = [ const spaces = /\s/g; -testData.forEach((item) => { - // Normalize expected data by stripping whitespace - const expected = item.html.replace(spaces, ''); - const includeAnalytics = typeof item.analyticsId !== 'undefined'; +testData.forEach(({ file, html, analyticsId }) => { + // Normalize expected data by stripping whitespace. + const expected = html.replace(spaces, ''); + const includeAnalytics = typeof analyticsId !== 'undefined'; - fs.readFile(item.file, 'utf8', common.mustCall((err, input) => { + readFile(file, 'utf8', common.mustCall((err, input) => { assert.ifError(err); - processIncludes(item.file, input, common.mustCall((err, preprocessed) => { + processIncludes(file, input, common.mustCall((err, preprocessed) => { assert.ifError(err); - html( + toHTML( { input: preprocessed, filename: 'foo', nodeVersion: process.version, - analytics: item.analyticsId, + analytics: analyticsId, }, common.mustCall((err, output) => { assert.ifError(err); const actual = output.replace(spaces, ''); - const scriptDomain = 'google-analytics.com'; // Assert that the input stripped of all whitespace contains the - // expected list + // expected markup. assert(actual.includes(expected)); // Testing the insertion of Google Analytics script when - // an analytics id is provided. Should not be present by default + // an analytics id is provided. Should not be present by default. + const scriptDomain = 'google-analytics.com'; if (includeAnalytics) { assert(actual.includes(scriptDomain), `Google Analytics script was not present in "${actual}"`); From e61337d36dd957ec0bf0dce5398e8c2c4bd468f4 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 11 May 2018 00:25:59 -0400 Subject: [PATCH 087/208] async_wrap: fix memory leak in AsyncResource Reset the persistent that keeps the resource Object alive when the AsyncResource is being destroyed. Fixes: https://github.com/nodejs/node-addon-api/issues/237 PR-URL: https://github.com/nodejs/node/pull/20668 Reviewed-By: Anna Henningsen Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Gabriel Schulhof Reviewed-By: James M Snell --- src/node.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/node.h b/src/node.h index 5d6aa8dadfc8c4..2ac145f4f75bd9 100644 --- a/src/node.h +++ b/src/node.h @@ -714,6 +714,7 @@ class AsyncResource { virtual ~AsyncResource() { EmitAsyncDestroy(isolate_, async_context_); + resource_.Reset(); } v8::MaybeLocal MakeCallback( From f263340731ef60d939c429b66234af8a4d2c6ad0 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Wed, 9 May 2018 15:53:50 -0400 Subject: [PATCH 088/208] doc: fix signature for napi_create_range_error Fixes: https://github.com/nodejs/node/issues/20623 PR-URL: https://github.com/nodejs/node/pull/20641 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Trivikram Kamat Reviewed-By: Ruben Bridgewater --- doc/api/n-api.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/api/n-api.md b/doc/api/n-api.md index 3748e252fc8964..355519bc54863b 100644 --- a/doc/api/n-api.md +++ b/doc/api/n-api.md @@ -471,9 +471,9 @@ This API returns a JavaScript `TypeError` with the text provided. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_create_range_error(napi_env env, +NAPI_EXTERN napi_status napi_create_range_error(napi_env env, napi_value code, - const char* msg, + napi_value msg, napi_value* result); ``` - `[in] env`: The environment that the API is invoked under. From a66aad4a5020960831e7f7fa884b624abff6da64 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Wed, 9 May 2018 15:58:38 -0400 Subject: [PATCH 089/208] doc: fixup NODE_EXTERN -> NAPI_EXTERN Seems like we missed updating doc when we changed from NODE_EXTERN to NAPI_EXTERN PR-URL: https://github.com/nodejs/node/pull/20641 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Trivikram Kamat Reviewed-By: Ruben Bridgewater --- doc/api/n-api.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/api/n-api.md b/doc/api/n-api.md index 355519bc54863b..cb07e23e1e69d5 100644 --- a/doc/api/n-api.md +++ b/doc/api/n-api.md @@ -343,7 +343,7 @@ TypeError [ERR_ERROR_1] added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_throw(napi_env env, napi_value error); +NAPI_EXTERN napi_status napi_throw(napi_env env, napi_value error); ``` - `[in] env`: The environment that the API is invoked under. - `[in] error`: The JavaScript value to be thrown. @@ -357,7 +357,7 @@ This API throws the JavaScript value provided. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_throw_error(napi_env env, +NAPI_EXTERN napi_status napi_throw_error(napi_env env, const char* code, const char* msg); ``` @@ -375,7 +375,7 @@ This API throws a JavaScript `Error` with the text provided. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_throw_type_error(napi_env env, +NAPI_EXTERN napi_status napi_throw_type_error(napi_env env, const char* code, const char* msg); ``` @@ -393,7 +393,7 @@ This API throws a JavaScript `TypeError` with the text provided. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_throw_range_error(napi_env env, +NAPI_EXTERN napi_status napi_throw_range_error(napi_env env, const char* code, const char* msg); ``` @@ -411,7 +411,7 @@ This API throws a JavaScript `RangeError` with the text provided. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_is_error(napi_env env, +NAPI_EXTERN napi_status napi_is_error(napi_env env, napi_value value, bool* result); ``` @@ -429,7 +429,7 @@ This API queries a `napi_value` to check if it represents an error object. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_create_error(napi_env env, +NAPI_EXTERN napi_status napi_create_error(napi_env env, napi_value code, napi_value msg, napi_value* result); @@ -450,7 +450,7 @@ This API returns a JavaScript `Error` with the text provided. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_create_type_error(napi_env env, +NAPI_EXTERN napi_status napi_create_type_error(napi_env env, napi_value code, napi_value msg, napi_value* result); @@ -659,7 +659,7 @@ can only be called once. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_open_handle_scope(napi_env env, +NAPI_EXTERN napi_status napi_open_handle_scope(napi_env env, napi_handle_scope* result); ``` - `[in] env`: The environment that the API is invoked under. @@ -674,7 +674,7 @@ This API open a new scope. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_close_handle_scope(napi_env env, +NAPI_EXTERN napi_status napi_close_handle_scope(napi_env env, napi_handle_scope scope); ``` - `[in] env`: The environment that the API is invoked under. @@ -692,7 +692,7 @@ This API can be called even if there is a pending JavaScript exception. added: v8.0.0 --> ```C -NODE_EXTERN napi_status +NAPI_EXTERN napi_status napi_open_escapable_handle_scope(napi_env env, napi_handle_scope* result); ``` @@ -709,7 +709,7 @@ to the outer scope. added: v8.0.0 --> ```C -NODE_EXTERN napi_status +NAPI_EXTERN napi_status napi_close_escapable_handle_scope(napi_env env, napi_handle_scope scope); ``` @@ -793,7 +793,7 @@ individual count. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_create_reference(napi_env env, +NAPI_EXTERN napi_status napi_create_reference(napi_env env, napi_value value, int initial_refcount, napi_ref* result); @@ -815,7 +815,7 @@ to the `Object` passed in. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_delete_reference(napi_env env, napi_ref ref); +NAPI_EXTERN napi_status napi_delete_reference(napi_env env, napi_ref ref); ``` - `[in] env`: The environment that the API is invoked under. @@ -832,7 +832,7 @@ This API can be called even if there is a pending JavaScript exception. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_reference_ref(napi_env env, +NAPI_EXTERN napi_status napi_reference_ref(napi_env env, napi_ref ref, int* result); ``` @@ -850,7 +850,7 @@ passed in and returns the resulting reference count. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_reference_unref(napi_env env, +NAPI_EXTERN napi_status napi_reference_unref(napi_env env, napi_ref ref, int* result); ``` @@ -868,7 +868,7 @@ passed in and returns the resulting reference count. added: v8.0.0 --> ```C -NODE_EXTERN napi_status napi_get_reference_value(napi_env env, +NAPI_EXTERN napi_status napi_get_reference_value(napi_env env, napi_ref ref, napi_value* result); ``` From 886116f837ef847cde263464e66fc192276c7a66 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Thu, 10 May 2018 16:48:45 -0700 Subject: [PATCH 090/208] test: apply test-fs-access to promises API Add tests for `fs.promises.access()` in all test cases in `test-fs-access` that are relevant to the Promises-based API. PR-URL: https://github.com/nodejs/node/pull/20667 Reviewed-By: Daniel Bevenius Reviewed-By: Trivikram Kamat Reviewed-By: Benjamin Gruenbaum --- test/parallel/test-fs-access.js | 77 ++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 25 deletions(-) diff --git a/test/parallel/test-fs-access.js b/test/parallel/test-fs-access.js index 20448ffde6c6ea..01dbe90eda8435 100644 --- a/test/parallel/test-fs-access.js +++ b/test/parallel/test-fs-access.js @@ -62,37 +62,64 @@ assert.strictEqual(typeof fs.R_OK, 'number'); assert.strictEqual(typeof fs.W_OK, 'number'); assert.strictEqual(typeof fs.X_OK, 'number'); +const throwNextTick = (e) => { process.nextTick(() => { throw e; }); }; + fs.access(__filename, common.mustCall(assert.ifError)); +fs.promises.access(__filename) + .then(common.mustCall()) + .catch(throwNextTick); fs.access(__filename, fs.R_OK, common.mustCall(assert.ifError)); +fs.promises.access(__filename, fs.R_OK) + .then(common.mustCall()) + .catch(throwNextTick); fs.access(readOnlyFile, fs.F_OK | fs.R_OK, common.mustCall(assert.ifError)); +fs.promises.access(readOnlyFile, fs.F_OK | fs.R_OK) + .then(common.mustCall()) + .catch(throwNextTick); -fs.access(doesNotExist, common.mustCall((err) => { - assert.notStrictEqual(err, null, 'error should exist'); - assert.strictEqual(err.code, 'ENOENT'); - assert.strictEqual(err.path, doesNotExist); -})); - -fs.access(readOnlyFile, fs.W_OK, common.mustCall(function(err) { - assert.strictEqual(this, undefined); - if (hasWriteAccessForReadonlyFile) { - assert.ifError(err); - } else { - assert.notStrictEqual(err, null, 'error should exist'); - assert.strictEqual(err.path, readOnlyFile); - } -})); +{ + const expectedError = (err) => { + assert.notStrictEqual(err, null); + assert.strictEqual(err.code, 'ENOENT'); + assert.strictEqual(err.path, doesNotExist); + }; + fs.access(doesNotExist, common.mustCall(expectedError)); + fs.promises.access(doesNotExist) + .then(common.mustNotCall(), common.mustCall(expectedError)) + .catch(throwNextTick); +} -common.expectsError( - () => { - fs.access(100, fs.F_OK, common.mustNotCall()); - }, - { - code: 'ERR_INVALID_ARG_TYPE', - type: TypeError, - message: 'The "path" argument must be one of type string, Buffer, or URL.' + - ' Received type number' +{ + function expectedError(err) { + assert.strictEqual(this, undefined); + if (hasWriteAccessForReadonlyFile) { + assert.ifError(err); + } else { + assert.notStrictEqual(err, null); + assert.strictEqual(err.path, readOnlyFile); + } } -); + fs.access(readOnlyFile, fs.W_OK, common.mustCall(expectedError)); + fs.promises.access(readOnlyFile, fs.W_OK) + .then(common.mustNotCall(), common.mustCall(expectedError)) + .catch(throwNextTick); +} + +{ + const expectedError = (err) => { + assert.strictEqual(err.code, 'ERR_INVALID_ARG_TYPE'); + assert.ok(err instanceof TypeError); + return true; + }; + assert.throws( + () => { fs.access(100, fs.F_OK, common.mustNotCall()); }, + expectedError + ); + + fs.promises.access(100, fs.F_OK) + .then(common.mustNotCall(), common.mustCall(expectedError)) + .catch(throwNextTick); +} common.expectsError( () => { From e0b438a6416b13a665639b312b7e99e3acc54370 Mon Sep 17 00:00:00 2001 From: helloshuangzi Date: Fri, 11 May 2018 11:06:05 -0700 Subject: [PATCH 091/208] src: add public API to create isolate and context PR-URL: https://github.com/nodejs/node/pull/20639 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Gireesh Punathil Reviewed-By: Khaidi Chu Reviewed-By: Ben Noordhuis --- src/node.cc | 58 ++++++++++++++++++++++++++++++++++---------- src/node.h | 22 +++++++++++++++++ src/node_internals.h | 8 ------ 3 files changed, 67 insertions(+), 21 deletions(-) diff --git a/src/node.cc b/src/node.cc index 5429015a149c79..92faaf0693f756 100644 --- a/src/node.cc +++ b/src/node.cc @@ -4453,10 +4453,21 @@ int EmitExit(Environment* env) { } +ArrayBufferAllocator* CreateArrayBufferAllocator() { + return new ArrayBufferAllocator(); +} + + +void FreeArrayBufferAllocator(ArrayBufferAllocator* allocator) { + delete allocator; +} + + IsolateData* CreateIsolateData(Isolate* isolate, uv_loop_t* loop) { return new IsolateData(isolate, loop, nullptr); } + IsolateData* CreateIsolateData( Isolate* isolate, uv_loop_t* loop, @@ -4465,6 +4476,15 @@ IsolateData* CreateIsolateData( } +IsolateData* CreateIsolateData( + Isolate* isolate, + uv_loop_t* loop, + MultiIsolatePlatform* platform, + ArrayBufferAllocator* allocator) { + return new IsolateData(isolate, loop, platform, allocator->zero_fill_field()); +} + + void FreeIsolateData(IsolateData* isolate_data) { delete isolate_data; } @@ -4608,19 +4628,16 @@ bool AllowWasmCodeGenerationCallback( return wasm_code_gen->IsUndefined() || wasm_code_gen->IsTrue(); } -inline int Start(uv_loop_t* event_loop, - int argc, const char* const* argv, - int exec_argc, const char* const* exec_argv) { +Isolate* NewIsolate(ArrayBufferAllocator* allocator) { Isolate::CreateParams params; - ArrayBufferAllocator allocator; - params.array_buffer_allocator = &allocator; + params.array_buffer_allocator = allocator; #ifdef NODE_ENABLE_VTUNE_PROFILING params.code_event_handler = vTune::GetVtuneCodeEventHandler(); #endif - Isolate* const isolate = Isolate::New(params); + Isolate* isolate = Isolate::New(params); if (isolate == nullptr) - return 12; // Signal internal error. + return nullptr; isolate->AddMessageListener(OnMessage); isolate->SetAbortOnUncaughtExceptionCallback(ShouldAbortOnUncaughtException); @@ -4628,6 +4645,18 @@ inline int Start(uv_loop_t* event_loop, isolate->SetFatalErrorHandler(OnFatalError); isolate->SetAllowWasmCodeGenerationCallback(AllowWasmCodeGenerationCallback); + return isolate; +} + +inline int Start(uv_loop_t* event_loop, + int argc, const char* const* argv, + int exec_argc, const char* const* exec_argv) { + std::unique_ptr + allocator(CreateArrayBufferAllocator(), &FreeArrayBufferAllocator); + Isolate* const isolate = NewIsolate(allocator.get()); + if (isolate == nullptr) + return 12; // Signal internal error. + { Mutex::ScopedLock scoped_lock(node_isolate_mutex); CHECK_EQ(node_isolate, nullptr); @@ -4639,15 +4668,18 @@ inline int Start(uv_loop_t* event_loop, Locker locker(isolate); Isolate::Scope isolate_scope(isolate); HandleScope handle_scope(isolate); - IsolateData isolate_data( - isolate, - event_loop, - v8_platform.Platform(), - allocator.zero_fill_field()); + std::unique_ptr isolate_data( + CreateIsolateData( + isolate, + event_loop, + v8_platform.Platform(), + allocator.get()), + &FreeIsolateData); if (track_heap_objects) { isolate->GetHeapProfiler()->StartTrackingHeapObjects(true); } - exit_code = Start(isolate, &isolate_data, argc, argv, exec_argc, exec_argv); + exit_code = + Start(isolate, isolate_data.get(), argc, argv, exec_argc, exec_argv); } { diff --git a/src/node.h b/src/node.h index 2ac145f4f75bd9..44c89afdb7134c 100644 --- a/src/node.h +++ b/src/node.h @@ -214,6 +214,11 @@ NODE_EXTERN void Init(int* argc, int* exec_argc, const char*** exec_argv); +class ArrayBufferAllocator; + +NODE_EXTERN ArrayBufferAllocator* CreateArrayBufferAllocator(); +NODE_EXTERN void FreeArrayBufferAllocator(ArrayBufferAllocator* allocator); + class IsolateData; class Environment; @@ -229,9 +234,21 @@ class MultiIsolatePlatform : public v8::Platform { virtual void UnregisterIsolate(IsolateData* isolate_data) = 0; }; +// Creates a new isolate with Node.js-specific settings. +NODE_EXTERN v8::Isolate* NewIsolate(ArrayBufferAllocator* allocator); + +// Creates a new context with Node.js-specific tweaks. Currently, it removes +// the `v8BreakIterator` property from the global `Intl` object if present. +// See https://github.com/nodejs/node/issues/14909 for more info. +NODE_EXTERN v8::Local NewContext( + v8::Isolate* isolate, + v8::Local object_template = + v8::Local()); + // If `platform` is passed, it will be used to register new Worker instances. // It can be `nullptr`, in which case creating new Workers inside of // Environments that use this `IsolateData` will not work. +// TODO(helloshuangzi): switch to default parameters. NODE_EXTERN IsolateData* CreateIsolateData( v8::Isolate* isolate, struct uv_loop_s* loop); @@ -239,6 +256,11 @@ NODE_EXTERN IsolateData* CreateIsolateData( v8::Isolate* isolate, struct uv_loop_s* loop, MultiIsolatePlatform* platform); +NODE_EXTERN IsolateData* CreateIsolateData( + v8::Isolate* isolate, + struct uv_loop_s* loop, + MultiIsolatePlatform* platform, + ArrayBufferAllocator* allocator); NODE_EXTERN void FreeIsolateData(IsolateData* isolate_data); NODE_EXTERN Environment* CreateEnvironment(IsolateData* isolate_data, diff --git a/src/node_internals.h b/src/node_internals.h index c10369c5631dd6..1ba56458b194c2 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -232,14 +232,6 @@ inline v8::Local PersistentToLocal( v8::Isolate* isolate, const Persistent& persistent); -// Creates a new context with Node.js-specific tweaks. Currently, it removes -// the `v8BreakIterator` property from the global `Intl` object if present. -// See https://github.com/nodejs/node/issues/14909 for more info. -v8::Local NewContext( - v8::Isolate* isolate, - v8::Local object_template = - v8::Local()); - // Convert a struct sockaddr to a { address: '1.2.3.4', port: 1234 } JS object. // Sets address and port properties on the info object and returns it. // If |info| is omitted, a new object is returned. From ccf69dd3b66df54204a456adc36a2a8117618c5a Mon Sep 17 00:00:00 2001 From: helloshuangzi Date: Tue, 8 May 2018 16:34:55 -0700 Subject: [PATCH 092/208] inspector: fix inspector::Agent::HasConnectedSessions PR-URL: https://github.com/nodejs/node/pull/20614 Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Anna Henningsen Reviewed-By: James M Snell --- src/inspector_agent.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc index 391d3bc037927e..c8e62f6f0a22c0 100644 --- a/src/inspector_agent.cc +++ b/src/inspector_agent.cc @@ -693,6 +693,8 @@ bool Agent::IsWaitingForConnect() { } bool Agent::HasConnectedSessions() { + if (client_ == nullptr) + return false; return client_->hasConnectedSessions(); } From 39caa6ddaf58e4c8b1327a6ed2caeebc012f7898 Mon Sep 17 00:00:00 2001 From: Jackson Tian Date: Mon, 7 May 2018 01:16:09 +0800 Subject: [PATCH 093/208] fs: use _final() for fs.WriteStream use _final() method instead of once 'finish' event. PR-URL: https://github.com/nodejs/node/pull/20562 Reviewed-By: Luigi Pinca Reviewed-By: Anna Henningsen Reviewed-By: Trivikram Kamat Reviewed-By: James M Snell --- lib/fs.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/fs.js b/lib/fs.js index ed2a241e568cf5..136048c02cd5a2 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -2212,17 +2212,17 @@ function WriteStream(path, options) { if (typeof this.fd !== 'number') this.open(); - - // dispose on finish. - this.once('finish', function() { - if (this.autoClose) { - this.destroy(); - } - }); } fs.FileWriteStream = fs.WriteStream; // support the legacy name +WriteStream.prototype._final = function(callback) { + if (this.autoClose) { + this.destroy(); + } + + callback(); +}; WriteStream.prototype.open = function() { fs.open(this.path, this.flags, this.mode, (er, fd) => { From e6c0bbe185f5c8cdfebfe419cdcc0f2e9fd803ef Mon Sep 17 00:00:00 2001 From: RakshithNM Date: Sun, 6 May 2018 19:42:50 +0530 Subject: [PATCH 094/208] test: display values in AssertionErrors In test-module-relative-lookup, change assert.strictEqual() calls so that values are displayed when an AssertionError occurs. PR-URL: https://github.com/nodejs/node/pull/20545 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Rich Trott Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat --- test/parallel/test-module-relative-lookup.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/parallel/test-module-relative-lookup.js b/test/parallel/test-module-relative-lookup.js index 6ebb8ee1881962..3e1904dc14fa61 100644 --- a/test/parallel/test-module-relative-lookup.js +++ b/test/parallel/test-module-relative-lookup.js @@ -6,10 +6,10 @@ const _module = require('module'); // avoid collision with global.module const lookupResults = _module._resolveLookupPaths('./lodash'); let paths = lookupResults[1]; -assert.strictEqual(paths[0], '.', - 'Current directory gets highest priority for local modules'); +// Current directory gets highest priority for local modules +assert.strictEqual(paths[0], '.'); paths = _module._resolveLookupPaths('./lodash', null, true); -assert.strictEqual(paths && paths[0], '.', - 'Current directory gets highest priority for local modules'); +// Current directory gets highest priority for local modules +assert.strictEqual(paths && paths[0], '.'); From 2b6e8ccfd4db451159176a16c97e2987b0b40dc4 Mon Sep 17 00:00:00 2001 From: David Humphrey Date: Wed, 4 Apr 2018 16:29:18 -0400 Subject: [PATCH 095/208] test: increase test coverage for fs/promises.js PR-URL: https://github.com/nodejs/node/pull/19811 Reviewed-By: Ruben Bridgewater Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: James M Snell Reviewed-By: Michael Dawson --- test/parallel/test-fs-promises.js | 55 ++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/test/parallel/test-fs-promises.js b/test/parallel/test-fs-promises.js index 8f1d646bb0e01e..992f30afec233e 100644 --- a/test/parallel/test-fs-promises.js +++ b/test/parallel/test-fs-promises.js @@ -87,24 +87,60 @@ function verifyStatObject(stat) { stats = await stat(dest); verifyStatObject(stats); + stats = await handle.stat(); + verifyStatObject(stats); + await fdatasync(handle); + await handle.datasync(); await fsync(handle); + await handle.sync(); - const buf = Buffer.from('hello world'); - + const buf = Buffer.from('hello fsPromises'); + const bufLen = buf.length; await write(handle, buf); - - const ret = await read(handle, Buffer.alloc(11), 0, 11, 0); - assert.strictEqual(ret.bytesRead, 11); + const ret = await read(handle, Buffer.alloc(bufLen), 0, bufLen, 0); + assert.strictEqual(ret.bytesRead, bufLen); assert.deepStrictEqual(ret.buffer, buf); + const buf2 = Buffer.from('hello FileHandle'); + const buf2Len = buf2.length; + await handle.write(buf2, 0, buf2Len, 0); + const ret2 = await handle.read(Buffer.alloc(buf2Len), 0, buf2Len, 0); + assert.strictEqual(ret2.bytesRead, buf2Len); + assert.deepStrictEqual(ret2.buffer, buf2); + await chmod(dest, 0o666); await fchmod(handle, 0o666); + await handle.chmod(0o666); + + // `mode` can't be > 0o777 + assert.rejects( + async () => chmod(handle, (0o777 + 1)), + { + code: 'ERR_INVALID_ARG_TYPE', + name: 'TypeError [ERR_INVALID_ARG_TYPE]' + } + ); + assert.rejects( + async () => fchmod(handle, (0o777 + 1)), + { + code: 'ERR_OUT_OF_RANGE', + name: 'RangeError [ERR_OUT_OF_RANGE]' + } + ); + assert.rejects( + async () => handle.chmod(handle, (0o777 + 1)), + { + code: 'ERR_INVALID_ARG_TYPE', + name: 'TypeError [ERR_INVALID_ARG_TYPE]' + } + ); await utimes(dest, new Date(), new Date()); try { await futimes(handle, new Date(), new Date()); + await handle.utimes(new Date(), new Date()); } catch (err) { // Some systems do not have futimes. If there is an error, // expect it to be ENOSYS @@ -152,6 +188,15 @@ function verifyStatObject(stat) { await rmdir(newdir); await mkdtemp(path.resolve(tmpDir, 'FOO')); + assert.rejects( + // mkdtemp() expects to get a string prefix. + async () => mkdtemp(1), + { + code: 'ERR_INVALID_ARG_TYPE', + name: 'TypeError [ERR_INVALID_ARG_TYPE]' + } + ); + } doTest().then(common.mustCall()); From 981a2f7b16c2fef7e384fce3fd4779f50b096b9b Mon Sep 17 00:00:00 2001 From: cjihrig Date: Sat, 12 May 2018 23:25:21 -0400 Subject: [PATCH 096/208] stream: simplify Writable.prototype.cork() This commit removes an unnecessary intermediate variable. PR-URL: https://github.com/nodejs/node/pull/20697 Reviewed-By: Daniel Bevenius Reviewed-By: Luigi Pinca Reviewed-By: Minwoo Jung Reviewed-By: Ruben Bridgewater Reviewed-By: Trivikram Kamat Reviewed-By: James M Snell --- lib/_stream_writable.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js index fff47a703fe252..3df14206f17789 100644 --- a/lib/_stream_writable.js +++ b/lib/_stream_writable.js @@ -299,9 +299,7 @@ Writable.prototype.write = function(chunk, encoding, cb) { }; Writable.prototype.cork = function() { - var state = this._writableState; - - state.corked++; + this._writableState.corked++; }; Writable.prototype.uncork = function() { From 39a41120d4329676ebc50383e3fd7053b6679325 Mon Sep 17 00:00:00 2001 From: cjihrig Date: Sat, 12 May 2018 23:07:52 -0400 Subject: [PATCH 097/208] stream: simplify writable's validChunk() This commit simplifies validChunk() by removing an unnecessary intermediate variable. PR-URL: https://github.com/nodejs/node/pull/20696 Reviewed-By: Trivikram Kamat Reviewed-By: Daniel Bevenius Reviewed-By: Luigi Pinca Reviewed-By: Ruben Bridgewater Reviewed-By: Jackson Tian Reviewed-By: Anna Henningsen Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: James M Snell --- lib/_stream_writable.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js index 3df14206f17789..2f69ba931afa4b 100644 --- a/lib/_stream_writable.js +++ b/lib/_stream_writable.js @@ -250,7 +250,6 @@ function writeAfterEnd(stream, cb) { // mode the stream is in. Currently this means that `null` is never accepted // and undefined/non-string values are only allowed in object mode. function validChunk(stream, state, chunk, cb) { - var valid = true; var er; if (chunk === null) { @@ -261,9 +260,9 @@ function validChunk(stream, state, chunk, cb) { if (er) { stream.emit('error', er); process.nextTick(cb, er); - valid = false; + return false; } - return valid; + return true; } Writable.prototype.write = function(chunk, encoding, cb) { From fd14ec11010eea7160c404955bdce9e81c1f30f0 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 14 May 2018 19:35:45 +0200 Subject: [PATCH 098/208] doc: add missing `changes:` entry for assert.throws Refs: https://github.com/nodejs/node/pull/20485 PR-URL: https://github.com/nodejs/node/pull/20723 Reviewed-By: Ruben Bridgewater Reviewed-By: Ujjwal Sharma --- doc/api/assert.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/api/assert.md b/doc/api/assert.md index 19111f5137c7c9..094dcbc7f2112c 100644 --- a/doc/api/assert.md +++ b/doc/api/assert.md @@ -1056,6 +1056,10 @@ instead of the `AssertionError`. ' + '

    Describe Something in more detail here.

    ' }, diff --git a/tools/doc/html.js b/tools/doc/html.js index dfd0f22c7c8330..24c4614fc291c7 100644 --- a/tools/doc/html.js +++ b/tools/doc/html.js @@ -141,7 +141,7 @@ function linkManPages(text) { MAN_PAGE, (match, beginning, name, number, optionalCharacter) => { // Name consists of lowercase letters, // number is a single digit with an optional lowercase letter. - const displayAs = `${name}(${number}${optionalCharacter})`; + const displayAs = `${name}(${number}${optionalCharacter})`; if (BSD_ONLY_SYSCALLS.has(name)) { return `${beginning} Reviewed-By: Benjamin Gruenbaum Reviewed-By: Luigi Pinca Reviewed-By: Ruben Bridgewater --- lib/fs.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/fs.js b/lib/fs.js index 7d84b5bacafa94..fedd4dcdb54df2 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -60,7 +60,6 @@ const { Readable, Writable } = require('stream'); const EventEmitter = require('events'); const { FSReqWrap, statValues, kFsStatsFieldsLength } = binding; const { FSEvent } = process.binding('fs_event_wrap'); -const promises = require('internal/fs/promises'); const internalFS = require('internal/fs/utils'); const { getPathFromURL } = require('internal/url'); const internalUtil = require('internal/util'); @@ -89,14 +88,18 @@ const { CHAR_BACKWARD_SLASH, } = require('internal/constants'); -let warn = true; +// Lazy loaded +let promises; + +let promisesWarn = true; Object.defineProperty(fs, 'promises', { configurable: true, enumerable: false, get() { - if (warn) { - warn = false; + if (promisesWarn) { + promises = require('internal/fs/promises'); + promisesWarn = false; process.emitWarning('The fs.promises API is experimental', 'ExperimentalWarning'); } From 9b43af3703a129021f4f8ed653fe06beb7f8c8d1 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Mon, 14 May 2018 16:39:54 -0700 Subject: [PATCH 132/208] fs: lazy load createPromise/promiseResolve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/20766 Reviewed-By: Joyee Cheung Reviewed-By: Michaël Zasso Reviewed-By: Minwoo Jung Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Benjamin Gruenbaum Reviewed-By: Luigi Pinca Reviewed-By: Ruben Bridgewater --- lib/fs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fs.js b/lib/fs.js index fedd4dcdb54df2..bf6f93ebb7bf05 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -44,7 +44,6 @@ const { const util = require('util'); const pathModule = require('path'); const { isUint8Array } = require('internal/util/types'); -const { createPromise, promiseResolve } = process.binding('util'); const binding = process.binding('fs'); const fs = exports; @@ -248,6 +247,7 @@ fs.exists = function(path, callback) { Object.defineProperty(fs.exists, internalUtil.promisify.custom, { value: (path) => { + const { createPromise, promiseResolve } = process.binding('util'); const promise = createPromise(); fs.exists(path, (exists) => promiseResolve(promise, exists)); return promise; From d6805c15a5980ab4edc277f40479863cbefc77e3 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Wed, 16 May 2018 09:06:46 +0200 Subject: [PATCH 133/208] src: add override to ThreadPool methods in zlib Currently the following compiler warnings are generated: ../src/node_zlib.cc:222:8: warning: 'DoThreadPoolWork' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] void DoThreadPoolWork() { ^ ../src/node_internals.h:509:16: note: overridden virtual function is here virtual void DoThreadPoolWork() = 0; ^ ../src/node_zlib.cc:357:8: warning: 'AfterThreadPoolWork' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] void AfterThreadPoolWork(int status) { ^ ../src/node_internals.h:510:16: note: overridden virtual function is here virtual void AfterThreadPoolWork(int status) = 0; ^ This commit adds the override specifier to the methods to silence the warnings. PR-URL: https://github.com/nodejs/node/pull/20769 Reviewed-By: Joyee Cheung Reviewed-By: Ben Noordhuis Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Colin Ihrig --- src/node_zlib.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node_zlib.cc b/src/node_zlib.cc index 632dad1f8110be..87415eb5758712 100644 --- a/src/node_zlib.cc +++ b/src/node_zlib.cc @@ -219,7 +219,7 @@ class ZCtx : public AsyncWrap, public ThreadPoolWork { // This function may be called multiple times on the uv_work pool // for a single write() call, until all of the input bytes have // been consumed. - void DoThreadPoolWork() { + void DoThreadPoolWork() override { const Bytef* next_expected_header_byte = nullptr; // If the avail_out is left at 0, then it means that it ran out @@ -353,7 +353,7 @@ class ZCtx : public AsyncWrap, public ThreadPoolWork { // v8 land! - void AfterThreadPoolWork(int status) { + void AfterThreadPoolWork(int status) override { write_in_progress_ = false; if (status == UV_ECANCELED) { From aaf1df59bed8310d63d9fe3d51e2b2dae3e75555 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Mon, 14 May 2018 12:24:12 +0200 Subject: [PATCH 134/208] build: export openssl TLSv1 methods again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream deprecated them and moved them into categories of their own. Add those categories to the export list. Node.js doesn't use them but some add-ons do. Fixes: https://github.com/nodejs/node/issues/20369 PR-URL: https://github.com/nodejs/node/pull/20712 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Daniel Bevenius Reviewed-By: James M Snell Reviewed-By: Michael Dawson Reviewed-By: Ruben Bridgewater Reviewed-By: Tobias Nießen --- node.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node.gyp b/node.gyp index 577c8901ba84b9..29fc973a68411b 100644 --- a/node.gyp +++ b/node.gyp @@ -600,7 +600,7 @@ # Categories to export. '-CAES,BF,BIO,DES,DH,DSA,EC,ECDH,ECDSA,ENGINE,EVP,HMAC,MD4,MD5,' 'PSK,RC2,RC4,RSA,SHA,SHA0,SHA1,SHA256,SHA512,SOCK,STDIO,TLSEXT,' - 'FP_API', + 'FP_API,TLS1_METHOD,TLS1_1_METHOD,TLS1_2_METHOD', # Defines. '-DWIN32', # Symbols to filter from the export list. From 47103493f7031c7f2b9bf82b0e25badf634433a1 Mon Sep 17 00:00:00 2001 From: killagu Date: Sat, 24 Feb 2018 22:00:32 +0800 Subject: [PATCH 135/208] child_process: fix exec set stdout.setEncoding cp.exec decide to use `_stdout`(_stdout is string) or `Buffer.concat(_stdout)`(_stdout is buffer array) by options.encoding. but std(out|err) encoding can be changed. If encoding is changed to not null, `_stdout` will become string, and `Buffer.concat(_stdout)` will throw TypeError. This patch will fix it, use options.encoding and `std(out|err)._readableState.encoding`. PR-URL: https://github.com/nodejs/node/pull/18976 Fixes: https://github.com/nodejs/node/issues/18969 Reviewed-By: Matteo Collina Reviewed-By: Ruben Bridgewater --- lib/_stream_readable.js | 3 +- lib/child_process.js | 33 +++++++++++-------- .../test-child-process-exec-maxBuffer.js | 22 +++++++++++++ .../test-child-process-exec-std-encoding.js | 23 +++++++++++++ .../test-stream-readable-setEncoding-null.js | 15 +++++++++ 5 files changed, 82 insertions(+), 14 deletions(-) create mode 100644 test/parallel/test-child-process-exec-std-encoding.js create mode 100644 test/parallel/test-stream-readable-setEncoding-null.js diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js index 8073e174cc586f..3b614a7924f893 100644 --- a/lib/_stream_readable.js +++ b/lib/_stream_readable.js @@ -324,7 +324,8 @@ Readable.prototype.setEncoding = function(enc) { if (!StringDecoder) StringDecoder = require('string_decoder').StringDecoder; this._readableState.decoder = new StringDecoder(enc); - this._readableState.encoding = enc; + // if setEncoding(null), decoder.encoding equals utf8 + this._readableState.encoding = this._readableState.decoder.encoding; return this; }; diff --git a/lib/child_process.js b/lib/child_process.js index 734f67d7a51f99..b2835b0a8f58be 100644 --- a/lib/child_process.js +++ b/lib/child_process.js @@ -226,15 +226,11 @@ exports.execFile = function execFile(file /* , args, options, callback */) { }); var encoding; - var _stdout; - var _stderr; + var _stdout = []; + var _stderr = []; if (options.encoding !== 'buffer' && Buffer.isEncoding(options.encoding)) { encoding = options.encoding; - _stdout = ''; - _stderr = ''; } else { - _stdout = []; - _stderr = []; encoding = null; } var stdoutLen = 0; @@ -261,11 +257,24 @@ exports.execFile = function execFile(file /* , args, options, callback */) { // merge chunks var stdout; var stderr; - if (encoding) { - stdout = _stdout; - stderr = _stderr; + if (encoding || + ( + child.stdout && + child.stdout._readableState && + child.stdout._readableState.encoding + )) { + stdout = _stdout.join(''); } else { stdout = Buffer.concat(_stdout); + } + if (encoding || + ( + child.stderr && + child.stderr._readableState && + child.stderr._readableState.encoding + )) { + stderr = _stderr.join(''); + } else { stderr = Buffer.concat(_stderr); } @@ -329,13 +338,12 @@ exports.execFile = function execFile(file /* , args, options, callback */) { child.stdout.setEncoding(encoding); child.stdout.on('data', function onChildStdout(chunk) { + var encoding = child.stdout._readableState.encoding; stdoutLen += encoding ? Buffer.byteLength(chunk, encoding) : chunk.length; if (stdoutLen > options.maxBuffer) { ex = new ERR_CHILD_PROCESS_STDIO_MAXBUFFER('stdout'); kill(); - } else if (encoding) { - _stdout += chunk; } else { _stdout.push(chunk); } @@ -347,13 +355,12 @@ exports.execFile = function execFile(file /* , args, options, callback */) { child.stderr.setEncoding(encoding); child.stderr.on('data', function onChildStderr(chunk) { + var encoding = child.stderr._readableState.encoding; stderrLen += encoding ? Buffer.byteLength(chunk, encoding) : chunk.length; if (stderrLen > options.maxBuffer) { ex = new ERR_CHILD_PROCESS_STDIO_MAXBUFFER('stderr'); kill(); - } else if (encoding) { - _stderr += chunk; } else { _stderr.push(chunk); } diff --git a/test/parallel/test-child-process-exec-maxBuffer.js b/test/parallel/test-child-process-exec-maxBuffer.js index 4a65ccf5be7510..94545e719ba2d7 100644 --- a/test/parallel/test-child-process-exec-maxBuffer.js +++ b/test/parallel/test-child-process-exec-maxBuffer.js @@ -41,3 +41,25 @@ const unicode = '中文测试'; // length = 4, byte length = 12 cp.exec(cmd, { maxBuffer: 10 }, checkFactory('stderr')); } + +{ + const cmd = `"${process.execPath}" -e "console.log('${unicode}');"`; + + const child = cp.exec( + cmd, + { encoding: null, maxBuffer: 10 }, + checkFactory('stdout')); + + child.stdout.setEncoding('utf-8'); +} + +{ + const cmd = `"${process.execPath}" -e "console.error('${unicode}');"`; + + const child = cp.exec( + cmd, + { encoding: null, maxBuffer: 10 }, + checkFactory('stderr')); + + child.stderr.setEncoding('utf-8'); +} diff --git a/test/parallel/test-child-process-exec-std-encoding.js b/test/parallel/test-child-process-exec-std-encoding.js new file mode 100644 index 00000000000000..11cb66cf42cc5b --- /dev/null +++ b/test/parallel/test-child-process-exec-std-encoding.js @@ -0,0 +1,23 @@ +'use strict'; +const common = require('../common'); +const assert = require('assert'); +const cp = require('child_process'); +const stdoutData = 'foo'; +const stderrData = 'bar'; +const expectedStdout = `${stdoutData}\n`; +const expectedStderr = `${stderrData}\n`; + +if (process.argv[2] === 'child') { + // The following console calls are part of the test. + console.log(stdoutData); + console.error(stderrData); +} else { + const cmd = `"${process.execPath}" "${__filename}" child`; + const child = cp.exec(cmd, common.mustCall((err, stdout, stderr) => { + assert.ifError(err); + assert.strictEqual(stdout, expectedStdout); + assert.strictEqual(stderr, expectedStderr); + })); + child.stdout.setEncoding('utf-8'); + child.stderr.setEncoding('utf-8'); +} diff --git a/test/parallel/test-stream-readable-setEncoding-null.js b/test/parallel/test-stream-readable-setEncoding-null.js new file mode 100644 index 00000000000000..b95b26bb795728 --- /dev/null +++ b/test/parallel/test-stream-readable-setEncoding-null.js @@ -0,0 +1,15 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); +const { Readable } = require('stream'); + + +{ + const readable = new Readable({ encoding: 'hex' }); + assert.strictEqual(readable._readableState.encoding, 'hex'); + + readable.setEncoding(null); + + assert.strictEqual(readable._readableState.encoding, 'utf8'); +} From ed5f253cfadf20efa3e62f01082933d3c95534b5 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 30 Apr 2018 07:14:00 +0200 Subject: [PATCH 136/208] stream: refactor getHighWaterMark in state.js This commit aims to reduce some code duplication in state.js PR-URL: https://github.com/nodejs/node/pull/20415 Reviewed-By: Anatoli Papirovski Reviewed-By: Luigi Pinca Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat --- lib/internal/streams/state.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/internal/streams/state.js b/lib/internal/streams/state.js index 4a1b49d25cadba..c54c8230c72227 100644 --- a/lib/internal/streams/state.js +++ b/lib/internal/streams/state.js @@ -2,19 +2,19 @@ const { ERR_INVALID_OPT_VALUE } = require('internal/errors').codes; +function highWaterMarkFrom(options, isDuplex, duplexKey) { + return options.highWaterMark != null ? options.highWaterMark : + isDuplex ? options[duplexKey] : null; +} + function getHighWaterMark(state, options, duplexKey, isDuplex) { - let hwm = options.highWaterMark; + const hwm = highWaterMarkFrom(options, isDuplex, duplexKey); if (hwm != null) { - if (typeof hwm !== 'number' || !(hwm >= 0)) - throw new ERR_INVALID_OPT_VALUE('highWaterMark', hwm); - return Math.floor(hwm); - } else if (isDuplex) { - hwm = options[duplexKey]; - if (hwm != null) { - if (typeof hwm !== 'number' || !(hwm >= 0)) - throw new ERR_INVALID_OPT_VALUE(duplexKey, hwm); - return Math.floor(hwm); + if (!Number.isInteger(hwm) || hwm < 0) { + const name = isDuplex ? duplexKey : 'highWaterMark'; + throw new ERR_INVALID_OPT_VALUE(name, hwm); } + return Math.floor(hwm); } // Default value From 526163cff92f089e544cda493a44b38becc17231 Mon Sep 17 00:00:00 2001 From: Ayush Gupta Date: Thu, 3 May 2018 00:21:20 +0530 Subject: [PATCH 137/208] url: introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduce `URL_FLAGS_IS_DEFAULT_SCHEME_PORT` flag which is retured when the parser detects that the port passed is the default port for that scheme. PR-URL: https://github.com/nodejs/node/pull/20479 Fixes: https://github.com/nodejs/node/issues/20465 Reviewed-By: James M Snell Reviewed-By: Michaël Zasso Reviewed-By: Anatoli Papirovski Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Ruben Bridgewater --- lib/internal/url.js | 3 ++- src/node_url.cc | 2 ++ src/node_url.h | 3 ++- test/fixtures/url-setter-tests.js | 13 ++++++++++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lib/internal/url.js b/lib/internal/url.js index d9daef1524787d..7a67fe2f15ef4a 100644 --- a/lib/internal/url.js +++ b/lib/internal/url.js @@ -46,6 +46,7 @@ const { URL_FLAGS_HAS_PATH, URL_FLAGS_HAS_QUERY, URL_FLAGS_HAS_USERNAME, + URL_FLAGS_IS_DEFAULT_SCHEME_PORT, URL_FLAGS_SPECIAL, kFragment, kHost, @@ -276,7 +277,7 @@ function onParsePortComplete(flags, protocol, username, password, function onParseHostComplete(flags, protocol, username, password, host, port, path, query, fragment) { onParseHostnameComplete.apply(this, arguments); - if (port !== null) + if (port !== null || ((flags & URL_FLAGS_IS_DEFAULT_SCHEME_PORT) !== 0)) onParsePortComplete.apply(this, arguments); } diff --git a/src/node_url.cc b/src/node_url.cc index 42ecf47f4c958a..82c093d516bc4a 100644 --- a/src/node_url.cc +++ b/src/node_url.cc @@ -1749,6 +1749,8 @@ void URL::Parse(const char* input, } // the port is valid url->port = NormalizePort(url->scheme, static_cast(port)); + if (url->port == -1) + url->flags |= URL_FLAGS_IS_DEFAULT_SCHEME_PORT; buffer.clear(); } else if (has_state_override) { // TODO(TimothyGu): Similar case as above. diff --git a/src/node_url.h b/src/node_url.h index 6b526d15b07703..b2eadf9923a7ea 100644 --- a/src/node_url.h +++ b/src/node_url.h @@ -50,7 +50,8 @@ using v8::Value; XX(URL_FLAGS_HAS_HOST, 0x80) \ XX(URL_FLAGS_HAS_PATH, 0x100) \ XX(URL_FLAGS_HAS_QUERY, 0x200) \ - XX(URL_FLAGS_HAS_FRAGMENT, 0x400) + XX(URL_FLAGS_HAS_FRAGMENT, 0x400) \ + XX(URL_FLAGS_IS_DEFAULT_SCHEME_PORT, 0x800) \ enum url_parse_state { kUnknownState = -1, diff --git a/test/fixtures/url-setter-tests.js b/test/fixtures/url-setter-tests.js index 289812cb7e33ff..1e460ff2d8dd7c 100644 --- a/test/fixtures/url-setter-tests.js +++ b/test/fixtures/url-setter-tests.js @@ -2,7 +2,7 @@ /* The following tests are copied from WPT. Modifications to them should be upstreamed first. Refs: - https://github.com/w3c/web-platform-tests/blob/ed4bb727ed/url/setters_tests.json + https://github.com/w3c/web-platform-tests/blob/f0fe479/url/setters_tests.json License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html */ module.exports = @@ -727,6 +727,17 @@ module.exports = "port": "80" } }, + { + "comment": "Port number is removed if new port is scheme default and existing URL has a non-default port", + "href": "http://example.net:8080", + "new_value": "example.com:80", + "expected": { + "href": "http://example.com/", + "host": "example.com", + "hostname": "example.com", + "port": "" + } + }, { "comment": "Stuff after a / delimiter is ignored", "href": "http://example.net/path", From 0ace8f9835a5816a781816fcb0c6f9ae8d4916e7 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Sun, 6 May 2018 23:08:00 +0200 Subject: [PATCH 138/208] string_decoder: lazy loaded PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/_stream_readable.js | 4 +++- lib/internal/child_process.js | 6 +++++- lib/internal/crypto/cipher.js | 6 +++++- lib/readline.js | 10 +++++++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js index 3b614a7924f893..ecdcccc0640ff9 100644 --- a/lib/_stream_readable.js +++ b/lib/_stream_readable.js @@ -40,7 +40,9 @@ const { } = require('internal/errors').codes; const ReadableAsyncIterator = require('internal/streams/async_iterator'); const { emitExperimentalWarning } = require('internal/util'); -var StringDecoder; + +// Lazy loaded to improve the startup performance. +let StringDecoder; util.inherits(Readable, Stream); diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js index a630cff717bcad..1ec3f208660910 100644 --- a/lib/internal/child_process.js +++ b/lib/internal/child_process.js @@ -14,7 +14,6 @@ const { ERR_MISSING_ARGS } } = require('internal/errors'); -const { StringDecoder } = require('string_decoder'); const EventEmitter = require('events'); const net = require('net'); const dgram = require('dgram'); @@ -47,6 +46,9 @@ const { const { SocketListSend, SocketListReceive } = SocketList; +// Lazy loaded for startup performance. +let StringDecoder; + const MAX_HANDLE_RETRANSMISSIONS = 3; // this object contain function to convert TCP objects to native handle objects @@ -476,6 +478,8 @@ function setupChannel(target, channel) { const control = new Control(channel); + if (StringDecoder === undefined) + StringDecoder = require('string_decoder').StringDecoder; var decoder = new StringDecoder('utf8'); var jsonBuffer = ''; var pendingHandle = null; diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js index abf007de5cd623..4a523473804643 100644 --- a/lib/internal/crypto/cipher.js +++ b/lib/internal/crypto/cipher.js @@ -28,11 +28,13 @@ const { const assert = require('assert'); const LazyTransform = require('internal/streams/lazy_transform'); -const { StringDecoder } = require('string_decoder'); const { inherits } = require('util'); const { deprecate, normalizeEncoding } = require('internal/util'); +// Lazy loaded for startup performance. +let StringDecoder; + function rsaFunctionFor(method, defaultPadding) { return function(options, buffer) { const key = options.key || options; @@ -49,6 +51,8 @@ const privateDecrypt = rsaFunctionFor(_privateDecrypt, RSA_PKCS1_OAEP_PADDING); function getDecoder(decoder, encoding) { encoding = normalizeEncoding(encoding); + if (StringDecoder === undefined) + StringDecoder = require('string_decoder').StringDecoder; decoder = decoder || new StringDecoder(encoding); assert(decoder.encoding === encoding, 'Cannot change encoding'); return decoder; diff --git a/lib/readline.js b/lib/readline.js index 124fc8111b2f09..89dd1b84f2dde0 100644 --- a/lib/readline.js +++ b/lib/readline.js @@ -35,7 +35,6 @@ const { const { debug, inherits } = require('util'); const { Buffer } = require('buffer'); const EventEmitter = require('events'); -const { StringDecoder } = require('string_decoder'); const { CSI, emitKeys, @@ -52,6 +51,9 @@ const { kClearScreenDown } = CSI; +// Lazy load StringDecoder for startup performance. +let StringDecoder; + const kHistorySize = 30; const kMincrlfDelay = 100; // \r\n, \n, or \r followed by something other than \n @@ -73,6 +75,9 @@ function Interface(input, output, completer, terminal) { return new Interface(input, output, completer, terminal); } + if (StringDecoder === undefined) + StringDecoder = require('string_decoder').StringDecoder; + this._sawReturnAt = 0; this.isCompletionEnabled = true; this._sawKeyPress = false; @@ -987,6 +992,9 @@ Interface.prototype._ttyWrite = function(s, key) { function emitKeypressEvents(stream, iface) { if (stream[KEYPRESS_DECODER]) return; + + if (StringDecoder === undefined) + StringDecoder = require('string_decoder').StringDecoder; stream[KEYPRESS_DECODER] = new StringDecoder('utf8'); stream[ESCAPE_DECODER] = emitKeys(stream); From 4a92da15dce25d311094b2eb231332f770b58e44 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Sun, 6 May 2018 23:08:42 +0200 Subject: [PATCH 139/208] querystring: lazy loaded PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/internal/url.js | 8 ++++++-- lib/url.js | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/internal/url.js b/lib/internal/url.js index 7a67fe2f15ef4a..ffd8f10edaeee8 100644 --- a/lib/internal/url.js +++ b/lib/internal/url.js @@ -27,7 +27,9 @@ const { CHAR_LOWERCASE_A, CHAR_LOWERCASE_Z, } = require('internal/constants'); -const querystring = require('querystring'); + +// Lazy loaded for startup performance. +let querystring; const { platform } = process; const isWindows = platform === 'win32'; @@ -771,8 +773,10 @@ function parseParams(qs) { } else if (encodeCheck > 0) { // eslint-disable-next-line no-extra-boolean-cast if (!!isHexTable[code]) { - if (++encodeCheck === 3) + if (++encodeCheck === 3) { + querystring = require('querystring'); encoded = true; + } } else { encodeCheck = 0; } diff --git a/lib/url.js b/lib/url.js index e4326e80b5d948..c517ba7ab3dae0 100644 --- a/lib/url.js +++ b/lib/url.js @@ -94,7 +94,6 @@ const slashedProtocol = { 'file': true, 'file:': true }; -const querystring = require('querystring'); const { CHAR_SPACE, CHAR_TAB, @@ -133,6 +132,9 @@ const { CHAR_AT, } = require('internal/constants'); +// Lazy loaded for startup performance. +let querystring; + function urlParse(url, parseQueryString, slashesDenoteHost) { if (url instanceof Url) return url; @@ -233,6 +235,7 @@ Url.prototype.parse = function parse(url, parseQueryString, slashesDenoteHost) { if (simplePath[2]) { this.search = simplePath[2]; if (parseQueryString) { + if (querystring === undefined) querystring = require('querystring'); this.query = querystring.parse(this.search.slice(1)); } else { this.query = this.search.slice(1); @@ -422,6 +425,7 @@ Url.prototype.parse = function parse(url, parseQueryString, slashesDenoteHost) { this.query = rest.slice(questionIdx + 1, hashIdx); } if (parseQueryString) { + if (querystring === undefined) querystring = require('querystring'); this.query = querystring.parse(this.query); } } else if (parseQueryString) { @@ -584,8 +588,10 @@ Url.prototype.format = function format() { } } - if (this.query !== null && typeof this.query === 'object') + if (this.query !== null && typeof this.query === 'object') { + if (querystring === undefined) querystring = require('querystring'); query = querystring.stringify(this.query); + } var search = this.search || (query && ('?' + query)) || ''; From 3eb38debb4518b93e5ca449ef42642a59663e623 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Sun, 6 May 2018 23:09:01 +0200 Subject: [PATCH 140/208] readline: lazy loaded PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/tty.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/tty.js b/lib/tty.js index 4e9023b0eb6114..b36adf2534c326 100644 --- a/lib/tty.js +++ b/lib/tty.js @@ -26,9 +26,11 @@ const net = require('net'); const { TTY, isTTY } = process.binding('tty_wrap'); const errors = require('internal/errors'); const { ERR_INVALID_FD, ERR_TTY_INIT_FAILED } = errors.codes; -const readline = require('readline'); const { getColorDepth } = require('internal/tty'); +// Lazy loaded for startup performance. +let readline; + function isatty(fd) { return Number.isInteger(fd) && fd >= 0 && isTTY(fd); } @@ -122,15 +124,19 @@ WriteStream.prototype._refreshSize = function() { // Backwards-compat WriteStream.prototype.cursorTo = function(x, y) { + if (readline === undefined) readline = require('readline'); readline.cursorTo(this, x, y); }; WriteStream.prototype.moveCursor = function(dx, dy) { + if (readline === undefined) readline = require('readline'); readline.moveCursor(this, dx, dy); }; WriteStream.prototype.clearLine = function(dir) { + if (readline === undefined) readline = require('readline'); readline.clearLine(this, dir); }; WriteStream.prototype.clearScreenDown = function() { + if (readline === undefined) readline = require('readline'); readline.clearScreenDown(this); }; WriteStream.prototype.getWindowSize = function() { From 28d00a18c8db05f0375f4f70d8d674a9486051fe Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Sun, 6 May 2018 23:10:23 +0200 Subject: [PATCH 141/208] os: lazy loaded PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/assert.js | 2 +- lib/internal/constants.js | 4 ++++ lib/internal/tty.js | 9 ++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/assert.js b/lib/assert.js index 8bcdc8cdacb3ee..8ed90608d8f88d 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -33,7 +33,7 @@ const { codes: { const { AssertionError, errorCache } = require('internal/assert'); const { openSync, closeSync, readSync } = require('fs'); const { inspect, types: { isPromise, isRegExp } } = require('util'); -const { EOL } = require('os'); +const { EOL } = require('internal/constants'); const { NativeModule } = require('internal/bootstrap/loaders'); // Escape control characters but not \n and \t to keep the line breaks and diff --git a/lib/internal/constants.js b/lib/internal/constants.js index 5c884ae6bc4a7f..dfa30bea306e65 100644 --- a/lib/internal/constants.js +++ b/lib/internal/constants.js @@ -1,5 +1,7 @@ 'use strict'; +const isWindows = process.platform === 'win32'; + module.exports = { // Alphabet chars. CHAR_UPPERCASE_A: 65, /* A */ @@ -45,4 +47,6 @@ module.exports = { // Digits CHAR_0: 48, /* 0 */ CHAR_9: 57, /* 9 */ + + EOL: isWindows ? '\r\n' : '\n' }; diff --git a/lib/internal/tty.js b/lib/internal/tty.js index c4edab24fb87ab..1e60909f66a636 100644 --- a/lib/internal/tty.js +++ b/lib/internal/tty.js @@ -22,9 +22,7 @@ 'use strict'; -const { release } = require('os'); - -const OSRelease = release().split('.'); +let OSRelease; const COLORS_2 = 1; const COLORS_16 = 4; @@ -75,6 +73,11 @@ function getColorDepth(env = process.env) { } if (process.platform === 'win32') { + // Lazy load for startup performance. + if (OSRelease === undefined) { + const { release } = require('os'); + OSRelease = release().split('.'); + } // Windows 10 build 10586 is the first Windows release that supports 256 // colors. Windows 10 build 14931 is the first release that supports // 16m/TrueColor. From 60eab9100fc6aea8c03339ecee220e2607fea244 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Sun, 6 May 2018 23:10:57 +0200 Subject: [PATCH 142/208] dns: lazy loaded PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/dgram.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/dgram.js b/lib/dgram.js index 0a72834873e8bd..f3454ffc0702c4 100644 --- a/lib/dgram.js +++ b/lib/dgram.js @@ -35,7 +35,6 @@ const { ERR_SOCKET_DGRAM_NOT_RUNNING } = errors.codes; const { Buffer } = require('buffer'); -const dns = require('dns'); const util = require('util'); const { isUint8Array } = require('internal/util/types'); const EventEmitter = require('events'); @@ -47,6 +46,9 @@ const { UV_UDP_REUSEADDR } = process.binding('constants').os; const { UDP, SendWrap } = process.binding('udp_wrap'); +// Lazy load for startup performance. +let dns; + const BIND_STATE_UNBOUND = 0; const BIND_STATE_BINDING = 1; const BIND_STATE_BOUND = 2; @@ -72,9 +74,10 @@ function lookup6(lookup, address, callback) { function newHandle(type, lookup) { - if (lookup === undefined) + if (lookup === undefined) { + if (dns === undefined) dns = require('dns'); lookup = dns.lookup; - else if (typeof lookup !== 'function') + } else if (typeof lookup !== 'function') throw new ERR_INVALID_ARG_TYPE('lookup', 'Function', lookup); if (type === 'udp4') { From 486ac23cb0fc27c8abc243b55a6875d28506966b Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Sun, 6 May 2018 23:53:33 +0200 Subject: [PATCH 143/208] lib: only load inspector stuff if necessary PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/internal/bootstrap/node.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index f9bed03d269fb2..1aca1ea2374748 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -64,7 +64,10 @@ NativeModule.require('internal/process/write-coverage').setup(); NativeModule.require('internal/trace_events_async_hooks').setup(); - NativeModule.require('internal/inspector_async_hook').setup(); + + if (process.config.variables.v8_enable_inspector) { + NativeModule.require('internal/inspector_async_hook').setup(); + } _process.setupChannel(); _process.setupRawDebug(); From 3aab6ce39d0907d31e5cf81f5f2d8c3c7eadec0e Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 00:03:12 +0200 Subject: [PATCH 144/208] lib: lazy load necessary loaders PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/internal/modules/cjs/loader.js | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js index 022f58d27e2868..e471cc013a6531 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -23,8 +23,6 @@ const { NativeModule } = require('internal/bootstrap/loaders'); const util = require('util'); -const { decorateErrorStack } = require('internal/util'); -const { getURLFromFilePath } = require('internal/url'); const vm = require('vm'); const assert = require('assert').ok; const fs = require('fs'); @@ -53,11 +51,21 @@ const { module.exports = Module; -// these are below module.exports for the circular reference -const asyncESM = require('internal/process/esm_loader'); -const ModuleJob = require('internal/modules/esm/module_job'); -const createDynamicModule = require( - 'internal/modules/esm/create_dynamic_module'); +let asyncESM; +let ModuleJob; +let createDynamicModule; +let getURLFromFilePath; +let decorateErrorStack; + +function lazyLoadESM() { + asyncESM = require('internal/process/esm_loader'); + ModuleJob = require('internal/modules/esm/module_job'); + createDynamicModule = require( + 'internal/modules/esm/create_dynamic_module'); + decorateErrorStack = require('internal/util').decorateErrorStack; + getURLFromFilePath = require('internal/url').getURLFromFilePath; +} + const { CHAR_UPPERCASE_A, CHAR_LOWERCASE_A, @@ -497,6 +505,7 @@ Module._load = function(request, parent, isMain) { } if (experimentalModules && isMain) { + if (asyncESM === undefined) lazyLoadESM(); asyncESM.loaderPromise.then((loader) => { return loader.import(getURLFromFilePath(request).pathname); }) @@ -604,6 +613,7 @@ Module.prototype.load = function(filename) { this.loaded = true; if (experimentalModules) { + if (asyncESM === undefined) lazyLoadESM(); const ESMLoader = asyncESM.ESMLoader; const url = getURLFromFilePath(filename); const urlString = `${url}`; @@ -722,6 +732,7 @@ Module._extensions['.node'] = function(module, filename) { }; if (experimentalModules) { + if (asyncESM === undefined) lazyLoadESM(); Module._extensions['.mjs'] = function(module, filename) { throw new ERR_REQUIRE_ESM(filename); }; @@ -797,5 +808,5 @@ Module._preloadModules = function(requests) { Module._initPaths(); -// backwards compatibility +// Backwards compatibility Module.Module = Module; From 4a872b98a0ab36d54c493aa204aad46780322719 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 00:04:19 +0200 Subject: [PATCH 145/208] cluster: remove obsolete array allocation The array was only used to create a key. Instead of allocating that first, just directly create the necessary string. PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/internal/cluster/master.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/internal/cluster/master.js b/lib/internal/cluster/master.js index 8e4f9395da6643..457b3579b12c1c 100644 --- a/lib/internal/cluster/master.js +++ b/lib/internal/cluster/master.js @@ -275,12 +275,8 @@ function queryServer(worker, message) { if (worker.exitedAfterDisconnect) return; - const args = [message.address, - message.port, - message.addressType, - message.fd, - message.index]; - const key = args.join(':'); + const key = `${message.address}:${message.port}:${message.addressType}:` + + `${message.fd}:${message.index}`; var handle = handles[key]; if (handle === undefined) { From 72f32282037a4fa948f73eb7f30a389b54f00d28 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 00:15:00 +0200 Subject: [PATCH 146/208] lib: lazy loaded This makes sure the async hooks and more is only loaded in case it is actually necessary. PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/internal/bootstrap/node.js | 12 ++- lib/internal/trace_events_async_hooks.js | 128 +++++++++++------------ 2 files changed, 71 insertions(+), 69 deletions(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 1aca1ea2374748..9183f4576b6e48 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -63,7 +63,17 @@ if (global.__coverage__) NativeModule.require('internal/process/write-coverage').setup(); - NativeModule.require('internal/trace_events_async_hooks').setup(); + + { + const traceEvents = process.binding('trace_events'); + const traceEventCategory = 'node,node.async_hooks'; + + if (traceEvents.categoryGroupEnabled(traceEventCategory)) { + NativeModule.require('internal/trace_events_async_hooks') + .setup(traceEvents, traceEventCategory); + } + } + if (process.config.variables.v8_enable_inspector) { NativeModule.require('internal/inspector_async_hook').setup(); diff --git a/lib/internal/trace_events_async_hooks.js b/lib/internal/trace_events_async_hooks.js index db38fe99adcc9c..011dc6bbead187 100644 --- a/lib/internal/trace_events_async_hooks.js +++ b/lib/internal/trace_events_async_hooks.js @@ -1,71 +1,63 @@ 'use strict'; -const trace_events = process.binding('trace_events'); -const async_wrap = process.binding('async_wrap'); -const async_hooks = require('async_hooks'); - -// Use small letters such that chrome://tracing groups by the name. -// The behavior is not only useful but the same as the events emitted using -// the specific C++ macros. -const BEFORE_EVENT = 'b'.charCodeAt(0); -const END_EVENT = 'e'.charCodeAt(0); - -// In trace_events it is not only the id but also the name that needs to be -// repeated. Since async_hooks doesn't expose the provider type in the -// non-init events, use a map to manually map the asyncId to the type name. -const typeMemory = new Map(); - -const trace_event_category = 'node,node.async_hooks'; - -// It is faster to emit trace_events directly from C++. Thus, this happens in -// async_wrap.cc. However, events emitted from the JavaScript API or the -// Embedder C++ API can't be emitted from async_wrap.cc. Thus they are -// emitted using the JavaScript API. To prevent emitting the same event -// twice the async_wrap.Providers list is used to filter the events. -const nativeProviders = new Set(Object.keys(async_wrap.Providers)); - -const hook = async_hooks.createHook({ - init(asyncId, type, triggerAsyncId, resource) { - if (nativeProviders.has(type)) return; - - typeMemory.set(asyncId, type); - trace_events.emit(BEFORE_EVENT, trace_event_category, - type, asyncId, - 'triggerAsyncId', triggerAsyncId, - 'executionAsyncId', async_hooks.executionAsyncId()); - }, - - before(asyncId) { - const type = typeMemory.get(asyncId); - if (type === undefined) return; - - trace_events.emit(BEFORE_EVENT, trace_event_category, - type + '_CALLBACK', asyncId); - }, - - after(asyncId) { - const type = typeMemory.get(asyncId); - if (type === undefined) return; - - trace_events.emit(END_EVENT, trace_event_category, - type + '_CALLBACK', asyncId); - }, - - destroy(asyncId) { - const type = typeMemory.get(asyncId); - if (type === undefined) return; - - trace_events.emit(END_EVENT, trace_event_category, - type, asyncId); - - // cleanup asyncId to type map - typeMemory.delete(asyncId); - } -}); - - -exports.setup = function() { - if (trace_events.categoryGroupEnabled(trace_event_category)) { - hook.enable(); - } +exports.setup = function(traceEvents, traceEventCategory) { + const async_wrap = process.binding('async_wrap'); + const async_hooks = require('async_hooks'); + + // Use small letters such that chrome://tracing groups by the name. + // The behavior is not only useful but the same as the events emitted using + // the specific C++ macros. + const BEFORE_EVENT = 'b'.charCodeAt(0); + const END_EVENT = 'e'.charCodeAt(0); + + // In traceEvents it is not only the id but also the name that needs to be + // repeated. Since async_hooks doesn't expose the provider type in the + // non-init events, use a map to manually map the asyncId to the type name. + const typeMemory = new Map(); + + // It is faster to emit traceEvents directly from C++. Thus, this happens + // in async_wrap.cc. However, events emitted from the JavaScript API or the + // Embedder C++ API can't be emitted from async_wrap.cc. Thus they are + // emitted using the JavaScript API. To prevent emitting the same event + // twice the async_wrap.Providers list is used to filter the events. + const nativeProviders = new Set(Object.keys(async_wrap.Providers)); + + async_hooks.createHook({ + init(asyncId, type, triggerAsyncId, resource) { + if (nativeProviders.has(type)) return; + + typeMemory.set(asyncId, type); + traceEvents.emit(BEFORE_EVENT, traceEventCategory, + type, asyncId, + 'triggerAsyncId', triggerAsyncId, + 'executionAsyncId', async_hooks.executionAsyncId()); + }, + + before(asyncId) { + const type = typeMemory.get(asyncId); + if (type === undefined) return; + + traceEvents.emit(BEFORE_EVENT, traceEventCategory, + type + '_CALLBACK', asyncId); + }, + + after(asyncId) { + const type = typeMemory.get(asyncId); + if (type === undefined) return; + + traceEvents.emit(END_EVENT, traceEventCategory, + type + '_CALLBACK', asyncId); + }, + + destroy(asyncId) { + const type = typeMemory.get(asyncId); + if (type === undefined) return; + + traceEvents.emit(END_EVENT, traceEventCategory, + type, asyncId); + + // cleanup asyncId to type map + typeMemory.delete(asyncId); + } + }).enable(); }; From 07537749db93cf121c41f52374389dbc1d20adba Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 02:16:04 +0200 Subject: [PATCH 147/208] lib: use capital letters in comments PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/internal/bootstrap/node.js | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 9183f4576b6e48..905f2db881eae3 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -26,7 +26,7 @@ setupProcessObject(); - // do this good and early, since it handles errors. + // Do this good and early, since it handles errors. setupProcessFatal(); setupV8(); @@ -107,7 +107,7 @@ }); process.argv[0] = process.execPath; - // Handle `--debug*` deprecation and invalidation + // Handle `--debug*` deprecation and invalidation. if (process._invalidDebug) { process.emitWarning( '`node --debug` and `node --debug-brk` are invalid. ' + @@ -176,7 +176,7 @@ 'DeprecationWarning', 'DEP0068'); } - // Start the debugger agent + // Start the debugger agent. process.nextTick(function() { NativeModule.require('internal/deps/node-inspect/lib/_inspect').start(); }); @@ -185,7 +185,7 @@ NativeModule.require('internal/v8_prof_processor'); } else { - // There is user code to be run + // There is user code to be run. // If this is a worker in cluster mode, start up the communication // channel. This needs to be done before any user code gets executed @@ -203,7 +203,7 @@ perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START); perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END); // User passed '-e' or '--eval' arguments to Node without '-i' or - // '--interactive' + // '--interactive'. perf.markMilestone( NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START); @@ -217,7 +217,7 @@ evalScript('[eval]'); } else if (process.argv[1] && process.argv[1] !== '-') { perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START); - // make process.argv[1] into a full path + // Make process.argv[1] into a full path. const path = NativeModule.require('path'); process.argv[1] = path.resolve(process.argv[1]); @@ -229,10 +229,10 @@ preloadModules(); perf.markMilestone( NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END); - // check if user passed `-c` or `--check` arguments to Node. + // Check if user passed `-c` or `--check` arguments to Node. if (process._syntax_check_only != null) { const fs = NativeModule.require('fs'); - // read the source + // Read the source. const filename = CJSModule._resolveFilename(process.argv[1]); const source = fs.readFileSync(filename, 'utf-8'); checkScriptSyntax(source, filename); @@ -364,7 +364,7 @@ function setupGlobalConsole() { const originalConsole = global.console; const CJSModule = NativeModule.require('internal/modules/cjs/loader'); - // Setup Node.js global.console + // Setup Node.js global.console. const wrappedConsole = NativeModule.require('console'); Object.defineProperty(global, 'console', { configurable: true, @@ -398,7 +398,7 @@ return; } const { addCommandLineAPI, consoleCall } = process.binding('inspector'); - // Setup inspector command line API + // Setup inspector command line API. const { makeRequireFunction } = NativeModule.require('internal/modules/cjs/helpers'); const path = NativeModule.require('path'); @@ -448,14 +448,14 @@ exceptionHandlerState.captureFn(er); } else if (!process.emit('uncaughtException', er)) { // If someone handled it, then great. otherwise, die in C++ land - // since that means that we'll exit the process, emit the 'exit' event + // since that means that we'll exit the process, emit the 'exit' event. try { if (!process._exiting) { process._exiting = true; process.emit('exit', 1); } - } catch (er) { - // nothing to be done about it at this point. + } catch { + // Nothing to be done about it at this point. } try { const { kExpandStackSymbol } = NativeModule.require('internal/util'); @@ -466,7 +466,7 @@ } // If we handled an error, then make sure any ticks get processed - // by ensuring that the next Immediate cycle isn't empty + // by ensuring that the next Immediate cycle isn't empty. NativeModule.require('timers').setImmediate(noop); // Emit the after() hooks now that the exception has been handled. @@ -559,7 +559,7 @@ process._tickCallback(); } - // Load preload modules + // Load preload modules. function preloadModules() { if (process._preload_modules) { const { @@ -576,13 +576,13 @@ stripShebang, stripBOM } = NativeModule.require('internal/modules/cjs/helpers'); - // remove Shebang + // Remove Shebang. source = stripShebang(source); - // remove BOM + // Remove BOM. source = stripBOM(source); - // wrap it + // Wrap it. source = CJSModule.wrap(source); - // compile the script, this will throw if it fails + // Compile the script, this will throw if it fails. new vm.Script(source, { displayErrors: true, filename }); } From bd1319397901c569bea4c9556137e5b35ba522e3 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 02:18:14 +0200 Subject: [PATCH 148/208] lib: remove unnecessary require The call to url was not necessary since the `url` module itself was already taking care of this. PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/internal/bootstrap/node.js | 4 ---- lib/url.js | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 905f2db881eae3..fd9c2553ec27d9 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -89,10 +89,6 @@ setupGlobalURL(); } - // Ensure setURLConstructor() is called before the native - // URL::ToObject() method is used. - NativeModule.require('internal/url'); - // On OpenBSD process.execPath will be relative unless we // get the full path before process.execPath is used. if (process.platform === 'openbsd') { diff --git a/lib/url.js b/lib/url.js index c517ba7ab3dae0..3a2c3c01ea1f30 100644 --- a/lib/url.js +++ b/lib/url.js @@ -30,6 +30,8 @@ const { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes; +// This ensures setURLConstructor() is called before the native +// URL::ToObject() method is used. const { spliceOne } = require('internal/util'); // WHATWG URL implementation provided by internal/url From 2361f6454c4797241c76f12cac3e028ef7d1a104 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 02:18:23 +0200 Subject: [PATCH 149/208] tools: stricter eslint rule for globals PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/.eslintrc.yaml | 2 +- test/parallel/test-eslint-require-buffer.js | 4 +- tools/eslint-rules/require-buffer.js | 35 --------------- tools/eslint-rules/require-globals.js | 50 +++++++++++++++++++++ 4 files changed, 53 insertions(+), 38 deletions(-) delete mode 100644 tools/eslint-rules/require-buffer.js create mode 100644 tools/eslint-rules/require-globals.js diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml index 80cada0b8c9ecc..e7cab0ad931b4d 100644 --- a/lib/.eslintrc.yaml +++ b/lib/.eslintrc.yaml @@ -20,7 +20,7 @@ rules: - selector: "NewExpression[callee.name=/Error$/]:not([callee.name=/^(AssertionError|NghttpError)$/])" message: "Use an error exported by the internal/errors module." # Custom rules in tools/eslint-rules - node-core/require-buffer: error + node-core/require-globals: error node-core/buffer-constructor: error node-core/no-let-in-for-declaration: error node-core/lowercase-name-for-primitive: error diff --git a/test/parallel/test-eslint-require-buffer.js b/test/parallel/test-eslint-require-buffer.js index da17d44c7f600d..d928c435480e5e 100644 --- a/test/parallel/test-eslint-require-buffer.js +++ b/test/parallel/test-eslint-require-buffer.js @@ -5,7 +5,7 @@ const common = require('../common'); common.skipIfEslintMissing(); const RuleTester = require('../../tools/node_modules/eslint').RuleTester; -const rule = require('../../tools/eslint-rules/require-buffer'); +const rule = require('../../tools/eslint-rules/require-globals'); const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 }, env: { node: true } @@ -18,7 +18,7 @@ const useStrict = '\'use strict\';\n\n'; const bufferModule = 'const { Buffer } = require(\'buffer\');\n'; const mockComment = '// Some Comment\n//\n// Another Comment\n\n'; const useBuffer = 'Buffer;'; -ruleTester.run('require-buffer', rule, { +ruleTester.run('require-globals', rule, { valid: [ 'foo', 'const Buffer = require("Buffer"); Buffer;', diff --git a/tools/eslint-rules/require-buffer.js b/tools/eslint-rules/require-buffer.js deleted file mode 100644 index b12b9ce04e7cfc..00000000000000 --- a/tools/eslint-rules/require-buffer.js +++ /dev/null @@ -1,35 +0,0 @@ -'use strict'; -const BUFFER_REQUIRE = 'const { Buffer } = require(\'buffer\');'; - -module.exports = function(context) { - - function flagIt(reference) { - const msg = `Use ${BUFFER_REQUIRE} at the beginning of this file`; - - context.report({ - node: reference.identifier, - message: msg, - fix: (fixer) => { - const sourceCode = context.getSourceCode(); - - const useStrict = /'use strict';\n\n?/g; - const hasUseStrict = !!useStrict.exec(sourceCode.text); - const firstLOC = sourceCode.ast.range[0]; - const rangeNeedle = hasUseStrict ? useStrict.lastIndex : firstLOC; - - return fixer.insertTextBeforeRange([rangeNeedle], - `${BUFFER_REQUIRE}\n`); - } - }); - } - - return { - 'Program:exit': function() { - const globalScope = context.getScope(); - const variable = globalScope.set.get('Buffer'); - if (variable) { - variable.references.forEach(flagIt); - } - } - }; -}; diff --git a/tools/eslint-rules/require-globals.js b/tools/eslint-rules/require-globals.js new file mode 100644 index 00000000000000..bc49ff6c8746ed --- /dev/null +++ b/tools/eslint-rules/require-globals.js @@ -0,0 +1,50 @@ +'use strict'; + +// This rule makes sure that no Globals are going to be used in /lib. +// That could otherwise result in problems with the repl. + +module.exports = function(context) { + + function flagIt(msg, fix) { + return (reference) => { + context.report({ + node: reference.identifier, + message: msg, + fix: (fixer) => { + const sourceCode = context.getSourceCode(); + + const useStrict = /'use strict';\n\n?/g; + const hasUseStrict = !!useStrict.exec(sourceCode.text); + const firstLOC = sourceCode.ast.range[0]; + const rangeNeedle = hasUseStrict ? useStrict.lastIndex : firstLOC; + + return fixer.insertTextBeforeRange([rangeNeedle], `${fix}\n`); + } + }); + }; + } + + return { + 'Program:exit': function() { + const globalScope = context.getScope(); + let variable = globalScope.set.get('Buffer'); + if (variable) { + const fix = "const { Buffer } = require('buffer');"; + const msg = `Use ${fix} at the beginning of this file`; + variable.references.forEach(flagIt(msg, fix)); + } + variable = globalScope.set.get('URL'); + if (variable) { + const fix = "const { URL } = require('url');"; + const msg = `Use ${fix} at the beginning of this file`; + variable.references.forEach(flagIt(msg, fix)); + } + variable = globalScope.set.get('URLSearchParams'); + if (variable) { + const fix = "const { URLSearchParams } = require('url');"; + const msg = `Use ${fix} at the beginning of this file`; + variable.references.forEach(flagIt(msg, fix)); + } + } + }; +}; From 74db9f43ba0cd451af165b820b59c336814fe6f2 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 03:53:02 +0200 Subject: [PATCH 150/208] assert,util: lazy load comparison functions PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/assert.js | 18 ++++++++++++++---- lib/util.js | 13 ++++++++----- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/lib/assert.js b/lib/assert.js index 8ed90608d8f88d..98900c5151ed41 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -21,10 +21,6 @@ 'use strict'; const { Buffer } = require('buffer'); -const { - isDeepEqual, - isDeepStrictEqual -} = require('internal/util/comparisons'); const { codes: { ERR_AMBIGUOUS_ARGUMENT, ERR_INVALID_ARG_TYPE, @@ -36,6 +32,15 @@ const { inspect, types: { isPromise, isRegExp } } = require('util'); const { EOL } = require('internal/constants'); const { NativeModule } = require('internal/bootstrap/loaders'); +let isDeepEqual; +let isDeepStrictEqual; + +function lazyLoadComparison() { + const comparison = require('internal/util/comparisons'); + isDeepEqual = comparison.isDeepEqual; + isDeepStrictEqual = comparison.isDeepStrictEqual; +} + // Escape control characters but not \n and \t to keep the line breaks and // indentation intact. // eslint-disable-next-line no-control-regex @@ -284,6 +289,7 @@ assert.notEqual = function notEqual(actual, expected, message) { // The equivalence assertion tests a deep equality relation. assert.deepEqual = function deepEqual(actual, expected, message) { + if (isDeepEqual === undefined) lazyLoadComparison(); if (!isDeepEqual(actual, expected)) { innerFail({ actual, @@ -297,6 +303,7 @@ assert.deepEqual = function deepEqual(actual, expected, message) { // The non-equivalence assertion tests for any deep inequality. assert.notDeepEqual = function notDeepEqual(actual, expected, message) { + if (isDeepEqual === undefined) lazyLoadComparison(); if (isDeepEqual(actual, expected)) { innerFail({ actual, @@ -310,6 +317,7 @@ assert.notDeepEqual = function notDeepEqual(actual, expected, message) { /* eslint-enable */ assert.deepStrictEqual = function deepStrictEqual(actual, expected, message) { + if (isDeepEqual === undefined) lazyLoadComparison(); if (!isDeepStrictEqual(actual, expected)) { innerFail({ actual, @@ -323,6 +331,7 @@ assert.deepStrictEqual = function deepStrictEqual(actual, expected, message) { assert.notDeepStrictEqual = notDeepStrictEqual; function notDeepStrictEqual(actual, expected, message) { + if (isDeepEqual === undefined) lazyLoadComparison(); if (isDeepStrictEqual(actual, expected)) { innerFail({ actual, @@ -439,6 +448,7 @@ function expectedException(actual, expected, msg) { if (expected instanceof Error) { keys.push('name', 'message'); } + if (isDeepEqual === undefined) lazyLoadComparison(); for (const key of keys) { if (typeof actual[key] === 'string' && isRegExp(expected[key]) && diff --git a/lib/util.js b/lib/util.js index 45d98de194c836..bd7a98694b91a9 100644 --- a/lib/util.js +++ b/lib/util.js @@ -64,10 +64,6 @@ const { isTypedArray } = types; -const { - isDeepStrictEqual -} = require('internal/util/comparisons'); - const { customInspectSymbol, deprecate, @@ -95,6 +91,7 @@ const dateToISOString = Date.prototype.toISOString; const errorToString = Error.prototype.toString; let CIRCULAR_ERROR_MESSAGE; +let internalDeepEqual; /* eslint-disable */ const strEscapeSequencesRegExp = /[\x00-\x1f\x27\x5c]/; @@ -1261,7 +1258,13 @@ module.exports = exports = { isArray: Array.isArray, isBoolean, isBuffer, - isDeepStrictEqual, + isDeepStrictEqual(a, b) { + if (internalDeepEqual === undefined) { + internalDeepEqual = require('internal/util/comparisons') + .isDeepStrictEqual; + } + return internalDeepEqual(a, b); + }, isNull, isNullOrUndefined, isNumber, From 9feca3ea32bb4b01be71331047481926b819b015 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 04:25:26 +0200 Subject: [PATCH 151/208] async_hooks: lazy loading for startup performance PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/internal/inspector_async_hook.js | 62 ++++++++++++++++------------ 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/lib/internal/inspector_async_hook.js b/lib/internal/inspector_async_hook.js index b190ff90b8ea2c..6a7489af974a40 100644 --- a/lib/internal/inspector_async_hook.js +++ b/lib/internal/inspector_async_hook.js @@ -1,49 +1,56 @@ 'use strict'; -const { createHook } = require('async_hooks'); const inspector = process.binding('inspector'); -const config = process.binding('config'); if (!inspector || !inspector.asyncTaskScheduled) { exports.setup = function() {}; return; } -const hook = createHook({ - init(asyncId, type, triggerAsyncId, resource) { +let hook; +let config; + +function lazyHookCreation() { + const { createHook } = require('async_hooks'); + config = process.binding('config'); + + hook = createHook({ + init(asyncId, type, triggerAsyncId, resource) { // It's difficult to tell which tasks will be recurring and which won't, // therefore we mark all tasks as recurring. Based on the discussion // in https://github.com/nodejs/node/pull/13870#discussion_r124515293, // this should be fine as long as we call asyncTaskCanceled() too. - const recurring = true; - if (type === 'PROMISE') - this.promiseIds.add(asyncId); - else - inspector.asyncTaskScheduled(type, asyncId, recurring); - }, + const recurring = true; + if (type === 'PROMISE') + this.promiseIds.add(asyncId); + else + inspector.asyncTaskScheduled(type, asyncId, recurring); + }, - before(asyncId) { - if (this.promiseIds.has(asyncId)) - return; - inspector.asyncTaskStarted(asyncId); - }, + before(asyncId) { + if (this.promiseIds.has(asyncId)) + return; + inspector.asyncTaskStarted(asyncId); + }, - after(asyncId) { - if (this.promiseIds.has(asyncId)) - return; - inspector.asyncTaskFinished(asyncId); - }, + after(asyncId) { + if (this.promiseIds.has(asyncId)) + return; + inspector.asyncTaskFinished(asyncId); + }, - destroy(asyncId) { - if (this.promiseIds.has(asyncId)) - return this.promiseIds.delete(asyncId); - inspector.asyncTaskCanceled(asyncId); - }, -}); + destroy(asyncId) { + if (this.promiseIds.has(asyncId)) + return this.promiseIds.delete(asyncId); + inspector.asyncTaskCanceled(asyncId); + }, + }); -hook.promiseIds = new Set(); + hook.promiseIds = new Set(); +} function enable() { + if (hook === undefined) lazyHookCreation(); if (config.bits < 64) { // V8 Inspector stores task ids as (void*) pointers. // async_hooks store ids as 64bit numbers. @@ -61,6 +68,7 @@ function enable() { } function disable() { + if (hook === undefined) lazyHookCreation(); hook.disable(); } From e0fd80c641597afac02f42de27dd5c1dcacf8e25 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 04:25:54 +0200 Subject: [PATCH 152/208] lib: do not call performance hooks PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/internal/bootstrap/node.js | 1 - lib/internal/process.js | 5 ----- 2 files changed, 6 deletions(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index fd9c2553ec27d9..5f7fda2a8aeb52 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -56,7 +56,6 @@ } = perf.constants; _process.setup_hrtime(); - _process.setup_performance(); _process.setup_cpuUsage(); _process.setupMemoryUsage(); _process.setupKillAndExit(); diff --git a/lib/internal/process.js b/lib/internal/process.js index f72043264ff80c..6d1958db6db0a2 100644 --- a/lib/internal/process.js +++ b/lib/internal/process.js @@ -24,10 +24,6 @@ process.assert = deprecate( 'process.assert() is deprecated. Please use the `assert` module instead.', 'DEP0100'); -function setup_performance() { - require('perf_hooks'); -} - // Set up the process.cpuUsage() function. function setup_cpuUsage() { // Get the native function, which will be replaced with a JS version. @@ -284,7 +280,6 @@ function setupUncaughtExceptionCapture(exceptionHandlerState) { } module.exports = { - setup_performance, setup_cpuUsage, setup_hrtime, setupMemoryUsage, From 94d217f87743f555bac3796f94ab3dd959ec7753 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 05:11:55 +0200 Subject: [PATCH 153/208] stream: lazy load ReadableAsyncIterator PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/_stream_readable.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js index ecdcccc0640ff9..d00728b112d4f3 100644 --- a/lib/_stream_readable.js +++ b/lib/_stream_readable.js @@ -38,11 +38,11 @@ const { ERR_METHOD_NOT_IMPLEMENTED, ERR_STREAM_UNSHIFT_AFTER_END_EVENT } = require('internal/errors').codes; -const ReadableAsyncIterator = require('internal/streams/async_iterator'); const { emitExperimentalWarning } = require('internal/util'); // Lazy loaded to improve the startup performance. let StringDecoder; +let ReadableAsyncIterator; util.inherits(Readable, Stream); @@ -988,7 +988,8 @@ Readable.prototype.wrap = function(stream) { Readable.prototype[Symbol.asyncIterator] = function() { emitExperimentalWarning('Readable[Symbol.asyncIterator]'); - + if (ReadableAsyncIterator === undefined) + ReadableAsyncIterator = require('internal/streams/async_iterator'); return new ReadableAsyncIterator(this); }; From bc6dbc3bfc7cc5467181043c3320b7549c17620a Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 05:12:10 +0200 Subject: [PATCH 154/208] console: lazy load cli PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/console.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/console.js b/lib/console.js index 0f08e37fa7e22c..52c2351cae86e2 100644 --- a/lib/console.js +++ b/lib/console.js @@ -31,7 +31,6 @@ const { } = require('internal/errors'); const { previewMapIterator, previewSetIterator } = require('internal/v8'); const { Buffer: { isBuffer } } = require('buffer'); -const cliTable = require('internal/cli_table'); const util = require('util'); const { isTypedArray, isSet, isMap, isSetIterator, isMapIterator, @@ -49,6 +48,9 @@ const { from: ArrayFrom, } = Array; +// Lazy loaded for startup performance. +let cliTable; + // Track amount of indentation required via `console.group()`. const kGroupIndent = Symbol('kGroupIndent'); @@ -325,6 +327,7 @@ Console.prototype.table = function(tabularData, properties) { (typeof tabularData !== 'object' && typeof tabularData !== 'function')) return this.log(tabularData); + if (cliTable === undefined) cliTable = require('internal/cli_table'); const final = (k, v) => this.log(cliTable(k, v)); const inspect = (v) => { From 328a2c7c282ef6719b765ac800cd0e5a9bf71430 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 05:12:32 +0200 Subject: [PATCH 155/208] stream: lazy load end-of-stream PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/internal/streams/pipeline.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/internal/streams/pipeline.js b/lib/internal/streams/pipeline.js index 7e87210a774c5f..1178108842be61 100644 --- a/lib/internal/streams/pipeline.js +++ b/lib/internal/streams/pipeline.js @@ -3,7 +3,7 @@ 'use strict'; -const eos = require('internal/streams/end-of-stream'); +let eos; const { ERR_MISSING_ARGS, @@ -33,6 +33,7 @@ function destroyer(stream, reading, writing, callback) { closed = true; }); + if (eos === undefined) eos = require('internal/streams/end-of-stream'); eos(stream, { readable: reading, writable: writing }, (err) => { if (err) return callback(err); closed = true; From eac7aad55e15740fd68c28568f39f108eea8ca5f Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 05:12:47 +0200 Subject: [PATCH 156/208] net: lazy load dns PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- lib/net.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/net.js b/lib/net.js index 5537c472fe05e3..7d0a4a0e54a255 100644 --- a/lib/net.js +++ b/lib/net.js @@ -75,13 +75,12 @@ const { ERR_SOCKET_BAD_PORT, ERR_SOCKET_CLOSED } = errors.codes; -const dns = require('dns'); const kLastWriteQueueSize = Symbol('lastWriteQueueSize'); -// `cluster` is only used by `listenInCluster` so for startup performance -// reasons it's lazy loaded. -var cluster = null; +// Lazy loaded to improve startup performance. +let cluster; +let dns; const errnoException = errors.errnoException; const exceptionWithHostPort = errors.exceptionWithHostPort; @@ -1034,6 +1033,8 @@ function lookupAndConnect(self, options) { throw new ERR_INVALID_ARG_TYPE('options.lookup', 'Function', options.lookup); + + if (dns === undefined) dns = require('dns'); var dnsopts = { family: options.family, hints: options.hints || 0 @@ -1368,7 +1369,7 @@ function listenInCluster(server, address, port, addressType, backlog, fd, exclusive) { exclusive = !!exclusive; - if (cluster === null) cluster = require('cluster'); + if (cluster === undefined) cluster = require('cluster'); if (cluster.isMaster || exclusive) { // Will create a new handle @@ -1482,6 +1483,7 @@ Server.prototype.listen = function(...args) { }; function lookupAndListen(self, port, address, backlog, exclusive) { + if (dns === undefined) dns = require('dns'); dns.lookup(address, function doListen(err, ip, addressType) { if (err) { self.emit('error', err); From 1ae076b30ea9eaef128939666ddcd222afea42b7 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 7 May 2018 06:04:07 +0200 Subject: [PATCH 157/208] test: add loaded modules test This makes sure there is no regression by switching to loading eagerly. PR-URL: https://github.com/nodejs/node/pull/20567 Reviewed-By: Gus Caplan Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- test/parallel/test-bootstrap-modules.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 test/parallel/test-bootstrap-modules.js diff --git a/test/parallel/test-bootstrap-modules.js b/test/parallel/test-bootstrap-modules.js new file mode 100644 index 00000000000000..4a46ac905b8161 --- /dev/null +++ b/test/parallel/test-bootstrap-modules.js @@ -0,0 +1,14 @@ +/* eslint-disable node-core/required-modules */ + +'use strict'; + +// Ordinarily test files must require('common') but that action causes +// the global console to be compiled, defeating the purpose of this test. +// This makes sure no additional files are added without carefully considering +// lazy loading. Please adjust the value if necessary. + +const list = process.moduleLoadList.slice(); + +const assert = require('assert'); + +assert(list.length <= 73, list); From 83119db45ef3e91926d74e82a505700f6ce84934 Mon Sep 17 00:00:00 2001 From: monkingxue Date: Wed, 9 May 2018 10:34:57 +0800 Subject: [PATCH 158/208] repl: add friendly tips about how to exit repl Imitate python repl, when the user enters 'exit' or 'quit', no longer prompt 'Reference Error', but prompts 'To exit, press ^D or type .exit'. If the user defines variables named 'exit' or 'quit' , only the value of the variables are output PR-URL: https://github.com/nodejs/node/pull/20617 Fixes: https://github.com/nodejs/node/issues/19021 Reviewed-By: Anna Henningsen Reviewed-By: Ruben Bridgewater --- lib/repl.js | 18 ++++++++++++++---- test/parallel/test-repl.js | 24 ++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/lib/repl.js b/lib/repl.js index 600816a6058fbc..928e7c6d69cfae 100644 --- a/lib/repl.js +++ b/lib/repl.js @@ -215,9 +215,15 @@ function REPLServer(prompt, function defaultEval(code, context, file, cb) { var err, result, script, wrappedErr; + var isExitCommand = false; var wrappedCmd = false; var awaitPromise = false; var input = code; + var trimmedCommand = code.trim(); + + if (trimmedCommand === 'exit' || trimmedCommand === 'quit') { + isExitCommand = true; + } if (/^\s*\{/.test(code) && /\}\s*$/.test(code)) { // It's confusing for `{ a : 1 }` to be interpreted as a block @@ -313,10 +319,16 @@ function REPLServer(prompt, breakOnSigint: self.breakEvalOnSigint }; + const localContext = self.useGlobal ? global : self.context; + if (isExitCommand && !localContext.hasOwnProperty(trimmedCommand)) { + self.outputStream.write('(To exit, press ^D or type .exit)\n'); + return self.displayPrompt(); + } + if (self.useGlobal) { result = script.runInThisContext(scriptOptions); } else { - result = script.runInContext(context, scriptOptions); + result = script.runInContext(localContext, scriptOptions); } } finally { if (self.breakEvalOnSigint) { @@ -332,12 +344,10 @@ function REPLServer(prompt, } } catch (e) { err = e; - if (err && err.code === 'ERR_SCRIPT_EXECUTION_INTERRUPTED') { - // The stack trace for this case is not very useful anyway. + // The stack trace for this case is not very useful anyway. Object.defineProperty(err, 'stack', { value: '' }); } - if (process.domain) { debug('not recoverable, send to domain'); process.domain.emit('error', err); diff --git a/test/parallel/test-repl.js b/test/parallel/test-repl.js index e14398541dd8de..b9c92c3cd63bc0 100644 --- a/test/parallel/test-repl.js +++ b/test/parallel/test-repl.js @@ -132,6 +132,29 @@ const strictModeTests = [ } ]; +const friendlyExitTests = [ + { + send: 'exit', + expect: '(To exit, press ^D or type .exit)' + }, + { + send: 'quit', + expect: '(To exit, press ^D or type .exit)' + }, + { + send: 'quit = 1', + expect: '1' + }, + { + send: 'quit', + expect: '1' + }, + { + send: 'exit', + expect: '(To exit, press ^D or type .exit)' + }, +]; + const errorTests = [ // Uncaught error throws and prints out { @@ -742,6 +765,7 @@ const tcpTests = [ const [ socket, replServer ] = await startUnixRepl(); await runReplTests(socket, prompt_unix, unixTests); + await runReplTests(socket, prompt_unix, friendlyExitTests); await runReplTests(socket, prompt_unix, errorTests); replServer.replMode = repl.REPL_MODE_STRICT; await runReplTests(socket, prompt_unix, strictModeTests); From 3edb04d0651788340f4494cf43ffd6dbf1811de8 Mon Sep 17 00:00:00 2001 From: Dan Kang Date: Wed, 9 May 2018 23:39:58 +0900 Subject: [PATCH 159/208] src: remove 2nd `undefined` argument in node_file.cc In the document for fs, there are several functions that state "No arguments other than a possible exception are given to the completion callback." (ex> fs.access, fs.chmod, fs.close, ..) But, the functions are invoking the callback with two parameters (err, undefined) It causes problems in using several API like [async.waterfall](https://caolan.github.io/async/docs.html#waterfall). PR-URL: https://github.com/nodejs/node/pull/20629 Fixes: https://github.com/nodejs/node/issues/20335 Reviewed-By: James M Snell Reviewed-By: Joyee Cheung Reviewed-By: Ruben Bridgewater --- src/node_file.cc | 4 +++- test/parallel/test-fs-access.js | 12 +++++++++--- test/parallel/test-fs-close.js | 12 ++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 test/parallel/test-fs-close.js diff --git a/src/node_file.cc b/src/node_file.cc index 713dcbf6331898..5ab1a8d3c641eb 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -421,7 +421,9 @@ void FSReqWrap::Resolve(Local value) { Null(env()->isolate()), value }; - MakeCallback(env()->oncomplete_string(), arraysize(argv), argv); + MakeCallback(env()->oncomplete_string(), + value->IsUndefined() ? 1 : arraysize(argv), + argv); } void FSReqWrap::SetReturnValue(const FunctionCallbackInfo& args) { diff --git a/test/parallel/test-fs-access.js b/test/parallel/test-fs-access.js index 01dbe90eda8435..d053b9323bc275 100644 --- a/test/parallel/test-fs-access.js +++ b/test/parallel/test-fs-access.js @@ -64,15 +64,21 @@ assert.strictEqual(typeof fs.X_OK, 'number'); const throwNextTick = (e) => { process.nextTick(() => { throw e; }); }; -fs.access(__filename, common.mustCall(assert.ifError)); +fs.access(__filename, common.mustCall(function(...args) { + assert.deepStrictEqual(args, [null]); +})); fs.promises.access(__filename) .then(common.mustCall()) .catch(throwNextTick); -fs.access(__filename, fs.R_OK, common.mustCall(assert.ifError)); +fs.access(__filename, fs.R_OK, common.mustCall(function(...args) { + assert.deepStrictEqual(args, [null]); +})); fs.promises.access(__filename, fs.R_OK) .then(common.mustCall()) .catch(throwNextTick); -fs.access(readOnlyFile, fs.F_OK | fs.R_OK, common.mustCall(assert.ifError)); +fs.access(readOnlyFile, fs.F_OK | fs.R_OK, common.mustCall(function(...args) { + assert.deepStrictEqual(args, [null]); +})); fs.promises.access(readOnlyFile, fs.F_OK | fs.R_OK) .then(common.mustCall()) .catch(throwNextTick); diff --git a/test/parallel/test-fs-close.js b/test/parallel/test-fs-close.js new file mode 100644 index 00000000000000..da0d0dfdc832d8 --- /dev/null +++ b/test/parallel/test-fs-close.js @@ -0,0 +1,12 @@ +'use strict'; + +const common = require('../common'); + +const assert = require('assert'); +const fs = require('fs'); + +const fd = fs.openSync(__filename, 'r'); + +fs.close(fd, common.mustCall(function(...args) { + assert.deepStrictEqual(args, [null]); +})); From 3fd67249df436c00a9bec258fca2fd338cad1a3b Mon Sep 17 00:00:00 2001 From: ohbarye Date: Sat, 12 May 2018 02:26:28 +0900 Subject: [PATCH 160/208] console: .table fall back to logging for function too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to the console.table documentation, it reads that it "falls back to just logging the argument if it can’t be parsed as tabular." But it doesn't fall back when I give a function as its first argument. It logs an empty table. This is fixes by this commit. PR-URL: https://github.com/nodejs/node/pull/20681 Fixes: https://github.com/nodejs/node/issues/20679 Reviewed-By: Ruben Bridgewater Reviewed-By: Gus Caplan Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat --- lib/console.js | 3 +-- test/parallel/test-console-table.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/console.js b/lib/console.js index 52c2351cae86e2..9b8b7cb7c9f822 100644 --- a/lib/console.js +++ b/lib/console.js @@ -323,8 +323,7 @@ Console.prototype.table = function(tabularData, properties) { if (properties !== undefined && !ArrayIsArray(properties)) throw new ERR_INVALID_ARG_TYPE('properties', 'Array', properties); - if (tabularData == null || - (typeof tabularData !== 'object' && typeof tabularData !== 'function')) + if (tabularData == null || typeof tabularData !== 'object') return this.log(tabularData); if (cliTable === undefined) cliTable = require('internal/cli_table'); diff --git a/test/parallel/test-console-table.js b/test/parallel/test-console-table.js index 64e2533f175e1d..2b63556acaa478 100644 --- a/test/parallel/test-console-table.js +++ b/test/parallel/test-console-table.js @@ -29,6 +29,7 @@ test(undefined, 'undefined\n'); test(false, 'false\n'); test('hi', 'hi\n'); test(Symbol(), 'Symbol()\n'); +test(function() {}, '[Function]\n'); test([1, 2, 3], ` ┌─────────┬────────┐ From 045b37b32d92e1d33b39152f6f129b81e31fc785 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 14 May 2018 17:28:26 +0200 Subject: [PATCH 161/208] test: add eslint rule to verify assertion input The input for `assert.deepStrictEqual` and similar expect the actual input first and the expected input as second argument. This verifies that this is actually done correct in our tests. This is important so the possible error message actually makes sense. PR-URL: https://github.com/nodejs/node/pull/20718 Reviewed-By: Rich Trott Reviewed-By: Trivikram Kamat Reviewed-By: James M Snell --- test/.eslintrc.yaml | 27 ++++++++++++++++++++ test/addons-napi/test_conversions/test.js | 8 +++--- test/parallel/test-child-process-exec-env.js | 8 +++--- test/parallel/test-crypto.js | 4 +-- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/test/.eslintrc.yaml b/test/.eslintrc.yaml index 7c90a5026b27d0..f07dd076d93865 100644 --- a/test/.eslintrc.yaml +++ b/test/.eslintrc.yaml @@ -19,6 +19,33 @@ rules: ## common module is mandatory in tests node-core/required-modules: [error, common] + no-restricted-syntax: + # Config copied from .eslintrc.js + - error + - selector: "CallExpression[callee.object.name='assert'][callee.property.name='doesNotThrow']" + message: "Please replace `assert.doesNotThrow()` and add a comment next to the code instead." + - selector: "CallExpression[callee.object.name='assert'][callee.property.name='rejects'][arguments.length<2]" + message: "assert.rejects() must be invoked with at least two arguments." + - selector: "CallExpression[callee.object.name='assert'][callee.property.name='throws'][arguments.1.type='Literal']:not([arguments.1.regex])" + message: "Use an object as second argument of assert.throws()" + - selector: "CallExpression[callee.object.name='assert'][callee.property.name='throws'][arguments.length<2]" + message: "assert.throws() must be invoked with at least two arguments." + - selector: "CallExpression[callee.name='setTimeout'][arguments.length<2]" + message: "setTimeout() must be invoked with at least two arguments." + - selector: "CallExpression[callee.name='setInterval'][arguments.length<2]" + message: "setInterval() must be invoked with at least 2 arguments." + - selector: "ThrowStatement > CallExpression[callee.name=/Error$/]" + message: "Use new keyword when throwing an Error." + # Specific to /test + - selector: "CallExpression[callee.object.name='assert'][callee.property.name='notDeepStrictEqual'][arguments.0.type='Literal']:not([arguments.1.type='Literal']):not([arguments.1.type='ObjectExpression']):not([arguments.1.type='ArrayExpression'])" + message: "The first argument should be the `actual`, not the `expected` value." + - selector: "CallExpression[callee.object.name='assert'][callee.property.name='notStrictEqual'][arguments.0.type='Literal']:not([arguments.1.type='Literal']):not([arguments.1.type='ObjectExpression']):not([arguments.1.type='ArrayExpression'])" + message: "The first argument should be the `actual`, not the `expected` value." + - selector: "CallExpression[callee.object.name='assert'][callee.property.name='deepStrictEqual'][arguments.0.type='Literal']:not([arguments.1.type='Literal']):not([arguments.1.type='ObjectExpression']):not([arguments.1.type='ArrayExpression'])" + message: "The first argument should be the `actual`, not the `expected` value." + # TODO: Activate the `strictEqual` rule as soon as it produces less churn. + # - selector: "CallExpression[callee.object.name='assert'][callee.property.name='strictEqual'][arguments.0.type='Literal']:not([arguments.1.type='Literal']):not([arguments.1.type='ObjectExpression']):not([arguments.1.type='ArrayExpression'])" + # message: "The first argument should be the `actual`, not the `expected` value." # Global scoped methods and vars globals: WebAssembly: false diff --git a/test/addons-napi/test_conversions/test.js b/test/addons-napi/test_conversions/test.js index 73d2c3314f600b..27e1fb322c4c47 100644 --- a/test/addons-napi/test_conversions/test.js +++ b/test/addons-napi/test_conversions/test.js @@ -118,10 +118,10 @@ assert.deepStrictEqual(new String(''), test.toObject('')); assert.deepStrictEqual(new Number(0), test.toObject(0)); assert.deepStrictEqual(new Number(Number.NaN), test.toObject(Number.NaN)); assert.deepStrictEqual(new Object(testSym), test.toObject(testSym)); -assert.notDeepStrictEqual(false, test.toObject(false)); -assert.notDeepStrictEqual(true, test.toObject(true)); -assert.notDeepStrictEqual('', test.toObject('')); -assert.notDeepStrictEqual(0, test.toObject(0)); +assert.notDeepStrictEqual(test.toObject(false), false); +assert.notDeepStrictEqual(test.toObject(true), true); +assert.notDeepStrictEqual(test.toObject(''), ''); +assert.notDeepStrictEqual(test.toObject(0), 0); assert.ok(!Number.isNaN(test.toObject(Number.NaN))); assert.strictEqual('', test.toString('')); diff --git a/test/parallel/test-child-process-exec-env.js b/test/parallel/test-child-process-exec-env.js index c34fdb7b49a161..41aaf992cfc8c9 100644 --- a/test/parallel/test-child-process-exec-env.js +++ b/test/parallel/test-child-process-exec-env.js @@ -34,10 +34,10 @@ function after(err, stdout, stderr) { console.log(`error!: ${err.code}`); console.log(`stdout: ${JSON.stringify(stdout)}`); console.log(`stderr: ${JSON.stringify(stderr)}`); - assert.strictEqual(false, err.killed); + assert.strictEqual(err.killed, false); } else { success_count++; - assert.notStrictEqual('', stdout); + assert.notStrictEqual(stdout, ''); } } @@ -56,7 +56,7 @@ child.stdout.on('data', function(chunk) { process.on('exit', function() { console.log('response: ', response); - assert.strictEqual(1, success_count); - assert.strictEqual(0, error_count); + assert.strictEqual(success_count, 1); + assert.strictEqual(error_count, 0); assert.ok(response.includes('HELLO=WORLD')); }); diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js index 9a93e8422fd0b4..88d49167100fbe 100644 --- a/test/parallel/test-crypto.js +++ b/test/parallel/test-crypto.js @@ -129,7 +129,7 @@ assert(tlsCiphers.every((value) => noCapitals.test(value))); validateList(tlsCiphers); // Assert that we have sha1 and sha256 but not SHA1 and SHA256. -assert.notStrictEqual(0, crypto.getHashes().length); +assert.notStrictEqual(crypto.getHashes().length, 0); assert(crypto.getHashes().includes('sha1')); assert(crypto.getHashes().includes('sha256')); assert(!crypto.getHashes().includes('SHA1')); @@ -139,7 +139,7 @@ assert(!crypto.getHashes().includes('rsa-sha1')); validateList(crypto.getHashes()); // Assume that we have at least secp384r1. -assert.notStrictEqual(0, crypto.getCurves().length); +assert.notStrictEqual(crypto.getCurves().length, 0); assert(crypto.getCurves().includes('secp384r1')); assert(!crypto.getCurves().includes('SECP384R1')); validateList(crypto.getCurves()); From bd500af2ffec3a7dd08ea0aa40bf74083a368259 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Tue, 15 May 2018 14:32:27 -0700 Subject: [PATCH 162/208] tools: update prohibited-strings md linting Update to remark-lint-prohibited-strings 1.0.3 to avoid false positives with GitHub team names which must be lowercased no matter what our prohibited-strings rules say about a particular string. PR-URL: https://github.com/nodejs/node/pull/20742 Refs: https://github.com/nodejs/node/pull/20740 Reviewed-By: Ruben Bridgewater Reviewed-By: Colin Ihrig Reviewed-By: Michael Dawson Reviewed-By: Trivikram Kamat Reviewed-By: James M Snell --- tools/remark-cli/package-lock.json | 547 +++++++++--------- .../remark-preset-lint-node/package-lock.json | 226 ++++---- 2 files changed, 407 insertions(+), 366 deletions(-) diff --git a/tools/remark-cli/package-lock.json b/tools/remark-cli/package-lock.json index e47a22823d9e8f..bf869643901f2c 100644 --- a/tools/remark-cli/package-lock.json +++ b/tools/remark-cli/package-lock.json @@ -2,7 +2,6 @@ "name": "remark-cli", "version": "4.0.0", "lockfileVersion": 1, - "preserveSymlinks": "1", "requires": true, "dependencies": { "ansi-regex": { @@ -11,9 +10,9 @@ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "requires": { "color-convert": "1.9.1" } @@ -28,9 +27,9 @@ } }, "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "requires": { "sprintf-js": "1.0.3" } @@ -49,9 +48,9 @@ "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" }, "array-iterate": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.1.tgz", - "integrity": "sha1-hlv3+K851rCYLGCQKRSsdrwBCPY=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.2.tgz", + "integrity": "sha512-1hWSHTIlG/8wtYD+PPX5AOBtKWngpDFjrsrHgZpe+JdgNGz0udYu6ZIkAa/xuenIUEqFv7DvE2Yr60jxweJSrQ==" }, "array-unique": { "version": "0.2.1", @@ -64,9 +63,9 @@ "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" }, "bail": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz", - "integrity": "sha1-99bBcxYwqfnw1NNe0fli4gdKF2Q=" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz", + "integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==" }, "balanced-match": { "version": "1.0.0", @@ -74,14 +73,14 @@ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "binary-extensions": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", - "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=" + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", + "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=" }, "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -97,45 +96,50 @@ "repeat-element": "1.1.2" } }, + "buffer-from": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", + "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==" + }, "camelcase": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" }, "ccount": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz", - "integrity": "sha1-U7ai+BW7d7nChx97mnLDol8djok=" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz", + "integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==" }, "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "requires": { - "ansi-styles": "3.2.0", + "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" + "supports-color": "5.4.0" } }, "character-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz", - "integrity": "sha1-92hxvl72bdt/j440eOzDdMJ9bco=" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz", + "integrity": "sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==" }, "character-entities-html4": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz", - "integrity": "sha1-NZoqSg9+KdPcKsmb2+Ie45Q46lA=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz", + "integrity": "sha512-sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==" }, "character-entities-legacy": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz", - "integrity": "sha1-9Ad53xoQGHK7UQo9KV4fzPFHIC8=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz", + "integrity": "sha512-9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==" }, "character-reference-invalid": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz", - "integrity": "sha1-lCg191Dk7GGjCOYMLvjMEBEgLvw=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz", + "integrity": "sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==" }, "chokidar": { "version": "1.7.0", @@ -158,9 +162,9 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "collapse-white-space": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz", - "integrity": "sha1-S5BvZw5aljqHt2sOFolkM0G2Ajw=" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz", + "integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==" }, "color-convert": { "version": "1.9.1", @@ -181,12 +185,13 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "requires": { + "buffer-from": "1.0.0", "inherits": "2.0.3", - "readable-stream": "2.3.3", + "readable-stream": "2.3.6", "typedarray": "0.0.6" } }, @@ -204,9 +209,9 @@ } }, "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=" + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==" }, "error-ex": { "version": "1.3.1", @@ -239,7 +244,7 @@ "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "requires": { - "fill-range": "2.2.3" + "fill-range": "2.2.4" } }, "extend": { @@ -256,9 +261,9 @@ } }, "fault": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.1.tgz", - "integrity": "sha1-3o01Df1IviS13BsChn4IcbkTUJI=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz", + "integrity": "sha512-o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw==", "requires": { "format": "0.2.2" } @@ -269,13 +274,13 @@ "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" }, "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", + "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "requires": { "is-number": "2.1.0", "isobject": "2.1.0", - "randomatic": "1.1.7", + "randomatic": "3.0.0", "repeat-element": "1.1.2", "repeat-string": "1.6.1" } @@ -344,14 +349,14 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "ignore": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz", - "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==" + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz", + "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==" }, "inflight": { "version": "1.0.6", @@ -368,14 +373,14 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=" + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, "is-alphabetical": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz", - "integrity": "sha1-x3B5zJHU76x3W+EDS/LSQ/lebwg=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz", + "integrity": "sha512-V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==" }, "is-alphanumeric": { "version": "1.0.0", @@ -383,12 +388,12 @@ "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=" }, "is-alphanumerical": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz", - "integrity": "sha1-37SqTRCF4zvbYcLe6cgOnGwZ9Ts=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz", + "integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==", "requires": { - "is-alphabetical": "1.0.1", - "is-decimal": "1.0.1" + "is-alphabetical": "1.0.2", + "is-decimal": "1.0.2" } }, "is-arrayish": { @@ -401,7 +406,7 @@ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "requires": { - "binary-extensions": "1.10.0" + "binary-extensions": "1.11.0" } }, "is-buffer": { @@ -410,9 +415,9 @@ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-decimal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz", - "integrity": "sha1-9ftqlJlq2ejjdh+/vQkfH8qMToI=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz", + "integrity": "sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==" }, "is-dotfile": { "version": "1.0.3", @@ -459,9 +464,9 @@ } }, "is-hexadecimal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz", - "integrity": "sha1-bghLvJIGH7sJcexYts5tQE4k2mk=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz", + "integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==" }, "is-hidden": { "version": "1.1.1", @@ -497,14 +502,14 @@ "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" }, "is-whitespace-character": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.1.tgz", - "integrity": "sha1-muAXbzKCtlRXoZks2whPil+DPjs=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz", + "integrity": "sha512-SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ==" }, "is-word-character": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.1.tgz", - "integrity": "sha1-WgP6HqkazopusMfNdw64bWXIvvs=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.2.tgz", + "integrity": "sha512-T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA==" }, "isarray": { "version": "1.0.0", @@ -520,11 +525,11 @@ } }, "js-yaml": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", - "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz", + "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==", "requires": { - "argparse": "1.0.9", + "argparse": "1.0.10", "esprima": "4.0.0" } }, @@ -537,12 +542,12 @@ } }, "load-plugin": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-2.2.1.tgz", - "integrity": "sha512-raqInsJNdPGpzZyb+FjjJYmXsjIm8fIiOjOmqmUTGPyCXDMeEK3p4x4Xm1ZCNp43UmfDTWvo7pZkB2fKbD5AAA==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/load-plugin/-/load-plugin-2.2.2.tgz", + "integrity": "sha512-FYzamtURIJefQykZGtiClYuZkJBUKzmx8Tc74y8JGAulDzbzVm/C+w/MbAljHRr+REL0cRzy3WgnHE+T8gce5g==", "requires": { "npm-prefix": "1.2.0", - "resolve-from": "2.0.0" + "resolve-from": "4.0.0" } }, "longest-streak": { @@ -551,27 +556,32 @@ "integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==" }, "markdown-escapes": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.1.tgz", - "integrity": "sha1-GZTfLTr0gR3lmmcUk0wrIpJzRRg=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz", + "integrity": "sha512-lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA==" }, "markdown-extensions": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-1.1.0.tgz", - "integrity": "sha1-+6Dxouu09BI9JbepO8NXksEfUE4=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-1.1.1.tgz", + "integrity": "sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==" }, "markdown-table": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.1.tgz", - "integrity": "sha1-Sz3ToTPRUYuO8NvHCb8qG0gkvIw=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.2.tgz", + "integrity": "sha512-NcWuJFHDA8V3wkDgR/j4+gZx+YQwstPgfQDV8ndUeWWzta3dnDTBxpVzqS9lkmJAuV5YX35lmyojl6HO5JXAgw==" + }, + "math-random": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", + "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=" }, "mdast-util-compact": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz", "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=", "requires": { - "unist-util-modify-children": "1.1.1", - "unist-util-visit": "1.1.3" + "unist-util-modify-children": "1.1.2", + "unist-util-visit": "1.3.1" } }, "micromatch": { @@ -599,7 +609,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -625,7 +635,7 @@ "resolved": "https://registry.npmjs.org/npm-prefix/-/npm-prefix-1.2.0.tgz", "integrity": "sha1-5hlFX3B0ulTMZtbQ033Z8b5ry8A=", "requires": { - "rc": "1.2.2", + "rc": "1.2.7", "shellsubstitute": "1.2.0", "untildify": "2.1.0" } @@ -658,16 +668,16 @@ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "parse-entities": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz", - "integrity": "sha1-gRLYhHExnyerrk1klksSL+ThuJA=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz", + "integrity": "sha512-5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==", "requires": { - "character-entities": "1.2.1", - "character-entities-legacy": "1.1.1", - "character-reference-invalid": "1.1.1", - "is-alphanumerical": "1.0.1", - "is-decimal": "1.0.1", - "is-hexadecimal": "1.0.1" + "character-entities": "1.2.2", + "character-entities-legacy": "1.1.2", + "character-reference-invalid": "1.1.2", + "is-alphanumerical": "1.0.2", + "is-decimal": "1.0.2", + "is-hexadecimal": "1.0.2" } }, "parse-glob": { @@ -700,69 +710,54 @@ "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, "randomatic": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz", + "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "4.0.0", + "kind-of": "6.0.2", + "math-random": "1.0.1" }, "dependencies": { "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" }, "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "requires": { - "is-buffer": "1.1.6" - } + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, "rc": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz", - "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", + "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", + "deep-extend": "0.5.1", + "ini": "1.3.5", "minimist": "1.2.0", "strip-json-comments": "2.0.1" } }, "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } }, @@ -773,7 +768,7 @@ "requires": { "graceful-fs": "4.1.11", "minimatch": "3.0.4", - "readable-stream": "2.3.3", + "readable-stream": "2.3.6", "set-immediate-shim": "1.0.1" } }, @@ -792,7 +787,7 @@ "requires": { "remark-parse": "4.0.0", "remark-stringify": "4.0.0", - "unified": "6.1.5" + "unified": "6.2.0" } }, "remark-parse": { @@ -800,20 +795,20 @@ "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-4.0.0.tgz", "integrity": "sha512-XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==", "requires": { - "collapse-white-space": "1.0.3", - "is-alphabetical": "1.0.1", - "is-decimal": "1.0.1", - "is-whitespace-character": "1.0.1", - "is-word-character": "1.0.1", - "markdown-escapes": "1.0.1", - "parse-entities": "1.1.1", + "collapse-white-space": "1.0.4", + "is-alphabetical": "1.0.2", + "is-decimal": "1.0.2", + "is-whitespace-character": "1.0.2", + "is-word-character": "1.0.2", + "markdown-escapes": "1.0.2", + "parse-entities": "1.1.2", "repeat-string": "1.6.1", - "state-toggle": "1.0.0", + "state-toggle": "1.0.1", "trim": "0.0.1", - "trim-trailing-lines": "1.1.0", - "unherit": "1.1.0", - "unist-util-remove-position": "1.1.1", - "vfile-location": "2.0.2", + "trim-trailing-lines": "1.1.1", + "unherit": "1.1.1", + "unist-util-remove-position": "1.1.2", + "vfile-location": "2.0.3", "xtend": "4.0.1" } }, @@ -822,19 +817,19 @@ "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-4.0.0.tgz", "integrity": "sha512-xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==", "requires": { - "ccount": "1.0.2", + "ccount": "1.0.3", "is-alphanumeric": "1.0.0", - "is-decimal": "1.0.1", - "is-whitespace-character": "1.0.1", + "is-decimal": "1.0.2", + "is-whitespace-character": "1.0.2", "longest-streak": "2.0.2", - "markdown-escapes": "1.0.1", - "markdown-table": "1.1.1", + "markdown-escapes": "1.0.2", + "markdown-table": "1.1.2", "mdast-util-compact": "1.0.1", - "parse-entities": "1.1.1", + "parse-entities": "1.1.2", "repeat-string": "1.6.1", - "state-toggle": "1.0.0", - "stringify-entities": "1.3.1", - "unherit": "1.1.0", + "state-toggle": "1.0.1", + "stringify-entities": "1.3.2", + "unherit": "1.1.1", "xtend": "4.0.1" } }, @@ -859,14 +854,14 @@ "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=" }, "resolve-from": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", - "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" }, "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "set-immediate-shim": { "version": "1.0.1", @@ -884,9 +879,9 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "state-toggle": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.0.tgz", - "integrity": "sha1-0g+aYWu08MO5i5GSLSW2QKorxCU=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz", + "integrity": "sha512-Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og==" }, "string-width": { "version": "1.0.2", @@ -899,22 +894,22 @@ } }, "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } }, "stringify-entities": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz", - "integrity": "sha1-sVDsLXKsTBtfMktR+2soyc3/BYw=", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz", + "integrity": "sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==", "requires": { - "character-entities-html4": "1.1.1", - "character-entities-legacy": "1.1.1", - "is-alphanumerical": "1.0.1", - "is-hexadecimal": "1.0.1" + "character-entities-html4": "1.1.2", + "character-entities-legacy": "1.1.2", + "is-alphanumerical": "1.0.2", + "is-hexadecimal": "1.0.2" } }, "strip-ansi": { @@ -931,11 +926,11 @@ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" }, "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "requires": { - "has-flag": "2.0.0" + "has-flag": "3.0.0" } }, "text-table": { @@ -944,12 +939,13 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" }, "to-vfile": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/to-vfile/-/to-vfile-2.1.2.tgz", - "integrity": "sha512-o8o2CXU2LDxh4OsvG9bGRXkIhcvk+bWKqWQECLcjfMNy2b8rl4kuFAZeTcPM5obK1mrvQ4iS3AcdopFDluq1jQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/to-vfile/-/to-vfile-2.2.0.tgz", + "integrity": "sha512-saGC8/lWdGrEoBMLUtgzhRHWAkQMP8gdldA3MOAUhBwTGEb1RSMVcflHGSx4ZJsdEZ9o1qDBCPp47LCPrbZWow==", "requires": { "is-buffer": "1.1.6", - "vfile": "2.2.0" + "vfile": "2.3.0", + "x-is-function": "1.0.4" } }, "trim": { @@ -958,14 +954,14 @@ "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=" }, "trim-trailing-lines": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz", - "integrity": "sha1-eu+7eAjfnWafbaLkOMrIxGradoQ=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz", + "integrity": "sha512-bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==" }, "trough": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz", - "integrity": "sha1-qf2LA5Swro//guBjOgo2zK1bX4Y=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz", + "integrity": "sha512-FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ==" }, "typedarray": { "version": "0.0.6", @@ -973,25 +969,24 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "unherit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz", - "integrity": "sha1-a5qu379z3xdWrZ4xbdmBiFhAzX0=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz", + "integrity": "sha512-+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==", "requires": { "inherits": "2.0.3", "xtend": "4.0.1" } }, "unified": { - "version": "6.1.5", - "resolved": "https://registry.npmjs.org/unified/-/unified-6.1.5.tgz", - "integrity": "sha1-cWk3hyYhpjE15iztLzrGoGPG+4c=", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/unified/-/unified-6.2.0.tgz", + "integrity": "sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==", "requires": { - "bail": "1.0.2", + "bail": "1.0.3", "extend": "3.0.1", "is-plain-obj": "1.1.0", - "trough": "1.0.1", - "vfile": "2.2.0", - "x-is-function": "1.0.4", + "trough": "1.0.2", + "vfile": "2.3.0", "x-is-string": "0.1.0" } }, @@ -1001,7 +996,7 @@ "integrity": "sha1-jZubitNHvrN/QwVipixNNhtCIg8=", "requires": { "camelcase": "4.1.0", - "chalk": "2.3.0", + "chalk": "2.4.1", "chokidar": "1.7.0", "minimist": "1.2.0", "text-table": "0.2.0", @@ -1013,52 +1008,60 @@ "resolved": "https://registry.npmjs.org/unified-engine/-/unified-engine-4.0.1.tgz", "integrity": "sha1-lpKql/1cTsNoiXeeElFL746GP8M=", "requires": { - "concat-stream": "1.6.0", + "concat-stream": "1.6.2", "debug": "2.6.9", - "fault": "1.0.1", + "fault": "1.0.2", "fn-name": "2.0.1", "glob": "7.1.2", - "ignore": "3.3.7", + "ignore": "3.3.8", "is-empty": "1.2.0", "is-hidden": "1.1.1", "is-object": "1.0.1", - "js-yaml": "3.10.0", - "load-plugin": "2.2.1", + "js-yaml": "3.11.0", + "load-plugin": "2.2.2", "parse-json": "2.2.0", - "to-vfile": "2.1.2", - "trough": "1.0.1", + "to-vfile": "2.2.0", + "trough": "1.0.2", "vfile-reporter": "4.0.0", - "vfile-statistics": "1.1.0", + "vfile-statistics": "1.1.1", "x-is-function": "1.0.4", "x-is-string": "0.1.0", "xtend": "4.0.1" } }, + "unist-util-is": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz", + "integrity": "sha512-YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==" + }, "unist-util-modify-children": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.1.tgz", - "integrity": "sha1-ZtfmpEnm9nIguXarPLi166w55R0=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.2.tgz", + "integrity": "sha512-GRi04yhng1WqBf5RBzPkOtWAadcZS2gvuOgNn/cyJBYNxtTuyYqTKN0eg4rC1YJwGnzrqfRB3dSKm8cNCjNirg==", "requires": { - "array-iterate": "1.1.1" + "array-iterate": "1.1.2" } }, "unist-util-remove-position": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz", - "integrity": "sha1-WoXBVV/BugwQG4ZwfRXlD6TIcbs=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz", + "integrity": "sha512-XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==", "requires": { - "unist-util-visit": "1.1.3" + "unist-util-visit": "1.3.1" } }, "unist-util-stringify-position": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz", - "integrity": "sha1-PMvcU2ee7W7PN3fdf14yKcG2qjw=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz", + "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==" }, "unist-util-visit": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.1.3.tgz", - "integrity": "sha1-7CaOcxudJ3p5pbWqBkOZDkBdYAs=" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz", + "integrity": "sha512-0fdB9EQJU0tho5tK0VzOJzAQpPv2LyLZ030b10GxuzAWEfvd54mpY7BMjQ1L69k2YNvL+SvxRzH0yUIehOO8aA==", + "requires": { + "unist-util-is": "2.1.2" + } }, "untildify": { "version": "2.1.0", @@ -1074,19 +1077,28 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "vfile": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.2.0.tgz", - "integrity": "sha1-zkek+zNZIrIz5TXbD32BIdj87U4=", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz", + "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==", "requires": { "is-buffer": "1.1.6", "replace-ext": "1.0.0", - "unist-util-stringify-position": "1.1.1" + "unist-util-stringify-position": "1.1.2", + "vfile-message": "1.0.1" } }, "vfile-location": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz", - "integrity": "sha1-02dcWch3SY5JK0dW/2Xkrxp1IlU=" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz", + "integrity": "sha512-zM5/l4lfw1CBoPx3Jimxoc5RNDAHHpk6AM6LM0pTIkm5SUSsx8ZekZ0PVdf0WEZ7kjlhSt7ZlqbRL6Cd6dBs6A==" + }, + "vfile-message": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.0.1.tgz", + "integrity": "sha512-vSGCkhNvJzO6VcWC6AlJW4NtYOVtS+RgCaqFIYUjoGIlHnFL+i0LbtYvonDWOMcB97uTPT4PRsyYY7REWC9vug==", + "requires": { + "unist-util-stringify-position": "1.1.2" + } }, "vfile-reporter": { "version": "4.0.0", @@ -1096,14 +1108,29 @@ "repeat-string": "1.6.1", "string-width": "1.0.2", "supports-color": "4.5.0", - "unist-util-stringify-position": "1.1.1", - "vfile-statistics": "1.1.0" + "unist-util-stringify-position": "1.1.2", + "vfile-statistics": "1.1.1" + }, + "dependencies": { + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "requires": { + "has-flag": "2.0.0" + } + } } }, "vfile-statistics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.0.tgz", - "integrity": "sha1-AhBMYP3u0dEbH3OtZTMLdjSz2JU=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.1.tgz", + "integrity": "sha512-dxUM6IYvGChHuwMT3dseyU5BHprNRXzAV0OHx1A769lVGsTiT50kU7BbpRFV+IE6oWmU+PwHdsTKfXhnDIRIgQ==" }, "wrappy": { "version": "1.0.2", diff --git a/tools/remark-preset-lint-node/package-lock.json b/tools/remark-preset-lint-node/package-lock.json index 55f29b9aba9e73..766164d64aaa9b 100644 --- a/tools/remark-preset-lint-node/package-lock.json +++ b/tools/remark-preset-lint-node/package-lock.json @@ -42,7 +42,7 @@ "resolved": "https://registry.npmjs.org/remark-lint/-/remark-lint-6.0.1.tgz", "integrity": "sha512-wvTTuB5O5pF8SxqahQjjrU3dtuhygYjaGcOZTw+4ACgSE4RBINDlNqN46HjcV3X0ib5GmObJUt5a2mmhtmuTqw==", "requires": { - "remark-message-control": "4.0.1" + "remark-message-control": "4.1.0" } }, "remark-lint-blockquote-indentation": { @@ -53,9 +53,9 @@ "mdast-util-to-string": "1.0.4", "plur": "2.1.2", "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-checkbox-character-style": { @@ -64,10 +64,10 @@ "integrity": "sha512-AF+1UrsVyrYYbK8Mg5TXr/IxaepgMspejPKuflK+TKOYKmMxOHUjdk2kIBBulj+hZCp+yz7lq3ifr8N2Vqg9BA==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0", - "vfile-location": "2.0.2" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1", + "vfile-location": "2.0.3" } }, "remark-lint-checkbox-content-indent": { @@ -76,10 +76,10 @@ "integrity": "sha512-cCPzu1HSQUevFsfJ7mmwj/v76ZWYBSbBu/GmFJE57G10BCEv1pCHuxJYjGKbXPcQXU5NTvIH9fuHWRVdM3hwdA==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0", - "vfile-location": "2.0.2" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1", + "vfile-location": "2.0.3" } }, "remark-lint-code-block-style": { @@ -88,9 +88,9 @@ "integrity": "sha512-FRUMhhKwCruH4vkatdMhVO4WlYpysV1NmMILVoK/k+/7uFLSfgvlqo66nzhpMdWL8TQHqdo0LhiXuetGC2WjsQ==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-definition-spacing": { @@ -99,9 +99,9 @@ "integrity": "sha512-ewzdlFfpTSP11ZuiOln0yfz6Y03aWtgJmLVQNfF1spaT1gURaShjs8Hiilbo719bz96DgvXSZLP6UnkSiZL1vg==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-fenced-code-flag": { @@ -110,9 +110,9 @@ "integrity": "sha512-P24T9DRe/nnywPFRpE1UAXAVzN1CX6HmINr15UHbQZo1Cy8KYt7uV9YOR0/XzphtnO/AFenAqZyf7tchW5AUNQ==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-fenced-code-marker": { @@ -121,9 +121,9 @@ "integrity": "sha512-mX7xAMl5m7xGX+YtOtyXIyv+egD4IQAm6DPGdfunI734QwODwcoBydtpTD56jrY+48nVcQ/anFYT1Blg3Xk3sQ==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-file-extension": { @@ -140,9 +140,9 @@ "integrity": "sha512-DK6bphJdQ0xSOQAn+8wOyLIVc3SZW2+ZzCMCLkQnVtHiQ9GHMzFiCkeE3Cq+OClsMI5Yn8wFTHZHPUn58VhNEQ==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-final-newline": { @@ -159,8 +159,8 @@ "integrity": "sha512-R11L8arXZy+uAZIioSRVWhp4f6Oere/Q071INTX8g4uvuZrC/uKDjxa3iZ6dlWCfLijC0z/s2JbeqwYbV5QrCA==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-visit": "1.3.1" } }, "remark-lint-hard-break-spaces": { @@ -169,9 +169,9 @@ "integrity": "sha512-uh7LqHgRPCphiCvRzBVA4D0Ml2IqPaw89lWJdQ6HvYiV8ChB/OFLBapHi6OKW7NVVVPPJsElPMB/UPUsKFaPTg==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-heading-style": { @@ -181,8 +181,8 @@ "requires": { "mdast-util-heading-style": "1.0.3", "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-visit": "1.3.1" } }, "remark-lint-maximum-line-length": { @@ -191,9 +191,9 @@ "integrity": "sha512-M4UIXAAbtLgoQbTDVwdKOEFbTKtJSZ+pCW7ZqMFs+cbIN0Svm32LM9+xpVfVU0hLYt3Ypl++EAPfguBNe1PZEw==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-no-auto-link-without-protocol": { @@ -203,9 +203,9 @@ "requires": { "mdast-util-to-string": "1.0.4", "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-no-blockquote-without-caret": { @@ -214,10 +214,10 @@ "integrity": "sha1-gd0i3V8EVOupwqU3u6Jgh0ShrW8=", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0", - "vfile-location": "2.0.2" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1", + "vfile-location": "2.0.3" } }, "remark-lint-no-duplicate-definitions": { @@ -226,9 +226,9 @@ "integrity": "sha512-3I0V3UVJ0gkDKZahSZ0xdFmklecr5SMwXcWbVBzXvHR59LqgjMVHFI7G/QZ6k2imOl1X22YVRz+mpMjacu2Ipw==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-no-file-name-articles": { @@ -263,9 +263,9 @@ "mdast-util-heading-style": "1.0.3", "plur": "2.1.2", "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-no-heading-indent": { @@ -275,9 +275,9 @@ "requires": { "plur": "2.1.2", "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-no-inline-padding": { @@ -287,8 +287,8 @@ "requires": { "mdast-util-to-string": "1.0.4", "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-visit": "1.3.1" } }, "remark-lint-no-multiple-toplevel-headings": { @@ -297,9 +297,9 @@ "integrity": "sha512-LFfgjF3NKFkt0tGNnJ8Exf8+DrVcMRwek5qu5mvh2KrZnmSpm5flYWzUy2UnnIyicDL3CZYC/r3Fjz6CeBYgZA==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-no-shell-dollars": { @@ -308,8 +308,8 @@ "integrity": "sha512-YryHem73PTxjCkuC4HONJWHsmrLyXmF7r+cCH36Ys3vuWsfAbwkbOwpyuPB4KXn+6fHaTUfz/B5BPp3iwzJwyA==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-visit": "1.3.1" } }, "remark-lint-no-shortcut-reference-image": { @@ -318,8 +318,8 @@ "integrity": "sha512-nUQ+4xB5hKZTCl9gvg7c+W1T3ddsnjgu4zwRza2Bn+21cKmUzx+z9dvlZ4aVuNGmxuWHbKI8/ZkKuB8Eu27vJw==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-visit": "1.3.1" } }, "remark-lint-no-table-indentation": { @@ -328,9 +328,9 @@ "integrity": "sha512-QrtT1GvJmAoNsWh+gmHFajFlM+ubm9rd3Cbz2OYPix8ZM6g907aIfG2NusJFXL9D8/CExQWYhlBvelFBbHgqbQ==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-no-tabs": { @@ -339,7 +339,7 @@ "integrity": "sha512-sFNCjz3MpX2TKo4vvo9s6iX8C0MsTmw10iC0F6mk3FKZ694bkHnEQOPhz5oyZIodV+QJ2wKqpZkuyXruIshjtA==", "requires": { "unified-lint-rule": "1.0.2", - "vfile-location": "2.0.2" + "vfile-location": "2.0.3" } }, "remark-lint-no-unused-definitions": { @@ -348,17 +348,17 @@ "integrity": "sha512-weNwWXvoSBmB3L2Yh8oxY0ylF6L5b/PjFbOhzBU4SlnpFOMfTn3rwNxOxbTrDS8MG2JTPVTaFn4ajXr/zkbH0Q==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-visit": "1.3.1" } }, "remark-lint-prohibited-strings": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/remark-lint-prohibited-strings/-/remark-lint-prohibited-strings-1.0.0.tgz", - "integrity": "sha512-FXqOBjU36+67l3y3RwtACrXdMUusANgyj+kDx6vlXYP8OfaRRjYNse51AcCiNQKR3XHgbGKxEklUHMJFKWfe7A==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/remark-lint-prohibited-strings/-/remark-lint-prohibited-strings-1.0.3.tgz", + "integrity": "sha512-XgxDXQrNjnHd4+cGavdiW8y5ipN+DwJxWIZDUIWuWjEhmRmgUl8nJHXOKjIYZ8inYxuhVit9m1Y9kX12wO3Edw==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-visit": "1.2.0" + "unist-util-visit": "1.3.1" } }, "remark-lint-rule-style": { @@ -367,9 +367,9 @@ "integrity": "sha512-dzH+K6DcPIIMBq6LUQgE4dR9TiQGZrQOoULD7m0Y0lIb2EoR2FK5Zd4TgZg/LnvTs6fid37t0xFoaY4/lXV/5Q==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-strong-marker": { @@ -378,9 +378,9 @@ "integrity": "sha512-+bwWKWAqDwqd21Vw+ndqVFh5V27Dp4MKhk9AUlKmcvgJYHuvQ8UfWQdpZcP218ps/4EbwTfyi33TaPyXqOTlXA==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-table-cell-padding": { @@ -389,9 +389,9 @@ "integrity": "sha512-o3WwC9YysXbQKf0D5nvhhJPcLagqedLwGdifukdgyaKvuIQVbtWbNv1/UOdB3LL+D+2fUrwrCmnQ8J3E1r0lBw==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-lint-table-pipes": { @@ -400,20 +400,19 @@ "integrity": "sha512-VHfDRvcovLBl/cvSjwDoA0xRizdZU33A6F2qFD9A5hu1sDWgGxMLg5m2MOvFlRkUVxSwUv47cuD0/yxB4THYXQ==", "requires": { "unified-lint-rule": "1.0.2", - "unist-util-generated": "1.1.1", - "unist-util-position": "3.0.0", - "unist-util-visit": "1.2.0" + "unist-util-generated": "1.1.2", + "unist-util-position": "3.0.1", + "unist-util-visit": "1.3.1" } }, "remark-message-control": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/remark-message-control/-/remark-message-control-4.0.1.tgz", - "integrity": "sha1-KRPNYLMW2fnzkKp/NGOdIM9VmW0=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/remark-message-control/-/remark-message-control-4.1.0.tgz", + "integrity": "sha512-e1dszks4YKY7hLAkhS2367jBjBpAfvi+kVgSN/tOFrdp3qxITjiNR5fOFnyYF8vvorkQ9uxlKJoZUOW8T7rKDg==", "requires": { "mdast-comment-marker": "1.0.2", - "trim": "0.0.1", - "unist-util-visit": "1.2.0", - "vfile-location": "2.0.2" + "unified-message-control": "1.0.4", + "xtend": "4.0.1" } }, "sliced": { @@ -434,33 +433,43 @@ "wrapped": "1.0.1" } }, + "unified-message-control": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/unified-message-control/-/unified-message-control-1.0.4.tgz", + "integrity": "sha512-e1dEtN4Z/TvLn/qHm+xeZpzqhJTtfZusFErk336kkZVpqrJYiV9ptxq+SbRPFMlN0OkjDYHmVJ929KYjsMTo3g==", + "requires": { + "trim": "0.0.1", + "unist-util-visit": "1.3.1", + "vfile-location": "2.0.3" + } + }, "unist-util-generated": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.1.tgz", - "integrity": "sha1-mfFseJWayFTe58YVwpGSTIv03n8=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.2.tgz", + "integrity": "sha512-1HcwiEO62dr0XWGT+abVK4f0aAm8Ik8N08c5nAYVmuSxfvpA9rCcNyX/le8xXj1pJK5nBrGlZefeWB6bN8Pstw==" }, "unist-util-is": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.1.tgz", - "integrity": "sha1-DDEmKeP5YMZukx6BLT2A53AQlHs=" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz", + "integrity": "sha512-YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==" }, "unist-util-position": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.0.tgz", - "integrity": "sha1-5uHgPu64HF4a/lU+jUrfvXwNj4I=" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.1.tgz", + "integrity": "sha512-05QfJDPI7PE1BIUtAxeSV+cDx21xP7+tUZgSval5CA7tr0pHBwybF7OnEa1dOFqg6BfYH/qiMUnWwWj+Frhlww==" }, "unist-util-visit": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.2.0.tgz", - "integrity": "sha512-lI+jyPlDztHZ2CJhUchcRMQ7MNc0yASgYFxwRTxs0EZ+9HbYFBLVGDJ2FchTBy+pra0O1LVEn0Wkgf19mDVDzw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz", + "integrity": "sha512-0fdB9EQJU0tho5tK0VzOJzAQpPv2LyLZ030b10GxuzAWEfvd54mpY7BMjQ1L69k2YNvL+SvxRzH0yUIehOO8aA==", "requires": { - "unist-util-is": "2.1.1" + "unist-util-is": "2.1.2" } }, "vfile-location": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz", - "integrity": "sha1-02dcWch3SY5JK0dW/2Xkrxp1IlU=" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz", + "integrity": "sha512-zM5/l4lfw1CBoPx3Jimxoc5RNDAHHpk6AM6LM0pTIkm5SUSsx8ZekZ0PVdf0WEZ7kjlhSt7ZlqbRL6Cd6dBs6A==" }, "wrapped": { "version": "1.0.1", @@ -470,6 +479,11 @@ "co": "3.1.0", "sliced": "1.0.1" } + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" } } } From 9a8cdc93ff003192a0967c7227e31bc92b904fc6 Mon Sep 17 00:00:00 2001 From: Vse Mozhet Byt Date: Tue, 15 May 2018 11:37:46 +0300 Subject: [PATCH 163/208] doc: fix typo in COLLABORATOR_GUIDE.md PR-URL: https://github.com/nodejs/node/pull/20742 Refs: https://github.com/nodejs/node/pull/20740 Reviewed-By: Ruben Bridgewater Reviewed-By: Colin Ihrig Reviewed-By: Michael Dawson Reviewed-By: Trivikram Kamat Reviewed-By: James M Snell --- COLLABORATOR_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 76007aad6e3dd6..585d102f73ef35 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -843,7 +843,7 @@ LTS working group and the Release team. | `lib/domains` | @nodejs/domains | | `lib/fs`, `src/{fs,file}` | @nodejs/fs | | `lib/{_}http{*}` | @nodejs/http | -| `lib/inspector.js`, `src/inspector_*` | @nodejs/V8-inspector | +| `lib/inspector.js`, `src/inspector_*` | @nodejs/v8-inspector | | `lib/internal/bootstrap/*` | @nodejs/process | | `lib/internal/url`, `src/node_url` | @nodejs/url | | `lib/net` | @bnoordhuis, @indutny, @nodejs/streams | From 8e058d5f94bd2f372e726d0093325db53779c6fc Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Tue, 15 May 2018 12:12:09 -0400 Subject: [PATCH 164/208] deps: patch V8 to 6.6.346.32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/20748 Refs: https://github.com/v8/v8/compare/6.6.346.31...6.6.346.32 Reviewed-By: Michaël Zasso Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Gus Caplan --- deps/v8/include/v8-version.h | 2 +- deps/v8/src/managed.h | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index dac19fa6213c5c..cdb2c5381e3c85 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 6 #define V8_MINOR_VERSION 6 #define V8_BUILD_NUMBER 346 -#define V8_PATCH_LEVEL 31 +#define V8_PATCH_LEVEL 32 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/src/managed.h b/deps/v8/src/managed.h index 63fefdd480ae10..d0ccb4e739db4f 100644 --- a/deps/v8/src/managed.h +++ b/deps/v8/src/managed.h @@ -59,22 +59,30 @@ class Managed : public Foreign { isolate->factory()->NewForeign(reinterpret_cast
    (finalizer))); Handle global_handle = isolate->global_handles()->Create(*handle); finalizer->global_handle_location = global_handle.location(); - GlobalHandles::MakeWeak(finalizer->global_handle_location, - handle->GetFinalizer(), &Managed::GCDelete, - v8::WeakCallbackType::kParameter); + GlobalHandles::MakeWeak( + finalizer->global_handle_location, handle->GetFinalizer(), + &ResetWeakAndScheduleGCDelete, v8::WeakCallbackType::kParameter); return handle; } private: - static void GCDelete(const v8::WeakCallbackInfo& data) { + static void ResetWeakAndScheduleGCDelete( + const v8::WeakCallbackInfo& data) { FinalizerWithHandle* finalizer = reinterpret_cast(data.GetParameter()); - + GlobalHandles::Destroy(finalizer->global_handle_location); Isolate* isolate = reinterpret_cast(data.GetIsolate()); isolate->UnregisterFromReleaseAtTeardown(finalizer); + // We need to call GCDelete as a second pass callback because + // it can trigger garbage collection. The first pass callbacks + // are not allowed to invoke V8 API. + data.SetSecondPassCallback(&GCDelete); + } - GlobalHandles::Destroy(finalizer->global_handle_location); + static void GCDelete(const v8::WeakCallbackInfo& data) { + FinalizerWithHandle* finalizer = + reinterpret_cast(data.GetParameter()); NativeDelete(finalizer); } From 338e663860b8b53281418b22fbdfc87c18b3a3c6 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Tue, 15 May 2018 18:44:19 +0200 Subject: [PATCH 165/208] assert: fix EOL issue in messages on Windows PR-URL: https://github.com/nodejs/node/pull/20754 Reviewed-By: Joyee Cheung Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat --- lib/assert.js | 17 ++++++++++------- test/parallel/test-assert.js | 37 ++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/lib/assert.js b/lib/assert.js index 98900c5151ed41..17b0059cba50e7 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -119,12 +119,12 @@ assert.fail = fail; assert.AssertionError = AssertionError; function getBuffer(fd, assertLine) { - var lines = 0; + let lines = 0; // Prevent blocking the event loop by limiting the maximum amount of // data that may be read. - var maxReads = 64; // bytesPerRead * maxReads = 512 kb - var bytesRead = 0; - var startBuffer = 0; // Start reading from that char on + let maxReads = 64; // bytesPerRead * maxReads = 512 kb + let bytesRead = 0; + let startBuffer = 0; // Start reading from that char on const bytesPerRead = 8192; const buffers = []; do { @@ -167,7 +167,7 @@ function getErrMessage(call) { return; } - var fd; + let fd, message; try { fd = openSync(filename, 'r', 0o666); const buffers = getBuffer(fd, line); @@ -186,11 +186,14 @@ function getErrMessage(call) { // not user defined function names. const ok = name === 'ok' ? '.ok' : ''; const args = node.arguments; - var message = code + message = code .slice(args[0].start, args[args.length - 1].end) .replace(escapeSequencesRegExp, escapeFn); + if (EOL === '\r\n') { + message = message.replace(/\r\n/g, '\n'); + } message = 'The expression evaluated to a falsy value:' + - `${EOL}${EOL} assert${ok}(${message})${EOL}`; + `\n\n assert${ok}(${message})\n`; } // Make sure to always set the cache! No matter if the message is // undefined or not diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js index e35ef326c34b86..d81ef32cd82210 100644 --- a/test/parallel/test-assert.js +++ b/test/parallel/test-assert.js @@ -27,7 +27,6 @@ const common = require('../common'); const assert = require('assert'); -const { EOL } = require('os'); const EventEmitter = require('events'); const { errorCache } = require('internal/assert'); const { writeFileSync, unlinkSync } = require('fs'); @@ -462,8 +461,8 @@ assert.throws( { code: 'ERR_ASSERTION', type: assert.AssertionError, - message: `The expression evaluated to a falsy value:${EOL}${EOL} ` + - `assert.ok(typeof 123 === 'string')${EOL}` + message: 'The expression evaluated to a falsy value:\n\n ' + + "assert.ok(typeof 123 === 'string')\n" } ); Error.stackTraceLimit = tmpLimit; @@ -625,8 +624,8 @@ common.expectsError( code: 'ERR_ASSERTION', type: assert.AssertionError, generatedMessage: true, - message: `The expression evaluated to a falsy value:${EOL}${EOL} ` + - `assert.ok(null)${EOL}` + message: 'The expression evaluated to a falsy value:\n\n ' + + 'assert.ok(null)\n' } ); common.expectsError( @@ -635,8 +634,8 @@ common.expectsError( code: 'ERR_ASSERTION', type: assert.AssertionError, generatedMessage: true, - message: `The expression evaluated to a falsy value:${EOL}${EOL} ` + - `assert(typeof 123 === 'string')${EOL}` + message: 'The expression evaluated to a falsy value:\n\n ' + + "assert(typeof 123 === 'string')\n" } ); @@ -666,8 +665,8 @@ common.expectsError( { code: 'ERR_ASSERTION', type: assert.AssertionError, - message: `The expression evaluated to a falsy value:${EOL}${EOL} ` + - `assert(Buffer.from('test') instanceof Error)${EOL}` + message: 'The expression evaluated to a falsy value:\n\n ' + + "assert(Buffer.from('test') instanceof Error)\n" } ); common.expectsError( @@ -675,8 +674,8 @@ common.expectsError( { code: 'ERR_ASSERTION', type: assert.AssertionError, - message: `The expression evaluated to a falsy value:${EOL}${EOL} ` + - `assert(Buffer.from('test') instanceof Error)${EOL}` + message: 'The expression evaluated to a falsy value:\n\n ' + + "assert(Buffer.from('test') instanceof Error)\n" } ); fs.close = tmp; @@ -695,12 +694,12 @@ common.expectsError( { code: 'ERR_ASSERTION', type: assert.AssertionError, - message: `The expression evaluated to a falsy value:${EOL}${EOL} ` + - `assert((() => 'string')()${EOL}` + - ` // eslint-disable-next-line${EOL}` + - ` ===${EOL}` + - ` 123 instanceof${EOL}` + - ` Buffer)${EOL}` + message: 'The expression evaluated to a falsy value:\n\n ' + + "assert((() => 'string')()\n" + + ' // eslint-disable-next-line\n' + + ' ===\n' + + ' 123 instanceof\n' + + ' Buffer)\n' } ); @@ -709,8 +708,8 @@ common.expectsError( { code: 'ERR_ASSERTION', type: assert.AssertionError, - message: `The expression evaluated to a falsy value:${EOL}${EOL} ` + - `assert(null, undefined)${EOL}` + message: 'The expression evaluated to a falsy value:\n\n ' + + 'assert(null, undefined)\n' } ); From 3b516177c8e6624831f227abf1f5dfc1c59fb762 Mon Sep 17 00:00:00 2001 From: Benjamin Coe Date: Tue, 15 May 2018 17:30:05 -0700 Subject: [PATCH 166/208] build: use nyc's merge command a 'merge' command has recently been added to nyc, eliminating the need for the istanbul-merge library. PR-URL: https://github.com/nodejs/node/pull/20760 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Ruben Bridgewater --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e74f29b84dde6b..addcc5f9f17981 100644 --- a/Makefile +++ b/Makefile @@ -165,8 +165,6 @@ coverage: coverage-test ## Run the tests and generate a coverage report. .PHONY: coverage-build coverage-build: all mkdir -p node_modules - if [ ! -d node_modules/istanbul-merge ]; then \ - $(NODE) ./deps/npm install istanbul-merge --no-save --no-package-lock; fi if [ ! -d node_modules/nyc ]; then \ $(NODE) ./deps/npm install nyc --no-save --no-package-lock; fi if [ ! -d gcovr ]; then git clone -b 3.4 --depth=1 \ @@ -195,11 +193,11 @@ coverage-test: coverage-build mv lib lib__ mv lib_ lib mkdir -p coverage .cov_tmp - $(NODE) ./node_modules/.bin/istanbul-merge --out \ - .cov_tmp/libcov.json 'out/Release/.coverage/coverage-*.json' + $(NODE) ./node_modules/.bin/nyc merge 'out/Release/.coverage' \ + .cov_tmp/libcov.json (cd lib && .$(NODE) ../node_modules/.bin/nyc report \ --temp-directory "$(CURDIR)/.cov_tmp" \ - --report-dir "../coverage") + --report-dir "$(CURDIR)/coverage") -(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \ --gcov-exclude='.*usr' -v -r Release/obj.target \ --html --html-detail -o ../coverage/cxxcoverage.html \ From 7b1c035218baf64e43ae0bb7b470f85d03bdb78b Mon Sep 17 00:00:00 2001 From: Bartosz Sosnowski Date: Wed, 16 May 2018 13:59:48 +0200 Subject: [PATCH 167/208] doc: describe using multiple link-module on win Current description seems to suggest that only one linked-module can be provided. This modifies the example to show that multiple inked-modules can be used. PR-URL: https://github.com/nodejs/node/pull/20774 Reviewed-By: Colin Ihrig Reviewed-By: Vse Mozhet Byt Reviewed-By: Trivikram Kamat Reviewed-By: James M Snell Reviewed-By: Ruben Bridgewater --- BUILDING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 6e7f606d2cb0c2..3e053050743c10 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -423,8 +423,9 @@ $ ./configure --link-module '/root/myModule.js' --link-module './myModule2.js' ### Windows -To make `./myCustomModule.js` available via `require('myCustomModule')`. +To make `./myModule.js` available via `require('myModule')` and +`./myModule2.js` available via `require('myModule2')`: ```console -> .\vcbuild link-module './myCustomModule.js' +> .\vcbuild link-module './myModule.js' link-module './myModule2.js' ``` From b664a848fa6be38944370b2b566da2ca9d45d806 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 18 May 2018 00:02:29 +0200 Subject: [PATCH 168/208] test: improve assertion in test-performance PR-URL: https://github.com/nodejs/node/pull/20809 Reviewed-By: Ruben Bridgewater Reviewed-By: Daniel Bevenius --- test/sequential/test-performance.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/sequential/test-performance.js b/test/sequential/test-performance.js index ea7e17e18dbe99..c26a7df7616025 100644 --- a/test/sequential/test-performance.js +++ b/test/sequential/test-performance.js @@ -60,7 +60,9 @@ function checkNodeTiming(props) { const delta = performance.nodeTiming[prop] - props[prop].around; assert(Math.abs(delta) < 1000); } else { - assert.strictEqual(performance.nodeTiming[prop], props[prop]); + assert.strictEqual(performance.nodeTiming[prop], props[prop], + `mismatch for performance property ${prop}: ` + + `${performance.nodeTiming[prop]} vs ${props[prop]}`); } } } From 4b64c847f180636d23a8ce8f6daf780aff09d5b7 Mon Sep 17 00:00:00 2001 From: Ali Ijaz Sheikh Date: Tue, 15 May 2018 11:52:18 -0700 Subject: [PATCH 169/208] src: trace_events: support for metadata events Add support for metadata events. At this point they are added to the main buffer. Emit a metadata event for the main thread. PR-URL: https://github.com/nodejs/node/pull/20757 Reviewed-By: James M Snell Reviewed-By: Matteo Collina --- src/node.cc | 3 ++ src/tracing/trace_event.h | 39 ++++++++++++++++++++ test/parallel/test-trace-events-api.js | 3 +- test/parallel/test-trace-events-binding.js | 3 +- test/parallel/test-trace-events-bootstrap.js | 3 +- test/parallel/test-trace-events-metadata.js | 26 +++++++++++++ test/parallel/test-trace-events-none.js | 8 +++- test/parallel/test-trace-events-perf.js | 3 +- test/parallel/test-trace-events-vm.js | 3 +- 9 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 test/parallel/test-trace-events-metadata.js diff --git a/src/node.cc b/src/node.cc index 72eb4283d0b568..3236c7ae675e9a 100644 --- a/src/node.cc +++ b/src/node.cc @@ -4559,6 +4559,9 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data, Environment env(isolate_data, context, v8_platform.GetTracingAgent()); env.Start(argc, argv, exec_argc, exec_argv, v8_is_profiling); + TRACE_EVENT_METADATA1("__metadata", "thread_name", "name", + "JavaScriptMainThread"); + const char* path = argc > 1 ? argv[1] : nullptr; StartInspector(&env, path, debug_options); diff --git a/src/tracing/trace_event.h b/src/tracing/trace_event.h index 3fbe1b0a1f9a46..1165fca59a99ea 100644 --- a/src/tracing/trace_event.h +++ b/src/tracing/trace_event.h @@ -118,6 +118,15 @@ enum CategoryGroupEnabledFlags { node::tracing::TraceEventHelper::GetTracingController() \ ->UpdateTraceEventDuration +// Adds a metadata event to the trace log. The |AppendValueAsTraceFormat| method +// on the convertable value will be called at flush time. +// TRACE_EVENT_API_ADD_METADATA_EVENT( +// const unsigned char* category_group_enabled, +// const char* event_name, +// const char* arg_name, +// std::unique_ptr arg_value) +#define TRACE_EVENT_API_ADD_METADATA_EVENT node::tracing::AddMetadataEvent + // Defines atomic operations used internally by the tracing system. #define TRACE_EVENT_API_ATOMIC_WORD intptr_t #define TRACE_EVENT_API_ATOMIC_LOAD(var) (var) @@ -259,6 +268,16 @@ enum CategoryGroupEnabledFlags { } \ } while (0) +#define INTERNAL_TRACE_EVENT_METADATA_ADD(category_group, name, ...) \ + do { \ + INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group); \ + if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \ + TRACE_EVENT_API_ADD_METADATA_EVENT( \ + INTERNAL_TRACE_EVENT_UID(category_group_enabled), name, \ + ##__VA_ARGS__); \ + } \ + } while(0) + // Enter and leave a context based on the current scope. #define INTERNAL_TRACE_EVENT_SCOPED_CONTEXT(category_group, name, context) \ struct INTERNAL_TRACE_EVENT_UID(ScopedContext) { \ @@ -612,6 +631,26 @@ static V8_INLINE uint64_t AddTraceEventWithTimestamp( arg_names, arg_types, arg_values, flags, timestamp); } +template +static V8_INLINE uint64_t AddMetadataEvent( + const uint8_t* category_group_enabled, const char* name, + const char* arg1_name, ARG1_TYPE&& arg1_val) { + const int num_args = 1; + uint8_t arg_type; + uint64_t arg_value; + SetTraceValue(std::forward(arg1_val), &arg_type, &arg_value); + // TODO(ofrobots): It would be good to add metadata events to a separate + // buffer so that they can be periodically reemitted. For now, we have a + // single buffer, so we just add them to the main buffer. + return TRACE_EVENT_API_ADD_TRACE_EVENT( + TRACE_EVENT_PHASE_METADATA, + category_group_enabled, name, + node::tracing::kGlobalScope, // scope + node::tracing::kNoId, // id + node::tracing::kNoId, // bind_id + num_args, &arg1_name, &arg_type, &arg_value, TRACE_EVENT_FLAG_NONE); +} + // Used by TRACE_EVENTx macros. Do not use directly. class ScopedTracer { public: diff --git a/test/parallel/test-trace-events-api.js b/test/parallel/test-trace-events-api.js index b4f7112d07ac77..a68a2850a37c45 100644 --- a/test/parallel/test-trace-events-api.js +++ b/test/parallel/test-trace-events-api.js @@ -130,7 +130,8 @@ if (isChild) { assert(common.fileExists(file)); fs.readFile(file, common.mustCall((err, data) => { - const traces = JSON.parse(data.toString()).traceEvents; + const traces = JSON.parse(data.toString()).traceEvents + .filter((trace) => trace.cat !== '__metadata'); assert.strictEqual(traces.length, expectedMarks.length + expectedBegins.length + diff --git a/test/parallel/test-trace-events-binding.js b/test/parallel/test-trace-events-binding.js index 35fbfc3692a5d3..e52f1c769f5283 100644 --- a/test/parallel/test-trace-events-binding.js +++ b/test/parallel/test-trace-events-binding.js @@ -31,7 +31,8 @@ const proc = cp.spawn(process.execPath, proc.once('exit', common.mustCall(() => { assert(common.fileExists(FILE_NAME)); fs.readFile(FILE_NAME, common.mustCall((err, data) => { - const traces = JSON.parse(data.toString()).traceEvents; + const traces = JSON.parse(data.toString()).traceEvents + .filter((trace) => trace.cat !== '__metadata'); assert.strictEqual(traces.length, 3); assert.strictEqual(traces[0].pid, proc.pid); diff --git a/test/parallel/test-trace-events-bootstrap.js b/test/parallel/test-trace-events-bootstrap.js index a0bfcf123e7233..6f8c76564a8ac4 100644 --- a/test/parallel/test-trace-events-bootstrap.js +++ b/test/parallel/test-trace-events-bootstrap.js @@ -42,7 +42,8 @@ if (process.argv[2] === 'child') { assert(common.fileExists(file)); fs.readFile(file, common.mustCall((err, data) => { - const traces = JSON.parse(data.toString()).traceEvents; + const traces = JSON.parse(data.toString()).traceEvents + .filter((trace) => trace.cat !== '__metadata'); traces.forEach((trace) => { assert.strictEqual(trace.pid, proc.pid); assert(names.includes(trace.name)); diff --git a/test/parallel/test-trace-events-metadata.js b/test/parallel/test-trace-events-metadata.js new file mode 100644 index 00000000000000..f8fcdcfe5bb788 --- /dev/null +++ b/test/parallel/test-trace-events-metadata.js @@ -0,0 +1,26 @@ +'use strict'; +const common = require('../common'); +const assert = require('assert'); +const cp = require('child_process'); +const fs = require('fs'); + +const CODE = + 'setTimeout(() => { for (var i = 0; i < 100000; i++) { "test" + i } }, 1)'; +const FILE_NAME = 'node_trace.1.log'; + +const tmpdir = require('../common/tmpdir'); +tmpdir.refresh(); +process.chdir(tmpdir.path); + +const proc = cp.spawn(process.execPath, + [ '--trace-events-enabled', '-e', CODE ]); +proc.once('exit', common.mustCall(() => { + assert(common.fileExists(FILE_NAME)); + fs.readFile(FILE_NAME, common.mustCall((err, data) => { + const traces = JSON.parse(data.toString()).traceEvents; + assert(traces.length > 0); + assert(traces.some((trace) => + trace.cat === '__metadata' && trace.name === 'thread_name' && + trace.args.name === 'JavaScriptMainThread')); + })); +})); diff --git a/test/parallel/test-trace-events-none.js b/test/parallel/test-trace-events-none.js index 6b60ce999ac118..a3f0338f28af35 100644 --- a/test/parallel/test-trace-events-none.js +++ b/test/parallel/test-trace-events-none.js @@ -2,6 +2,7 @@ const common = require('../common'); const assert = require('assert'); const cp = require('child_process'); +const fs = require('fs'); const CODE = 'setTimeout(() => { for (var i = 0; i < 100000; i++) { "test" + i } }, 1)'; @@ -17,5 +18,10 @@ const proc_no_categories = cp.spawn( ); proc_no_categories.once('exit', common.mustCall(() => { - assert(!common.fileExists(FILE_NAME)); + assert(common.fileExists(FILE_NAME)); + // Only __metadata categories should have been emitted. + fs.readFile(FILE_NAME, common.mustCall((err, data) => { + assert.ok(JSON.parse(data.toString()).traceEvents.every( + (trace) => trace.cat === '__metadata')); + })); })); diff --git a/test/parallel/test-trace-events-perf.js b/test/parallel/test-trace-events-perf.js index 5758082b6efa43..57ac0e3142f66d 100644 --- a/test/parallel/test-trace-events-perf.js +++ b/test/parallel/test-trace-events-perf.js @@ -49,7 +49,8 @@ if (process.argv[2] === 'child') { assert(common.fileExists(file)); fs.readFile(file, common.mustCall((err, data) => { - const traces = JSON.parse(data.toString()).traceEvents; + const traces = JSON.parse(data.toString()).traceEvents + .filter((trace) => trace.cat !== '__metadata'); assert.strictEqual(traces.length, expectedMarks.length + expectedBegins.length + diff --git a/test/parallel/test-trace-events-vm.js b/test/parallel/test-trace-events-vm.js index fc7af34d8866d2..3dc6e263e1b6a1 100644 --- a/test/parallel/test-trace-events-vm.js +++ b/test/parallel/test-trace-events-vm.js @@ -32,7 +32,8 @@ if (process.argv[2] === 'child') { assert(common.fileExists(file)); fs.readFile(file, common.mustCall((err, data) => { - const traces = JSON.parse(data.toString()).traceEvents; + const traces = JSON.parse(data.toString()).traceEvents + .filter((trace) => trace.cat !== '__metadata'); traces.forEach((trace) => { assert.strictEqual(trace.pid, proc.pid); assert(names.includes(trace.name)); From e56716e39614248a70b2031d903bb9115b038442 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 18 May 2018 18:49:41 +0200 Subject: [PATCH 170/208] deps: cherry-pick ff0a9793334 from upstream V8 Original commit message: [api] Expose PreviewEntries as public API Turn `debug::EntriesPreview` into a public API. This is a straightforward approach to addressing nodejs/node#20409 (not relying on functionality behind `--allow-natives-syntax`) in Node.js. Refs: https://github.com/v8/v8/commit/ff0a979333408f544f081489411814b84df6e2d9 PR-URL: https://github.com/nodejs/node/pull/20719 Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Gus Caplan Reviewed-By: James M Snell Reviewed-By: Matteo Collina Reviewed-By: Ruben Bridgewater --- deps/v8/include/v8.h | 11 +++++++++++ deps/v8/src/api.cc | 19 +++++++++---------- deps/v8/src/debug/debug-interface.h | 4 ---- deps/v8/src/inspector/v8-debugger.cc | 4 +++- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index 201c2cc05ca6bd..31407fa0839bb9 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -3503,6 +3503,17 @@ class V8_EXPORT Object : public Value { */ Isolate* GetIsolate(); + /** + * If this object is a Set, Map, WeakSet or WeakMap, this returns a + * representation of the elements of this object as an array. + * If this object is a SetIterator or MapIterator, this returns all + * elements of the underlying collection, starting at the iterator's current + * position. + * For other types, this will return an empty MaybeLocal (without + * scheduling an exception). + */ + MaybeLocal PreviewEntries(bool* is_key_value); + static Local New(Isolate* isolate); V8_INLINE static Object* Cast(Value* obj); diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc index 2c3f1b797664fd..f5be62058a0f94 100644 --- a/deps/v8/src/api.cc +++ b/deps/v8/src/api.cc @@ -9526,21 +9526,20 @@ int debug::EstimatedValueSize(Isolate* v8_isolate, v8::Local value) { return i::Handle::cast(object)->Size(); } -v8::MaybeLocal debug::EntriesPreview(Isolate* v8_isolate, - v8::Local value, - bool* is_key_value) { - i::Isolate* isolate = reinterpret_cast(v8_isolate); - ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate); - if (value->IsMap()) { +v8::MaybeLocal v8::Object::PreviewEntries(bool* is_key_value) { + if (IsMap()) { *is_key_value = true; - return value.As()->AsArray(); + return Map::Cast(this)->AsArray(); } - if (value->IsSet()) { + if (IsSet()) { *is_key_value = false; - return value.As()->AsArray(); + return Set::Cast(this)->AsArray(); } - i::Handle object = Utils::OpenHandle(*value); + i::Handle object = Utils::OpenHandle(this); + i::Isolate* isolate = object->GetIsolate(); + Isolate* v8_isolate = reinterpret_cast(isolate); + ENTER_V8_NO_SCRIPT_NO_EXCEPTION(isolate); if (object->IsJSWeakCollection()) { *is_key_value = object->IsJSWeakMap(); return Utils::ToLocal(i::JSWeakCollection::GetEntries( diff --git a/deps/v8/src/debug/debug-interface.h b/deps/v8/src/debug/debug-interface.h index eef65f5100ec29..6d50be6e0ea0c2 100644 --- a/deps/v8/src/debug/debug-interface.h +++ b/deps/v8/src/debug/debug-interface.h @@ -204,10 +204,6 @@ void ResetBlackboxedStateCache(Isolate* isolate, int EstimatedValueSize(Isolate* isolate, v8::Local value); -v8::MaybeLocal EntriesPreview(Isolate* isolate, - v8::Local value, - bool* is_key_value); - enum Builtin { kObjectKeys, kObjectGetPrototypeOf, diff --git a/deps/v8/src/inspector/v8-debugger.cc b/deps/v8/src/inspector/v8-debugger.cc index 9b0ca38018a43e..0f3fd0377e9e94 100644 --- a/deps/v8/src/inspector/v8-debugger.cc +++ b/deps/v8/src/inspector/v8-debugger.cc @@ -29,8 +29,10 @@ v8::MaybeLocal collectionsEntries(v8::Local context, v8::Isolate* isolate = context->GetIsolate(); v8::Local entries; bool isKeyValue = false; - if (!v8::debug::EntriesPreview(isolate, value, &isKeyValue).ToLocal(&entries)) + if (!value->IsObject() || + !value.As()->PreviewEntries(&isKeyValue).ToLocal(&entries)) { return v8::MaybeLocal(); + } v8::Local wrappedEntries = v8::Array::New(isolate); CHECK(!isKeyValue || wrappedEntries->Length() % 2 == 0); From fb7a77524246feada872674b34bef80f4f7e649e Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 14 May 2018 17:30:27 +0200 Subject: [PATCH 171/208] lib,src: use V8 API for collection inspection Use a new public V8 API for inspecting weak collections and collection iterators, rather than using V8-internal functions to achieve this. This currently comes with a slight modification of the output for inspecting iterators generated by `Set().entries()`. Fixes: https://github.com/nodejs/node/issues/20409 PR-URL: https://github.com/nodejs/node/pull/20719 Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Gus Caplan Reviewed-By: James M Snell Reviewed-By: Matteo Collina Reviewed-By: Ruben Bridgewater --- lib/console.js | 6 ++--- lib/internal/bootstrap/node.js | 17 ------------- lib/internal/v8.js | 39 ------------------------------ lib/util.js | 32 +++++++++--------------- node.gyp | 1 - src/node.cc | 6 ----- src/node_util.cc | 30 +++++++++++++++++++++++ test/parallel/test-util-inspect.js | 8 +++--- 8 files changed, 47 insertions(+), 92 deletions(-) delete mode 100644 lib/internal/v8.js diff --git a/lib/console.js b/lib/console.js index 9b8b7cb7c9f822..ed4b6fe9145069 100644 --- a/lib/console.js +++ b/lib/console.js @@ -29,7 +29,7 @@ const { ERR_INVALID_ARG_VALUE, }, } = require('internal/errors'); -const { previewMapIterator, previewSetIterator } = require('internal/v8'); +const { previewEntries } = process.binding('util'); const { Buffer: { isBuffer } } = require('buffer'); const util = require('util'); const { @@ -341,7 +341,7 @@ Console.prototype.table = function(tabularData, properties) { const mapIter = isMapIterator(tabularData); if (mapIter) - tabularData = previewMapIterator(tabularData); + tabularData = previewEntries(tabularData); if (mapIter || isMap(tabularData)) { const keys = []; @@ -363,7 +363,7 @@ Console.prototype.table = function(tabularData, properties) { const setIter = isSetIterator(tabularData); if (setIter) - tabularData = previewSetIterator(tabularData); + tabularData = previewEntries(tabularData); const setlike = setIter || isSet(tabularData); if (setlike) { diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 5f7fda2a8aeb52..51a60bc0d8a344 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -29,7 +29,6 @@ // Do this good and early, since it handles errors. setupProcessFatal(); - setupV8(); setupProcessICUVersions(); setupGlobalVariables(); @@ -478,22 +477,6 @@ }; } - function setupV8() { - // Warm up the map and set iterator preview functions. V8 compiles - // functions lazily (unless --nolazy is set) so we need to do this - // before we turn off --allow_natives_syntax again. - const v8 = NativeModule.require('internal/v8'); - v8.previewMapIterator(new Map().entries()); - v8.previewSetIterator(new Set().entries()); - v8.previewWeakMap(new WeakMap(), 1); - v8.previewWeakSet(new WeakSet(), 1); - // Disable --allow_natives_syntax again unless it was explicitly - // specified on the command line. - const re = /^--allow[-_]natives[-_]syntax$/; - if (!process.execArgv.some((s) => re.test(s))) - process.binding('v8').setFlagsFromString('--noallow_natives_syntax'); - } - function setupProcessICUVersions() { const icu = process.binding('config').hasIntl ? process.binding('icu') : undefined; diff --git a/lib/internal/v8.js b/lib/internal/v8.js deleted file mode 100644 index 3102b45a2d4032..00000000000000 --- a/lib/internal/v8.js +++ /dev/null @@ -1,39 +0,0 @@ -'use strict'; - -// This file provides access to some of V8's native runtime functions. See -// https://github.com/v8/v8/wiki/Built-in-functions for further information -// about their implementation. -// They have to be loaded before anything else to make sure we deactivate them -// before executing any other code. Gaining access is achieved by using a -// specific flag that is used internally in the startup phase. - -// Clone the provided Map Iterator. -function previewMapIterator(it) { - return %MapIteratorClone(it); -} - -// Clone the provided Set Iterator. -function previewSetIterator(it) { - return %SetIteratorClone(it); -} - -// Retrieve all WeakMap instance key / value pairs up to `max`. `max` limits the -// number of key / value pairs returned. Make sure it is a positive number, -// otherwise V8 aborts. Passing through `0` returns all elements. -function previewWeakMap(weakMap, max) { - return %GetWeakMapEntries(weakMap, max); -} - -// Retrieve all WeakSet instance values up to `max`. `max` limits the -// number of key / value pairs returned. Make sure it is a positive number, -// otherwise V8 aborts. Passing through `0` returns all elements. -function previewWeakSet(weakSet, max) { - return %GetWeakSetValues(weakSet, max); -} - -module.exports = { - previewMapIterator, - previewSetIterator, - previewWeakMap, - previewWeakSet -}; diff --git a/lib/util.js b/lib/util.js index bd7a98694b91a9..f358adefdb25d6 100644 --- a/lib/util.js +++ b/lib/util.js @@ -30,18 +30,12 @@ const { const { TextDecoder, TextEncoder } = require('internal/encoding'); const { isBuffer } = require('buffer').Buffer; -const { - previewMapIterator, - previewSetIterator, - previewWeakMap, - previewWeakSet -} = require('internal/v8'); - const { getPromiseDetails, getProxyDetails, kPending, kRejected, + previewEntries } = process.binding('util'); const { internalBinding } = require('internal/bootstrap/loaders'); @@ -912,7 +906,7 @@ function formatMap(ctx, value, recurseTimes, keys) { function formatWeakSet(ctx, value, recurseTimes, keys) { const maxArrayLength = Math.max(ctx.maxArrayLength, 0); - const entries = previewWeakSet(value, maxArrayLength + 1); + const entries = previewEntries(value).slice(0, maxArrayLength + 1); const maxLength = Math.min(maxArrayLength, entries.length); let output = new Array(maxLength); for (var i = 0; i < maxLength; ++i) @@ -929,16 +923,14 @@ function formatWeakSet(ctx, value, recurseTimes, keys) { function formatWeakMap(ctx, value, recurseTimes, keys) { const maxArrayLength = Math.max(ctx.maxArrayLength, 0); - const entries = previewWeakMap(value, maxArrayLength + 1); - // Entries exist as [key1, val1, key2, val2, ...] - const remainder = entries.length / 2 > maxArrayLength; - const len = entries.length / 2 - (remainder ? 1 : 0); + const entries = previewEntries(value).slice(0, maxArrayLength + 1); + const remainder = entries.length > maxArrayLength; + const len = entries.length - (remainder ? 1 : 0); const maxLength = Math.min(maxArrayLength, len); let output = new Array(maxLength); for (var i = 0; i < len; i++) { - const pos = i * 2; - output[i] = `${formatValue(ctx, entries[pos], recurseTimes)} => ` + - formatValue(ctx, entries[pos + 1], recurseTimes); + output[i] = `${formatValue(ctx, entries[i][0], recurseTimes)} => ` + + formatValue(ctx, entries[i][1], recurseTimes); } // Sort all entries to have a halfway reliable output (if more entries than // retrieved ones exist, we can not reliably return the same output). @@ -950,9 +942,9 @@ function formatWeakMap(ctx, value, recurseTimes, keys) { return output; } -function formatCollectionIterator(preview, ctx, value, recurseTimes, keys) { +function formatCollectionIterator(ctx, value, recurseTimes, keys) { const output = []; - for (const entry of preview(value)) { + for (const entry of previewEntries(value)) { if (ctx.maxArrayLength === output.length) { output.push('... more items'); break; @@ -966,13 +958,11 @@ function formatCollectionIterator(preview, ctx, value, recurseTimes, keys) { } function formatMapIterator(ctx, value, recurseTimes, keys) { - return formatCollectionIterator(previewMapIterator, ctx, value, recurseTimes, - keys); + return formatCollectionIterator(ctx, value, recurseTimes, keys); } function formatSetIterator(ctx, value, recurseTimes, keys) { - return formatCollectionIterator(previewSetIterator, ctx, value, recurseTimes, - keys); + return formatCollectionIterator(ctx, value, recurseTimes, keys); } function formatPromise(ctx, value, recurseTimes, keys) { diff --git a/node.gyp b/node.gyp index 29fc973a68411b..66bd10827200d8 100644 --- a/node.gyp +++ b/node.gyp @@ -145,7 +145,6 @@ 'lib/internal/http2/core.js', 'lib/internal/http2/compat.js', 'lib/internal/http2/util.js', - 'lib/internal/v8.js', 'lib/internal/v8_prof_polyfill.js', 'lib/internal/v8_prof_processor.js', 'lib/internal/stream_base_commons.js', diff --git a/src/node.cc b/src/node.cc index 3236c7ae675e9a..e6c221a948adaa 100644 --- a/src/node.cc +++ b/src/node.cc @@ -4369,12 +4369,6 @@ void Init(int* argc, } #endif - // Needed for access to V8 intrinsics. Disabled again during bootstrapping, - // see lib/internal/bootstrap/node.js. - const char allow_natives_syntax[] = "--allow_natives_syntax"; - V8::SetFlagsFromString(allow_natives_syntax, - sizeof(allow_natives_syntax) - 1); - // We should set node_is_initialized here instead of in node::Start, // otherwise embedders using node::Init to initialize everything will not be // able to set it and native modules will not load for them. diff --git a/src/node_util.cc b/src/node_util.cc index 662809fb851a98..2db68586459ab2 100644 --- a/src/node_util.cc +++ b/src/node_util.cc @@ -49,6 +49,35 @@ static void GetProxyDetails(const FunctionCallbackInfo& args) { args.GetReturnValue().Set(ret); } +static void PreviewEntries(const FunctionCallbackInfo& args) { + if (!args[0]->IsObject()) + return; + + bool is_key_value; + Local entries; + if (!args[0].As()->PreviewEntries(&is_key_value).ToLocal(&entries)) + return; + if (!is_key_value) + return args.GetReturnValue().Set(entries); + + uint32_t length = entries->Length(); + CHECK_EQ(length % 2, 0); + + Environment* env = Environment::GetCurrent(args); + Local context = env->context(); + + Local pairs = Array::New(env->isolate(), length / 2); + for (uint32_t i = 0; i < length / 2; i++) { + Local pair = Array::New(env->isolate(), 2); + pair->Set(context, 0, entries->Get(context, i * 2).ToLocalChecked()) + .FromJust(); + pair->Set(context, 1, entries->Get(context, i * 2 + 1).ToLocalChecked()) + .FromJust(); + pairs->Set(context, i, pair).FromJust(); + } + args.GetReturnValue().Set(pairs); +} + // Side effect-free stringification that will never throw exceptions. static void SafeToString(const FunctionCallbackInfo& args) { auto context = args.GetIsolate()->GetCurrentContext(); @@ -188,6 +217,7 @@ void Initialize(Local target, env->SetMethod(target, "getPromiseDetails", GetPromiseDetails); env->SetMethod(target, "getProxyDetails", GetProxyDetails); env->SetMethod(target, "safeToString", SafeToString); + env->SetMethod(target, "previewEntries", PreviewEntries); env->SetMethod(target, "startSigintWatchdog", StartSigintWatchdog); env->SetMethod(target, "stopSigintWatchdog", StopSigintWatchdog); diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js index 2b8e14e45f64e6..b80e932dd1c17f 100644 --- a/test/parallel/test-util-inspect.js +++ b/test/parallel/test-util-inspect.js @@ -19,14 +19,13 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -// Flags: --expose_internals 'use strict'; const common = require('../common'); const assert = require('assert'); const JSStream = process.binding('js_stream').JSStream; const util = require('util'); const vm = require('vm'); -const { previewMapIterator } = require('internal/v8'); +const { previewEntries } = process.binding('util'); assert.strictEqual(util.inspect(1), '1'); assert.strictEqual(util.inspect(false), 'false'); @@ -448,7 +447,7 @@ assert.strictEqual(util.inspect(-5e-324), '-5e-324'); { const map = new Map(); map.set(1, 2); - const vals = previewMapIterator(map.entries()); + const vals = previewEntries(map.entries()); const valsOutput = []; for (const o of vals) { valsOutput.push(o); @@ -935,8 +934,7 @@ if (typeof Symbol !== 'undefined') { const aSet = new Set([1, 3]); assert.strictEqual(util.inspect(aSet.keys()), '[Set Iterator] { 1, 3 }'); assert.strictEqual(util.inspect(aSet.values()), '[Set Iterator] { 1, 3 }'); - assert.strictEqual(util.inspect(aSet.entries()), - '[Set Iterator] { [ 1, 1 ], [ 3, 3 ] }'); + assert.strictEqual(util.inspect(aSet.entries()), '[Set Iterator] { 1, 3 }'); // Make sure the iterator doesn't get consumed. const keys = aSet.keys(); assert.strictEqual(util.inspect(keys), '[Set Iterator] { 1, 3 }'); From b308a073012977debe6197b7b4a72b67873cf957 Mon Sep 17 00:00:00 2001 From: Gus Caplan Date: Wed, 16 May 2018 12:07:20 -0500 Subject: [PATCH 172/208] util: support inspecting namespaces of unevaluated modules PR-URL: https://github.com/nodejs/node/pull/20782 Reviewed-By: Ben Noordhuis Reviewed-By: Guy Bedford Reviewed-By: Ruben Bridgewater Reviewed-By: James M Snell --- lib/util.js | 53 ++++++++++++++++---- test/parallel/test-util-inspect-namespace.js | 22 ++++++++ 2 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 test/parallel/test-util-inspect-namespace.js diff --git a/lib/util.js b/lib/util.js index f358adefdb25d6..2ef7e4e54c5c6d 100644 --- a/lib/util.js +++ b/lib/util.js @@ -629,6 +629,9 @@ function formatValue(ctx, value, recurseTimes, ln) { } else { extra = '[items unknown]'; } + } else if (types.isModuleNamespaceObject(value)) { + braces[0] = `[${tag}] {`; + formatter = formatNamespaceObject; } else { // Check boxed primitives other than string with valueOf() // NOTE: `Date` has to be checked first! @@ -757,6 +760,15 @@ function formatObject(ctx, value, recurseTimes, keys) { return output; } +function formatNamespaceObject(ctx, value, recurseTimes, keys) { + const len = keys.length; + const output = new Array(len); + for (var i = 0; i < len; i++) { + output[i] = formatNamespaceProperty(ctx, value, recurseTimes, keys[i]); + } + return output; +} + // The array is sparse and/or has extra keys function formatSpecialArray(ctx, value, recurseTimes, keys, maxLength, valLen) { const output = []; @@ -980,8 +992,36 @@ function formatPromise(ctx, value, recurseTimes, keys) { return output; } +function formatKey(ctx, key, enumerable) { + if (typeof key === 'symbol') { + return `[${ctx.stylize(key.toString(), 'symbol')}]`; + } + if (enumerable === false) { + return `[${key}]`; + } + if (keyStrRegExp.test(key)) { + return ctx.stylize(key, 'name'); + } + return ctx.stylize(strEscape(key), 'string'); +} + +function formatNamespaceProperty(ctx, ns, recurseTimes, key) { + let value; + try { + value = formatValue(ctx, ns[key], recurseTimes, true); + } catch (err) { + if (err instanceof ReferenceError) { + value = ctx.stylize('', 'special'); + } else { + throw err; + } + } + + return `${formatKey(ctx, key)}: ${value}`; +} + function formatProperty(ctx, value, recurseTimes, key, array) { - let name, str; + let str; const desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key], enumerable: true }; if (desc.value !== undefined) { @@ -1003,17 +1043,8 @@ function formatProperty(ctx, value, recurseTimes, key, array) { if (array === 1) { return str; } - if (typeof key === 'symbol') { - name = `[${ctx.stylize(key.toString(), 'symbol')}]`; - } else if (desc.enumerable === false) { - name = `[${key}]`; - } else if (keyStrRegExp.test(key)) { - name = ctx.stylize(key, 'name'); - } else { - name = ctx.stylize(strEscape(key), 'string'); - } - return `${name}: ${str}`; + return `${formatKey(ctx, key, desc.enumerable)}: ${str}`; } function reduceToSingleString(ctx, output, base, braces, addLn) { diff --git a/test/parallel/test-util-inspect-namespace.js b/test/parallel/test-util-inspect-namespace.js new file mode 100644 index 00000000000000..fddbcdb34697d9 --- /dev/null +++ b/test/parallel/test-util-inspect-namespace.js @@ -0,0 +1,22 @@ +'use strict'; + +// Flags: --experimental-vm-modules + +const common = require('../common'); +const assert = require('assert'); + +common.crashOnUnhandledRejection(); + +const { Module } = require('vm'); +const { inspect } = require('util'); + +(async () => { + const m = new Module('export const a = 1; export var b = 2'); + await m.link(() => 0); + m.instantiate(); + assert.strictEqual( + inspect(m.namespace), + '[Module] { a: , b: undefined }'); + await m.evaluate(); + assert.strictEqual(inspect(m.namespace), '[Module] { a: 1, b: 2 }'); +})(); From e7c2616d103b83e9e8d5f0d7b80bad1a87b2a480 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Sat, 19 May 2018 13:59:46 +0200 Subject: [PATCH 173/208] test: mark tests as flaky as intermediate step We have a few http2 issues that are currently resolved. Until they are, just mark these two tests as flaky. PR-URL: https://github.com/nodejs/node/pull/20835 Reviewed-By: Anatoli Papirovski Reviewed-By: Gireesh Punathil --- test/parallel/parallel.status | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status index 899e6adfac060d..2bd5db83889740 100644 --- a/test/parallel/parallel.status +++ b/test/parallel/parallel.status @@ -8,6 +8,12 @@ prefix parallel # Postmortem debugging data is prone to accidental removal during V8 updates. test-postmortem-metadata: PASS,FLAKY +# http2 has a few bugs that make these tests flaky and that are currently worked +# on. +test-http2-client-upload-reject: PASS,FLAKY +test-http2-pipe: PASS,FLAKY +test-http2-client-upload: PASS,FLAKY + [$system==win32] [$system==linux] From 5ffce3ef0666761904024637e3a6b11fa0aeeca9 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 14 May 2018 14:30:24 +0200 Subject: [PATCH 174/208] test: remove untested knownGlobals These values are all non-enumerable and will never be checked. By removing them, we make sure they will not become enumerable unnoticed. PR-URL: https://github.com/nodejs/node/pull/20717 Reviewed-By: James M Snell Reviewed-By: Matteo Collina --- test/common/index.js | 25 ------------------------- test/common/index.mjs | 25 ------------------------- test/message/console_low_stack_space.js | 9 ++++++--- 3 files changed, 6 insertions(+), 53 deletions(-) diff --git a/test/common/index.js b/test/common/index.js index 07c0992d65e8d2..743bf15fb8301d 100644 --- a/test/common/index.js +++ b/test/common/index.js @@ -310,8 +310,6 @@ let knownGlobals = [ clearImmediate, clearInterval, clearTimeout, - console, - constructor, // Enumerable in V8 3.21. global, process, setImmediate, @@ -341,29 +339,6 @@ if (global.COUNTER_NET_SERVER_CONNECTION) { knownGlobals.push(COUNTER_HTTP_CLIENT_RESPONSE); } -if (global.ArrayBuffer) { - knownGlobals.push(ArrayBuffer); - knownGlobals.push(Int8Array); - knownGlobals.push(Uint8Array); - knownGlobals.push(Uint8ClampedArray); - knownGlobals.push(Int16Array); - knownGlobals.push(Uint16Array); - knownGlobals.push(Int32Array); - knownGlobals.push(Uint32Array); - knownGlobals.push(Float32Array); - knownGlobals.push(Float64Array); - knownGlobals.push(DataView); -} - -// Harmony features. -if (global.Proxy) { - knownGlobals.push(Proxy); -} - -if (global.Symbol) { - knownGlobals.push(Symbol); -} - if (process.env.NODE_TEST_KNOWN_GLOBALS) { const knownFromEnv = process.env.NODE_TEST_KNOWN_GLOBALS.split(','); allowGlobals(...knownFromEnv); diff --git a/test/common/index.mjs b/test/common/index.mjs index 49b9e56bd9a10b..dd4ee2146e0720 100644 --- a/test/common/index.mjs +++ b/test/common/index.mjs @@ -8,8 +8,6 @@ let knownGlobals = [ clearImmediate, clearInterval, clearTimeout, - console, - constructor, // Enumerable in V8 3.21. global, process, setImmediate, @@ -50,29 +48,6 @@ export function leakedGlobals() { knownGlobals.push(COUNTER_HTTP_CLIENT_RESPONSE); } - if (global.ArrayBuffer) { - knownGlobals.push(ArrayBuffer); - knownGlobals.push(Int8Array); - knownGlobals.push(Uint8Array); - knownGlobals.push(Uint8ClampedArray); - knownGlobals.push(Int16Array); - knownGlobals.push(Uint16Array); - knownGlobals.push(Int32Array); - knownGlobals.push(Uint32Array); - knownGlobals.push(Float32Array); - knownGlobals.push(Float64Array); - knownGlobals.push(DataView); - } - - // Harmony features. - if (global.Proxy) { - knownGlobals.push(Proxy); - } - - if (global.Symbol) { - knownGlobals.push(Symbol); - } - const leaked = []; for (const val in global) { diff --git a/test/message/console_low_stack_space.js b/test/message/console_low_stack_space.js index 9128eb49d120e0..4834ffd9cd0b36 100644 --- a/test/message/console_low_stack_space.js +++ b/test/message/console_low_stack_space.js @@ -1,8 +1,11 @@ 'use strict'; -// copy console accessor because requiring ../common touches it +// Copy console accessor because requiring ../common touches it const consoleDescriptor = Object.getOwnPropertyDescriptor(global, 'console'); -delete global.console; -global.console = {}; +Object.defineProperty(global, 'console', { + configurable: true, + writable: true, + value: {} +}); require('../common'); From ada41b02c5ace81d1b4e81ca2d01f7f1e6d2eed8 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 14 May 2018 14:51:50 +0200 Subject: [PATCH 175/208] repl: make console, module and require non-enumerable This aligns these globals with the regular context. PR-URL: https://github.com/nodejs/node/pull/20717 Reviewed-By: James M Snell Reviewed-By: Matteo Collina --- lib/repl.js | 15 +++++-- test/parallel/test-repl-console.js | 44 ------------------- test/parallel/test-repl-context.js | 39 +++++++++------- ...test-repl-function-definition-edge-case.js | 4 +- test/parallel/test-repl-let-process.js | 2 - test/parallel/test-repl-mode.js | 4 +- test/parallel/test-repl-options.js | 2 - test/parallel/test-repl-reset-event.js | 1 - 8 files changed, 36 insertions(+), 75 deletions(-) delete mode 100644 test/parallel/test-repl-console.js diff --git a/lib/repl.js b/lib/repl.js index 928e7c6d69cfae..9935d60fa73e03 100644 --- a/lib/repl.js +++ b/lib/repl.js @@ -793,7 +793,7 @@ REPLServer.prototype.createContext = function() { const _console = new Console(this.outputStream); Object.defineProperty(context, 'console', { configurable: true, - enumerable: true, + writable: true, value: _console }); @@ -813,9 +813,16 @@ REPLServer.prototype.createContext = function() { module.paths = CJSModule._resolveLookupPaths('', parentModule, true) || []; - var require = makeRequireFunction(module); - context.module = module; - context.require = require; + Object.defineProperty(context, 'module', { + configurable: true, + writable: true, + value: module + }); + Object.defineProperty(context, 'require', { + configurable: true, + writable: true, + value: makeRequireFunction(module) + }); addBuiltinLibsToObject(context); diff --git a/test/parallel/test-repl-console.js b/test/parallel/test-repl-console.js deleted file mode 100644 index 94547e4768bb76..00000000000000 --- a/test/parallel/test-repl-console.js +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright Joyent, Inc. and other Node 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. - -'use strict'; -const common = require('../common'); -const assert = require('assert'); -const repl = require('repl'); - -// Create a dummy stream that does nothing -const stream = new common.ArrayStream(); - -const r = repl.start({ - input: stream, - output: stream, - useGlobal: false -}); - - -// ensure that the repl context gets its own "console" instance -assert(r.context.console); - -// ensure that the repl console instance is not the global one -assert.notStrictEqual(r.context.console, console); - -// ensure that the repl console instance does not have a setter -assert.throws(() => r.context.console = 'foo', TypeError); diff --git a/test/parallel/test-repl-context.js b/test/parallel/test-repl-context.js index 9d18067bc2aca4..914aa563bd50fb 100644 --- a/test/parallel/test-repl-context.js +++ b/test/parallel/test-repl-context.js @@ -4,32 +4,39 @@ const assert = require('assert'); const repl = require('repl'); const vm = require('vm'); -// Create a dummy stream that does nothing +// Create a dummy stream that does nothing. const stream = new common.ArrayStream(); -// Test when useGlobal is false -testContext(repl.start({ - input: stream, - output: stream, - useGlobal: false -})); +// Test context when useGlobal is false. +{ + const r = repl.start({ + input: stream, + output: stream, + useGlobal: false + }); -function testContext(repl) { - const context = repl.createContext(); - // ensure that the repl context gets its own "console" instance + // Ensure that the repl context gets its own "console" instance. + assert(r.context.console); + + // Ensure that the repl console instance is not the global one. + assert.notStrictEqual(r.context.console, console); + + const context = r.createContext(); + // Ensure that the repl context gets its own "console" instance. assert(context.console instanceof require('console').Console); - // ensure that the repl's global property is the context + // Ensure that the repl's global property is the context. assert.strictEqual(context.global, context); - // ensure that the repl console instance does not have a setter - assert.throws(() => context.console = 'foo', TypeError); - repl.close(); + // Ensure that the repl console instance is writable. + context.console = 'foo'; + r.close(); } -testContextSideEffects(repl.start({ input: stream, output: stream })); +// Test for context side effects. +{ + const server = repl.start({ input: stream, output: stream }); -function testContextSideEffects(server) { assert.ok(!server.underscoreAssigned); assert.strictEqual(server.lines.length, 0); diff --git a/test/parallel/test-repl-function-definition-edge-case.js b/test/parallel/test-repl-function-definition-edge-case.js index 1e3063e3db53ff..952fba4103cc26 100644 --- a/test/parallel/test-repl-function-definition-edge-case.js +++ b/test/parallel/test-repl-function-definition-edge-case.js @@ -1,12 +1,10 @@ // Reference: https://github.com/nodejs/node/pull/7624 'use strict'; -const common = require('../common'); +require('../common'); const assert = require('assert'); const repl = require('repl'); const stream = require('stream'); -common.globalCheck = false; - const r = initRepl(); r.input.emit('data', 'function a() { return 42; } (1)\n'); diff --git a/test/parallel/test-repl-let-process.js b/test/parallel/test-repl-let-process.js index 3e6c3e85665be1..dd8fa60f463d8b 100644 --- a/test/parallel/test-repl-let-process.js +++ b/test/parallel/test-repl-let-process.js @@ -2,8 +2,6 @@ const common = require('../common'); const repl = require('repl'); -common.globalCheck = false; - // Regression test for https://github.com/nodejs/node/issues/6802 const input = new common.ArrayStream(); repl.start({ input, output: process.stdout, useGlobal: true }); diff --git a/test/parallel/test-repl-mode.js b/test/parallel/test-repl-mode.js index 60b430d8c7ee31..df84d86a3c8dc3 100644 --- a/test/parallel/test-repl-mode.js +++ b/test/parallel/test-repl-mode.js @@ -1,11 +1,9 @@ 'use strict'; -const common = require('../common'); +require('../common'); const assert = require('assert'); const Stream = require('stream'); const repl = require('repl'); -common.globalCheck = false; - const tests = [ testSloppyMode, testStrictMode, diff --git a/test/parallel/test-repl-options.js b/test/parallel/test-repl-options.js index 6bd908aadf935d..1de49c8e861391 100644 --- a/test/parallel/test-repl-options.js +++ b/test/parallel/test-repl-options.js @@ -24,8 +24,6 @@ const common = require('../common'); const assert = require('assert'); const repl = require('repl'); -common.globalCheck = false; - // Create a dummy stream that does nothing const stream = new common.ArrayStream(); diff --git a/test/parallel/test-repl-reset-event.js b/test/parallel/test-repl-reset-event.js index 83ab7fd6a3ec52..4b3a04aeeb88c5 100644 --- a/test/parallel/test-repl-reset-event.js +++ b/test/parallel/test-repl-reset-event.js @@ -21,7 +21,6 @@ 'use strict'; const common = require('../common'); -common.globalCheck = false; const assert = require('assert'); const repl = require('repl'); From 22f46e7766815aa500c38c41e28b5c3824879a4f Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Mon, 14 May 2018 16:16:33 +0200 Subject: [PATCH 176/208] test: remove common.globalCheck This flag is partially used in tests where it was not necessary and it is always possible to replace this flag with `common.allowGlobals`. This makes sure all globals are truly tested for. PR-URL: https://github.com/nodejs/node/pull/20717 Reviewed-By: James M Snell Reviewed-By: Matteo Collina --- test/common/README.md | 5 ----- test/common/index.js | 6 ------ test/common/index.mjs | 4 ---- test/parallel/test-domain-crypto.js | 2 +- test/parallel/test-global.js | 2 +- test/parallel/test-repl-autolibs.js | 4 +--- test/parallel/test-repl-envvars.js | 5 +---- test/parallel/test-repl-history-perm.js | 3 --- test/parallel/test-repl-persistent-history.js | 3 --- test/parallel/test-repl-reset-event.js | 2 ++ test/parallel/test-repl-use-global.js | 3 --- test/parallel/test-repl.js | 3 +-- test/parallel/test-require-deps-deprecation.js | 5 +++-- test/parallel/test-timer-immediate.js | 2 +- test/parallel/test-vm-new-script-this-context.js | 10 ++++++++-- test/parallel/test-vm-run-in-new-context.js | 9 +++++++-- test/parallel/test-vm-static-this.js | 9 +++++++-- 17 files changed, 33 insertions(+), 44 deletions(-) diff --git a/test/common/README.md b/test/common/README.md index 08d7bbb762fbb4..111ce45b00360c 100644 --- a/test/common/README.md +++ b/test/common/README.md @@ -150,11 +150,6 @@ Attempts to get a valid TTY file descriptor. Returns `-1` if it fails. The TTY file descriptor is assumed to be capable of being writable. -### globalCheck -* [<boolean>] - -Set to `false` if the test should not check for global leaks. - ### hasCrypto * [<boolean>] diff --git a/test/common/index.js b/test/common/index.js index 743bf15fb8301d..85d11ec093414c 100644 --- a/test/common/index.js +++ b/test/common/index.js @@ -366,21 +366,15 @@ function leakedGlobals() { } exports.leakedGlobals = leakedGlobals; -// Turn this off if the test should not check for global leaks. -exports.globalCheck = true; - process.on('exit', function() { - if (!exports.globalCheck) return; const leaked = leakedGlobals(); if (leaked.length > 0) { assert.fail(`Unexpected global(s) found: ${leaked.join(', ')}`); } }); - const mustCallChecks = []; - function runCallChecks(exitCode) { if (exitCode !== 0) return; diff --git a/test/common/index.mjs b/test/common/index.mjs index dd4ee2146e0720..b7ac556bca52c3 100644 --- a/test/common/index.mjs +++ b/test/common/index.mjs @@ -63,11 +63,7 @@ export function leakedGlobals() { } } -// Turn this off if the test should not check for global leaks. -export let globalCheck = true; // eslint-disable-line - process.on('exit', function() { - if (!globalCheck) return; const leaked = leakedGlobals(); if (leaked.length > 0) { assert.fail(`Unexpected global(s) found: ${leaked.join(', ')}`); diff --git a/test/parallel/test-domain-crypto.js b/test/parallel/test-domain-crypto.js index 3890a7b4641ade..26ee6b888efb2d 100644 --- a/test/parallel/test-domain-crypto.js +++ b/test/parallel/test-domain-crypto.js @@ -29,7 +29,7 @@ if (!common.hasCrypto) const crypto = require('crypto'); // Pollution of global is intentional as part of test. -common.globalCheck = false; +common.allowGlobals(require('domain')); // See https://github.com/nodejs/node/commit/d1eff9ab global.domain = require('domain'); diff --git a/test/parallel/test-global.js b/test/parallel/test-global.js index 46db72eeceb586..b139a6287488d2 100644 --- a/test/parallel/test-global.js +++ b/test/parallel/test-global.js @@ -28,7 +28,7 @@ const fixtures = require('../common/fixtures'); const assert = require('assert'); -common.globalCheck = false; +common.allowGlobals('bar', 'foo'); baseFoo = 'foo'; // eslint-disable-line no-undef global.baseBar = 'bar'; diff --git a/test/parallel/test-repl-autolibs.js b/test/parallel/test-repl-autolibs.js index 52234deb5e732e..024dd971bf44e1 100644 --- a/test/parallel/test-repl-autolibs.js +++ b/test/parallel/test-repl-autolibs.js @@ -25,9 +25,6 @@ const assert = require('assert'); const util = require('util'); const repl = require('repl'); -// This test adds global variables -common.globalCheck = false; - const putIn = new common.ArrayStream(); repl.start('', putIn, null, true); @@ -65,6 +62,7 @@ function test2() { }; const val = {}; global.url = val; + common.allowGlobals(val); assert(!gotWrite); putIn.run(['url']); assert(gotWrite); diff --git a/test/parallel/test-repl-envvars.js b/test/parallel/test-repl-envvars.js index d29e7b3574c1f2..d6a45a664fa3b7 100644 --- a/test/parallel/test-repl-envvars.js +++ b/test/parallel/test-repl-envvars.js @@ -2,7 +2,7 @@ // Flags: --expose-internals -const common = require('../common'); +require('../common'); const stream = require('stream'); const REPL = require('internal/repl'); const assert = require('assert'); @@ -47,9 +47,6 @@ function run(test) { REPL.createInternalRepl(env, opts, function(err, repl) { assert.ifError(err); - // The REPL registers 'module' and 'require' globals - common.allowGlobals(repl.context.module, repl.context.require); - assert.strictEqual(expected.terminal, repl.terminal, `Expected ${inspect(expected)} with ${inspect(env)}`); assert.strictEqual(expected.useColors, repl.useColors, diff --git a/test/parallel/test-repl-history-perm.js b/test/parallel/test-repl-history-perm.js index b125fa551dc858..03ce1435d9ba4e 100644 --- a/test/parallel/test-repl-history-perm.js +++ b/test/parallel/test-repl-history-perm.js @@ -38,9 +38,6 @@ const replHistoryPath = path.join(tmpdir.path, '.node_repl_history'); const checkResults = common.mustCall(function(err, r) { assert.ifError(err); - // The REPL registers 'module' and 'require' globals - common.allowGlobals(r.context.module, r.context.require); - r.input.end(); const stat = fs.statSync(replHistoryPath); const fileMode = stat.mode & 0o777; diff --git a/test/parallel/test-repl-persistent-history.js b/test/parallel/test-repl-persistent-history.js index 4d0330272ab3c6..bb10085eccfcf6 100644 --- a/test/parallel/test-repl-persistent-history.js +++ b/test/parallel/test-repl-persistent-history.js @@ -216,9 +216,6 @@ function runTest(assertCleaned) { throw err; } - // The REPL registers 'module' and 'require' globals - common.allowGlobals(repl.context.module, repl.context.require); - repl.once('close', () => { if (repl._flushing) { repl.once('flushHistory', onClose); diff --git a/test/parallel/test-repl-reset-event.js b/test/parallel/test-repl-reset-event.js index 4b3a04aeeb88c5..96d1d199af34c9 100644 --- a/test/parallel/test-repl-reset-event.js +++ b/test/parallel/test-repl-reset-event.js @@ -26,6 +26,8 @@ const assert = require('assert'); const repl = require('repl'); const util = require('util'); +common.allowGlobals(42); + // Create a dummy stream that does nothing const dummy = new common.ArrayStream(); diff --git a/test/parallel/test-repl-use-global.js b/test/parallel/test-repl-use-global.js index c76505272b2682..947adc7f255035 100644 --- a/test/parallel/test-repl-use-global.js +++ b/test/parallel/test-repl-use-global.js @@ -18,9 +18,6 @@ const globalTest = (useGlobal, cb, output) => (err, repl) => { if (err) return cb(err); - // The REPL registers 'module' and 'require' globals - common.allowGlobals(repl.context.module, repl.context.require); - let str = ''; output.on('data', (data) => (str += data)); global.lunch = 'tacos'; diff --git a/test/parallel/test-repl.js b/test/parallel/test-repl.js index b9c92c3cd63bc0..9aaf366c6807f0 100644 --- a/test/parallel/test-repl.js +++ b/test/parallel/test-repl.js @@ -26,7 +26,6 @@ const assert = require('assert'); const net = require('net'); const repl = require('repl'); -common.globalCheck = false; common.crashOnUnhandledRejection(); const message = 'Read, Eval, Print Loop'; @@ -41,7 +40,6 @@ global.invoke_me = function(arg) { return `invoked ${arg}`; }; - // Helpers for describing the expected output: const kArrow = /^ *\^+ *$/; // Arrow of ^ pointing to syntax error location const kSource = Symbol('kSource'); // Placeholder standing for input readback @@ -779,6 +777,7 @@ const tcpTests = [ socket.end(); } + common.allowGlobals(...Object.values(global)); })(); function startTCPRepl() { diff --git a/test/parallel/test-require-deps-deprecation.js b/test/parallel/test-require-deps-deprecation.js index 24a2e86e6a42ee..80bf66d7f6b74f 100644 --- a/test/parallel/test-require-deps-deprecation.js +++ b/test/parallel/test-require-deps-deprecation.js @@ -2,8 +2,6 @@ const common = require('../common'); const assert = require('assert'); -// The v8 modules when imported leak globals. Disable global check. -common.globalCheck = false; const deprecatedModules = [ 'node-inspect/lib/_inspect', @@ -53,3 +51,6 @@ for (const m of deps) { } assert.notStrictEqual(path, m); } + +// The V8 modules add the WebInspector to the globals. +common.allowGlobals(global.WebInspector); diff --git a/test/parallel/test-timer-immediate.js b/test/parallel/test-timer-immediate.js index 385fa4baca4ee5..b0f52db1b713d3 100644 --- a/test/parallel/test-timer-immediate.js +++ b/test/parallel/test-timer-immediate.js @@ -1,5 +1,5 @@ 'use strict'; const common = require('../common'); -common.globalCheck = false; global.process = {}; // Boom! +common.allowGlobals(global.process); setImmediate(common.mustCall()); diff --git a/test/parallel/test-vm-new-script-this-context.js b/test/parallel/test-vm-new-script-this-context.js index 6da47e67249c2b..2c0c21690e1821 100644 --- a/test/parallel/test-vm-new-script-this-context.js +++ b/test/parallel/test-vm-new-script-this-context.js @@ -24,8 +24,6 @@ const common = require('../common'); const assert = require('assert'); const Script = require('vm').Script; -common.globalCheck = false; - // Run a string let script = new Script('\'passed\';'); const result = script.runInThisContext(script); @@ -60,3 +58,11 @@ global.f = function() { global.foo = 100; }; script = new Script('f()'); script.runInThisContext(script); assert.strictEqual(100, global.foo); + +common.allowGlobals( + global.hello, + global.code, + global.foo, + global.obj, + global.f +); diff --git a/test/parallel/test-vm-run-in-new-context.js b/test/parallel/test-vm-run-in-new-context.js index 1edb061ea6a871..e844cd6816bba3 100644 --- a/test/parallel/test-vm-run-in-new-context.js +++ b/test/parallel/test-vm-run-in-new-context.js @@ -29,8 +29,6 @@ const vm = require('vm'); assert.strictEqual(typeof global.gc, 'function', 'Run this test with --expose-gc'); -common.globalCheck = false; - // Run a string const result = vm.runInNewContext('\'passed\';'); assert.strictEqual(result, 'passed'); @@ -93,3 +91,10 @@ fn(); return true; }); } + +common.allowGlobals( + global.hello, + global.code, + global.foo, + global.obj +); diff --git a/test/parallel/test-vm-static-this.js b/test/parallel/test-vm-static-this.js index 5306e31dc0e4a7..d4530604dc06f0 100644 --- a/test/parallel/test-vm-static-this.js +++ b/test/parallel/test-vm-static-this.js @@ -24,8 +24,6 @@ const common = require('../common'); const assert = require('assert'); const vm = require('vm'); -common.globalCheck = false; - // Run a string const result = vm.runInThisContext('\'passed\';'); assert.strictEqual('passed', result); @@ -58,3 +56,10 @@ assert.strictEqual(1, global.foo); global.f = function() { global.foo = 100; }; vm.runInThisContext('f()'); assert.strictEqual(100, global.foo); + +common.allowGlobals( + global.hello, + global.foo, + global.obj, + global.f +); From 2e9957641e2cd388cbc226596624cb2713caaf63 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Tue, 15 May 2018 23:31:58 -0700 Subject: [PATCH 177/208] perf_hooks: always set bootstrapComplete PR-URL: https://github.com/nodejs/node/pull/20768 Reviewed-By: Ruben Bridgewater Reviewed-By: Colin Ihrig --- lib/internal/bootstrap/node.js | 9 +++++++-- test/sequential/test-performance.js | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 51a60bc0d8a344..4d95529c4b58e6 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -157,12 +157,12 @@ // To allow people to extend Node in different ways, this hook allows // one to drop a file lib/_third_party_main.js into the build // directory which will be executed instead of Node's normal loading. + perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); process.nextTick(function() { perf.markMilestone(NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_START); NativeModule.require('_third_party_main'); perf.markMilestone(NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_END); }); - } else if (process.argv[1] === 'inspect' || process.argv[1] === 'debug') { if (process.argv[1] === 'debug') { process.emitWarning( @@ -171,13 +171,14 @@ } // Start the debugger agent. + perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); process.nextTick(function() { NativeModule.require('internal/deps/node-inspect/lib/_inspect').start(); }); } else if (process.profProcess) { + perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); NativeModule.require('internal/v8_prof_processor'); - } else { // There is user code to be run. @@ -208,6 +209,7 @@ addBuiltinLibsToObject } = NativeModule.require('internal/modules/cjs/helpers'); addBuiltinLibsToObject(global); + perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); evalScript('[eval]'); } else if (process.argv[1] && process.argv[1] !== '-') { perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START); @@ -232,6 +234,7 @@ checkScriptSyntax(source, filename); process.exit(0); } + perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); CJSModule.runMain(); } else { perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START); @@ -262,6 +265,7 @@ if (process._eval != null) { // User passed '-e' or '--eval' + perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); evalScript('[eval]'); } } else { @@ -278,6 +282,7 @@ checkScriptSyntax(code, '[stdin]'); } else { process._eval = code; + perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); evalScript('[stdin]'); } }); diff --git a/test/sequential/test-performance.js b/test/sequential/test-performance.js index c26a7df7616025..c5065227a6a410 100644 --- a/test/sequential/test-performance.js +++ b/test/sequential/test-performance.js @@ -74,7 +74,7 @@ checkNodeTiming({ duration: { around: performance.now() }, nodeStart: { around: 0 }, v8Start: { around: 0 }, - bootstrapComplete: -1, + bootstrapComplete: { around: inited }, environment: { around: 0 }, loopStart: -1, loopExit: -1, From 36d4a42e353d7772f3083653026729fe6eaf9160 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Wed, 16 May 2018 13:05:02 -0700 Subject: [PATCH 178/208] src: move CallbackScope to separate cc/h PR-URL: https://github.com/nodejs/node/pull/20789 Reviewed-By: Anna Henningsen Reviewed-By: Daniel Bevenius Reviewed-By: Gus Caplan Reviewed-By: Tiancheng "Timothy" Gu --- node.gyp | 2 + src/callback_scope.cc | 126 ++++++++++++++++++++++++++++++++++++++++++ src/callback_scope.h | 56 +++++++++++++++++++ src/node.cc | 111 ------------------------------------- src/node.h | 37 +------------ 5 files changed, 185 insertions(+), 147 deletions(-) create mode 100644 src/callback_scope.cc create mode 100644 src/callback_scope.h diff --git a/node.gyp b/node.gyp index 66bd10827200d8..6bd95c9954b96a 100644 --- a/node.gyp +++ b/node.gyp @@ -302,6 +302,7 @@ 'sources': [ 'src/async_wrap.cc', + 'src/callback_scope.cc', 'src/cares_wrap.cc', 'src/connection_wrap.cc', 'src/connect_wrap.cc', @@ -363,6 +364,7 @@ 'src/async_wrap-inl.h', 'src/base_object.h', 'src/base_object-inl.h', + 'src/callback_scope.h', 'src/connection_wrap.h', 'src/connect_wrap.h', 'src/env.h', diff --git a/src/callback_scope.cc b/src/callback_scope.cc new file mode 100644 index 00000000000000..5539d77c70cb4e --- /dev/null +++ b/src/callback_scope.cc @@ -0,0 +1,126 @@ +#include "node.h" +#include "callback_scope.h" +#include "async_wrap.h" +#include "async_wrap-inl.h" +#include "env.h" +#include "env-inl.h" +#include "v8.h" + +namespace node { + +using v8::HandleScope; +using v8::Isolate; +using v8::Local; +using v8::Object; + +using AsyncHooks = Environment::AsyncHooks; + +CallbackScope::CallbackScope(Isolate* isolate, + Local object, + async_context asyncContext) + : private_(new InternalCallbackScope(Environment::GetCurrent(isolate), + object, + asyncContext)), + try_catch_(isolate) { + try_catch_.SetVerbose(true); +} + +CallbackScope::~CallbackScope() { + if (try_catch_.HasCaught()) + private_->MarkAsFailed(); + delete private_; +} + +InternalCallbackScope::InternalCallbackScope(AsyncWrap* async_wrap) + : InternalCallbackScope(async_wrap->env(), + async_wrap->object(), + { async_wrap->get_async_id(), + async_wrap->get_trigger_async_id() }) {} + +InternalCallbackScope::InternalCallbackScope(Environment* env, + Local object, + const async_context& asyncContext, + ResourceExpectation expect) + : env_(env), + async_context_(asyncContext), + object_(object), + callback_scope_(env) { + if (expect == kRequireResource) { + CHECK(!object.IsEmpty()); + } + + if (!env->can_call_into_js()) { + failed_ = true; + return; + } + + HandleScope handle_scope(env->isolate()); + // If you hit this assertion, you forgot to enter the v8::Context first. + CHECK_EQ(Environment::GetCurrent(env->isolate()), env); + + if (asyncContext.async_id != 0) { + // No need to check a return value because the application will exit if + // an exception occurs. + AsyncWrap::EmitBefore(env, asyncContext.async_id); + } + + if (!IsInnerMakeCallback()) { + env->tick_info()->set_has_thrown(false); + } + + env->async_hooks()->push_async_ids(async_context_.async_id, + async_context_.trigger_async_id); + pushed_ids_ = true; +} + +InternalCallbackScope::~InternalCallbackScope() { + Close(); +} + +void InternalCallbackScope::Close() { + if (closed_) return; + closed_ = true; + HandleScope handle_scope(env_->isolate()); + + if (pushed_ids_) + env_->async_hooks()->pop_async_id(async_context_.async_id); + + if (failed_) return; + + if (async_context_.async_id != 0) { + AsyncWrap::EmitAfter(env_, async_context_.async_id); + } + + if (IsInnerMakeCallback()) { + return; + } + + Environment::TickInfo* tick_info = env_->tick_info(); + + if (!env_->can_call_into_js()) return; + if (!tick_info->has_scheduled()) { + env_->isolate()->RunMicrotasks(); + } + + // Make sure the stack unwound properly. If there are nested MakeCallback's + // then it should return early and not reach this code. + if (env_->async_hooks()->fields()[AsyncHooks::kTotals]) { + CHECK_EQ(env_->execution_async_id(), 0); + CHECK_EQ(env_->trigger_async_id(), 0); + } + + if (!tick_info->has_scheduled() && !tick_info->has_promise_rejections()) { + return; + } + + Local process = env_->process_object(); + + if (!env_->can_call_into_js()) return; + + if (env_->tick_callback_function()->Call(process, 0, nullptr).IsEmpty()) { + env_->tick_info()->set_has_thrown(true); + failed_ = true; + } +} + +} // namespace node diff --git a/src/callback_scope.h b/src/callback_scope.h new file mode 100644 index 00000000000000..11fee0dd57ac81 --- /dev/null +++ b/src/callback_scope.h @@ -0,0 +1,56 @@ +#ifndef SRC_CALLBACK_SCOPE_H_ +#define SRC_CALLBACK_SCOPE_H_ + +#ifdef _WIN32 +# ifndef BUILDING_NODE_EXTENSION +# define NODE_EXTERN __declspec(dllexport) +# else +# define NODE_EXTERN __declspec(dllimport) +# endif +#else +# define NODE_EXTERN /* nothing */ +#endif + +#include "v8.h" + +namespace node { + +typedef double async_id; +struct async_context { + ::node::async_id async_id; + ::node::async_id trigger_async_id; +}; + +class InternalCallbackScope; + +/* This class works like `MakeCallback()` in that it sets up a specific + * asyncContext as the current one and informs the async_hooks and domains + * modules that this context is currently active. + * + * `MakeCallback()` is a wrapper around this class as well as + * `Function::Call()`. Either one of these mechanisms needs to be used for + * top-level calls into JavaScript (i.e. without any existing JS stack). + * + * This object should be stack-allocated to ensure that it is contained in a + * valid HandleScope. + */ +class NODE_EXTERN CallbackScope { + public: + CallbackScope(v8::Isolate* isolate, + v8::Local resource, + async_context asyncContext); + ~CallbackScope(); + + private: + InternalCallbackScope* private_; + v8::TryCatch try_catch_; + + void operator=(const CallbackScope&) = delete; + void operator=(CallbackScope&&) = delete; + CallbackScope(const CallbackScope&) = delete; + CallbackScope(CallbackScope&&) = delete; +}; + +} // namespace node + +#endif // SRC_CALLBACK_SCOPE_H_ diff --git a/src/node.cc b/src/node.cc index e6c221a948adaa..154cbf1c801ea0 100644 --- a/src/node.cc +++ b/src/node.cc @@ -169,8 +169,6 @@ using v8::Undefined; using v8::V8; using v8::Value; -using AsyncHooks = Environment::AsyncHooks; - static Mutex process_mutex; static Mutex environ_mutex; @@ -923,115 +921,6 @@ void RemoveEnvironmentCleanupHook(v8::Isolate* isolate, env->RemoveCleanupHook(fun, arg); } - -CallbackScope::CallbackScope(Isolate* isolate, - Local object, - async_context asyncContext) - : private_(new InternalCallbackScope(Environment::GetCurrent(isolate), - object, - asyncContext)), - try_catch_(isolate) { - try_catch_.SetVerbose(true); -} - -CallbackScope::~CallbackScope() { - if (try_catch_.HasCaught()) - private_->MarkAsFailed(); - delete private_; -} - -InternalCallbackScope::InternalCallbackScope(AsyncWrap* async_wrap) - : InternalCallbackScope(async_wrap->env(), - async_wrap->object(), - { async_wrap->get_async_id(), - async_wrap->get_trigger_async_id() }) {} - -InternalCallbackScope::InternalCallbackScope(Environment* env, - Local object, - const async_context& asyncContext, - ResourceExpectation expect) - : env_(env), - async_context_(asyncContext), - object_(object), - callback_scope_(env) { - if (expect == kRequireResource) { - CHECK(!object.IsEmpty()); - } - - if (!env->can_call_into_js()) { - failed_ = true; - return; - } - - HandleScope handle_scope(env->isolate()); - // If you hit this assertion, you forgot to enter the v8::Context first. - CHECK_EQ(Environment::GetCurrent(env->isolate()), env); - - if (asyncContext.async_id != 0) { - // No need to check a return value because the application will exit if - // an exception occurs. - AsyncWrap::EmitBefore(env, asyncContext.async_id); - } - - if (!IsInnerMakeCallback()) { - env->tick_info()->set_has_thrown(false); - } - - env->async_hooks()->push_async_ids(async_context_.async_id, - async_context_.trigger_async_id); - pushed_ids_ = true; -} - -InternalCallbackScope::~InternalCallbackScope() { - Close(); -} - -void InternalCallbackScope::Close() { - if (closed_) return; - closed_ = true; - HandleScope handle_scope(env_->isolate()); - - if (pushed_ids_) - env_->async_hooks()->pop_async_id(async_context_.async_id); - - if (failed_) return; - - if (async_context_.async_id != 0) { - AsyncWrap::EmitAfter(env_, async_context_.async_id); - } - - if (IsInnerMakeCallback()) { - return; - } - - Environment::TickInfo* tick_info = env_->tick_info(); - - if (!env_->can_call_into_js()) return; - if (!tick_info->has_scheduled()) { - env_->isolate()->RunMicrotasks(); - } - - // Make sure the stack unwound properly. If there are nested MakeCallback's - // then it should return early and not reach this code. - if (env_->async_hooks()->fields()[AsyncHooks::kTotals]) { - CHECK_EQ(env_->execution_async_id(), 0); - CHECK_EQ(env_->trigger_async_id(), 0); - } - - if (!tick_info->has_scheduled() && !tick_info->has_promise_rejections()) { - return; - } - - Local process = env_->process_object(); - - if (!env_->can_call_into_js()) return; - - if (env_->tick_callback_function()->Call(process, 0, nullptr).IsEmpty()) { - env_->tick_info()->set_has_thrown(true); - failed_ = true; - } -} - MaybeLocal InternalMakeCallback(Environment* env, Local recv, const Local callback, diff --git a/src/node.h b/src/node.h index 44c89afdb7134c..e10e393cd64d4b 100644 --- a/src/node.h +++ b/src/node.h @@ -63,6 +63,7 @@ #include "v8.h" // NOLINT(build/include_order) #include "v8-platform.h" // NOLINT(build/include_order) #include "node_version.h" // NODE_MODULE_VERSION +#include "callback_scope.h" #define NODE_MAKE_VERSION(major, minor, patch) \ ((major) * 0x1000 + (minor) * 0x100 + (patch)) @@ -593,12 +594,6 @@ typedef void (*promise_hook_func) (v8::PromiseHookType type, v8::Local parent, void* arg); -typedef double async_id; -struct async_context { - ::node::async_id async_id; - ::node::async_id trigger_async_id; -}; - /* Registers an additional v8::PromiseHook wrapper. This API exists because V8 * itself supports only a single PromiseHook. */ NODE_EXTERN void AddPromiseHook(v8::Isolate* isolate, @@ -647,36 +642,6 @@ NODE_EXTERN async_context EmitAsyncInit(v8::Isolate* isolate, NODE_EXTERN void EmitAsyncDestroy(v8::Isolate* isolate, async_context asyncContext); -class InternalCallbackScope; - -/* This class works like `MakeCallback()` in that it sets up a specific - * asyncContext as the current one and informs the async_hooks and domains - * modules that this context is currently active. - * - * `MakeCallback()` is a wrapper around this class as well as - * `Function::Call()`. Either one of these mechanisms needs to be used for - * top-level calls into JavaScript (i.e. without any existing JS stack). - * - * This object should be stack-allocated to ensure that it is contained in a - * valid HandleScope. - */ -class NODE_EXTERN CallbackScope { - public: - CallbackScope(v8::Isolate* isolate, - v8::Local resource, - async_context asyncContext); - ~CallbackScope(); - - private: - InternalCallbackScope* private_; - v8::TryCatch try_catch_; - - void operator=(const CallbackScope&) = delete; - void operator=(CallbackScope&&) = delete; - CallbackScope(const CallbackScope&) = delete; - CallbackScope(CallbackScope&&) = delete; -}; - /* An API specific to emit before/after callbacks is unnecessary because * MakeCallback will automatically call them for you. * From 08b98d17f1665ea2c6d652983de7b4c954e3c27a Mon Sep 17 00:00:00 2001 From: James M Snell Date: Wed, 16 May 2018 13:21:00 -0700 Subject: [PATCH 179/208] src: fix odd linting issue The prior commit causes a linting issue here. Fix by changing from a struct to a class. PR-URL: https://github.com/nodejs/node/pull/20789 Reviewed-By: Anna Henningsen Reviewed-By: Daniel Bevenius Reviewed-By: Gus Caplan Reviewed-By: Tiancheng "Timothy" Gu --- src/node.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/node.cc b/src/node.cc index 154cbf1c801ea0..3fac1e897a62de 100644 --- a/src/node.cc +++ b/src/node.cc @@ -2077,7 +2077,8 @@ node_module* get_linked_module(const char* name) { return FindModule(modlist_linked, name, NM_F_LINKED); } -struct DLib { +class DLib { + public: #ifdef __POSIX__ static const int kDefaultFlags = RTLD_LAZY; #else @@ -2098,7 +2099,7 @@ struct DLib { #ifndef __POSIX__ uv_lib_t lib_; #endif - + private: DISALLOW_COPY_AND_ASSIGN(DLib); }; From 010ad8c26c86c968d57e10e30e68b746d760682c Mon Sep 17 00:00:00 2001 From: James M Snell Date: Wed, 16 May 2018 14:24:25 -0700 Subject: [PATCH 180/208] src: move *Exceptions out to separate cc/h PR-URL: https://github.com/nodejs/node/pull/20789 Reviewed-By: Anna Henningsen Reviewed-By: Daniel Bevenius Reviewed-By: Gus Caplan Reviewed-By: Tiancheng "Timothy" Gu --- node.gyp | 2 + src/callback_scope.h | 11 +-- src/core.h | 44 +++++++++ src/exceptions.cc | 215 +++++++++++++++++++++++++++++++++++++++++++ src/exceptions.h | 76 +++++++++++++++ src/node.cc | 195 --------------------------------------- src/node.h | 103 +-------------------- 7 files changed, 340 insertions(+), 306 deletions(-) create mode 100644 src/core.h create mode 100644 src/exceptions.cc create mode 100644 src/exceptions.h diff --git a/node.gyp b/node.gyp index 6bd95c9954b96a..a40206944f8780 100644 --- a/node.gyp +++ b/node.gyp @@ -307,6 +307,7 @@ 'src/connection_wrap.cc', 'src/connect_wrap.cc', 'src/env.cc', + 'src/exceptions.cc', 'src/fs_event_wrap.cc', 'src/handle_wrap.cc', 'src/js_stream.cc', @@ -369,6 +370,7 @@ 'src/connect_wrap.h', 'src/env.h', 'src/env-inl.h', + 'src/exceptions.h', 'src/handle_wrap.h', 'src/js_stream.h', 'src/module_wrap.h', diff --git a/src/callback_scope.h b/src/callback_scope.h index 11fee0dd57ac81..7f199aaea228d4 100644 --- a/src/callback_scope.h +++ b/src/callback_scope.h @@ -1,16 +1,7 @@ #ifndef SRC_CALLBACK_SCOPE_H_ #define SRC_CALLBACK_SCOPE_H_ -#ifdef _WIN32 -# ifndef BUILDING_NODE_EXTENSION -# define NODE_EXTERN __declspec(dllexport) -# else -# define NODE_EXTERN __declspec(dllimport) -# endif -#else -# define NODE_EXTERN /* nothing */ -#endif - +#include "core.h" #include "v8.h" namespace node { diff --git a/src/core.h b/src/core.h new file mode 100644 index 00000000000000..0dbce4f3f8f6f9 --- /dev/null +++ b/src/core.h @@ -0,0 +1,44 @@ +#ifndef SRC_CORE_H_ +#define SRC_CORE_H_ + +#ifdef _WIN32 +# ifndef BUILDING_NODE_EXTENSION +# define NODE_EXTERN __declspec(dllexport) +# else +# define NODE_EXTERN __declspec(dllimport) +# endif +#else +# define NODE_EXTERN /* nothing */ +#endif + +#define NODE_MAKE_VERSION(major, minor, patch) \ + ((major) * 0x1000 + (minor) * 0x100 + (patch)) + +#ifdef __clang__ +# define NODE_CLANG_AT_LEAST(major, minor, patch) \ + (NODE_MAKE_VERSION(major, minor, patch) <= \ + NODE_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)) +#else +# define NODE_CLANG_AT_LEAST(major, minor, patch) (0) +#endif + +#ifdef __GNUC__ +# define NODE_GNUC_AT_LEAST(major, minor, patch) \ + (NODE_MAKE_VERSION(major, minor, patch) <= \ + NODE_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)) +#else +# define NODE_GNUC_AT_LEAST(major, minor, patch) (0) +#endif + +#if NODE_CLANG_AT_LEAST(2, 9, 0) || NODE_GNUC_AT_LEAST(4, 5, 0) +# define NODE_DEPRECATED(message, declarator) \ + __attribute__((deprecated(message))) declarator +#elif defined(_MSC_VER) +# define NODE_DEPRECATED(message, declarator) \ + __declspec(deprecated) declarator +#else +# define NODE_DEPRECATED(message, declarator) \ + declarator +#endif + +#endif // SRC_CORE_H_ diff --git a/src/exceptions.cc b/src/exceptions.cc new file mode 100644 index 00000000000000..3068483bdf58ff --- /dev/null +++ b/src/exceptions.cc @@ -0,0 +1,215 @@ +#include "node.h" +#include "node_internals.h" +#include "env.h" +#include "env-inl.h" +#include "exceptions.h" +#include "util.h" +#include "util-inl.h" +#include "v8.h" +#include "uv.h" + +#include + +namespace node { + +using v8::Exception; +using v8::Integer; +using v8::Isolate; +using v8::Local; +using v8::Message; +using v8::Object; +using v8::String; +using v8::Value; + +Local ErrnoException(Isolate* isolate, + int errorno, + const char *syscall, + const char *msg, + const char *path) { + Environment* env = Environment::GetCurrent(isolate); + + Local e; + Local estring = OneByteString(env->isolate(), errno_string(errorno)); + if (msg == nullptr || msg[0] == '\0') { + msg = strerror(errorno); + } + Local message = OneByteString(env->isolate(), msg); + + Local cons = + String::Concat(estring, FIXED_ONE_BYTE_STRING(env->isolate(), ", ")); + cons = String::Concat(cons, message); + + Local path_string; + if (path != nullptr) { + // FIXME(bnoordhuis) It's questionable to interpret the file path as UTF-8. + path_string = String::NewFromUtf8(env->isolate(), path); + } + + if (path_string.IsEmpty() == false) { + cons = String::Concat(cons, FIXED_ONE_BYTE_STRING(env->isolate(), " '")); + cons = String::Concat(cons, path_string); + cons = String::Concat(cons, FIXED_ONE_BYTE_STRING(env->isolate(), "'")); + } + e = Exception::Error(cons); + + Local obj = e.As(); + obj->Set(env->errno_string(), Integer::New(env->isolate(), errorno)); + obj->Set(env->code_string(), estring); + + if (path_string.IsEmpty() == false) { + obj->Set(env->path_string(), path_string); + } + + if (syscall != nullptr) { + obj->Set(env->syscall_string(), OneByteString(env->isolate(), syscall)); + } + + return e; +} + +static Local StringFromPath(Isolate* isolate, const char* path) { +#ifdef _WIN32 + if (strncmp(path, "\\\\?\\UNC\\", 8) == 0) { + return String::Concat(FIXED_ONE_BYTE_STRING(isolate, "\\\\"), + String::NewFromUtf8(isolate, path + 8)); + } else if (strncmp(path, "\\\\?\\", 4) == 0) { + return String::NewFromUtf8(isolate, path + 4); + } +#endif + + return String::NewFromUtf8(isolate, path); +} + + +Local UVException(Isolate* isolate, + int errorno, + const char* syscall, + const char* msg, + const char* path) { + return UVException(isolate, errorno, syscall, msg, path, nullptr); +} + + +Local UVException(Isolate* isolate, + int errorno, + const char* syscall, + const char* msg, + const char* path, + const char* dest) { + Environment* env = Environment::GetCurrent(isolate); + + if (!msg || !msg[0]) + msg = uv_strerror(errorno); + + Local js_code = OneByteString(isolate, uv_err_name(errorno)); + Local js_syscall = OneByteString(isolate, syscall); + Local js_path; + Local js_dest; + + Local js_msg = js_code; + js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, ": ")); + js_msg = String::Concat(js_msg, OneByteString(isolate, msg)); + js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, ", ")); + js_msg = String::Concat(js_msg, js_syscall); + + if (path != nullptr) { + js_path = StringFromPath(isolate, path); + + js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, " '")); + js_msg = String::Concat(js_msg, js_path); + js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, "'")); + } + + if (dest != nullptr) { + js_dest = StringFromPath(isolate, dest); + + js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, " -> '")); + js_msg = String::Concat(js_msg, js_dest); + js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, "'")); + } + + Local e = Exception::Error(js_msg)->ToObject(isolate); + + e->Set(env->errno_string(), Integer::New(isolate, errorno)); + e->Set(env->code_string(), js_code); + e->Set(env->syscall_string(), js_syscall); + if (!js_path.IsEmpty()) + e->Set(env->path_string(), js_path); + if (!js_dest.IsEmpty()) + e->Set(env->dest_string(), js_dest); + + return e; +} + +#ifdef _WIN32 +// Does about the same as strerror(), +// but supports all windows error messages +static const char *winapi_strerror(const int errorno, bool* must_free) { + char *errmsg = nullptr; + + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, errorno, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&errmsg, 0, nullptr); + + if (errmsg) { + *must_free = true; + + // Remove trailing newlines + for (int i = strlen(errmsg) - 1; + i >= 0 && (errmsg[i] == '\n' || errmsg[i] == '\r'); i--) { + errmsg[i] = '\0'; + } + + return errmsg; + } else { + // FormatMessage failed + *must_free = false; + return "Unknown error"; + } +} + + +Local WinapiErrnoException(Isolate* isolate, + int errorno, + const char* syscall, + const char* msg, + const char* path) { + Environment* env = Environment::GetCurrent(isolate); + Local e; + bool must_free = false; + if (!msg || !msg[0]) { + msg = winapi_strerror(errorno, &must_free); + } + Local message = OneByteString(env->isolate(), msg); + + if (path) { + Local cons1 = + String::Concat(message, FIXED_ONE_BYTE_STRING(isolate, " '")); + Local cons2 = + String::Concat(cons1, String::NewFromUtf8(isolate, path)); + Local cons3 = + String::Concat(cons2, FIXED_ONE_BYTE_STRING(isolate, "'")); + e = Exception::Error(cons3); + } else { + e = Exception::Error(message); + } + + Local obj = e.As(); + obj->Set(env->errno_string(), Integer::New(isolate, errorno)); + + if (path != nullptr) { + obj->Set(env->path_string(), String::NewFromUtf8(isolate, path)); + } + + if (syscall != nullptr) { + obj->Set(env->syscall_string(), OneByteString(isolate, syscall)); + } + + if (must_free) + LocalFree((HLOCAL)msg); + + return e; +} +#endif + +} // namespace node diff --git a/src/exceptions.h b/src/exceptions.h new file mode 100644 index 00000000000000..8a4a8ce99e876d --- /dev/null +++ b/src/exceptions.h @@ -0,0 +1,76 @@ +#ifndef SRC_EXCEPTIONS_H_ +#define SRC_EXCEPTIONS_H_ + +#include "core.h" +#include "v8.h" + +namespace node { + +NODE_EXTERN v8::Local ErrnoException(v8::Isolate* isolate, + int errorno, + const char* syscall = nullptr, + const char* message = nullptr, + const char* path = nullptr); +NODE_EXTERN v8::Local UVException(v8::Isolate* isolate, + int errorno, + const char* syscall = nullptr, + const char* message = nullptr, + const char* path = nullptr); +NODE_EXTERN v8::Local UVException(v8::Isolate* isolate, + int errorno, + const char* syscall, + const char* message, + const char* path, + const char* dest); + +NODE_DEPRECATED( + "Use ErrnoException(isolate, ...)", + inline v8::Local ErrnoException( + int errorno, + const char* syscall = nullptr, + const char* message = nullptr, + const char* path = nullptr) { + return ErrnoException(v8::Isolate::GetCurrent(), + errorno, + syscall, + message, + path); +}) + +inline v8::Local UVException(int errorno, + const char* syscall = nullptr, + const char* message = nullptr, + const char* path = nullptr) { + return UVException(v8::Isolate::GetCurrent(), + errorno, + syscall, + message, + path); +} + +#ifdef _WIN32 +NODE_EXTERN v8::Local WinapiErrnoException( + v8::Isolate* isolate, + int errorno, + const char *syscall = nullptr, + const char *msg = "", + const char *path = nullptr); + +NODE_DEPRECATED( + "Use WinapiErrnoException(isolate, ...)", + inline v8::Local WinapiErrnoException( + int errorno, + const char *syscall = nullptr, + const char *msg = "", + const char *path = nullptr) { + return WinapiErrnoException(v8::Isolate::GetCurrent(), + errorno, + syscall, + msg, + path); +}) +#endif + +} // namespace node + +#endif // SRC_EXCEPTIONS_H_ diff --git a/src/node.cc b/src/node.cc index 3fac1e897a62de..1edb87bf84f0ba 100644 --- a/src/node.cc +++ b/src/node.cc @@ -575,129 +575,6 @@ const char *signo_string(int signo) { } } - -Local ErrnoException(Isolate* isolate, - int errorno, - const char *syscall, - const char *msg, - const char *path) { - Environment* env = Environment::GetCurrent(isolate); - - Local e; - Local estring = OneByteString(env->isolate(), errno_string(errorno)); - if (msg == nullptr || msg[0] == '\0') { - msg = strerror(errorno); - } - Local message = OneByteString(env->isolate(), msg); - - Local cons = - String::Concat(estring, FIXED_ONE_BYTE_STRING(env->isolate(), ", ")); - cons = String::Concat(cons, message); - - Local path_string; - if (path != nullptr) { - // FIXME(bnoordhuis) It's questionable to interpret the file path as UTF-8. - path_string = String::NewFromUtf8(env->isolate(), path); - } - - if (path_string.IsEmpty() == false) { - cons = String::Concat(cons, FIXED_ONE_BYTE_STRING(env->isolate(), " '")); - cons = String::Concat(cons, path_string); - cons = String::Concat(cons, FIXED_ONE_BYTE_STRING(env->isolate(), "'")); - } - e = Exception::Error(cons); - - Local obj = e.As(); - obj->Set(env->errno_string(), Integer::New(env->isolate(), errorno)); - obj->Set(env->code_string(), estring); - - if (path_string.IsEmpty() == false) { - obj->Set(env->path_string(), path_string); - } - - if (syscall != nullptr) { - obj->Set(env->syscall_string(), OneByteString(env->isolate(), syscall)); - } - - return e; -} - - -static Local StringFromPath(Isolate* isolate, const char* path) { -#ifdef _WIN32 - if (strncmp(path, "\\\\?\\UNC\\", 8) == 0) { - return String::Concat(FIXED_ONE_BYTE_STRING(isolate, "\\\\"), - String::NewFromUtf8(isolate, path + 8)); - } else if (strncmp(path, "\\\\?\\", 4) == 0) { - return String::NewFromUtf8(isolate, path + 4); - } -#endif - - return String::NewFromUtf8(isolate, path); -} - - -Local UVException(Isolate* isolate, - int errorno, - const char* syscall, - const char* msg, - const char* path) { - return UVException(isolate, errorno, syscall, msg, path, nullptr); -} - - -Local UVException(Isolate* isolate, - int errorno, - const char* syscall, - const char* msg, - const char* path, - const char* dest) { - Environment* env = Environment::GetCurrent(isolate); - - if (!msg || !msg[0]) - msg = uv_strerror(errorno); - - Local js_code = OneByteString(isolate, uv_err_name(errorno)); - Local js_syscall = OneByteString(isolate, syscall); - Local js_path; - Local js_dest; - - Local js_msg = js_code; - js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, ": ")); - js_msg = String::Concat(js_msg, OneByteString(isolate, msg)); - js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, ", ")); - js_msg = String::Concat(js_msg, js_syscall); - - if (path != nullptr) { - js_path = StringFromPath(isolate, path); - - js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, " '")); - js_msg = String::Concat(js_msg, js_path); - js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, "'")); - } - - if (dest != nullptr) { - js_dest = StringFromPath(isolate, dest); - - js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, " -> '")); - js_msg = String::Concat(js_msg, js_dest); - js_msg = String::Concat(js_msg, FIXED_ONE_BYTE_STRING(isolate, "'")); - } - - Local e = Exception::Error(js_msg)->ToObject(isolate); - - e->Set(env->errno_string(), Integer::New(isolate, errorno)); - e->Set(env->code_string(), js_code); - e->Set(env->syscall_string(), js_syscall); - if (!js_path.IsEmpty()) - e->Set(env->path_string(), js_path); - if (!js_dest.IsEmpty()) - e->Set(env->dest_string(), js_dest); - - return e; -} - - // Look up environment variable unless running as setuid root. bool SafeGetenv(const char* key, std::string* text) { #if !defined(__CloudABI__) && !defined(_WIN32) @@ -719,78 +596,6 @@ bool SafeGetenv(const char* key, std::string* text) { } -#ifdef _WIN32 -// Does about the same as strerror(), -// but supports all windows error messages -static const char *winapi_strerror(const int errorno, bool* must_free) { - char *errmsg = nullptr; - - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, errorno, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&errmsg, 0, nullptr); - - if (errmsg) { - *must_free = true; - - // Remove trailing newlines - for (int i = strlen(errmsg) - 1; - i >= 0 && (errmsg[i] == '\n' || errmsg[i] == '\r'); i--) { - errmsg[i] = '\0'; - } - - return errmsg; - } else { - // FormatMessage failed - *must_free = false; - return "Unknown error"; - } -} - - -Local WinapiErrnoException(Isolate* isolate, - int errorno, - const char* syscall, - const char* msg, - const char* path) { - Environment* env = Environment::GetCurrent(isolate); - Local e; - bool must_free = false; - if (!msg || !msg[0]) { - msg = winapi_strerror(errorno, &must_free); - } - Local message = OneByteString(env->isolate(), msg); - - if (path) { - Local cons1 = - String::Concat(message, FIXED_ONE_BYTE_STRING(isolate, " '")); - Local cons2 = - String::Concat(cons1, String::NewFromUtf8(isolate, path)); - Local cons3 = - String::Concat(cons2, FIXED_ONE_BYTE_STRING(isolate, "'")); - e = Exception::Error(cons3); - } else { - e = Exception::Error(message); - } - - Local obj = e.As(); - obj->Set(env->errno_string(), Integer::New(isolate, errorno)); - - if (path != nullptr) { - obj->Set(env->path_string(), String::NewFromUtf8(isolate, path)); - } - - if (syscall != nullptr) { - obj->Set(env->syscall_string(), OneByteString(isolate, syscall)); - } - - if (must_free) - LocalFree((HLOCAL)msg); - - return e; -} -#endif - - void* ArrayBufferAllocator::Allocate(size_t size) { if (zero_fill_field_ || zero_fill_all_buffers) return UncheckedCalloc(size); diff --git a/src/node.h b/src/node.h index e10e393cd64d4b..d4b934645163f1 100644 --- a/src/node.h +++ b/src/node.h @@ -22,16 +22,6 @@ #ifndef SRC_NODE_H_ #define SRC_NODE_H_ -#ifdef _WIN32 -# ifndef BUILDING_NODE_EXTENSION -# define NODE_EXTERN __declspec(dllexport) -# else -# define NODE_EXTERN __declspec(dllimport) -# endif -#else -# define NODE_EXTERN /* nothing */ -#endif - #ifdef BUILDING_NODE_EXTENSION # undef BUILDING_V8_SHARED # undef BUILDING_UV_SHARED @@ -60,40 +50,12 @@ # define SIGKILL 9 #endif +#include "core.h" // NOLINT(build/include_order) #include "v8.h" // NOLINT(build/include_order) #include "v8-platform.h" // NOLINT(build/include_order) #include "node_version.h" // NODE_MODULE_VERSION #include "callback_scope.h" - -#define NODE_MAKE_VERSION(major, minor, patch) \ - ((major) * 0x1000 + (minor) * 0x100 + (patch)) - -#ifdef __clang__ -# define NODE_CLANG_AT_LEAST(major, minor, patch) \ - (NODE_MAKE_VERSION(major, minor, patch) <= \ - NODE_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)) -#else -# define NODE_CLANG_AT_LEAST(major, minor, patch) (0) -#endif - -#ifdef __GNUC__ -# define NODE_GNUC_AT_LEAST(major, minor, patch) \ - (NODE_MAKE_VERSION(major, minor, patch) <= \ - NODE_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)) -#else -# define NODE_GNUC_AT_LEAST(major, minor, patch) (0) -#endif - -#if NODE_CLANG_AT_LEAST(2, 9, 0) || NODE_GNUC_AT_LEAST(4, 5, 0) -# define NODE_DEPRECATED(message, declarator) \ - __attribute__((deprecated(message))) declarator -#elif defined(_MSC_VER) -# define NODE_DEPRECATED(message, declarator) \ - __declspec(deprecated) declarator -#else -# define NODE_DEPRECATED(message, declarator) \ - declarator -#endif +#include "exceptions.h" // Forward-declare libuv loop struct uv_loop_s; @@ -107,47 +69,6 @@ class TracingController; // terminally confused when it's done in node_internals.h namespace node { -NODE_EXTERN v8::Local ErrnoException(v8::Isolate* isolate, - int errorno, - const char* syscall = nullptr, - const char* message = nullptr, - const char* path = nullptr); -NODE_EXTERN v8::Local UVException(v8::Isolate* isolate, - int errorno, - const char* syscall = nullptr, - const char* message = nullptr, - const char* path = nullptr); -NODE_EXTERN v8::Local UVException(v8::Isolate* isolate, - int errorno, - const char* syscall, - const char* message, - const char* path, - const char* dest); - -NODE_DEPRECATED("Use ErrnoException(isolate, ...)", - inline v8::Local ErrnoException( - int errorno, - const char* syscall = nullptr, - const char* message = nullptr, - const char* path = nullptr) { - return ErrnoException(v8::Isolate::GetCurrent(), - errorno, - syscall, - message, - path); -}) - -inline v8::Local UVException(int errorno, - const char* syscall = nullptr, - const char* message = nullptr, - const char* path = nullptr) { - return UVException(v8::Isolate::GetCurrent(), - errorno, - syscall, - message, - path); -} - /* * These methods need to be called in a HandleScope. * @@ -452,26 +373,6 @@ NODE_DEPRECATED("Use DecodeWrite(isolate, ...)", return DecodeWrite(v8::Isolate::GetCurrent(), buf, buflen, val, encoding); }) -#ifdef _WIN32 -NODE_EXTERN v8::Local WinapiErrnoException( - v8::Isolate* isolate, - int errorno, - const char *syscall = nullptr, - const char *msg = "", - const char *path = nullptr); - -NODE_DEPRECATED("Use WinapiErrnoException(isolate, ...)", - inline v8::Local WinapiErrnoException(int errorno, - const char *syscall = nullptr, const char *msg = "", - const char *path = nullptr) { - return WinapiErrnoException(v8::Isolate::GetCurrent(), - errorno, - syscall, - msg, - path); -}) -#endif - const char *signo_string(int errorno); From d614511b9ff3ffa0e145530acfd8a928f79d960e Mon Sep 17 00:00:00 2001 From: Ujjwal Sharma Date: Thu, 10 May 2018 02:47:56 +0530 Subject: [PATCH 181/208] net,http2: refactor _write and _writev Refactor writable part (the _write and _writev functions) in net.Socket and http2.Http2Stream classes. Also involves adding a generic "WriteGeneric" method to the Http2Stream class based on net.Socket._writeGeneric, but behind a symbol. PR-URL: https://github.com/nodejs/node/pull/20643 Reviewed-By: Anatoli Papirovski Reviewed-By: Ruben Bridgewater --- lib/internal/http2/core.js | 47 ++++++++++++-------------------------- lib/net.js | 4 ++-- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index dfd74accabbd22..fbccbf0d849977 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -146,6 +146,7 @@ const kSession = Symbol('session'); const kState = Symbol('state'); const kType = Symbol('type'); const kUpdateTimer = Symbol('update-timer'); +const kWriteGeneric = Symbol('write-generic'); const kDefaultSocketTimeout = 2 * 60 * 1000; @@ -1657,13 +1658,16 @@ class Http2Stream extends Duplex { 'bug in Node.js'); } - _write(data, encoding, cb) { + [kWriteGeneric](writev, data, encoding, cb) { // When the Http2Stream is first created, it is corked until the // handle and the stream ID is assigned. However, if the user calls // uncork() before that happens, the Duplex will attempt to pass // writes through. Those need to be queued up here. if (this.pending) { - this.once('ready', this._write.bind(this, data, encoding, cb)); + this.once( + 'ready', + this[kWriteGeneric].bind(this, writev, data, encoding, cb) + ); return; } @@ -1683,41 +1687,20 @@ class Http2Stream extends Duplex { const req = createWriteWrap(this[kHandle], afterDoStreamWrite); req.stream = this[kID]; - writeGeneric(this, req, data, encoding, cb); + if (writev) + writevGeneric(this, req, data, cb); + else + writeGeneric(this, req, data, encoding, cb); trackWriteState(this, req.bytes); } - _writev(data, cb) { - // When the Http2Stream is first created, it is corked until the - // handle and the stream ID is assigned. However, if the user calls - // uncork() before that happens, the Duplex will attempt to pass - // writes through. Those need to be queued up here. - if (this.pending) { - this.once('ready', this._writev.bind(this, data, cb)); - return; - } - - // If the stream has been destroyed, there's nothing else we can do - // because the handle has been destroyed. This should only be an - // issue if a write occurs before the 'ready' event in the case where - // the duplex is uncorked before the stream is ready to go. In that - // case, drop the data on the floor. An error should have already been - // emitted. - if (this.destroyed) - return; - - this[kUpdateTimer](); - - if (!this.headersSent) - this[kProceed](); - - var req = createWriteWrap(this[kHandle], afterDoStreamWrite); - req.stream = this[kID]; - - writevGeneric(this, req, data, cb); + _write(data, encoding, cb) { + this[kWriteGeneric](false, data, encoding, cb); + } - trackWriteState(this, req.bytes); + _writev(data, cb) { + this[kWriteGeneric](true, data, '', cb); } _final(cb) { diff --git a/lib/net.js b/lib/net.js index 7d0a4a0e54a255..92b04838b6178d 100644 --- a/lib/net.js +++ b/lib/net.js @@ -744,13 +744,13 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) { this._pendingData = null; this._pendingEncoding = ''; - this._unrefTimer(); - if (!this._handle) { this.destroy(new ERR_SOCKET_CLOSED(), cb); return false; } + this._unrefTimer(); + var req = createWriteWrap(this._handle, afterWrite); if (writev) writevGeneric(this, req, data, cb); From 88aee8a65cc19d31cd3362a738972dbaf531e152 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 16 May 2018 14:24:11 -0700 Subject: [PATCH 182/208] doc: improve _Deprecation_ definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use definition from Wikipedia. Provide link. * Use italics for "words-as-words". * Simplify sentence. ("Deprecation is..." rather than "Deprecation refers to...".) PR-URL: https://github.com/nodejs/node/pull/20788 Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Reviewed-By: Richard Lau Reviewed-By: Luigi Pinca Reviewed-By: Colin Ihrig Reviewed-By: Tobias Nießen --- COLLABORATOR_GUIDE.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 585d102f73ef35..f5ffd35f04aa02 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -411,8 +411,11 @@ recommended but not required. ### Deprecations -**Deprecation** refers to the identification of Public APIs that should no -longer be used. +[_Deprecation_][] is "the discouragement of use of some … feature … or practice, +typically because it has been superseded or is no longer considered efficient or +safe, without completely removing it or prohibiting its use. It can also imply +that a feature, design, or practice will be removed or discontinued entirely in +the future." Node.js uses three Deprecation levels: @@ -879,6 +882,7 @@ If you cannot find who to cc for a file, `git shortlog -n -s ` may help. [Enhancement Proposal]: https://github.com/nodejs/node-eps [Stability Index]: doc/api/documentation.md#stability-index [TSC]: https://github.com/nodejs/TSC +[_Deprecation_]: https://en.wikipedia.org/wiki/Deprecation [`--pending-deprecation`]: doc/api/cli.md#--pending-deprecation [`node-core-utils`]: https://github.com/nodejs/node-core-utils [backporting guide]: doc/guides/backporting-to-release-lines.md From 37b9fe1e68b52299464d94c952d619d7790e9143 Mon Sep 17 00:00:00 2001 From: Keita Akutsu Date: Sun, 20 May 2018 14:01:44 +0900 Subject: [PATCH 183/208] doc: fix typo in http2.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/20843 Reviewed-By: Colin Ihrig Reviewed-By: Trivikram Kamat Reviewed-By: Luigi Pinca Reviewed-By: Vse Mozhet Byt Reviewed-By: Tobias Nießen --- doc/api/http2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/http2.md b/doc/api/http2.md index 560e183dca6da1..ec75dd7f63b0aa 100644 --- a/doc/api/http2.md +++ b/doc/api/http2.md @@ -3121,7 +3121,7 @@ added: v8.4.0 --> Call [`http2stream.pushStream()`][] with the given headers, and wraps the -given newly created [`Http2Stream`] on `Http2ServerRespose`. +given newly created [`Http2Stream`] on `Http2ServerResponse`. The callback will be called with an error with code `ERR_HTTP2_STREAM_CLOSED` if the stream is closed. From 8317a468db5bf118b06e8dbcc8875abc284185fb Mon Sep 17 00:00:00 2001 From: Keita Akutsu Date: Sun, 20 May 2018 02:45:26 +0900 Subject: [PATCH 184/208] doc: fix fs.promises sample codes PR-URL: https://github.com/nodejs/node/pull/20838 Reviewed-By: Benjamin Gruenbaum Reviewed-By: Vse Mozhet Byt Reviewed-By: Trivikram Kamat --- doc/api/fs.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/api/fs.md b/doc/api/fs.md index 286ffb3a63fb3a..cfa21733069698 100644 --- a/doc/api/fs.md +++ b/doc/api/fs.md @@ -3443,6 +3443,7 @@ added: v10.0.0 Closes the file descriptor. ```js +const fsPromises = require('fs').promises; async function openAndClose() { let filehandle; try { @@ -3554,6 +3555,9 @@ For example, the following program retains only the first four bytes of the file: ```js +const fs = require('fs'); +const fsPromises = fs.promises; + console.log(fs.readFileSync('temp.txt', 'utf8')); // Prints: Node.js @@ -3570,6 +3574,9 @@ If the file previously was shorter than `len` bytes, it is extended, and the extended part is filled with null bytes (`'\0'`). For example, ```js +const fs = require('fs'); +const fsPromises = fs.promises; + console.log(fs.readFileSync('temp.txt', 'utf8')); // Prints: Node.js @@ -3674,6 +3681,9 @@ with an `Error` object. The following example checks if the file `/etc/passwd` can be read and written by the current process. ```js +const fs = require('fs'); +const fsPromises = fs.promises; + fsPromises.access('/etc/passwd', fs.constants.R_OK | fs.constants.W_OK) .then(() => console.log('can access')) .catch(() => console.error('cannot access')); @@ -3766,7 +3776,7 @@ then the operation will fail. Example: ```js -const fs = require('fs'); +const fsPromises = require('fs').promises; // destination.txt will be created or overwritten by default. fsPromises.copyFile('source.txt', 'destination.txt') @@ -3779,6 +3789,7 @@ following example. ```js const fs = require('fs'); +const fsPromises = fs.promises; const { COPYFILE_EXCL } = fs.constants; // By using COPYFILE_EXCL, the operation will fail if destination.txt exists. From b6225349f474d9dc01334278106065e63aaa6e17 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 17 May 2018 08:23:37 +0200 Subject: [PATCH 185/208] src: use unqualified names in node_crypto.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit removes the usage of qualified names for consistency. PR-URL: https://github.com/nodejs/node/pull/20799 Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Tobias Nießen Reviewed-By: Luigi Pinca Reviewed-By: Trivikram Kamat --- src/node_crypto.cc | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 25b47b798d8c9f..48236e0ae2ffb7 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -311,7 +311,7 @@ bool EntropySource(unsigned char* buffer, size_t length) { void SecureContext::Initialize(Environment* env, Local target) { - Local t = env->NewFunctionTemplate(SecureContext::New); + Local t = env->NewFunctionTemplate(New); t->InstanceTemplate()->SetInternalFieldCount(1); Local secureContextString = FIXED_ONE_BYTE_STRING(env->isolate(), "SecureContext"); @@ -464,8 +464,7 @@ void SecureContext::Init(const FunctionCallbackInfo& args) { RAND_bytes(sc->ticket_key_aes_, sizeof(sc->ticket_key_aes_)) <= 0) { return env->ThrowError("Error generating ticket keys"); } - SSL_CTX_set_tlsext_ticket_key_cb(sc->ctx_.get(), - SecureContext::TicketCompatibilityCallback); + SSL_CTX_set_tlsext_ticket_key_cb(sc->ctx_.get(), TicketCompatibilityCallback); } @@ -1916,8 +1915,7 @@ void SSLWrap::SetSession(const FunctionCallbackInfo& args) { sbuf.assign(p, p + slen); const unsigned char* p = reinterpret_cast(sbuf.data()); - SSLSessionPointer sess( - d2i_SSL_SESSION(nullptr, &p, slen)); + SSLSessionPointer sess(d2i_SSL_SESSION(nullptr, &p, slen)); if (sess == nullptr) return; @@ -2020,8 +2018,7 @@ void SSLWrap::NewSessionDone(const FunctionCallbackInfo& args) { template -void SSLWrap::SetOCSPResponse( - const v8::FunctionCallbackInfo& args) { +void SSLWrap::SetOCSPResponse(const FunctionCallbackInfo& args) { #ifdef NODE__HAVE_TLSEXT_STATUS_CB Base* w; ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder()); @@ -2038,8 +2035,7 @@ void SSLWrap::SetOCSPResponse( template -void SSLWrap::RequestOCSP( - const v8::FunctionCallbackInfo& args) { +void SSLWrap::RequestOCSP(const FunctionCallbackInfo& args) { #ifdef NODE__HAVE_TLSEXT_STATUS_CB Base* w; ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder()); @@ -2051,7 +2047,7 @@ void SSLWrap::RequestOCSP( template void SSLWrap::GetEphemeralKeyInfo( - const v8::FunctionCallbackInfo& args) { + const FunctionCallbackInfo& args) { Base* w; ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder()); Environment* env = Environment::GetCurrent(args); @@ -2111,7 +2107,7 @@ void SSLWrap::GetEphemeralKeyInfo( #ifdef SSL_set_max_send_fragment template void SSLWrap::SetMaxSendFragment( - const v8::FunctionCallbackInfo& args) { + const FunctionCallbackInfo& args) { CHECK(args.Length() >= 1 && args[0]->IsNumber()); Base* w; @@ -2265,7 +2261,7 @@ int SSLWrap::SelectALPNCallback(SSL* s, template void SSLWrap::GetALPNNegotiatedProto( - const FunctionCallbackInfo& args) { + const FunctionCallbackInfo& args) { #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation Base* w; ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder()); @@ -2285,8 +2281,7 @@ void SSLWrap::GetALPNNegotiatedProto( template -void SSLWrap::SetALPNProtocols( - const FunctionCallbackInfo& args) { +void SSLWrap::SetALPNProtocols(const FunctionCallbackInfo& args) { #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation Base* w; ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder()); @@ -3162,7 +3157,7 @@ void CipherBase::Final(const FunctionCallbackInfo& args) { } -void Hmac::Initialize(Environment* env, v8::Local target) { +void Hmac::Initialize(Environment* env, v8::Local target) { Local t = env->NewFunctionTemplate(New); t->InstanceTemplate()->SetInternalFieldCount(1); @@ -3282,7 +3277,7 @@ void Hmac::HmacDigest(const FunctionCallbackInfo& args) { } -void Hash::Initialize(Environment* env, v8::Local target) { +void Hash::Initialize(Environment* env, v8::Local target) { Local t = env->NewFunctionTemplate(New); t->InstanceTemplate()->SetInternalFieldCount(1); @@ -3474,7 +3469,7 @@ static bool ApplyRSAOptions(const EVPKeyPointer& pkey, -void Sign::Initialize(Environment* env, v8::Local target) { +void Sign::Initialize(Environment* env, v8::Local target) { Local t = env->NewFunctionTemplate(New); t->InstanceTemplate()->SetInternalFieldCount(1); @@ -3640,7 +3635,7 @@ void Sign::SignFinal(const FunctionCallbackInfo& args) { } -void Verify::Initialize(Environment* env, v8::Local target) { +void Verify::Initialize(Environment* env, v8::Local target) { Local t = env->NewFunctionTemplate(New); t->InstanceTemplate()->SetInternalFieldCount(1); @@ -4220,7 +4215,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo& args) { Buffer::New(env->isolate(), data.release(), data.size).ToLocalChecked()); } -void DiffieHellman::SetKey(const v8::FunctionCallbackInfo& args, +void DiffieHellman::SetKey(const v8::FunctionCallbackInfo& args, int (*set_field)(DH*, BIGNUM*), const char* what) { Environment* env = Environment::GetCurrent(args); From 3110d15f2b23515113db3a5e75e7ad10a0ace722 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 17 May 2018 08:52:55 +0200 Subject: [PATCH 186/208] src: make pointers lean left in node_crypto.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/20799 Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Tobias Nießen Reviewed-By: Luigi Pinca Reviewed-By: Trivikram Kamat --- src/node_crypto.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 48236e0ae2ffb7..cff8a5346c6765 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -153,7 +153,7 @@ template int SSLWrap::SelectALPNCallback( #endif // TLSEXT_TYPE_application_layer_protocol_negotiation -static int PasswordCallback(char *buf, int size, int rwflag, void *u) { +static int PasswordCallback(char* buf, int size, int rwflag, void* u) { if (u) { size_t buflen = static_cast(size); size_t len = strlen(static_cast(u)); @@ -206,7 +206,7 @@ static ENGINE* LoadEngineById(const char* engine_id, char (*errmsg)[1024]) { // for the OpenSSL CLI, but works poorly for Node.js because it involves // synchronous interaction with the controlling terminal, something we never // want, and use this function to avoid it. -static int NoPasswordCallback(char *buf, int size, int rwflag, void *u) { +static int NoPasswordCallback(char* buf, int size, int rwflag, void* u) { return 0; } @@ -726,7 +726,7 @@ static X509_STORE* NewRootCertStore() { if (root_certs_vector.empty()) { for (size_t i = 0; i < arraysize(root_certs); i++) { BIO* bp = NodeBIO::NewFixed(root_certs[i], strlen(root_certs[i])); - X509 *x509 = PEM_read_bio_X509(bp, nullptr, NoPasswordCallback, nullptr); + X509* x509 = PEM_read_bio_X509(bp, nullptr, NoPasswordCallback, nullptr); BIO_free(bp); // Parse errors from the built-in roots are fatal. @@ -743,7 +743,7 @@ static X509_STORE* NewRootCertStore() { if (ssl_openssl_cert_store) { X509_STORE_set_default_paths(store); } else { - for (X509 *cert : root_certs_vector) { + for (X509* cert : root_certs_vector) { X509_up_ref(cert); X509_STORE_add_cert(store, cert); } @@ -1994,7 +1994,7 @@ void SSLWrap::GetTLSTicket(const FunctionCallbackInfo& args) { if (sess == nullptr) return; - const unsigned char *ticket; + const unsigned char* ticket; size_t length; SSL_SESSION_get0_ticket(sess, &ticket, &length); @@ -2771,7 +2771,7 @@ static bool IsValidGCMTagLength(unsigned int tag_len) { return tag_len == 4 || tag_len == 8 || (tag_len >= 12 && tag_len <= 16); } -bool CipherBase::InitAuthenticated(const char *cipher_type, int iv_len, +bool CipherBase::InitAuthenticated(const char* cipher_type, int iv_len, unsigned int auth_tag_len) { CHECK(IsAuthenticatedMode()); @@ -3085,7 +3085,7 @@ void CipherBase::SetAutoPadding(const FunctionCallbackInfo& args) { } -bool CipherBase::Final(unsigned char** out, int *out_len) { +bool CipherBase::Final(unsigned char** out, int* out_len) { if (!ctx_) return false; From 8a17a259f3d6b5c61e71b746ca9aaba2429bf841 Mon Sep 17 00:00:00 2001 From: Vse Mozhet Byt Date: Sun, 20 May 2018 20:16:19 +0300 Subject: [PATCH 187/208] doc: fix some nits in hardcoded manpage links After https://github.com/nodejs/node/pull/20785, we wrap autogenerated manpage links in code elements. This PR unify some hardcoded manpage links with autogenerated ones: it adds backticks, parentheses, section numbers, and updates URLs. Also, some typos are fixes in passing (missing periods, reference sorting). PR-URL: https://github.com/nodejs/node/pull/20854 Reviewed-By: Anna Henningsen Reviewed-By: Ruben Bridgewater --- doc/api/errors.md | 6 +++--- doc/api/fs.md | 10 +++++----- doc/api/net.md | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/api/errors.md b/doc/api/errors.md index a2489c6ac2e7e7..0c3c5fba7d0e49 100644 --- a/doc/api/errors.md +++ b/doc/api/errors.md @@ -1704,6 +1704,7 @@ Creation of a [`zlib`][] object failed due to incorrect configuration. [`--force-fips`]: cli.html#cli_force_fips [`child_process`]: child_process.html [`cipher.getAuthTag()`]: crypto.html#crypto_cipher_getauthtag +[`Class: assert.AssertionError`]: assert.html#assert_class_assert_assertionerror [`crypto.timingSafeEqual()`]: crypto.html#crypto_crypto_timingsafeequal_a_b [`dgram.createSocket()`]: dgram.html#dgram_dgram_createsocket_options_callback [`ERR_INVALID_ARG_TYPE`]: #ERR_INVALID_ARG_TYPE @@ -1736,7 +1737,7 @@ Creation of a [`zlib`][] object failed due to incorrect configuration. [`process.setUncaughtExceptionCaptureCallback()`]: process.html#process_process_setuncaughtexceptioncapturecallback_fn [`require('crypto').setEngine()`]: crypto.html#crypto_crypto_setengine_engine_flags [`server.listen()`]: net.html#net_server_listen -[`Class: assert.AssertionError`]: assert.html#assert_class_assert_assertionerror +[`zlib`]: zlib.html [ES6 module]: esm.html [Node.js Error Codes]: #nodejs-error-codes [V8's stack trace API]: https://github.com/v8/v8/wiki/Stack-Trace-API @@ -1748,8 +1749,7 @@ Creation of a [`zlib`][] object failed due to incorrect configuration. [ICU]: intl.html#intl_internationalization_support [online]: http://man7.org/linux/man-pages/man3/errno.3.html [stream-based]: stream.html -[syscall]: http://man7.org/linux/man-pages/man2/syscall.2.html +[syscall]: http://man7.org/linux/man-pages/man2/syscalls.2.html [try-catch]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/try...catch [vm]: vm.html [WHATWG Supported Encodings]: util.html#util_whatwg_supported_encodings -[`zlib`]: zlib.html diff --git a/doc/api/fs.md b/doc/api/fs.md index cfa21733069698..26eda38f739892 100644 --- a/doc/api/fs.md +++ b/doc/api/fs.md @@ -3036,9 +3036,9 @@ The recursive option is only supported on macOS and Windows. This feature depends on the underlying operating system providing a way to be notified of filesystem changes. -* On Linux systems, this uses [`inotify`] -* On BSD systems, this uses [`kqueue`] -* On macOS, this uses [`kqueue`] for files and [`FSEvents`] for directories. +* On Linux systems, this uses [`inotify(7)`]. +* On BSD systems, this uses [`kqueue(2)`]. +* On macOS, this uses [`kqueue(2)`] for files and [`FSEvents`] for directories. * On SunOS systems (including Solaris and SmartOS), this uses [`event ports`]. * On Windows systems, this feature depends on [`ReadDirectoryChangesW`]. * On Aix systems, this feature depends on [`AHAFS`], which must be enabled. @@ -4680,8 +4680,8 @@ the file contents. [`fs.watch()`]: #fs_fs_watch_filename_options_listener [`fs.write()`]: #fs_fs_write_fd_buffer_offset_length_position_callback [`fs.writeFile()`]: #fs_fs_writefile_file_data_options_callback -[`inotify`]: http://man7.org/linux/man-pages/man7/inotify.7.html -[`kqueue`]: https://www.freebsd.org/cgi/man.cgi?kqueue +[`inotify(7)`]: http://man7.org/linux/man-pages/man7/inotify.7.html +[`kqueue(2)`]: https://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2 [`net.Socket`]: net.html#net_class_net_socket [`stat()`]: fs.html#fs_fs_stat_path_callback [`util.promisify()`]: util.html#util_util_promisify_original diff --git a/doc/api/net.md b/doc/api/net.md index 21d14fc7068bc5..5ac60403e5ee02 100644 --- a/doc/api/net.md +++ b/doc/api/net.md @@ -204,7 +204,8 @@ length of the queue of pending connections. The actual length will be determined by the OS through sysctl settings such as `tcp_max_syn_backlog` and `somaxconn` on Linux. The default value of this parameter is 511 (not 512). -All [`net.Socket`][] are set to `SO_REUSEADDR` (See [socket(7)][] for details). +All [`net.Socket`][] are set to `SO_REUSEADDR` (see [`socket(7)`][] for +details). The `server.listen()` method can be called again if and only if there was an error during the first `server.listen()` call or `server.close()` has been @@ -1135,6 +1136,7 @@ Returns `true` if input is a version 6 IP address, otherwise returns `false`. [`server.listen(handle)`]: #net_server_listen_handle_backlog_callback [`server.listen(options)`]: #net_server_listen_options_callback [`server.listen(path)`]: #net_server_listen_path_backlog_callback +[`socket(7)`]: http://man7.org/linux/man-pages/man7/socket.7.html [`socket.connect()`]: #net_socket_connect [`socket.connect(options)`]: #net_socket_connect_options_connectlistener [`socket.connect(path)`]: #net_socket_connect_path_connectlistener @@ -1152,7 +1154,6 @@ Returns `true` if input is a version 6 IP address, otherwise returns `false`. [Readable Stream]: stream.html#stream_class_stream_readable [duplex stream]: stream.html#stream_class_stream_duplex [half-closed]: https://tools.ietf.org/html/rfc1122 -[socket(7)]: http://man7.org/linux/man-pages/man7/socket.7.html [stream_writable_write]: stream.html#stream_writable_write_chunk_encoding_callback [unspecified IPv4 address]: https://en.wikipedia.org/wiki/0.0.0.0 [unspecified IPv6 address]: https://en.wikipedia.org/wiki/IPv6_address#Unspecified_address From 5ce85a72cb8be1ed9e7264c39cd81212a89e89c0 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Thu, 17 May 2018 00:45:17 +0200 Subject: [PATCH 188/208] util: wrap error in brackets without stack This aligns the visualization of an error with no stack traces set to zero just as it is done in case the error has no stack trace. PR-URL: https://github.com/nodejs/node/pull/20802 Refs: https://github.com/nodejs/node/issues/20253 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Matteo Collina Reviewed-By: Trivikram Kamat --- lib/util.js | 10 +++++++--- test/parallel/test-util-inspect.js | 24 ++++++++++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/lib/util.js b/lib/util.js index 2ef7e4e54c5c6d..ac98590464a3fb 100644 --- a/lib/util.js +++ b/lib/util.js @@ -595,9 +595,13 @@ function formatValue(ctx, value, recurseTimes, ln) { base = `${dateToISOString.call(value)}`; } else if (isError(value)) { // Make error with message first say the error + base = formatError(value); + // Wrap the error in brackets in case it has no stack trace. + if (base.indexOf('\n at') === -1) { + base = `[${base}]`; + } if (keyLength === 0) - return formatError(value); - base = `${formatError(value)}`; + return base; } else if (isAnyArrayBuffer(value)) { // Fast path for ArrayBuffer and SharedArrayBuffer. // Can't do the same for DataView because it has a non-primitive @@ -749,7 +753,7 @@ function formatPrimitive(fn, value, ctx) { } function formatError(value) { - return value.stack || `[${errorToString.call(value)}]`; + return value.stack || errorToString.call(value); } function formatObject(ctx, value, recurseTimes, keys) { diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js index b80e932dd1c17f..0ea2fd702fd37d 100644 --- a/test/parallel/test-util-inspect.js +++ b/test/parallel/test-util-inspect.js @@ -496,12 +496,12 @@ assert.strictEqual(util.inspect(-5e-324), '-5e-324'); // Exceptions should print the error message, not '{}'. { - const errors = []; - errors.push(new Error()); - errors.push(new Error('FAIL')); - errors.push(new TypeError('FAIL')); - errors.push(new SyntaxError('FAIL')); - errors.forEach((err) => { + [ + new Error(), + new Error('FAIL'), + new TypeError('FAIL'), + new SyntaxError('FAIL') + ].forEach((err) => { assert.strictEqual(util.inspect(err), err.stack); }); try { @@ -515,6 +515,18 @@ assert.strictEqual(util.inspect(-5e-324), '-5e-324'); assert(ex.includes('[message]')); } +{ + const tmp = Error.stackTraceLimit; + Error.stackTraceLimit = 0; + const err = new Error('foo'); + assert.strictEqual(util.inspect(err), '[Error: foo]'); + assert(err.stack); + delete err.stack; + assert(!err.stack); + assert.strictEqual(util.inspect(err), '[Error: foo]'); + Error.stackTraceLimit = tmp; +} + // Doesn't capture stack trace. { function BadCustomError(msg) { From 38bc5fbd6b919a61bc83f5136ba42d71823cb699 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Thu, 17 May 2018 03:19:56 +0200 Subject: [PATCH 189/208] util: remove erroneous whitespace When inspecting nested objects some times a whitespace was added at the end of a line. This fixes this erroneous space. Besides that the `breakLength` was not followed if a single property was longer than the breakLength. It will now break a single property into the key and value in such cases. PR-URL: https://github.com/nodejs/node/pull/20802 Refs: https://github.com/nodejs/node/issues/20253 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Matteo Collina Reviewed-By: Trivikram Kamat --- lib/util.js | 82 ++++++++++++------------ test/parallel/test-util-format.js | 16 ++--- test/parallel/test-util-inspect.js | 2 +- test/parallel/test-whatwg-url-inspect.js | 8 ++- 4 files changed, 56 insertions(+), 52 deletions(-) diff --git a/lib/util.js b/lib/util.js index ac98590464a3fb..676f43499e830c 100644 --- a/lib/util.js +++ b/lib/util.js @@ -416,7 +416,7 @@ function getPrefix(constructor, tag) { return ''; } -function formatValue(ctx, value, recurseTimes, ln) { +function formatValue(ctx, value, recurseTimes) { // Primitive types cannot have properties if (typeof value !== 'object' && typeof value !== 'function') { return formatPrimitive(ctx.stylize, value, ctx); @@ -592,7 +592,7 @@ function formatValue(ctx, value, recurseTimes, ln) { return ctx.stylize(dateToISOString.call(value), 'date'); } // Make dates with properties first say the date - base = `${dateToISOString.call(value)}`; + base = dateToISOString.call(value); } else if (isError(value)) { // Make error with message first say the error base = formatError(value); @@ -693,7 +693,7 @@ function formatValue(ctx, value, recurseTimes, ln) { } ctx.seen.pop(); - return reduceToSingleString(ctx, output, base, braces, ln); + return reduceToSingleString(ctx, output, base, braces); } function formatNumber(fn, value) { @@ -768,7 +768,23 @@ function formatNamespaceObject(ctx, value, recurseTimes, keys) { const len = keys.length; const output = new Array(len); for (var i = 0; i < len; i++) { - output[i] = formatNamespaceProperty(ctx, value, recurseTimes, keys[i]); + try { + output[i] = formatProperty(ctx, value, recurseTimes, keys[i], 0); + } catch (err) { + if (!(err instanceof ReferenceError)) { + throw err; + } + // Use the existing functionality. This makes sure the indentation and + // line breaks are always correct. Otherwise it is very difficult to keep + // this aligned, even though this is a hacky way of dealing with this. + const tmp = { [keys[i]]: '' }; + output[i] = formatProperty(ctx, tmp, recurseTimes, keys[i], 0); + const pos = output[i].lastIndexOf(' '); + // We have to find the last whitespace and have to replace that value as + // it will be visualized as a regular string. + output[i] = output[i].slice(0, pos + 1) + + ctx.stylize('', 'special'); + } } return output; } @@ -996,42 +1012,21 @@ function formatPromise(ctx, value, recurseTimes, keys) { return output; } -function formatKey(ctx, key, enumerable) { - if (typeof key === 'symbol') { - return `[${ctx.stylize(key.toString(), 'symbol')}]`; - } - if (enumerable === false) { - return `[${key}]`; - } - if (keyStrRegExp.test(key)) { - return ctx.stylize(key, 'name'); - } - return ctx.stylize(strEscape(key), 'string'); -} - -function formatNamespaceProperty(ctx, ns, recurseTimes, key) { - let value; - try { - value = formatValue(ctx, ns[key], recurseTimes, true); - } catch (err) { - if (err instanceof ReferenceError) { - value = ctx.stylize('', 'special'); - } else { - throw err; - } - } - - return `${formatKey(ctx, key)}: ${value}`; -} - function formatProperty(ctx, value, recurseTimes, key, array) { - let str; + let name, str; + let extra = ' '; const desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key], enumerable: true }; if (desc.value !== undefined) { const diff = array !== 0 || ctx.compact === false ? 2 : 3; ctx.indentationLvl += diff; - str = formatValue(ctx, desc.value, recurseTimes, array === 0); + str = formatValue(ctx, desc.value, recurseTimes); + if (diff === 3) { + const len = ctx.colors ? removeColors(str).length : str.length; + if (ctx.breakLength < len) { + extra = `\n${' '.repeat(ctx.indentationLvl)}`; + } + } ctx.indentationLvl -= diff; } else if (desc.get !== undefined) { if (desc.set !== undefined) { @@ -1047,11 +1042,19 @@ function formatProperty(ctx, value, recurseTimes, key, array) { if (array === 1) { return str; } - - return `${formatKey(ctx, key, desc.enumerable)}: ${str}`; + if (typeof key === 'symbol') { + name = `[${ctx.stylize(key.toString(), 'symbol')}]`; + } else if (desc.enumerable === false) { + name = `[${key}]`; + } else if (keyStrRegExp.test(key)) { + name = ctx.stylize(key, 'name'); + } else { + name = ctx.stylize(strEscape(key), 'string'); + } + return `${name}:${extra}${str}`; } -function reduceToSingleString(ctx, output, base, braces, addLn) { +function reduceToSingleString(ctx, output, base, braces) { const breakLength = ctx.breakLength; let i = 0; if (ctx.compact === false) { @@ -1080,11 +1083,10 @@ function reduceToSingleString(ctx, output, base, braces, addLn) { // we need to force the first item to be on the next line or the // items will not line up correctly. const indentation = ' '.repeat(ctx.indentationLvl); - const extraLn = addLn === true ? `\n${indentation}` : ''; const ln = base === '' && braces[0].length === 1 ? - ' ' : `${base ? ` ${base}` : base}\n${indentation} `; + ' ' : `${base ? ` ${base}` : ''}\n${indentation} `; const str = join(output, `,\n${indentation} `); - return `${extraLn}${braces[0]}${ln}${str} ${braces[1]}`; + return `${braces[0]}${ln}${str} ${braces[1]}`; } function isBoolean(arg) { diff --git a/test/parallel/test-util-format.js b/test/parallel/test-util-format.js index fd686cb6d355ad..f99f85b78c853b 100644 --- a/test/parallel/test-util-format.js +++ b/test/parallel/test-util-format.js @@ -126,7 +126,7 @@ assert.strictEqual( util.format('%o', obj), '{ foo: \'bar\',\n' + ' foobar: 1,\n' + - ' func: \n' + + ' func:\n' + ' { [Function: func]\n' + ' [length]: 0,\n' + ' [name]: \'func\',\n' + @@ -135,8 +135,8 @@ assert.strictEqual( util.format('%o', nestedObj2), '{ foo: \'bar\',\n' + ' foobar: 1,\n' + - ' func: \n' + - ' [ { a: \n' + + ' func:\n' + + ' [ { a:\n' + ' { [Function: a]\n' + ' [length]: 0,\n' + ' [name]: \'a\',\n' + @@ -145,9 +145,9 @@ assert.strictEqual( assert.strictEqual( util.format('%o', nestedObj), '{ foo: \'bar\',\n' + - ' foobar: \n' + + ' foobar:\n' + ' { foo: \'bar\',\n' + - ' func: \n' + + ' func:\n' + ' { [Function: func]\n' + ' [length]: 0,\n' + ' [name]: \'func\',\n' + @@ -156,14 +156,14 @@ assert.strictEqual( util.format('%o %o', obj, obj), '{ foo: \'bar\',\n' + ' foobar: 1,\n' + - ' func: \n' + + ' func:\n' + ' { [Function: func]\n' + ' [length]: 0,\n' + ' [name]: \'func\',\n' + ' [prototype]: func { [constructor]: [Circular] } } }' + ' { foo: \'bar\',\n' + ' foobar: 1,\n' + - ' func: \n' + + ' func:\n' + ' { [Function: func]\n' + ' [length]: 0,\n' + ' [name]: \'func\',\n' + @@ -172,7 +172,7 @@ assert.strictEqual( util.format('%o %o', obj), '{ foo: \'bar\',\n' + ' foobar: 1,\n' + - ' func: \n' + + ' func:\n' + ' { [Function: func]\n' + ' [length]: 0,\n' + ' [name]: \'func\',\n' + diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js index 0ea2fd702fd37d..b7aa752952ce4c 100644 --- a/test/parallel/test-util-inspect.js +++ b/test/parallel/test-util-inspect.js @@ -1237,7 +1237,7 @@ util.inspect(process); let out = util.inspect(o, { compact: true, depth: 5, breakLength: 80 }); let expect = [ - '{ a: ', + '{ a:', ' [ 1,', ' 2,', " [ [ 'Lorem ipsum dolor\\nsit amet,\\tconsectetur adipiscing elit, " + diff --git a/test/parallel/test-whatwg-url-inspect.js b/test/parallel/test-whatwg-url-inspect.js index 5758b39b8af83d..1265428d4ca811 100644 --- a/test/parallel/test-whatwg-url-inspect.js +++ b/test/parallel/test-whatwg-url-inspect.js @@ -16,7 +16,8 @@ const url = new URL('https://username:password@host.name:8080/path/name/?que=ry# assert.strictEqual( util.inspect(url), `URL { - href: 'https://username:password@host.name:8080/path/name/?que=ry#hash', + href: + 'https://username:password@host.name:8080/path/name/?que=ry#hash', origin: 'https://host.name:8080', protocol: 'https:', username: 'username', @@ -32,7 +33,8 @@ assert.strictEqual( assert.strictEqual( util.inspect(url, { showHidden: true }), `URL { - href: 'https://username:password@host.name:8080/path/name/?que=ry#hash', + href: + 'https://username:password@host.name:8080/path/name/?que=ry#hash', origin: 'https://host.name:8080', protocol: 'https:', username: 'username', @@ -46,7 +48,7 @@ assert.strictEqual( hash: '#hash', cannotBeBase: false, special: true, - [Symbol(context)]:\x20 + [Symbol(context)]: URLContext { flags: 2032, scheme: 'https:', From f0d6a37c5c9c750a9dd32899097ee468d0592bb0 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Thu, 17 May 2018 03:26:21 +0200 Subject: [PATCH 190/208] util: fix inspected stack indentation Error stacks and multiline error messages were not correct indented. This is fixed by this patch. PR-URL: https://github.com/nodejs/node/pull/20802 Refs: https://github.com/nodejs/node/issues/20253 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Matteo Collina Reviewed-By: Trivikram Kamat --- lib/util.js | 5 +++ test/message/util_inspect_error.js | 12 ++++++ test/message/util_inspect_error.out | 63 +++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 test/message/util_inspect_error.js create mode 100644 test/message/util_inspect_error.out diff --git a/lib/util.js b/lib/util.js index 676f43499e830c..36a74b2e3041ab 100644 --- a/lib/util.js +++ b/lib/util.js @@ -600,6 +600,11 @@ function formatValue(ctx, value, recurseTimes) { if (base.indexOf('\n at') === -1) { base = `[${base}]`; } + // The message and the stack have to be indented as well! + if (ctx.indentationLvl !== 0) { + const indentation = ' '.repeat(ctx.indentationLvl); + base = formatError(value).replace(/\n/g, `\n${indentation}`); + } if (keyLength === 0) return base; } else if (isAnyArrayBuffer(value)) { diff --git a/test/message/util_inspect_error.js b/test/message/util_inspect_error.js new file mode 100644 index 00000000000000..20affd6c711fd8 --- /dev/null +++ b/test/message/util_inspect_error.js @@ -0,0 +1,12 @@ +'use strict'; + +require('../common'); +const util = require('util'); + +const err = new Error('foo\nbar'); + +console.log(util.inspect({ err, nested: { err } }, { compact: true })); +console.log(util.inspect({ err, nested: { err } }, { compact: false })); + +err.foo = 'bar'; +console.log(util.inspect(err, { compact: true, breakLength: 5 })); diff --git a/test/message/util_inspect_error.out b/test/message/util_inspect_error.out new file mode 100644 index 00000000000000..406d8112ce2599 --- /dev/null +++ b/test/message/util_inspect_error.out @@ -0,0 +1,63 @@ +{ err: + Error: foo + bar + at *util_inspect_error* + at * + at * + at * + at * + at * + at * + at * + at * + nested: + { err: + Error: foo + bar + at *util_inspect_error* + at * + at * + at * + at * + at * + at * + at * + at * } } +{ + err: Error: foo + bar + at *util_inspect_error* + at * + at * + at * + at * + at * + at * + at * + at *, + nested: { + err: Error: foo + bar + at *util_inspect_error* + at * + at * + at * + at * + at * + at * + at * + at * + } +} +{ Error: foo +bar + at *util_inspect_error* + at * + at * + at * + at * + at * + at * + at * + at * + foo: 'bar' } From c8c9211fa6220ccf9e2aa09819d1c07e0a635649 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Thu, 17 May 2018 13:20:27 +0200 Subject: [PATCH 191/208] util: improve error inspection When inspecting errors with extra properties while setting the compact option to false, it will now return: [Error: foo] { at repl:1:5 at Script.runInThisContext (vm.js:89:20) bla: true } Instead of: Error: foo at repl:1:5 at Script.runInThisContext (vm.js:91:20) { bla: true } PR-URL: https://github.com/nodejs/node/pull/20802 Refs: https://github.com/nodejs/node/issues/20253 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Matteo Collina Reviewed-By: Trivikram Kamat --- lib/util.js | 8 ++++- test/parallel/test-repl-underscore.js | 2 +- test/parallel/test-util-inspect.js | 42 +++++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/lib/util.js b/lib/util.js index 36a74b2e3041ab..79f3cc7205398b 100644 --- a/lib/util.js +++ b/lib/util.js @@ -597,7 +597,8 @@ function formatValue(ctx, value, recurseTimes) { // Make error with message first say the error base = formatError(value); // Wrap the error in brackets in case it has no stack trace. - if (base.indexOf('\n at') === -1) { + const stackStart = base.indexOf('\n at'); + if (stackStart === -1) { base = `[${base}]`; } // The message and the stack have to be indented as well! @@ -607,6 +608,11 @@ function formatValue(ctx, value, recurseTimes) { } if (keyLength === 0) return base; + + if (ctx.compact === false && stackStart !== -1) { + braces[0] += `${base.slice(stackStart)}`; + base = `[${base.slice(0, stackStart)}]`; + } } else if (isAnyArrayBuffer(value)) { // Fast path for ArrayBuffer and SharedArrayBuffer. // Can't do the same for DataView because it has a non-primitive diff --git a/test/parallel/test-repl-underscore.js b/test/parallel/test-repl-underscore.js index 57929244ae4374..628a7739fecf4e 100644 --- a/test/parallel/test-repl-underscore.js +++ b/test/parallel/test-repl-underscore.js @@ -174,7 +174,7 @@ function testError() { // The error, both from the original throw and the `_error` echo. 'Error: foo', - 'Error: foo', + '[Error: foo]', // The sync error, with individual property echoes /Error: ENOENT: no such file or directory, scandir '.*nonexistent.*'/, diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js index b7aa752952ce4c..2899beecf64346 100644 --- a/test/parallel/test-util-inspect.js +++ b/test/parallel/test-util-inspect.js @@ -519,11 +519,49 @@ assert.strictEqual(util.inspect(-5e-324), '-5e-324'); const tmp = Error.stackTraceLimit; Error.stackTraceLimit = 0; const err = new Error('foo'); - assert.strictEqual(util.inspect(err), '[Error: foo]'); + const err2 = new Error('foo\nbar'); + assert.strictEqual(util.inspect(err, { compact: true }), '[Error: foo]'); assert(err.stack); delete err.stack; assert(!err.stack); - assert.strictEqual(util.inspect(err), '[Error: foo]'); + assert.strictEqual(util.inspect(err, { compact: true }), '[Error: foo]'); + assert.strictEqual( + util.inspect(err2, { compact: true }), + '[Error: foo\nbar]' + ); + + err.bar = true; + err2.bar = true; + + assert.strictEqual( + util.inspect(err, { compact: true }), + '{ [Error: foo] bar: true }' + ); + assert.strictEqual( + util.inspect(err2, { compact: true }), + '{ [Error: foo\nbar] bar: true }' + ); + assert.strictEqual( + util.inspect(err, { compact: true, breakLength: 5 }), + '{ [Error: foo]\n bar: true }' + ); + assert.strictEqual( + util.inspect(err, { compact: true, breakLength: 1 }), + '{ [Error: foo]\n bar:\n true }' + ); + assert.strictEqual( + util.inspect(err2, { compact: true, breakLength: 5 }), + '{ [Error: foo\nbar]\n bar: true }' + ); + assert.strictEqual( + util.inspect(err, { compact: false }), + '[Error: foo] {\n bar: true\n}' + ); + assert.strictEqual( + util.inspect(err2, { compact: false }), + '[Error: foo\nbar] {\n bar: true\n}' + ); + Error.stackTraceLimit = tmp; } From 8f8a0e348387fdcc3905d24b25c3fbc51e790b69 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Wed, 16 May 2018 18:10:08 +0200 Subject: [PATCH 192/208] assert: fix wrong message indentation If code is read from a file and that code is indented, it would be misaligned. This makes sure it has a natural indentation that is relative to the starting point of the assertion. PR-URL: https://github.com/nodejs/node/pull/20791 Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Reviewed-By: Khaidi Chu Reviewed-By: Matteo Collina --- lib/assert.js | 13 +++++++++ test/parallel/test-assert.js | 53 ++++++++++++++++++++++++++++++++---- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/lib/assert.js b/lib/assert.js index 17b0059cba50e7..da92c02f640e46 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -192,6 +192,19 @@ function getErrMessage(call) { if (EOL === '\r\n') { message = message.replace(/\r\n/g, '\n'); } + // Always normalize indentation, otherwise the message could look weird. + if (message.indexOf('\n') !== -1) { + const tmp = message.split('\n'); + message = tmp[0]; + for (var i = 1; i < tmp.length; i++) { + let pos = 0; + while (pos < column && + (tmp[i][pos] === ' ' || tmp[i][pos] === '\t')) { + pos++; + } + message += `\n ${tmp[i].slice(pos)}`; + } + } message = 'The expression evaluated to a falsy value:' + `\n\n assert${ok}(${message})\n`; } diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js index d81ef32cd82210..eb084e9b01cb2b 100644 --- a/test/parallel/test-assert.js +++ b/test/parallel/test-assert.js @@ -694,14 +694,55 @@ common.expectsError( { code: 'ERR_ASSERTION', type: assert.AssertionError, - message: 'The expression evaluated to a falsy value:\n\n ' + - "assert((() => 'string')()\n" + - ' // eslint-disable-next-line\n' + - ' ===\n' + - ' 123 instanceof\n' + - ' Buffer)\n' + message: 'The expression evaluated to a falsy value:\n\n' + + ' assert((() => \'string\')()\n' + + ' // eslint-disable-next-line\n' + + ' ===\n' + + ' 123 instanceof\n' + + ' Buffer)\n' + } +); + +common.expectsError( + () => { + a( + (() => 'string')() + // eslint-disable-next-line + === + 123 instanceof + Buffer + ); + }, + { + code: 'ERR_ASSERTION', + type: assert.AssertionError, + message: 'The expression evaluated to a falsy value:\n\n' + + ' assert((() => \'string\')()\n' + + ' // eslint-disable-next-line\n' + + ' ===\n' + + ' 123 instanceof\n' + + ' Buffer)\n' + } +); + +/* eslint-disable indent */ +common.expectsError(() => { +a(( + () => 'string')() === +123 instanceof +Buffer +); +}, { + code: 'ERR_ASSERTION', + type: assert.AssertionError, + message: 'The expression evaluated to a falsy value:\n\n' + + ' assert((\n' + + ' () => \'string\')() ===\n' + + ' 123 instanceof\n' + + ' Buffer)\n' } ); +/* eslint-enable indent */ common.expectsError( () => assert(null, undefined), From c4f0e81dd0e185ccc2b3aff705f800fdd0cd0258 Mon Sep 17 00:00:00 2001 From: Ali Ijaz Sheikh Date: Wed, 16 May 2018 15:22:56 -0700 Subject: [PATCH 193/208] src: trace_events: background thread events V8 uses a thread pool provided by the host to schedule background tasks for concurrent GC and compiation. Emit trace events to identify the background threads. Ensure that the tracing infrastructure is started before the thread pool is initialized. PR-URL: https://github.com/nodejs/node/pull/20823 Reviewed-By: Matteo Collina --- src/node.cc | 10 ++++------ src/node_platform.cc | 6 ++++-- test/cctest/node_test_fixture.h | 6 +++--- test/parallel/test-trace-events-metadata.js | 3 +++ 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/node.cc b/src/node.cc index 1edb87bf84f0ba..3f0fe28e98b1b8 100644 --- a/src/node.cc +++ b/src/node.cc @@ -288,11 +288,11 @@ static struct { #if NODE_USE_V8_PLATFORM void Initialize(int thread_pool_size) { tracing_agent_.reset(new tracing::Agent(trace_file_pattern)); - platform_ = new NodePlatform(thread_pool_size, - tracing_agent_->GetTracingController()); + auto controller = tracing_agent_->GetTracingController(); + tracing::TraceEventHelper::SetTracingController(controller); + StartTracingAgent(); + platform_ = new NodePlatform(thread_pool_size, controller); V8::InitializePlatform(platform_); - tracing::TraceEventHelper::SetTracingController( - tracing_agent_->GetTracingController()); } void Dispose() { @@ -4420,8 +4420,6 @@ int Start(int argc, char** argv) { #endif // HAVE_OPENSSL v8_platform.Initialize(v8_thread_pool_size); - // Enable tracing when argv has --trace-events-enabled. - v8_platform.StartTracingAgent(); V8::Initialize(); performance::performance_v8_start = PERFORMANCE_NOW(); v8_initialized = true; diff --git a/src/node_platform.cc b/src/node_platform.cc index b8f1344727cfd6..2885c72ed71213 100644 --- a/src/node_platform.cc +++ b/src/node_platform.cc @@ -16,8 +16,10 @@ using v8::Platform; using v8::Task; using v8::TracingController; -static void BackgroundRunner(void* data) { - TaskQueue* background_tasks = static_cast*>(data); +static void BackgroundRunner(void *data) { + TRACE_EVENT_METADATA1("__metadata", "thread_name", "name", + "BackgroundTaskRunner"); + TaskQueue *background_tasks = static_cast *>(data); while (std::unique_ptr task = background_tasks->BlockingPop()) { task->Run(); background_tasks->NotifyOfCompletion(); diff --git a/test/cctest/node_test_fixture.h b/test/cctest/node_test_fixture.h index e0740a47096460..f43cb56cd3a5b5 100644 --- a/test/cctest/node_test_fixture.h +++ b/test/cctest/node_test_fixture.h @@ -64,12 +64,12 @@ class NodeTestFixture : public ::testing::Test { v8::Isolate* isolate_; static void SetUpTestCase() { - platform.reset(new node::NodePlatform(4, nullptr)); tracing_controller.reset(new v8::TracingController()); - allocator.reset(v8::ArrayBuffer::Allocator::NewDefaultAllocator()); - params.array_buffer_allocator = allocator.get(); node::tracing::TraceEventHelper::SetTracingController( tracing_controller.get()); + platform.reset(new node::NodePlatform(4, nullptr)); + allocator.reset(v8::ArrayBuffer::Allocator::NewDefaultAllocator()); + params.array_buffer_allocator = allocator.get(); CHECK_EQ(0, uv_loop_init(¤t_loop)); v8::V8::InitializePlatform(platform.get()); v8::V8::Initialize(); diff --git a/test/parallel/test-trace-events-metadata.js b/test/parallel/test-trace-events-metadata.js index f8fcdcfe5bb788..eccec1ecf0f1a2 100644 --- a/test/parallel/test-trace-events-metadata.js +++ b/test/parallel/test-trace-events-metadata.js @@ -22,5 +22,8 @@ proc.once('exit', common.mustCall(() => { assert(traces.some((trace) => trace.cat === '__metadata' && trace.name === 'thread_name' && trace.args.name === 'JavaScriptMainThread')); + assert(traces.some((trace) => + trace.cat === '__metadata' && trace.name === 'thread_name' && + trace.args.name === 'BackgroundTaskRunner')); })); })); From f5f9cdc110245a701743954893aa70f99a88d93c Mon Sep 17 00:00:00 2001 From: cjihrig Date: Sun, 20 May 2018 10:08:45 -0400 Subject: [PATCH 194/208] test: define SharedArrayBuffer as a known global MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit defines SharedArrayBuffer as a global for all tests, rather than adding comments to individual tests. PR-URL: https://github.com/nodejs/node/pull/20849 Reviewed-By: Tiancheng "Timothy" Gu Reviewed-By: Ruben Bridgewater Reviewed-By: Yuta Hiroto Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Benjamin Gruenbaum Reviewed-By: Tobias Nießen --- test/.eslintrc.yaml | 1 + test/parallel/test-buffer-sharedarraybuffer.js | 1 - test/parallel/test-util-format-shared-arraybuffer.js | 2 -- test/parallel/test-util-types.js | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/test/.eslintrc.yaml b/test/.eslintrc.yaml index f07dd076d93865..7f67df154a9b35 100644 --- a/test/.eslintrc.yaml +++ b/test/.eslintrc.yaml @@ -51,3 +51,4 @@ globals: WebAssembly: false BigInt64Array: false BigUint64Array: false + SharedArrayBuffer: false diff --git a/test/parallel/test-buffer-sharedarraybuffer.js b/test/parallel/test-buffer-sharedarraybuffer.js index ce3241ec0e7a0f..52cec6e9c5cd1a 100644 --- a/test/parallel/test-buffer-sharedarraybuffer.js +++ b/test/parallel/test-buffer-sharedarraybuffer.js @@ -1,4 +1,3 @@ -/* global SharedArrayBuffer */ 'use strict'; require('../common'); diff --git a/test/parallel/test-util-format-shared-arraybuffer.js b/test/parallel/test-util-format-shared-arraybuffer.js index c910c1f1b4e044..27dfad3c91fd16 100644 --- a/test/parallel/test-util-format-shared-arraybuffer.js +++ b/test/parallel/test-util-format-shared-arraybuffer.js @@ -2,7 +2,5 @@ require('../common'); const assert = require('assert'); const util = require('util'); - -/* global SharedArrayBuffer */ const sab = new SharedArrayBuffer(4); assert.strictEqual(util.format(sab), 'SharedArrayBuffer { byteLength: 4 }'); diff --git a/test/parallel/test-util-types.js b/test/parallel/test-util-types.js index 924869896869c0..24f613cc0b25ad 100644 --- a/test/parallel/test-util-types.js +++ b/test/parallel/test-util-types.js @@ -1,5 +1,4 @@ // Flags: --harmony-bigint --experimental-vm-modules -/* global SharedArrayBuffer */ 'use strict'; const common = require('../common'); const fixtures = require('../common/fixtures'); From a8c74e89ae614b329ddcb40fa375b8ad3184e45e Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 20 May 2018 18:40:49 -0700 Subject: [PATCH 195/208] test: use error code rather than message in test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use err.code checking instead of err.message checking in test-child-process-fork-closed-channel-segfault. PR-URL: https://github.com/nodejs/node/pull/20859 Reviewed-By: Daniel Bevenius Reviewed-By: Colin Ihrig Reviewed-By: Sakthipriyan Vairamani Reviewed-By: James M Snell Reviewed-By: Tobias Nießen Reviewed-By: Richard Lau Reviewed-By: Luigi Pinca Reviewed-By: Trivikram Kamat Reviewed-By: Anna Henningsen --- .../parallel/test-child-process-fork-closed-channel-segfault.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-child-process-fork-closed-channel-segfault.js b/test/parallel/test-child-process-fork-closed-channel-segfault.js index 87b599c7bb29f2..14cb4b8fd97ae9 100644 --- a/test/parallel/test-child-process-fork-closed-channel-segfault.js +++ b/test/parallel/test-child-process-fork-closed-channel-segfault.js @@ -66,7 +66,7 @@ const server = net send(function(err) { // Ignore errors when sending the second handle because the worker // may already have exited. - if (err && err.message !== 'Channel closed') { + if (err && err.code !== 'ERR_IPC_CHANNEL_CLOSED') { throw err; } }); From 2687d4473929917d379ad7952f160c50c8c40ba7 Mon Sep 17 00:00:00 2001 From: Anatoli Papirovski Date: Thu, 17 May 2018 23:03:15 +0400 Subject: [PATCH 196/208] http2: fix several serious bugs Currently http2 does not properly submit GOAWAY frames when a session is being destroyed. It also doesn't properly handle when the other party severs the connection after sending a GOAWAY frame, even though it should. Edge, IE & Safari are currently unable to handle empty TRAILERS frames despite them being correctly to spec. Instead send an empty DATA frame with END_STREAM flag in those situations. Fix and adjust several flaky and/or incorrect tests. PR-URL: https://github.com/nodejs/node/pull/20772 Fixes: https://github.com/nodejs/node/issues/20705 Fixes: https://github.com/nodejs/node/issues/20750 Fixes: https://github.com/nodejs/node/issues/20850 Reviewed-By: Matteo Collina Reviewed-By: Rich Trott Reviewed-By: James M Snell --- doc/api/http2.md | 4 + lib/internal/http2/core.js | 110 +++++++++++------- src/node_http2.cc | 50 +++++--- src/node_http2.h | 8 +- test/parallel/parallel.status | 6 - test/parallel/test-http2-client-destroy.js | 8 +- .../test-http2-no-wanttrailers-listener.js | 5 +- .../test-http2-server-close-callback.js | 19 +-- .../test-http2-server-sessionerror.js | 13 ++- ...st-http2-server-shutdown-options-errors.js | 6 - .../test-http2-server-socket-destroy.js | 10 +- ...est-http2-server-stream-session-destroy.js | 8 -- test/parallel/test-http2-server-timeout.js | 10 +- test/parallel/test-http2-too-many-settings.js | 7 +- test/parallel/test-http2-trailers.js | 3 +- 15 files changed, 145 insertions(+), 122 deletions(-) diff --git a/doc/api/http2.md b/doc/api/http2.md index ec75dd7f63b0aa..72233407d6c9e2 100644 --- a/doc/api/http2.md +++ b/doc/api/http2.md @@ -880,6 +880,10 @@ The `'trailers'` event is emitted when a block of headers associated with trailing header fields is received. The listener callback is passed the [HTTP/2 Headers Object][] and flags associated with the headers. +Note that this event might not be emitted if `http2stream.end()` is called +before trailers are received and the incoming data is not being read or +listened for. + ```js stream.on('trailers', (headers, flags) => { console.log(headers); diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js index fbccbf0d849977..39d456fb75905f 100644 --- a/lib/internal/http2/core.js +++ b/lib/internal/http2/core.js @@ -341,20 +341,25 @@ function onStreamClose(code) { stream[kState].fd = -1; // Defer destroy we actually emit end. - if (stream._readableState.endEmitted || code !== NGHTTP2_NO_ERROR) { + if (!stream.readable || code !== NGHTTP2_NO_ERROR) { // If errored or ended, we can destroy immediately. - stream[kMaybeDestroy](null, code); + stream[kMaybeDestroy](code); } else { // Wait for end to destroy. stream.on('end', stream[kMaybeDestroy]); // Push a null so the stream can end whenever the client consumes // it completely. stream.push(null); - // If the client hasn't tried to consume the stream and there is no - // resume scheduled (which would indicate they would consume in the future), - // then just dump the incoming data so that the stream can be destroyed. - if (!stream[kState].didRead && !stream._readableState.resumeScheduled) + + // If the user hasn't tried to consume the stream (and this is a server + // session) then just dump the incoming data so that the stream can + // be destroyed. + if (stream[kSession][kType] === NGHTTP2_SESSION_SERVER && + !stream[kState].didRead && + stream.readableFlowing === null) stream.resume(); + else + stream.read(0); } } @@ -379,7 +384,7 @@ function onStreamRead(nread, buf) { `${sessionName(stream[kSession][kType])}]: ending readable.`); // defer this until we actually emit end - if (stream._readableState.endEmitted) { + if (!stream.readable) { stream[kMaybeDestroy](); } else { stream.on('end', stream[kMaybeDestroy]); @@ -469,8 +474,7 @@ function onGoawayData(code, lastStreamID, buf) { // goaway using NGHTTP2_NO_ERROR because there was no error // condition on this side of the session that caused the // shutdown. - session.destroy(new ERR_HTTP2_SESSION_ERROR(code), - { errorCode: NGHTTP2_NO_ERROR }); + session.destroy(new ERR_HTTP2_SESSION_ERROR(code), NGHTTP2_NO_ERROR); } } @@ -813,6 +817,21 @@ function emitClose(self, error) { self.emit('close'); } +function finishSessionDestroy(session, error) { + const socket = session[kSocket]; + if (!socket.destroyed) + socket.destroy(error); + + session[kProxySocket] = undefined; + session[kSocket] = undefined; + session[kHandle] = undefined; + socket[kSession] = undefined; + socket[kServer] = undefined; + + // Finally, emit the close and error events (if necessary) on next tick. + process.nextTick(emitClose, session, error); +} + // Upon creation, the Http2Session takes ownership of the socket. The session // may not be ready to use immediately if the socket is not yet fully connected. // In that case, the Http2Session will wait for the socket to connect. Once @@ -869,6 +888,8 @@ class Http2Session extends EventEmitter { this[kState] = { flags: SESSION_FLAGS_PENDING, + goawayCode: null, + goawayLastStreamID: null, streams: new Map(), pendingStreams: new Set(), pendingAck: 0, @@ -1171,25 +1192,13 @@ class Http2Session extends EventEmitter { if (handle !== undefined) handle.destroy(code, socket.destroyed); - // If there is no error, use setImmediate to destroy the socket on the + // If the socket is alive, use setImmediate to destroy the session on the // next iteration of the event loop in order to give data time to transmit. // Otherwise, destroy immediately. - if (!socket.destroyed) { - if (!error) { - setImmediate(socket.destroy.bind(socket)); - } else { - socket.destroy(error); - } - } - - this[kProxySocket] = undefined; - this[kSocket] = undefined; - this[kHandle] = undefined; - socket[kSession] = undefined; - socket[kServer] = undefined; - - // Finally, emit the close and error events (if necessary) on next tick. - process.nextTick(emitClose, this, error); + if (!socket.destroyed) + setImmediate(finishSessionDestroy, this, error); + else + finishSessionDestroy(this, error); } // Closing the session will: @@ -1441,11 +1450,8 @@ function afterDoStreamWrite(status, handle) { } function streamOnResume() { - if (!this.destroyed && !this.pending) { - if (!this[kState].didRead) - this[kState].didRead = true; + if (!this.destroyed) this[kHandle].readStart(); - } } function streamOnPause() { @@ -1460,6 +1466,16 @@ function afterShutdown() { stream[kMaybeDestroy](); } +function finishSendTrailers(stream, headersList) { + stream[kState].flags &= ~STREAM_FLAGS_HAS_TRAILERS; + + const ret = stream[kHandle].trailers(headersList); + if (ret < 0) + stream.destroy(new NghttpError(ret)); + else + stream[kMaybeDestroy](); +} + function closeStream(stream, code, shouldSubmitRstStream = true) { const state = stream[kState]; state.flags |= STREAM_FLAGS_CLOSED; @@ -1521,6 +1537,10 @@ class Http2Stream extends Duplex { this[kSession] = session; session[kState].pendingStreams.add(this); + // Allow our logic for determining whether any reads have happened to + // work in all situations. This is similar to what we do in _http_incoming. + this._readableState.readingMore = true; + this[kTimeout] = null; this[kState] = { @@ -1531,7 +1551,6 @@ class Http2Stream extends Duplex { trailersReady: false }; - this.on('resume', streamOnResume); this.on('pause', streamOnPause); } @@ -1725,6 +1744,10 @@ class Http2Stream extends Duplex { this.push(null); return; } + if (!this[kState].didRead) { + this._readableState.readingMore = false; + this[kState].didRead = true; + } if (!this.pending) { streamOnResume.call(this); } else { @@ -1773,13 +1796,8 @@ class Http2Stream extends Duplex { throw headersList; this[kSentTrailers] = headers; - this[kState].flags &= ~STREAM_FLAGS_HAS_TRAILERS; - - const ret = this[kHandle].trailers(headersList); - if (ret < 0) - this.destroy(new NghttpError(ret)); - else - this[kMaybeDestroy](); + // Send the trailers in setImmediate so we don't do it on nghttp2 stack. + setImmediate(finishSendTrailers, this, headersList); } get closed() { @@ -1866,15 +1884,15 @@ class Http2Stream extends Duplex { } // The Http2Stream can be destroyed if it has closed and if the readable // side has received the final chunk. - [kMaybeDestroy](error, code = NGHTTP2_NO_ERROR) { - if (error || code !== NGHTTP2_NO_ERROR) { - this.destroy(error); + [kMaybeDestroy](code = NGHTTP2_NO_ERROR) { + if (code !== NGHTTP2_NO_ERROR) { + this.destroy(); return; } // TODO(mcollina): remove usage of _*State properties - if (this._writableState.ended && this._writableState.pendingcb === 0) { - if (this._readableState.ended && this.closed) { + if (!this.writable) { + if (!this.readable && this.closed) { this.destroy(); return; } @@ -1887,7 +1905,7 @@ class Http2Stream extends Duplex { this[kSession][kType] === NGHTTP2_SESSION_SERVER && !(state.flags & STREAM_FLAGS_HAS_TRAILERS) && !state.didRead && - !this._readableState.resumeScheduled) { + this.readableFlowing === null) { this.close(); } } @@ -2477,6 +2495,10 @@ Object.defineProperty(Http2Session.prototype, 'setTimeout', setTimeout); function socketOnError(error) { const session = this[kSession]; if (session !== undefined) { + // We can ignore ECONNRESET after GOAWAY was received as there's nothing + // we can do and the other side is fully within its rights to do so. + if (error.code === 'ECONNRESET' && session[kState].goawayCode !== null) + return session.destroy(); debug(`Http2Session ${sessionName(session[kType])}: socket error [` + `${error.message}]`); session.destroy(error); diff --git a/src/node_http2.cc b/src/node_http2.cc index 94f774e2d3506d..4745707f9ac345 100644 --- a/src/node_http2.cc +++ b/src/node_http2.cc @@ -577,9 +577,9 @@ void Http2Session::EmitStatistics() { void Http2Session::Close(uint32_t code, bool socket_closed) { DEBUG_HTTP2SESSION(this, "closing session"); - if (flags_ & SESSION_STATE_CLOSED) + if (flags_ & SESSION_STATE_CLOSING) return; - flags_ |= SESSION_STATE_CLOSED; + flags_ |= SESSION_STATE_CLOSING; // Stop reading on the i/o stream if (stream_ != nullptr) @@ -587,16 +587,18 @@ void Http2Session::Close(uint32_t code, bool socket_closed) { // If the socket is not closed, then attempt to send a closing GOAWAY // frame. There is no guarantee that this GOAWAY will be received by - // the peer but the HTTP/2 spec recommends sendinng it anyway. We'll + // the peer but the HTTP/2 spec recommends sending it anyway. We'll // make a best effort. if (!socket_closed) { - Http2Scope h2scope(this); DEBUG_HTTP2SESSION2(this, "terminating session with code %d", code); CHECK_EQ(nghttp2_session_terminate_session(session_, code), 0); + SendPendingData(); } else if (stream_ != nullptr) { stream_->RemoveStreamListener(this); } + flags_ |= SESSION_STATE_CLOSED; + // If there are outstanding pings, those will need to be canceled, do // so on the next iteration of the event loop to avoid calling out into // javascript since this may be called during garbage collection. @@ -1355,25 +1357,32 @@ void Http2Session::MaybeScheduleWrite() { } } +void Http2Session::MaybeStopReading() { + int want_read = nghttp2_session_want_read(session_); + DEBUG_HTTP2SESSION2(this, "wants read? %d", want_read); + if (want_read == 0) + stream_->ReadStop(); +} + // Unset the sending state, finish up all current writes, and reset // storage for data and metadata that was associated with these writes. void Http2Session::ClearOutgoing(int status) { CHECK_NE(flags_ & SESSION_STATE_SENDING, 0); + flags_ &= ~SESSION_STATE_SENDING; + if (outgoing_buffers_.size() > 0) { outgoing_storage_.clear(); - for (const nghttp2_stream_write& wr : outgoing_buffers_) { + std::vector current_outgoing_buffers_; + current_outgoing_buffers_.swap(outgoing_buffers_); + for (const nghttp2_stream_write& wr : current_outgoing_buffers_) { WriteWrap* wrap = wr.req_wrap; if (wrap != nullptr) wrap->Done(status); } - - outgoing_buffers_.clear(); } - flags_ &= ~SESSION_STATE_SENDING; - // Now that we've finished sending queued data, if there are any pending // RstStreams we should try sending again and then flush them one by one. if (pending_rst_streams_.size() > 0) { @@ -1484,8 +1493,7 @@ uint8_t Http2Session::SendPendingData() { ClearOutgoing(res.err); } - DEBUG_HTTP2SESSION2(this, "wants data in return? %d", - nghttp2_session_want_read(session_)); + MaybeStopReading(); return 0; } @@ -1618,8 +1626,7 @@ void Http2Session::OnStreamRead(ssize_t nread, const uv_buf_t& buf) { }; MakeCallback(env()->error_string(), arraysize(argv), argv); } else { - DEBUG_HTTP2SESSION2(this, "processed %d bytes. wants more? %d", ret, - nghttp2_session_want_read(session_)); + MaybeStopReading(); } } @@ -1814,6 +1821,7 @@ void Http2Stream::OnTrailers() { HandleScope scope(isolate); Local context = env()->context(); Context::Scope context_scope(context); + flags_ &= ~NGHTTP2_STREAM_FLAG_TRAILERS; MakeCallback(env()->ontrailers_string(), 0, nullptr); } @@ -1822,7 +1830,16 @@ int Http2Stream::SubmitTrailers(nghttp2_nv* nva, size_t len) { CHECK(!this->IsDestroyed()); Http2Scope h2scope(this); DEBUG_HTTP2STREAM2(this, "sending %d trailers", len); - int ret = nghttp2_submit_trailer(**session_, id_, nva, len); + int ret; + // Sending an empty trailers frame poses problems in Safari, Edge & IE. + // Instead we can just send an empty data frame with NGHTTP2_FLAG_END_STREAM + // to indicate that the stream is ready to be closed. + if (len == 0) { + Http2Stream::Provider::Stream prov(this, 0); + ret = nghttp2_submit_data(**session_, NGHTTP2_FLAG_END_STREAM, id_, *prov); + } else { + ret = nghttp2_submit_trailer(**session_, id_, nva, len); + } CHECK_NE(ret, NGHTTP2_ERR_NOMEM); return ret; } @@ -2351,8 +2368,7 @@ void Http2Stream::Info(const FunctionCallbackInfo& args) { Headers list(isolate, context, headers); args.GetReturnValue().Set(stream->SubmitInfo(*list, list.length())); - DEBUG_HTTP2STREAM2(stream, "%d informational headers sent", - headers->Length()); + DEBUG_HTTP2STREAM2(stream, "%d informational headers sent", list.length()); } // Submits trailing headers on the Http2Stream @@ -2367,7 +2383,7 @@ void Http2Stream::Trailers(const FunctionCallbackInfo& args) { Headers list(isolate, context, headers); args.GetReturnValue().Set(stream->SubmitTrailers(*list, list.length())); - DEBUG_HTTP2STREAM2(stream, "%d trailing headers sent", headers->Length()); + DEBUG_HTTP2STREAM2(stream, "%d trailing headers sent", list.length()); } // Grab the numeric id of the Http2Stream diff --git a/src/node_http2.h b/src/node_http2.h index f473e30286bc79..043449624fb120 100644 --- a/src/node_http2.h +++ b/src/node_http2.h @@ -433,7 +433,8 @@ enum session_state_flags { SESSION_STATE_HAS_SCOPE = 0x1, SESSION_STATE_WRITE_SCHEDULED = 0x2, SESSION_STATE_CLOSED = 0x4, - SESSION_STATE_SENDING = 0x8, + SESSION_STATE_CLOSING = 0x8, + SESSION_STATE_SENDING = 0x10, }; // This allows for 4 default-sized frames with their frame headers @@ -619,7 +620,7 @@ class Http2Stream : public AsyncWrap, inline bool IsClosed() const { return flags_ & NGHTTP2_STREAM_FLAG_CLOSED; - } + } inline bool HasTrailers() const { return flags_ & NGHTTP2_STREAM_FLAG_TRAILERS; @@ -827,6 +828,9 @@ class Http2Session : public AsyncWrap, public StreamListener { // Schedule a write if nghttp2 indicates it wants to write to the socket. void MaybeScheduleWrite(); + // Stop reading if nghttp2 doesn't want to anymore. + void MaybeStopReading(); + // Returns pointer to the stream, or nullptr if stream does not exist inline Http2Stream* FindStream(int32_t id); diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status index 2bd5db83889740..899e6adfac060d 100644 --- a/test/parallel/parallel.status +++ b/test/parallel/parallel.status @@ -8,12 +8,6 @@ prefix parallel # Postmortem debugging data is prone to accidental removal during V8 updates. test-postmortem-metadata: PASS,FLAKY -# http2 has a few bugs that make these tests flaky and that are currently worked -# on. -test-http2-client-upload-reject: PASS,FLAKY -test-http2-pipe: PASS,FLAKY -test-http2-client-upload: PASS,FLAKY - [$system==win32] [$system==linux] diff --git a/test/parallel/test-http2-client-destroy.js b/test/parallel/test-http2-client-destroy.js index 6238363511a791..43fc6819e21f7a 100644 --- a/test/parallel/test-http2-client-destroy.js +++ b/test/parallel/test-http2-client-destroy.js @@ -109,9 +109,6 @@ const Countdown = require('../common/countdown'); server.listen(0, common.mustCall(() => { const client = h2.connect(`http://localhost:${server.address().port}`); - // On some platforms (e.g. windows), an ECONNRESET may occur at this - // point -- or it may not. Do not make this a mustCall - client.on('error', () => {}); client.on('close', () => { server.close(); @@ -119,10 +116,7 @@ const Countdown = require('../common/countdown'); client.destroy(); }); - const req = client.request(); - // On some platforms (e.g. windows), an ECONNRESET may occur at this - // point -- or it may not. Do not make this a mustCall - req.on('error', () => {}); + client.request(); })); } diff --git a/test/parallel/test-http2-no-wanttrailers-listener.js b/test/parallel/test-http2-no-wanttrailers-listener.js index 7ba25d0e491e15..87bc21df48aa2c 100644 --- a/test/parallel/test-http2-no-wanttrailers-listener.js +++ b/test/parallel/test-http2-no-wanttrailers-listener.js @@ -3,7 +3,6 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); -const assert = require('assert'); const h2 = require('http2'); const server = h2.createServer(); @@ -25,9 +24,7 @@ server.on('listening', common.mustCall(function() { const client = h2.connect(`http://localhost:${this.address().port}`); const req = client.request(); req.resume(); - req.on('trailers', common.mustCall((headers) => { - assert.strictEqual(Object.keys(headers).length, 0); - })); + req.on('trailers', common.mustNotCall()); req.on('close', common.mustCall(() => { server.close(); client.close(); diff --git a/test/parallel/test-http2-server-close-callback.js b/test/parallel/test-http2-server-close-callback.js index 66887aa62bebe5..f822d8a4a92d78 100644 --- a/test/parallel/test-http2-server-close-callback.js +++ b/test/parallel/test-http2-server-close-callback.js @@ -4,21 +4,24 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); +const Countdown = require('../common/countdown'); const http2 = require('http2'); const server = http2.createServer(); +let session; + +const countdown = new Countdown(2, () => { + server.close(common.mustCall()); + session.destroy(); +}); + server.listen(0, common.mustCall(() => { const client = http2.connect(`http://localhost:${server.address().port}`); - client.on('error', (err) => { - if (err.code !== 'ECONNRESET') - throw err; - }); + client.on('connect', common.mustCall(() => countdown.dec())); })); server.on('session', common.mustCall((s) => { - setImmediate(() => { - server.close(common.mustCall()); - s.destroy(); - }); + session = s; + countdown.dec(); })); diff --git a/test/parallel/test-http2-server-sessionerror.js b/test/parallel/test-http2-server-sessionerror.js index 525eb2e6efd11a..c50352fcc35c28 100644 --- a/test/parallel/test-http2-server-sessionerror.js +++ b/test/parallel/test-http2-server-sessionerror.js @@ -35,14 +35,17 @@ server.on('session', common.mustCall((session) => { server.listen(0, common.mustCall(() => { const url = `http://localhost:${server.address().port}`; http2.connect(url) - // An ECONNRESET error may occur depending on the platform (due largely - // to differences in the timing of socket closing). Do not wrap this in - // a common must call. - .on('error', () => {}) + .on('error', common.expectsError({ + code: 'ERR_HTTP2_SESSION_ERROR', + message: 'Session closed with error code 2', + })) .on('close', () => { server.removeAllListeners('error'); http2.connect(url) - .on('error', () => {}) + .on('error', common.expectsError({ + code: 'ERR_HTTP2_SESSION_ERROR', + message: 'Session closed with error code 2', + })) .on('close', () => server.close()); }); })); diff --git a/test/parallel/test-http2-server-shutdown-options-errors.js b/test/parallel/test-http2-server-shutdown-options-errors.js index 95849411a29182..9dde6660ea25ce 100644 --- a/test/parallel/test-http2-server-shutdown-options-errors.js +++ b/test/parallel/test-http2-server-shutdown-options-errors.js @@ -55,13 +55,7 @@ server.listen( 0, common.mustCall(() => { const client = http2.connect(`http://localhost:${server.address().port}`); - // On certain operating systems, an ECONNRESET may occur. We do not need - // to test for it here. Do not make this a mustCall - client.on('error', () => {}); const req = client.request(); - // On certain operating systems, an ECONNRESET may occur. We do not need - // to test for it here. Do not make this a mustCall - req.on('error', () => {}); req.resume(); req.on('close', common.mustCall(() => { client.close(); diff --git a/test/parallel/test-http2-server-socket-destroy.js b/test/parallel/test-http2-server-socket-destroy.js index 03afc1957b8af4..99595aeb63004d 100644 --- a/test/parallel/test-http2-server-socket-destroy.js +++ b/test/parallel/test-http2-server-socket-destroy.js @@ -41,14 +41,20 @@ server.on('listening', common.mustCall(() => { // The client may have an ECONNRESET error here depending on the operating // system, due mainly to differences in the timing of socket closing. Do // not wrap this in a common mustCall. - client.on('error', () => {}); + client.on('error', (err) => { + if (err.code !== 'ECONNRESET') + throw err; + }); client.on('close', common.mustCall()); const req = client.request({ ':method': 'POST' }); // The client may have an ECONNRESET error here depending on the operating // system, due mainly to differences in the timing of socket closing. Do // not wrap this in a common mustCall. - req.on('error', () => {}); + req.on('error', (err) => { + if (err.code !== 'ECONNRESET') + throw err; + }); req.on('aborted', common.mustCall()); req.resume(); diff --git a/test/parallel/test-http2-server-stream-session-destroy.js b/test/parallel/test-http2-server-stream-session-destroy.js index ef4f42fe39bc3a..6a262e2736e4bc 100644 --- a/test/parallel/test-http2-server-stream-session-destroy.js +++ b/test/parallel/test-http2-server-stream-session-destroy.js @@ -44,16 +44,8 @@ server.on('stream', common.mustCall((stream) => { server.listen(0, common.mustCall(() => { const client = h2.connect(`http://localhost:${server.address().port}`); - client.on('error', (err) => { - if (err.code !== 'ECONNRESET') - throw err; - }); const req = client.request(); req.resume(); req.on('end', common.mustCall()); req.on('close', common.mustCall(() => server.close(common.mustCall()))); - req.on('error', (err) => { - if (err.code !== 'ECONNRESET') - throw err; - }); })); diff --git a/test/parallel/test-http2-server-timeout.js b/test/parallel/test-http2-server-timeout.js index 4410cb51c169c5..88fc4eab2e08c0 100755 --- a/test/parallel/test-http2-server-timeout.js +++ b/test/parallel/test-http2-server-timeout.js @@ -6,10 +6,10 @@ if (!common.hasCrypto) const http2 = require('http2'); const server = http2.createServer(); -server.setTimeout(common.platformTimeout(1)); +server.setTimeout(common.platformTimeout(50)); const onServerTimeout = common.mustCall((session) => { - session.close(() => session.destroy()); + session.close(); }); server.on('stream', common.mustNotCall()); @@ -18,14 +18,8 @@ server.once('timeout', onServerTimeout); server.listen(0, common.mustCall(() => { const url = `http://localhost:${server.address().port}`; const client = http2.connect(url); - // Because of the timeout, an ECONNRESET error may or may not happen here. - // Keep this as a non-op and do not use common.mustCall() - client.on('error', () => {}); client.on('close', common.mustCall(() => { const client2 = http2.connect(url); - // Because of the timeout, an ECONNRESET error may or may not happen here. - // Keep this as a non-op and do not use common.mustCall() - client2.on('error', () => {}); client2.on('close', common.mustCall(() => server.close())); })); })); diff --git a/test/parallel/test-http2-too-many-settings.js b/test/parallel/test-http2-too-many-settings.js index 0302fe623da07c..acfd73ada68416 100644 --- a/test/parallel/test-http2-too-many-settings.js +++ b/test/parallel/test-http2-too-many-settings.js @@ -29,9 +29,10 @@ function doTest(session) { server.listen(0, common.mustCall(() => { const client = h2.connect(`http://localhost:${server.address().port}`); - // On some operating systems, an ECONNRESET error may be emitted. - // On others it won't be. Do not make this a mustCall - client.on('error', () => {}); + client.on('error', common.expectsError({ + code: 'ERR_HTTP2_SESSION_ERROR', + message: 'Session closed with error code 2', + })); client.on('close', common.mustCall(() => server.close())); })); } diff --git a/test/parallel/test-http2-trailers.js b/test/parallel/test-http2-trailers.js index 2b7f6158ca3951..bdc0931157ad58 100644 --- a/test/parallel/test-http2-trailers.js +++ b/test/parallel/test-http2-trailers.js @@ -18,6 +18,7 @@ server.on('stream', common.mustCall(onStream)); function onStream(stream, headers, flags) { stream.on('trailers', common.mustCall((headers) => { assert.strictEqual(headers[trailerKey], trailerValue); + stream.end(body); })); stream.respond({ 'content-type': 'text/html', @@ -41,8 +42,6 @@ function onStream(stream, headers, flags) { type: Error } ); - - stream.end(body); } server.listen(0); From dd32a7a0d4ac7a9db945188e1af1c7c934b3ce49 Mon Sep 17 00:00:00 2001 From: Anatoli Papirovski Date: Mon, 21 May 2018 11:42:32 +0400 Subject: [PATCH 197/208] test: fix flaky http2-session-unref It's possible for the connections to take too long and since the server is already unrefed, the process will just exit. Instead adjust the test so that server unref only happens after all sessions have been successfuly established and unrefed. That still tests the same condition but will not fail under load. PR-URL: https://github.com/nodejs/node/pull/20772 Fixes: https://github.com/nodejs/node/issues/20705 Fixes: https://github.com/nodejs/node/issues/20750 Fixes: https://github.com/nodejs/node/issues/20850 Reviewed-By: Matteo Collina Reviewed-By: Rich Trott Reviewed-By: James M Snell --- test/parallel/test-http2-session-unref.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/parallel/test-http2-session-unref.js b/test/parallel/test-http2-session-unref.js index f946c2d3377b87..0381971c0eace5 100644 --- a/test/parallel/test-http2-session-unref.js +++ b/test/parallel/test-http2-session-unref.js @@ -9,16 +9,20 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); const http2 = require('http2'); +const Countdown = require('../common/countdown'); const makeDuplexPair = require('../common/duplexpair'); const server = http2.createServer(); const { clientSide, serverSide } = makeDuplexPair(); +const counter = new Countdown(3, () => server.unref()); + // 'session' event should be emitted 3 times: // - the vanilla client // - the destroyed client // - manual 'connection' event emission with generic Duplex stream server.on('session', common.mustCallAtLeast((session) => { + counter.dec(); session.unref(); }, 3)); @@ -54,4 +58,3 @@ server.listen(0, common.mustCall(() => { } })); server.emit('connection', serverSide); -server.unref(); From 75e4415c40fd144a33b559d075874bd929313c60 Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Wed, 16 May 2018 22:15:20 +0200 Subject: [PATCH 198/208] http: do not rely on the 'agentRemove' event Do not use the `'agentRemove'` event to null `socket._httpMessage` as that event is public and can be used to not keep a request in the agent. PR-URL: https://github.com/nodejs/node/pull/20786 Fixes: https://github.com/nodejs/node/issues/20690 Reviewed-By: Ruben Bridgewater Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Reviewed-By: Anatoli Papirovski --- lib/_http_agent.js | 1 - lib/_http_client.js | 1 + test/parallel/test-http-agent-remove.js | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 test/parallel/test-http-agent-remove.js diff --git a/lib/_http_agent.js b/lib/_http_agent.js index 303f56bfe4ba21..67f3d667b28169 100644 --- a/lib/_http_agent.js +++ b/lib/_http_agent.js @@ -276,7 +276,6 @@ function installListeners(agent, s, options) { s.removeListener('close', onClose); s.removeListener('free', onFree); s.removeListener('agentRemove', onRemove); - s._httpMessage = null; } s.on('agentRemove', onRemove); } diff --git a/lib/_http_client.js b/lib/_http_client.js index 3e9c6e994cd01b..d3616eb6b5e7f9 100644 --- a/lib/_http_client.js +++ b/lib/_http_client.js @@ -459,6 +459,7 @@ function socketOnData(d) { socket.removeListener('close', socketCloseListener); socket.removeListener('error', socketErrorListener); + socket._httpMessage = null; socket.readableFlowing = null; req.emit(eventName, res, socket, bodyHead); diff --git a/test/parallel/test-http-agent-remove.js b/test/parallel/test-http-agent-remove.js new file mode 100644 index 00000000000000..24fc7fcb8282fe --- /dev/null +++ b/test/parallel/test-http-agent-remove.js @@ -0,0 +1,21 @@ +'use strict'; +const { mustCall } = require('../common'); + +const http = require('http'); +const { strictEqual } = require('assert'); + +const server = http.createServer(mustCall((req, res) => { + res.flushHeaders(); +})); + +server.listen(0, mustCall(() => { + const req = http.get({ + port: server.address().port + }, mustCall(() => { + const { socket } = req; + socket.emit('agentRemove'); + strictEqual(socket._httpMessage, req); + socket.destroy(); + server.close(); + })); +})); From fe7e8d6a3ec2891e21d2cf1c5168195f1b53b21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D1=8F=20=D0=BA=D0=BE=D1=82=D0=B8=D0=BA=20=D0=BF=D1=83?= =?UTF-8?q?=D1=80-=D0=BF=D1=83=D1=80?= Date: Wed, 25 Apr 2018 15:49:04 +0300 Subject: [PATCH 199/208] http: fix capitalization of 418 status message Update the message to be consistent with RFC 7168. Add a note to "Multiple Choices" regarding RFC 7231 superseding RFC 7168. PR-URL: https://github.com/nodejs/node/pull/20700 Reviewed-By: Anatoli Papirovski Reviewed-By: Ruben Bridgewater Reviewed-By: Trivikram Kamat Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Yuta Hiroto t Co-authored-by: Antoine du Hamel --- lib/_http_server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/_http_server.js b/lib/_http_server.js index 928b57b3719684..425ddef6f954f6 100644 --- a/lib/_http_server.js +++ b/lib/_http_server.js @@ -67,7 +67,7 @@ const STATUS_CODES = { 207: 'Multi-Status', // RFC 4918 208: 'Already Reported', 226: 'IM Used', - 300: 'Multiple Choices', + 300: 'Multiple Choices', // RFC 7231 301: 'Moved Permanently', 302: 'Found', 303: 'See Other', @@ -93,7 +93,7 @@ const STATUS_CODES = { 415: 'Unsupported Media Type', 416: 'Range Not Satisfiable', 417: 'Expectation Failed', - 418: 'I\'m a teapot', // RFC 2324 + 418: 'I\'m a Teapot', // RFC 7168 421: 'Misdirected Request', 422: 'Unprocessable Entity', // RFC 4918 423: 'Locked', // RFC 4918 From 9c560ca9076a0e6446c5a3c0b7c78c5ac3999114 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 18 May 2018 14:22:26 +0200 Subject: [PATCH 200/208] test: rename and document tls test Add a short description and one question to a TLS test. Also, rename it since the previous name might unintentionally evoke connotations to an internet meme that would generally not be considered appropriate in our context. PR-URL: https://github.com/nodejs/node/pull/20820 Reviewed-By: Benjamin Gruenbaum Reviewed-By: Colin Ihrig Reviewed-By: Trivikram Kamat Reviewed-By: Rich Trott Reviewed-By: James M Snell Reviewed-By: Ujjwal Sharma --- ...-cas-one-string.js => test-tls-multiple-cas-as-string.js} | 5 +++++ 1 file changed, 5 insertions(+) rename test/parallel/{test-tls-two-cas-one-string.js => test-tls-multiple-cas-as-string.js} (77%) diff --git a/test/parallel/test-tls-two-cas-one-string.js b/test/parallel/test-tls-multiple-cas-as-string.js similarity index 77% rename from test/parallel/test-tls-two-cas-one-string.js rename to test/parallel/test-tls-multiple-cas-as-string.js index bbde78a24ed706..2612de55fe988f 100644 --- a/test/parallel/test-tls-two-cas-one-string.js +++ b/test/parallel/test-tls-multiple-cas-as-string.js @@ -4,6 +4,9 @@ const common = require('../common'); if (!common.hasCrypto) common.skip('missing crypto'); +// Verify that multiple CA certificates can be provided, and that for +// convenience that can also be in newline-separated strings. + const tls = require('tls'); const fixtures = require('../common/fixtures'); @@ -30,6 +33,8 @@ function test(ca, next) { } } +// `ca1` is not actually necessary for the certificate validation -- maybe +// the fixtures should be written in a way that requires it? const array = [ca1, ca2]; const string = `${ca1}\n${ca2}`; test(array, common.mustCall(() => test(string))); From d9aecc0c07b6dfd23a134bd27fe25109542ff089 Mon Sep 17 00:00:00 2001 From: Masashi Hirano Date: Sat, 19 May 2018 13:11:01 +0900 Subject: [PATCH 201/208] test: improve coverage for internal/readline Add tests for readline keys to improve coverage. PR-URL: https://github.com/nodejs/node/pull/20840 Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Reviewed-By: Benjamin Gruenbaum --- test/parallel/test-readline-keys.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/parallel/test-readline-keys.js b/test/parallel/test-readline-keys.js index 62d5ab24b85cef..f739999110b12f 100644 --- a/test/parallel/test-readline-keys.js +++ b/test/parallel/test-readline-keys.js @@ -279,6 +279,23 @@ addTest('\x1b[31ma\x1b[39ma', [ { name: 'a', sequence: 'a' }, ]); +// rxvt keys with modifiers +addTest('\x1b[a\x1b[b\x1b[c\x1b[d\x1b[e', [ + { name: 'up', sequence: '\x1b[a', code: '[a', shift: true }, + { name: 'down', sequence: '\x1b[b', code: '[b', shift: true }, + { name: 'right', sequence: '\x1b[c', code: '[c', shift: true }, + { name: 'left', sequence: '\x1b[d', code: '[d', shift: true }, + { name: 'clear', sequence: '\x1b[e', code: '[e', shift: true }, +]); + +addTest('\x1bOa\x1bOb\x1bOc\x1bOd\x1bOe', [ + { name: 'up', sequence: '\x1bOa', code: 'Oa', ctrl: true }, + { name: 'down', sequence: '\x1bOb', code: 'Ob', ctrl: true }, + { name: 'right', sequence: '\x1bOc', code: 'Oc', ctrl: true }, + { name: 'left', sequence: '\x1bOd', code: 'Od', ctrl: true }, + { name: 'clear', sequence: '\x1bOe', code: 'Oe', ctrl: true }, +]); + // Reduce array of addKeyIntervalTest(..) right to left // with () => {} as initial function const runKeyIntervalTests = [ From c1fe9b29b1b1cf38fe0fd3efdb074ff2f203e83f Mon Sep 17 00:00:00 2001 From: Bartosz Sosnowski Date: Tue, 15 May 2018 20:45:17 +0200 Subject: [PATCH 202/208] doc: add note about autocrlf required for tests Adds a note to test/README.md that setting autocrlf to true when checking out sources is required for the tests to run successfully. PR-URL: https://github.com/nodejs/node/pull/20752 Ref: https://github.com/nodejs/node/issues/18967 Reviewed-By: Colin Ihrig Reviewed-By: Trivikram Kamat Reviewed-By: Rich Trott Reviewed-By: Joyee Cheung Reviewed-By: Anatoli Papirovski --- test/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/README.md b/test/README.md index bc2464bcfaecdf..302db9d0bb8ad7 100644 --- a/test/README.md +++ b/test/README.md @@ -8,6 +8,9 @@ directory, see [the guide on writing tests](../doc/guides/writing-tests.md). On how to run tests in this directory, see [the contributing guide](../doc/guides/contributing/pull-requests.md#step-6-test). +For the tests to successfully run on Windows, Node.js has to be checked out from +GitHub with the `autocrlf` git config flag set to true. + ## Test Directories |Directory |Runs on CI |Purpose | From dc29a3b3866b18995be527c95b7410ea6fbe1cba Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 19 May 2018 21:04:12 -0700 Subject: [PATCH 203/208] test: add promise API test for appendFile() Apply the second of five test cases in test-fs-append-fil to the promise-based API in addition to the callback-based API. PR-URL: https://github.com/nodejs/node/pull/20842 Reviewed-By: Colin Ihrig Reviewed-By: Ruben Bridgewater Reviewed-By: Trivikram Kamat Reviewed-By: Benjamin Gruenbaum --- test/parallel/test-fs-append-file.js | 42 ++++++++++++++++++---------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/test/parallel/test-fs-append-file.js b/test/parallel/test-fs-append-file.js index 0b0cf5cdb2f119..9ab36a67767946 100644 --- a/test/parallel/test-fs-append-file.js +++ b/test/parallel/test-fs-append-file.js @@ -70,22 +70,35 @@ const throwNextTick = (e) => { process.nextTick(() => { throw e; }); }; .catch(throwNextTick); } -// test that appends data to a non empty file -const filename2 = join(tmpdir.path, 'append2.txt'); -fs.writeFileSync(filename2, currentFileData); +// test that appends data to a non-empty file (callback API) +{ + const filename = join(tmpdir.path, 'append-non-empty.txt'); + fs.writeFileSync(filename, currentFileData); -fs.appendFile(filename2, s, function(e) { - assert.ifError(e); + fs.appendFile(filename, s, common.mustCall(function(e) { + assert.ifError(e); - ncallbacks++; + fs.readFile(filename, common.mustCall(function(e, buffer) { + assert.ifError(e); + assert.strictEqual(Buffer.byteLength(s) + currentFileData.length, + buffer.length); + })); + })); +} - fs.readFile(filename2, function(e, buffer) { - assert.ifError(e); - ncallbacks++; - assert.strictEqual(Buffer.byteLength(s) + currentFileData.length, - buffer.length); - }); -}); +// test that appends data to a non-empty file (promise API) +{ + const filename = join(tmpdir.path, 'append-non-empty-promise.txt'); + fs.writeFileSync(filename, currentFileData); + + fs.promises.appendFile(filename, s) + .then(common.mustCall(() => fs.promises.readFile(filename))) + .then((buffer) => { + assert.strictEqual(Buffer.byteLength(s) + currentFileData.length, + buffer.length); + }) + .catch(throwNextTick); +} // test that appendFile accepts buffers const filename3 = join(tmpdir.path, 'append3.txt'); @@ -164,9 +177,8 @@ assert.throws( { code: 'ERR_INVALID_CALLBACK' }); process.on('exit', function() { - assert.strictEqual(10, ncallbacks); + assert.strictEqual(ncallbacks, 8); - fs.unlinkSync(filename2); fs.unlinkSync(filename3); fs.unlinkSync(filename4); fs.unlinkSync(filename5); From 8d8b0bdf3806086dd3aa2427598430a974fa7bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Sun, 20 May 2018 12:13:03 +0200 Subject: [PATCH 204/208] lib,src,test: fix comments PR-URL: https://github.com/nodejs/node/pull/20846 Reviewed-By: Colin Ihrig Reviewed-By: Ruben Bridgewater Reviewed-By: James M Snell Reviewed-By: Daniel Bevenius Reviewed-By: Richard Lau --- lib/_stream_readable.js | 4 ++-- src/node.cc | 2 +- src/stream_base-inl.h | 2 +- src/tracing/node_trace_buffer.cc | 2 +- src/tracing/node_trace_writer.cc | 2 +- test/sequential/test-timers-blocking-callback.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js index d00728b112d4f3..7c11978c12b65c 100644 --- a/lib/_stream_readable.js +++ b/lib/_stream_readable.js @@ -834,7 +834,7 @@ Readable.prototype.removeListener = function(ev, fn) { if (ev === 'readable') { // We need to check if there is someone still listening to - // to readable and reset the state. However this needs to happen + // readable and reset the state. However this needs to happen // after readable has been emitted but before I/O (nextTick) to // support once('readable', fn) cycles. This means that calling // resume within the same tick will have no @@ -850,7 +850,7 @@ Readable.prototype.removeAllListeners = function(ev) { if (ev === 'readable' || ev === undefined) { // We need to check if there is someone still listening to - // to readable and reset the state. However this needs to happen + // readable and reset the state. However this needs to happen // after readable has been emitted but before I/O (nextTick) to // support once('readable', fn) cycles. This means that calling // resume within the same tick will have no diff --git a/src/node.cc b/src/node.cc index 3f0fe28e98b1b8..c7cc49a2b951da 100644 --- a/src/node.cc +++ b/src/node.cc @@ -2384,7 +2384,7 @@ static void EnvGetter(Local property, arraysize(buffer)); // If result >= sizeof buffer the buffer was too small. That should never // happen. If result == 0 and result != ERROR_SUCCESS the variable was not - // not found. + // found. if ((result > 0 || GetLastError() == ERROR_SUCCESS) && result < arraysize(buffer)) { const uint16_t* two_byte_buffer = reinterpret_cast(buffer); diff --git a/src/stream_base-inl.h b/src/stream_base-inl.h index cfe0de0872df4a..b1e820b09f7e3b 100644 --- a/src/stream_base-inl.h +++ b/src/stream_base-inl.h @@ -70,7 +70,7 @@ inline StreamResource::~StreamResource() { StreamListener* listener = listener_; listener->OnStreamDestroy(); // Remove the listener if it didn’t remove itself. This makes the logic - // logic in `OnStreamDestroy()` implementations easier, because they + // in `OnStreamDestroy()` implementations easier, because they // may call generic cleanup functions which can just remove the // listener unconditionally. if (listener == listener_) diff --git a/src/tracing/node_trace_buffer.cc b/src/tracing/node_trace_buffer.cc index 1765b88df1ea94..6e552d659ad6a6 100644 --- a/src/tracing/node_trace_buffer.cc +++ b/src/tracing/node_trace_buffer.cc @@ -134,7 +134,7 @@ bool NodeTraceBuffer::Flush() { } // Attempts to set current_buf_ such that it references a buffer that can -// can write at least one trace event. If both buffers are unavailable this +// write at least one trace event. If both buffers are unavailable this // method returns false; otherwise it returns true. bool NodeTraceBuffer::TryLoadAvailableBuffer() { InternalTraceBuffer* prev_buf = current_buf_.load(); diff --git a/src/tracing/node_trace_writer.cc b/src/tracing/node_trace_writer.cc index 88ff3e6e7c159d..a2f7bebfc72f9a 100644 --- a/src/tracing/node_trace_writer.cc +++ b/src/tracing/node_trace_writer.cc @@ -153,7 +153,7 @@ void NodeTraceWriter::WriteToFile(std::string&& str, int highest_request_id) { write_req->str.length()); request_mutex_.Lock(); // Manage a queue of WriteRequest objects because the behavior of uv_write is - // is undefined if the same WriteRequest object is used more than once + // undefined if the same WriteRequest object is used more than once // between WriteCb calls. In addition, this allows us to keep track of the id // of the latest write request that actually been completed. write_req_queue_.push(write_req); diff --git a/test/sequential/test-timers-blocking-callback.js b/test/sequential/test-timers-blocking-callback.js index 22697cbd780238..435b69d1fa81b3 100644 --- a/test/sequential/test-timers-blocking-callback.js +++ b/test/sequential/test-timers-blocking-callback.js @@ -3,7 +3,7 @@ /* * This is a regression test for * https://github.com/nodejs/node-v0.x-archive/issues/15447 and - * and https://github.com/nodejs/node-v0.x-archive/issues/9333. + * https://github.com/nodejs/node-v0.x-archive/issues/9333. * * When a timer is added in another timer's callback, its underlying timer * handle was started with a timeout that was actually incorrect. From b6d678b0181aa9a4cb949643d552b786031cd025 Mon Sep 17 00:00:00 2001 From: Benjamin Coe Date: Wed, 16 May 2018 18:03:53 -0700 Subject: [PATCH 205/208] test: fix tests that fail under coverage Make test runner capable of skipping tests, which makes it possible to skip the failing test/message/core_line_numbers.js test. Make nyc no longer generate compact instrumentation (this causes significantly different code output, which leads to failing test assertions). PR-URL: https://github.com/nodejs/node/pull/20794 Reviewed-By: Rich Trott Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Khaidi Chu Reviewed-By: Anatoli Papirovski --- .nycrc | 1 + Makefile | 4 ++-- tools/test.py | 9 +++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.nycrc b/.nycrc index 9e34a976e21ef6..c826fbc02d5dd0 100644 --- a/.nycrc +++ b/.nycrc @@ -2,5 +2,6 @@ "exclude": [ "**/internal/process/write-coverage.js" ], + "compact": false, "reporter": ["html", "text"] } diff --git a/Makefile b/Makefile index addcc5f9f17981..a7099947c72a78 100644 --- a/Makefile +++ b/Makefile @@ -233,6 +233,7 @@ v8: .PHONY: jstest jstest: build-addons build-addons-napi ## Runs addon tests and JS tests $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \ + --skip-tests=$(CI_SKIP_TESTS) \ $(CI_JS_SUITES) \ $(CI_NATIVE_SUITES) @@ -263,8 +264,7 @@ test-cov: all $(MAKE) build-addons $(MAKE) build-addons-napi # $(MAKE) cctest - $(MAKE) jstest - $(MAKE) lint + CI_SKIP_TESTS=core_line_numbers.js $(MAKE) jstest test-parallel: all $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) parallel diff --git a/tools/test.py b/tools/test.py index 66b9c7291f36af..e5581e8da41c44 100755 --- a/tools/test.py +++ b/tools/test.py @@ -1382,6 +1382,9 @@ def BuildOptions(): result.add_option("--flaky-tests", help="Regard tests marked as flaky (run|skip|dontcare)", default="run") + result.add_option("--skip-tests", + help="Tests that should not be executed (comma-separated)", + default="") result.add_option("--warn-unused", help="Report unused rules", default=False, action="store_true") result.add_option("-j", help="The number of parallel tasks to run", @@ -1424,6 +1427,7 @@ def ProcessOptions(options): options.arch = options.arch.split(',') options.mode = options.mode.split(',') options.run = options.run.split(',') + options.skip_tests = options.skip_tests.split(',') if options.run == [""]: options.run = None elif len(options.run) != 2: @@ -1710,6 +1714,11 @@ def Main(): result = None def DoSkip(case): + # A list of tests that should be skipped can be provided. This is + # useful for tests that fail in some environments, e.g., under coverage. + if options.skip_tests != [""]: + if [ st for st in options.skip_tests if st in case.case.file ]: + return True if SKIP in case.outcomes or SLOW in case.outcomes: return True return FLAKY in case.outcomes and options.flaky_tests == SKIP From 5886b7826cbfbe4cc07223bc01deb16962ec9094 Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Thu, 17 May 2018 11:35:28 +0800 Subject: [PATCH 206/208] test: test about:blank against invalid WHATWG URL > If `failure` is true, parsing `about:blank` against `base` > must give failure. This tests that the logic for converting > base URLs into strings properly fails the whole parsing > algorithm if the base URL cannot be parsed. Fixes: https://github.com/nodejs/node/issues/20720 PR-URL: https://github.com/nodejs/node/pull/20796 Reviewed-By: Anatoli Papirovski Reviewed-By: Daijiro Wachi Reviewed-By: James M Snell Reviewed-By: Trivikram Kamat Reviewed-By: Ruben Bridgewater --- test/fixtures/url-tests.js | 28 +++++++++++++----------- test/parallel/test-whatwg-url-parsing.js | 23 +++++++++++++++++-- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/test/fixtures/url-tests.js b/test/fixtures/url-tests.js index 745adb8d8aab43..48533ed09073db 100644 --- a/test/fixtures/url-tests.js +++ b/test/fixtures/url-tests.js @@ -2,7 +2,7 @@ /* The following tests are copied from WPT. Modifications to them should be upstreamed first. Refs: - https://github.com/w3c/web-platform-tests/blob/ed4bb727ed/url/urltestdata.json + https://github.com/w3c/web-platform-tests/blob/88b75886e/url/urltestdata.json License: http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html */ module.exports = @@ -6529,27 +6529,34 @@ module.exports = "search": "?a", "hash": "#%GH" }, - "Bad bases", + "URLs that require a non-about:blank base. (Also serve as invalid base tests.)", { - "input": "test-a.html", - "base": "a", + "input": "a", + "base": "about:blank", "failure": true }, { - "input": "test-a-slash.html", - "base": "a/", + "input": "a/", + "base": "about:blank", "failure": true }, { - "input": "test-a-slash-slash.html", - "base": "a//", + "input": "a//", + "base": "about:blank", "failure": true }, + "Bases that don't fail to parse but fail to be bases", { "input": "test-a-colon.html", "base": "a:", "failure": true }, + { + "input": "test-a-colon-b.html", + "base": "a:b", + "failure": true + }, + "Other base URL tests, that must succeed", { "input": "test-a-colon-slash.html", "base": "a:/", @@ -6578,11 +6585,6 @@ module.exports = "search": "", "hash": "" }, - { - "input": "test-a-colon-b.html", - "base": "a:b", - "failure": true - }, { "input": "test-a-colon-slash-b.html", "base": "a:/b", diff --git a/test/parallel/test-whatwg-url-parsing.js b/test/parallel/test-whatwg-url-parsing.js index fd34fee1954d8c..fd8570eb720831 100644 --- a/test/parallel/test-whatwg-url-parsing.js +++ b/test/parallel/test-whatwg-url-parsing.js @@ -12,7 +12,10 @@ const fixtures = require('../common/fixtures'); // Tests below are not from WPT. const tests = require(fixtures.path('url-tests')); -const failureTests = tests.filter((test) => test.failure).concat([ + +const originalFailures = tests.filter((test) => test.failure); + +const typeFailures = [ { input: '' }, { input: 'test' }, { input: undefined }, @@ -25,7 +28,23 @@ const failureTests = tests.filter((test) => test.failure).concat([ { input: 'test', base: null }, { input: 'http://nodejs.org', base: null }, { input: () => {} } -]); +]; + +// See https://github.com/w3c/web-platform-tests/pull/10955 +// > If `failure` is true, parsing `about:blank` against `base` +// > must give failure. This tests that the logic for converting +// > base URLs into strings properly fails the whole parsing +// > algorithm if the base URL cannot be parsed. +const aboutBlankFailures = originalFailures + .map((test) => ({ + input: 'about:blank', + base: test.input, + failure: true + })); + +const failureTests = originalFailures + .concat(typeFailures) + .concat(aboutBlankFailures); const expectedError = common.expectsError( { code: 'ERR_INVALID_URL', type: TypeError }, failureTests.length); From 92dd9b59eb0c2146c7869dfda4b935c1ce663f10 Mon Sep 17 00:00:00 2001 From: Eugene Ostroukhov Date: Tue, 22 May 2018 14:20:24 -0700 Subject: [PATCH 207/208] inspector: get rid of the make_unique PR-URL: https://github.com/nodejs/node/pull/20895 Reviewed-By: Anna Henningsen Reviewed-By: Richard Lau Reviewed-By: Anatoli Papirovski Reviewed-By: Tiancheng "Timothy" Gu --- src/inspector/tracing_agent.cc | 6 ++++-- src/inspector_agent.cc | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/inspector/tracing_agent.cc b/src/inspector/tracing_agent.cc index 2d98fa1ee527cc..c0425aab29d4a0 100644 --- a/src/inspector/tracing_agent.cc +++ b/src/inspector/tracing_agent.cc @@ -56,7 +56,7 @@ TracingAgent::~TracingAgent() { } void TracingAgent::Wire(UberDispatcher* dispatcher) { - frontend_ = std::make_unique(dispatcher->channel()); + frontend_.reset(new NodeTracing::Frontend(dispatcher->channel())); NodeTracing::Dispatcher::wire(dispatcher, this); } @@ -77,7 +77,9 @@ DispatchResponse TracingAgent::start( return DispatchResponse::Error("At least one category should be enabled"); trace_writer_ = env_->tracing_agent()->AddClient( - categories_set, std::make_unique(frontend_.get())); + categories_set, + std::unique_ptr( + new InspectorTraceWriter(frontend_.get()))); return DispatchResponse::OK(); } diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc index 50aa23b63cd1d0..162bc6770e569e 100644 --- a/src/inspector_agent.cc +++ b/src/inspector_agent.cc @@ -198,8 +198,8 @@ class ChannelImpl final : public v8_inspector::V8Inspector::Channel, std::unique_ptr delegate) : delegate_(std::move(delegate)) { session_ = inspector->connect(1, this, StringView()); - node_dispatcher_ = std::make_unique(this); - tracing_agent_ = std::make_unique(env); + node_dispatcher_.reset(new protocol::UberDispatcher(this)); + tracing_agent_.reset(new protocol::TracingAgent(env)); tracing_agent_->Wire(node_dispatcher_.get()); } From 5cbb905c1af7cea2d709932d59827d7c6d03ef4a Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 14 May 2018 20:01:36 +0200 Subject: [PATCH 208/208] 2018-05-23, Version 10.2.0 (Current) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * addons: - Fixed a memory leak for users of `AsyncResource` and N-API. (Michael Dawson) https://github.com/nodejs/node/pull/20668 * assert: - The `error` parameter of `assert.throws()` can be an object containing regular expressions now. (Ruben Bridgewater) https://github.com/nodejs/node/pull/20485 * crypto: - The `authTagLength` option has been made more flexible (Tobias Nießen) https://github.com/nodejs/node/pull/20235) https://github.com/nodejs/node/pull/20039 * esm: - Builtin modules (e.g. `fs`) now provide named exports in ES6 modules. (Gus Caplan) https://github.com/nodejs/node/pull/20403 * http: - Handling of `close` and `aborted` events has been made more consistent. (Robert Nagy) https://github.com/nodejs/node/pull/20075 https://github.com/nodejs/node/pull/20611 * module: - add --preserve-symlinks-main (David Goldstein) https://github.com/nodejs/node/pull/19911 * timers: - `timeout.refresh()` has been added to the public API. (Jeremiah Senkpiel) https://github.com/nodejs/node/pull/20298 * Embedder support: - Functions for creating V8 `Isolate` and `Context` objects with Node.js-specific behaviour have been added to the API. (Allen Yonghuang Wang) https://github.com/nodejs/node/pull/20639 - Node.js `Environment`s clean up resources before exiting now. (Anna Henningsen) https://github.com/nodejs/node/pull/19377 - Support for multi-threaded embedding has been improved. (Anna Henningsen) https://github.com/nodejs/node/pull/20542 https://github.com/nodejs/node/pull/20539 https://github.com/nodejs/node/pull/20541 PR-URL: https://github.com/nodejs/node/pull/20724 --- CHANGELOG.md | 3 +- doc/api/assert.md | 2 +- doc/api/cli.md | 2 +- doc/api/crypto.md | 6 +- doc/api/n-api.md | 4 +- doc/api/timers.md | 2 +- doc/changelogs/CHANGELOG_V10.md | 239 +++++++++++++++++++++++++++++++- src/node_version.h | 6 +- 8 files changed, 250 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 053e4381c1563c..8ddad5af9fb4c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,8 @@ release. -10.1.0
    +10.2.0
    +10.1.0
    10.0.0
    diff --git a/doc/api/assert.md b/doc/api/assert.md index 094dcbc7f2112c..45132eec85cfb5 100644 --- a/doc/api/assert.md +++ b/doc/api/assert.md @@ -1056,7 +1056,7 @@ instead of the `AssertionError`. Instructs the module loader to preserve symbolic links when resolving and diff --git a/doc/api/crypto.md b/doc/api/crypto.md index 3fce0534d8c94b..c985d92ca39e16 100644 --- a/doc/api/crypto.md +++ b/doc/api/crypto.md @@ -1317,7 +1317,7 @@ This property is deprecated. Please use `crypto.setFips()` and added: v0.1.94 deprecated: v10.0.0 changes: - - version: REPLACEME + - version: v10.2.0 pr-url: https://github.com/nodejs/node/pull/20235 description: The `authTagLength` option can now be used to produce shorter authentication tags in GCM mode and defaults to 16 bytes. @@ -1369,7 +1369,7 @@ Adversaries][] for details. ```C NODE_EXTERN napi_status napi_add_env_cleanup_hook(napi_env env, @@ -923,7 +923,7 @@ is being torn down anyway. #### napi_remove_env_cleanup_hook ```C NAPI_EXTERN napi_status napi_remove_env_cleanup_hook(napi_env env, diff --git a/doc/api/timers.md b/doc/api/timers.md index c573d2afdb9e21..1eb511c3b92b48 100644 --- a/doc/api/timers.md +++ b/doc/api/timers.md @@ -76,7 +76,7 @@ to call `timeout.ref()` unless `timeout.unref()` had been called previously. ### timeout.refresh() * Returns: {Timeout} a reference to `timeout` diff --git a/doc/changelogs/CHANGELOG_V10.md b/doc/changelogs/CHANGELOG_V10.md index 48e757a5c452bc..389903433aa3e1 100644 --- a/doc/changelogs/CHANGELOG_V10.md +++ b/doc/changelogs/CHANGELOG_V10.md @@ -9,6 +9,7 @@ +10.2.0
    10.1.0
    10.0.0
    @@ -27,6 +28,240 @@ * [io.js](CHANGELOG_IOJS.md) * [Archive](CHANGELOG_ARCHIVE.md) + +## 2018-05-23, Version 10.2.0 (Current), @MylesBorins + +### Notable Changes + +* **addons**: + - Fixed a memory leak for users of `AsyncResource` and N-API. (Michael Dawson) [#20668](https://github.com/nodejs/node/pull/20668) +* **assert**: + - The `error` parameter of `assert.throws()` can be an object containing regular expressions now. (Ruben Bridgewater) [#20485](https://github.com/nodejs/node/pull/20485) +* **crypto**: + - The `authTagLength` option has been made more flexible. (Tobias Nießen) [#20235](https://github.com/nodejs/node/pull/20235), [#20039](https://github.com/nodejs/node/pull/20039) +* **esm**: + - Builtin modules (e.g. `fs`) now provide named exports in ES6 modules. (Gus Caplan) [#20403](https://github.com/nodejs/node/pull/20403) +* **http**: + - Handling of `close` and `aborted` events has been made more consistent. (Robert Nagy) [#20075](https://github.com/nodejs/node/pull/20075), [#20611](https://github.com/nodejs/node/pull/20611) +* **module**: + - add --preserve-symlinks-main (David Goldstein) [#19911](https://github.com/nodejs/node/pull/19911) +* **timers**: + - `timeout.refresh()` has been added to the public API. (Jeremiah Senkpiel) [#20298](https://github.com/nodejs/node/pull/20298) +* Embedder support: + - Functions for creating V8 `Isolate` and `Context` objects with Node.js-specific behaviour have been added to the API. (Allen Yonghuang Wang) [#20639](https://github.com/nodejs/node/pull/20639) + - Node.js `Environment`s clean up resources before exiting now. (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) + - Support for multi-threaded embedding has been improved. (Anna Henningsen) [#20542](https://github.com/nodejs/node/pull/20542), [#20539](https://github.com/nodejs/node/pull/20539), [#20541](https://github.com/nodejs/node/pull/20541) + +### Commits + +* [[`8f8a0e3483`](https://github.com/nodejs/node/commit/8f8a0e3483)] - **assert**: fix wrong message indentation (Ruben Bridgewater) [#20791](https://github.com/nodejs/node/pull/20791) +* [[`338e663860`](https://github.com/nodejs/node/commit/338e663860)] - **assert**: fix EOL issue in messages on Windows (Ruben Bridgewater) [#20754](https://github.com/nodejs/node/pull/20754) +* [[`1160d61cd9`](https://github.com/nodejs/node/commit/1160d61cd9)] - **assert**: support symbols as assertion messages (cjihrig) [#20693](https://github.com/nodejs/node/pull/20693) +* [[`bb857d9e71`](https://github.com/nodejs/node/commit/bb857d9e71)] - **assert**: make sure throws is able to handle primitives (Ruben Bridgewater) [#20482](https://github.com/nodejs/node/pull/20482) +* [[`5d06c1e1ae`](https://github.com/nodejs/node/commit/5d06c1e1ae)] - **assert**: move AssertionError into own file (Ruben Bridgewater) [#20486](https://github.com/nodejs/node/pull/20486) +* [[`a5ee31bba1`](https://github.com/nodejs/node/commit/a5ee31bba1)] - **(SEMVER-MINOR)** **assert**: accept regular expressions to validate (Ruben Bridgewater) [#20485](https://github.com/nodejs/node/pull/20485) +* [[`74db9f43ba`](https://github.com/nodejs/node/commit/74db9f43ba)] - **assert,util**: lazy load comparison functions (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`9feca3ea32`](https://github.com/nodejs/node/commit/9feca3ea32)] - **async_hooks**: lazy loading for startup performance (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`e61337d36d`](https://github.com/nodejs/node/commit/e61337d36d)] - **async_wrap**: fix memory leak in AsyncResource (Michael Dawson) [#20668](https://github.com/nodejs/node/pull/20668) +* [[`56de3bfb70`](https://github.com/nodejs/node/commit/56de3bfb70)] - **benchmark**: add tls benchmark for legacy SecurePair (Alex Fernández) [#20344](https://github.com/nodejs/node/pull/20344) +* [[`3b516177c8`](https://github.com/nodejs/node/commit/3b516177c8)] - **build**: use nyc's merge command (Benjamin Coe) [#20760](https://github.com/nodejs/node/pull/20760) +* [[`aaf1df59be`](https://github.com/nodejs/node/commit/aaf1df59be)] - **build**: export openssl TLSv1 methods again (Ben Noordhuis) [#20712](https://github.com/nodejs/node/pull/20712) +* [[`7a980086c8`](https://github.com/nodejs/node/commit/7a980086c8)] - **build**: always use BUILDTYPE binary to run JS tests (Joyee Cheung) [#20362](https://github.com/nodejs/node/pull/20362) +* [[`47103493f7`](https://github.com/nodejs/node/commit/47103493f7)] - **child_process**: fix exec set stdout.setEncoding (killagu) [#18976](https://github.com/nodejs/node/pull/18976) +* [[`4a872b98a0`](https://github.com/nodejs/node/commit/4a872b98a0)] - **cluster**: remove obsolete array allocation (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`a41c44a307`](https://github.com/nodejs/node/commit/a41c44a307)] - **codeowners**: add rule for \*.gypi files (Ben Noordhuis) [#20740](https://github.com/nodejs/node/pull/20740) +* [[`b701f5af18`](https://github.com/nodejs/node/commit/b701f5af18)] - **codeowners**: fix typo in v8-inspector team name (Ben Noordhuis) [#20740](https://github.com/nodejs/node/pull/20740) +* [[`3fd67249df`](https://github.com/nodejs/node/commit/3fd67249df)] - **console**: .table fall back to logging for function too (ohbarye) [#20681](https://github.com/nodejs/node/pull/20681) +* [[`bc6dbc3bfc`](https://github.com/nodejs/node/commit/bc6dbc3bfc)] - **console**: lazy load cli (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`cecec46204`](https://github.com/nodejs/node/commit/cecec46204)] - **crypto**: add test case for AES key wrapping (Yihong Wang) [#20587](https://github.com/nodejs/node/pull/20587) +* [[`34d67085d5`](https://github.com/nodejs/node/commit/34d67085d5)] - **crypto**: allocate more memory for cipher.update() (Yihong Wang) [#20370](https://github.com/nodejs/node/pull/20370) +* [[`2b2ccae390`](https://github.com/nodejs/node/commit/2b2ccae390)] - **(SEMVER-MINOR)** **crypto**: support authTagLength in GCM encryption (Tobias Nießen) [#20235](https://github.com/nodejs/node/pull/20235) +* [[`1e5de6fe97`](https://github.com/nodejs/node/commit/1e5de6fe97)] - **crypto**: add using directives for v8::Int32, Uint32 (Tobias Nießen) [#20225](https://github.com/nodejs/node/pull/20225) +* [[`f5e7010eb9`](https://github.com/nodejs/node/commit/f5e7010eb9)] - **crypto**: use kNoAuthTagLength in InitAuthenticated (Tobias Nießen) [#20225](https://github.com/nodejs/node/pull/20225) +* [[`5ea1a58db9`](https://github.com/nodejs/node/commit/5ea1a58db9)] - **crypto**: remove rsaPrivate and rename rsaPublic (Daniel Bevenius) [#20164](https://github.com/nodejs/node/pull/20164) +* [[`503844eb73`](https://github.com/nodejs/node/commit/503844eb73)] - **crypto**: add addCipherPrototypeFunctions function (Daniel Bevenius) [#20164](https://github.com/nodejs/node/pull/20164) +* [[`72029b8cc7`](https://github.com/nodejs/node/commit/72029b8cc7)] - **crypto**: add createCipher/WithIV functions (Daniel Bevenius) [#20164](https://github.com/nodejs/node/pull/20164) +* [[`bdd2856152`](https://github.com/nodejs/node/commit/bdd2856152)] - **(SEMVER-MINOR)** **crypto**: allow to restrict valid GCM tag length (Tobias Nießen) [#20039](https://github.com/nodejs/node/pull/20039) +* [[`e56716e396`](https://github.com/nodejs/node/commit/e56716e396)] - **deps**: cherry-pick ff0a9793334 from upstream V8 (Anna Henningsen) [#20719](https://github.com/nodejs/node/pull/20719) +* [[`8e058d5f94`](https://github.com/nodejs/node/commit/8e058d5f94)] - **deps**: patch V8 to 6.6.346.32 (Myles Borins) [#20748](https://github.com/nodejs/node/pull/20748) +* [[`cb94601cf2`](https://github.com/nodejs/node/commit/cb94601cf2)] - **deps**: cherry-pick 23652c5f from upstream V8 (Eugene Ostroukhov) [#20608](https://github.com/nodejs/node/pull/20608) +* [[`91e60b0d33`](https://github.com/nodejs/node/commit/91e60b0d33)] - **deps**: V8: cherry-pick b49206d from upstream (Ali Ijaz Sheikh) [#20727](https://github.com/nodejs/node/pull/20727) +* [[`6ce589f7f4`](https://github.com/nodejs/node/commit/6ce589f7f4)] - **deps**: patch V8 to 6.6.346.31 (Myles Borins) [#20603](https://github.com/nodejs/node/pull/20603) +* [[`f69a823f8e`](https://github.com/nodejs/node/commit/f69a823f8e)] - **deps**: upgrade to libuv 1.20.3 (cjihrig) [#20585](https://github.com/nodejs/node/pull/20585) +* [[`60eab9100f`](https://github.com/nodejs/node/commit/60eab9100f)] - **dns**: lazy loaded (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`c1fe9b29b1`](https://github.com/nodejs/node/commit/c1fe9b29b1)] - **doc**: add note about autocrlf required for tests (Bartosz Sosnowski) [#20752](https://github.com/nodejs/node/pull/20752) +* [[`8a17a259f3`](https://github.com/nodejs/node/commit/8a17a259f3)] - **doc**: fix some nits in hardcoded manpage links (Vse Mozhet Byt) [#20854](https://github.com/nodejs/node/pull/20854) +* [[`8317a468db`](https://github.com/nodejs/node/commit/8317a468db)] - **doc**: fix fs.promises sample codes (Keita Akutsu) [#20838](https://github.com/nodejs/node/pull/20838) +* [[`37b9fe1e68`](https://github.com/nodejs/node/commit/37b9fe1e68)] - **doc**: fix typo in http2.md (Keita Akutsu) [#20843](https://github.com/nodejs/node/pull/20843) +* [[`88aee8a65c`](https://github.com/nodejs/node/commit/88aee8a65c)] - **doc**: improve \_Deprecation\_ definition (Rich Trott) [#20788](https://github.com/nodejs/node/pull/20788) +* [[`7b1c035218`](https://github.com/nodejs/node/commit/7b1c035218)] - **doc**: describe using multiple link-module on win (Bartosz Sosnowski) [#20774](https://github.com/nodejs/node/pull/20774) +* [[`9a8cdc93ff`](https://github.com/nodejs/node/commit/9a8cdc93ff)] - **doc**: fix typo in COLLABORATOR\_GUIDE.md (Vse Mozhet Byt) [#20742](https://github.com/nodejs/node/pull/20742) +* [[`657f8cbe41`](https://github.com/nodejs/node/commit/657f8cbe41)] - **doc**: fix linter warnings and typos in manpage (Alhadis) [#20741](https://github.com/nodejs/node/pull/20741) +* [[`165971d35b`](https://github.com/nodejs/node/commit/165971d35b)] - **doc**: sort references in ASCII order (Rich Trott) [#20790](https://github.com/nodejs/node/pull/20790) +* [[`8f489a2447`](https://github.com/nodejs/node/commit/8f489a2447)] - **doc**: add .github to CODEOWNERS (Rich Trott) [#20733](https://github.com/nodejs/node/pull/20733) +* [[`7943449305`](https://github.com/nodejs/node/commit/7943449305)] - **doc**: improve specificity in CODEOWNERS (Rich Trott) [#20729](https://github.com/nodejs/node/pull/20729) +* [[`7d28f5bb1b`](https://github.com/nodejs/node/commit/7d28f5bb1b)] - **doc**: reorder CODEOWNERS file (Rich Trott) [#20732](https://github.com/nodejs/node/pull/20732) +* [[`fd14ec1101`](https://github.com/nodejs/node/commit/fd14ec1101)] - **doc**: add missing `changes:` entry for assert.throws (Anna Henningsen) [#20723](https://github.com/nodejs/node/pull/20723) +* [[`a66aad4a50`](https://github.com/nodejs/node/commit/a66aad4a50)] - **doc**: fixup NODE\_EXTERN -\> NAPI\_EXTERN (Michael Dawson) [#20641](https://github.com/nodejs/node/pull/20641) +* [[`f263340731`](https://github.com/nodejs/node/commit/f263340731)] - **doc**: fix signature for napi\_create\_range\_error (Michael Dawson) [#20641](https://github.com/nodejs/node/pull/20641) +* [[`d11a435875`](https://github.com/nodejs/node/commit/d11a435875)] - **doc**: fix typo in dns docs (Anna Henningsen) [#20711](https://github.com/nodejs/node/pull/20711) +* [[`512982c0ff`](https://github.com/nodejs/node/commit/512982c0ff)] - **doc**: update AUTHORS list (Michaël Zasso) [#20658](https://github.com/nodejs/node/pull/20658) +* [[`e06c5874f6`](https://github.com/nodejs/node/commit/e06c5874f6)] - **doc**: add global node\_modules to require.resolve() (musgravejw) [#20534](https://github.com/nodejs/node/pull/20534) +* [[`1d7379d641`](https://github.com/nodejs/node/commit/1d7379d641)] - **doc**: fix stability text for n-api (Michael Dawson) [#20659](https://github.com/nodejs/node/pull/20659) +* [[`73492233c3`](https://github.com/nodejs/node/commit/73492233c3)] - **doc**: add util.types.isModuleNamespaceObject() (Gus Caplan) [#20616](https://github.com/nodejs/node/pull/20616) +* [[`3929516a6f`](https://github.com/nodejs/node/commit/3929516a6f)] - **doc**: fix nits in doc/api\_assets/style.css (Vse Mozhet Byt) [#20601](https://github.com/nodejs/node/pull/20601) +* [[`01abed1c36`](https://github.com/nodejs/node/commit/01abed1c36)] - **doc**: update assert documentation (Ruben Bridgewater) [#20486](https://github.com/nodejs/node/pull/20486) +* [[`c546746396`](https://github.com/nodejs/node/commit/c546746396)] - **doc**: add util.types.isBig{Int,Uint}64Array() (cjihrig) [#20615](https://github.com/nodejs/node/pull/20615) +* [[`d568952b8c`](https://github.com/nodejs/node/commit/d568952b8c)] - **doc**: fix missing napi\_get\_typedarray\_info() param (Gabriel Schulhof) [#20631](https://github.com/nodejs/node/pull/20631) +* [[`9177f734e3`](https://github.com/nodejs/node/commit/9177f734e3)] - **doc**: update VM section text (Daniel Bevenius) [#20595](https://github.com/nodejs/node/pull/20595) +* [[`88bc6da6e9`](https://github.com/nodejs/node/commit/88bc6da6e9)] - **doc**: add parameters for Http2Stream:error event (Ujjwal Sharma) [#20610](https://github.com/nodejs/node/pull/20610) +* [[`b3b267a87c`](https://github.com/nodejs/node/commit/b3b267a87c)] - **doc**: add params for ClientHttp2Session:altsvc (Ujjwal Sharma) [#20598](https://github.com/nodejs/node/pull/20598) +* [[`d327893193`](https://github.com/nodejs/node/commit/d327893193)] - **doc**: refactor mode constants parts in fs.md (Shobhit Chittora) [#20558](https://github.com/nodejs/node/pull/20558) +* [[`4a7bb406fe`](https://github.com/nodejs/node/commit/4a7bb406fe)] - **doc, tools**: unify stability signatures (Vse Mozhet Byt) [#20552](https://github.com/nodejs/node/pull/20552) +* [[`c244436707`](https://github.com/nodejs/node/commit/c244436707)] - **errors**: move functions to error code (Ruben Bridgewater) [#20486](https://github.com/nodejs/node/pull/20486) +* [[`104c3bc443`](https://github.com/nodejs/node/commit/104c3bc443)] - **(SEMVER-MINOR)** **esm**: provide named exports for builtin libs (Gus Caplan) [#20403](https://github.com/nodejs/node/pull/20403) +* [[`9b43af3703`](https://github.com/nodejs/node/commit/9b43af3703)] - **fs**: lazy load createPromise/promiseResolve (James M Snell) [#20766](https://github.com/nodejs/node/pull/20766) +* [[`2d2897855f`](https://github.com/nodejs/node/commit/2d2897855f)] - **fs**: lazy load the promises impl (James M Snell) [#20766](https://github.com/nodejs/node/pull/20766) +* [[`dc30d36467`](https://github.com/nodejs/node/commit/dc30d36467)] - **fs**: consistent constants use and cleanup (James M Snell) [#20765](https://github.com/nodejs/node/pull/20765) +* [[`e5a0c197bd`](https://github.com/nodejs/node/commit/e5a0c197bd)] - **fs**: refactor promises version of lchown and lchmod (cjihrig) [#20551](https://github.com/nodejs/node/pull/20551) +* [[`39caa6ddaf`](https://github.com/nodejs/node/commit/39caa6ddaf)] - **fs**: use \_final() for fs.WriteStream (Jackson Tian) [#20562](https://github.com/nodejs/node/pull/20562) +* [[`de06115d18`](https://github.com/nodejs/node/commit/de06115d18)] - **fs**: make fs.promises non-enumerable (cjihrig) [#20632](https://github.com/nodejs/node/pull/20632) +* [[`fe7e8d6a3e`](https://github.com/nodejs/node/commit/fe7e8d6a3e)] - **http**: fix capitalization of 418 status message (я котик пур-пур) [#20700](https://github.com/nodejs/node/pull/20700) +* [[`75e4415c40`](https://github.com/nodejs/node/commit/75e4415c40)] - **http**: do not rely on the 'agentRemove' event (Luigi Pinca) [#20786](https://github.com/nodejs/node/pull/20786) +* [[`4c6bfbdbb4`](https://github.com/nodejs/node/commit/4c6bfbdbb4)] - **http**: fix client response close & aborted (Robert Nagy) [#20075](https://github.com/nodejs/node/pull/20075) +* [[`8029a2473e`](https://github.com/nodejs/node/commit/8029a2473e)] - **http**: always emit close on req and res (Robert Nagy) [#20611](https://github.com/nodejs/node/pull/20611) +* [[`2687d44739`](https://github.com/nodejs/node/commit/2687d44739)] - **http2**: fix several serious bugs (Anatoli Papirovski) [#20772](https://github.com/nodejs/node/pull/20772) +* [[`b2fb1d70bb`](https://github.com/nodejs/node/commit/b2fb1d70bb)] - **http2**: fix end without read (Anatoli Papirovski) [#20621](https://github.com/nodejs/node/pull/20621) +* [[`de2b04772b`](https://github.com/nodejs/node/commit/de2b04772b)] - **http2**: avoid bind and properly clean up in compat (Robert Nagy) [#20374](https://github.com/nodejs/node/pull/20374) +* [[`28ecf93dc5`](https://github.com/nodejs/node/commit/28ecf93dc5)] - **http2**: destroy the socket properly and add tests (Mathias Buus) [#19852](https://github.com/nodejs/node/pull/19852) +* [[`92dd9b59eb`](https://github.com/nodejs/node/commit/92dd9b59eb)] - **inspector**: get rid of the make\_unique (Eugene Ostroukhov) [#20895](https://github.com/nodejs/node/pull/20895) +* [[`04f7678edb`](https://github.com/nodejs/node/commit/04f7678edb)] - **inspector**: add a "NodeTracing" domain support (Eugene Ostroukhov) [#20608](https://github.com/nodejs/node/pull/20608) +* [[`ccf69dd3b6`](https://github.com/nodejs/node/commit/ccf69dd3b6)] - **inspector**: fix inspector::Agent::HasConnectedSessions (helloshuangzi) [#20614](https://github.com/nodejs/node/pull/20614) +* [[`e0fd80c641`](https://github.com/nodejs/node/commit/e0fd80c641)] - **lib**: do not call performance hooks (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`bd13193979`](https://github.com/nodejs/node/commit/bd13193979)] - **lib**: remove unnecessary require (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`07537749db`](https://github.com/nodejs/node/commit/07537749db)] - **lib**: use capital letters in comments (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`72f3228203`](https://github.com/nodejs/node/commit/72f3228203)] - **lib**: lazy loaded (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`3aab6ce39d`](https://github.com/nodejs/node/commit/3aab6ce39d)] - **lib**: lazy load necessary loaders (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`486ac23cb0`](https://github.com/nodejs/node/commit/486ac23cb0)] - **lib**: only load inspector stuff if necessary (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`61415dccc4`](https://github.com/nodejs/node/commit/61415dccc4)] - **(SEMVER-MINOR)** **lib**: defer pausing stdin to the next tick (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`7c13e54ca7`](https://github.com/nodejs/node/commit/7c13e54ca7)] - **lib**: return directly from packageMainCache (Daniel Bevenius) [#20591](https://github.com/nodejs/node/pull/20591) +* [[`fb7a775242`](https://github.com/nodejs/node/commit/fb7a775242)] - **lib,src**: use V8 API for collection inspection (Anna Henningsen) [#20719](https://github.com/nodejs/node/pull/20719) +* [[`8d8b0bdf38`](https://github.com/nodejs/node/commit/8d8b0bdf38)] - **lib,src,test**: fix comments (Tobias Nießen) [#20846](https://github.com/nodejs/node/pull/20846) +* [[`b10823506d`](https://github.com/nodejs/node/commit/b10823506d)] - **meta**: add initial CODEOWNERS file (James M Snell) [#20554](https://github.com/nodejs/node/pull/20554) +* [[`678b7544df`](https://github.com/nodejs/node/commit/678b7544df)] - **module**: introduce defaultModuleName in module.js (Daniel Bevenius) [#20709](https://github.com/nodejs/node/pull/20709) +* [[`b6ea5df08a`](https://github.com/nodejs/node/commit/b6ea5df08a)] - **(SEMVER-MINOR)** **module**: add --preserve-symlinks-main (David Goldstein) [#19911](https://github.com/nodejs/node/pull/19911) +* [[`eac7aad55e`](https://github.com/nodejs/node/commit/eac7aad55e)] - **net**: lazy load dns (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`1f34c04bd0`](https://github.com/nodejs/node/commit/1f34c04bd0)] - **net**: remove typo in setTimeout comment (Daniel Bevenius) [#20576](https://github.com/nodejs/node/pull/20576) +* [[`d614511b9f`](https://github.com/nodejs/node/commit/d614511b9f)] - **net,http2**: refactor \_write and \_writev (Ujjwal Sharma) [#20643](https://github.com/nodejs/node/pull/20643) +* [[`28d00a18c8`](https://github.com/nodejs/node/commit/28d00a18c8)] - **os**: lazy loaded (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`2e9957641e`](https://github.com/nodejs/node/commit/2e9957641e)] - **perf_hooks**: always set bootstrapComplete (James M Snell) [#20768](https://github.com/nodejs/node/pull/20768) +* [[`c8fe8e8f5d`](https://github.com/nodejs/node/commit/c8fe8e8f5d)] - **(SEMVER-MINOR)** **process**: create stdin with `manualStart: true` (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`4a92da15dc`](https://github.com/nodejs/node/commit/4a92da15dc)] - **querystring**: lazy loaded (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`3eb38debb4`](https://github.com/nodejs/node/commit/3eb38debb4)] - **readline**: lazy loaded (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`ada41b02c5`](https://github.com/nodejs/node/commit/ada41b02c5)] - **repl**: make console, module and require non-enumerable (Ruben Bridgewater) [#20717](https://github.com/nodejs/node/pull/20717) +* [[`83119db45e`](https://github.com/nodejs/node/commit/83119db45e)] - **repl**: add friendly tips about how to exit repl (monkingxue) [#20617](https://github.com/nodejs/node/pull/20617) +* [[`c4f0e81dd0`](https://github.com/nodejs/node/commit/c4f0e81dd0)] - **src**: trace\_events: background thread events (Ali Ijaz Sheikh) [#20823](https://github.com/nodejs/node/pull/20823) +* [[`3110d15f2b`](https://github.com/nodejs/node/commit/3110d15f2b)] - **src**: make pointers lean left in node\_crypto.cc (Daniel Bevenius) [#20799](https://github.com/nodejs/node/pull/20799) +* [[`b6225349f4`](https://github.com/nodejs/node/commit/b6225349f4)] - **src**: use unqualified names in node\_crypto.cc (Daniel Bevenius) [#20799](https://github.com/nodejs/node/pull/20799) +* [[`010ad8c26c`](https://github.com/nodejs/node/commit/010ad8c26c)] - **src**: move \*Exceptions out to separate cc/h (James M Snell) [#20789](https://github.com/nodejs/node/pull/20789) +* [[`08b98d17f1`](https://github.com/nodejs/node/commit/08b98d17f1)] - **src**: fix odd linting issue (James M Snell) [#20789](https://github.com/nodejs/node/pull/20789) +* [[`36d4a42e35`](https://github.com/nodejs/node/commit/36d4a42e35)] - **src**: move CallbackScope to separate cc/h (James M Snell) [#20789](https://github.com/nodejs/node/pull/20789) +* [[`4b64c847f1`](https://github.com/nodejs/node/commit/4b64c847f1)] - **src**: trace\_events: support for metadata events (Ali Ijaz Sheikh) [#20757](https://github.com/nodejs/node/pull/20757) +* [[`3edb04d065`](https://github.com/nodejs/node/commit/3edb04d065)] - **src**: remove 2nd `undefined` argument in node\_file.cc (Dan Kang) [#20629](https://github.com/nodejs/node/pull/20629) +* [[`d6805c15a5`](https://github.com/nodejs/node/commit/d6805c15a5)] - **src**: add override to ThreadPool methods in zlib (Daniel Bevenius) [#20769](https://github.com/nodejs/node/pull/20769) +* [[`01aa0581fe`](https://github.com/nodejs/node/commit/01aa0581fe)] - **src**: order C++ error list alphabetically (Anna Henningsen) [#20707](https://github.com/nodejs/node/pull/20707) +* [[`5eb0765fc9`](https://github.com/nodejs/node/commit/5eb0765fc9)] - **src**: handle TryCatch with empty message (Ben Noordhuis) [#20708](https://github.com/nodejs/node/pull/20708) +* [[`e0b438a641`](https://github.com/nodejs/node/commit/e0b438a641)] - **(SEMVER-MINOR)** **src**: add public API to create isolate and context (helloshuangzi) [#20639](https://github.com/nodejs/node/pull/20639) +* [[`d223e3ca41`](https://github.com/nodejs/node/commit/d223e3ca41)] - **src**: make `AsyncResource` destructor virtual (Anna Henningsen) [#20633](https://github.com/nodejs/node/pull/20633) +* [[`28b58b56a8`](https://github.com/nodejs/node/commit/28b58b56a8)] - **src**: replace `template\<` → `template \<` (Anna Henningsen) [#20675](https://github.com/nodejs/node/pull/20675) +* [[`30aceedba6`](https://github.com/nodejs/node/commit/30aceedba6)] - **src**: make env\_ and context\_ private (Daniel Bevenius) [#20671](https://github.com/nodejs/node/pull/20671) +* [[`9422909e07`](https://github.com/nodejs/node/commit/9422909e07)] - **src**: remove unused includes from node\_contextify.h (Daniel Bevenius) [#20670](https://github.com/nodejs/node/pull/20670) +* [[`e732b4ce5c`](https://github.com/nodejs/node/commit/e732b4ce5c)] - **src**: use unqualified names in node\_contextify.cc (Daniel Bevenius) [#20669](https://github.com/nodejs/node/pull/20669) +* [[`57dfd64f8f`](https://github.com/nodejs/node/commit/57dfd64f8f)] - **src**: add missing override to ThreadPoolWork funcs (Daniel Bevenius) [#20663](https://github.com/nodejs/node/pull/20663) +* [[`2347ce8870`](https://github.com/nodejs/node/commit/2347ce8870)] - **(SEMVER-MINOR)** **src**: unify thread pool work (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`7153bec955`](https://github.com/nodejs/node/commit/7153bec955)] - **(SEMVER-MINOR)** **src**: always call ReadStop() before Close() (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`9e1dcdc5bd`](https://github.com/nodejs/node/commit/9e1dcdc5bd)] - **(SEMVER-MINOR)** **src**: remove NodeCategorySet destructor (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`97d939a5f0`](https://github.com/nodejs/node/commit/97d939a5f0)] - **(SEMVER-MINOR)** **src**: store fd for libuv streams on Windows (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`5b0d2e7b19`](https://github.com/nodejs/node/commit/5b0d2e7b19)] - **(SEMVER-MINOR)** **src**: add can\_call\_into\_js flag (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`9e2554ce98`](https://github.com/nodejs/node/commit/9e2554ce98)] - **(SEMVER-MINOR)** **src**: use cleanup hooks to tear down BaseObjects (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`8995408748`](https://github.com/nodejs/node/commit/8995408748)] - **(SEMVER-MINOR)** **src**: keep track of open requests (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`75aad9069b`](https://github.com/nodejs/node/commit/75aad9069b)] - **(SEMVER-MINOR)** **src**: unify ReqWrap libuv calling (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`e253edb48a`](https://github.com/nodejs/node/commit/e253edb48a)] - **(SEMVER-MINOR)** **src**: make CleanupHandles() tear down handles/reqs (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`ba269585ed`](https://github.com/nodejs/node/commit/ba269585ed)] - **(SEMVER-MINOR)** **src**: add environment cleanup hooks (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`40fb885ecf`](https://github.com/nodejs/node/commit/40fb885ecf)] - **src**: more automatic memory management in node\_crypto.cc (Anna Henningsen) [#20238](https://github.com/nodejs/node/pull/20238) +* [[`fd5adbc9c3`](https://github.com/nodejs/node/commit/fd5adbc9c3)] - **src**: fix node\_crypto.cc compiler warnings (Daniel Bevenius) [#20216](https://github.com/nodejs/node/pull/20216) +* [[`db457cb6a0`](https://github.com/nodejs/node/commit/db457cb6a0)] - **src**: fix typo in util.h comment (Anna Henningsen) [#20656](https://github.com/nodejs/node/pull/20656) +* [[`e93726ad10`](https://github.com/nodejs/node/commit/e93726ad10)] - **src**: fix nullptr dereference for signal during startup (Anna Henningsen) [#20637](https://github.com/nodejs/node/pull/20637) +* [[`0824ea9d7b`](https://github.com/nodejs/node/commit/0824ea9d7b)] - **src**: use unqualified names in module\_wrap.cc (Daniel Bevenius) [#20594](https://github.com/nodejs/node/pull/20594) +* [[`43ec938634`](https://github.com/nodejs/node/commit/43ec938634)] - **src**: remove static variables from string\_search (Anna Henningsen) [#20541](https://github.com/nodejs/node/pull/20541) +* [[`4873fbaf63`](https://github.com/nodejs/node/commit/4873fbaf63)] - **src**: remove unused freelist.h header (Anna Henningsen) [#20544](https://github.com/nodejs/node/pull/20544) +* [[`a89cc2886e`](https://github.com/nodejs/node/commit/a89cc2886e)] - **src**: protect global state with mutexes (Anna Henningsen) [#20542](https://github.com/nodejs/node/pull/20542) +* [[`2df99ac095`](https://github.com/nodejs/node/commit/2df99ac095)] - **src**: use lock for c-ares library init/cleanup (Anna Henningsen) [#20539](https://github.com/nodejs/node/pull/20539) +* [[`5803973206`](https://github.com/nodejs/node/commit/5803973206)] - **src**: minor refactor to string\_search.h (Anna Henningsen) [#20546](https://github.com/nodejs/node/pull/20546) +* [[`983cb269e0`](https://github.com/nodejs/node/commit/983cb269e0)] - **src**: don't create Undefined if not needed (Daniel Bevenius) [#20573](https://github.com/nodejs/node/pull/20573) +* [[`e01e060763`](https://github.com/nodejs/node/commit/e01e060763)] - **src**: rename handle parameter object (Daniel Bevenius) [#20570](https://github.com/nodejs/node/pull/20570) +* [[`328a2c7c28`](https://github.com/nodejs/node/commit/328a2c7c28)] - **stream**: lazy load end-of-stream (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`94d217f877`](https://github.com/nodejs/node/commit/94d217f877)] - **stream**: lazy load ReadableAsyncIterator (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`ed5f253cfa`](https://github.com/nodejs/node/commit/ed5f253cfa)] - **stream**: refactor getHighWaterMark in state.js (Daniel Bevenius) [#20415](https://github.com/nodejs/node/pull/20415) +* [[`39a41120d4`](https://github.com/nodejs/node/commit/39a41120d4)] - **stream**: simplify writable's validChunk() (cjihrig) [#20696](https://github.com/nodejs/node/pull/20696) +* [[`981a2f7b16`](https://github.com/nodejs/node/commit/981a2f7b16)] - **stream**: simplify Writable.prototype.cork() (cjihrig) [#20697](https://github.com/nodejs/node/pull/20697) +* [[`ebc1b77e5a`](https://github.com/nodejs/node/commit/ebc1b77e5a)] - **stream**: no need to initial er with false (Jackson Tian) [#20607](https://github.com/nodejs/node/pull/20607) +* [[`0ace8f9835`](https://github.com/nodejs/node/commit/0ace8f9835)] - **string_decoder**: lazy loaded (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`5886b7826c`](https://github.com/nodejs/node/commit/5886b7826c)] - **test**: test about:blank against invalid WHATWG URL (Joyee Cheung) [#20796](https://github.com/nodejs/node/pull/20796) +* [[`b6d678b018`](https://github.com/nodejs/node/commit/b6d678b018)] - **test**: fix tests that fail under coverage (Benjamin Coe) [#20794](https://github.com/nodejs/node/pull/20794) +* [[`dc29a3b386`](https://github.com/nodejs/node/commit/dc29a3b386)] - **test**: add promise API test for appendFile() (Rich Trott) [#20842](https://github.com/nodejs/node/pull/20842) +* [[`d9aecc0c07`](https://github.com/nodejs/node/commit/d9aecc0c07)] - **test**: improve coverage for internal/readline (Masashi Hirano) [#20840](https://github.com/nodejs/node/pull/20840) +* [[`9c560ca907`](https://github.com/nodejs/node/commit/9c560ca907)] - **test**: rename and document tls test (Anna Henningsen) [#20820](https://github.com/nodejs/node/pull/20820) +* [[`dd32a7a0d4`](https://github.com/nodejs/node/commit/dd32a7a0d4)] - **test**: fix flaky http2-session-unref (Anatoli Papirovski) [#20772](https://github.com/nodejs/node/pull/20772) +* [[`a8c74e89ae`](https://github.com/nodejs/node/commit/a8c74e89ae)] - **test**: use error code rather than message in test (Rich Trott) [#20859](https://github.com/nodejs/node/pull/20859) +* [[`f5f9cdc110`](https://github.com/nodejs/node/commit/f5f9cdc110)] - **test**: define SharedArrayBuffer as a known global (cjihrig) [#20849](https://github.com/nodejs/node/pull/20849) +* [[`22f46e7766`](https://github.com/nodejs/node/commit/22f46e7766)] - **test**: remove common.globalCheck (Ruben Bridgewater) [#20717](https://github.com/nodejs/node/pull/20717) +* [[`5ffce3ef06`](https://github.com/nodejs/node/commit/5ffce3ef06)] - **test**: remove untested knownGlobals (Ruben Bridgewater) [#20717](https://github.com/nodejs/node/pull/20717) +* [[`e7c2616d10`](https://github.com/nodejs/node/commit/e7c2616d10)] - **test**: mark tests as flaky as intermediate step (Ruben Bridgewater) [#20835](https://github.com/nodejs/node/pull/20835) +* [[`b664a848fa`](https://github.com/nodejs/node/commit/b664a848fa)] - **test**: improve assertion in test-performance (Anna Henningsen) [#20809](https://github.com/nodejs/node/pull/20809) +* [[`045b37b32d`](https://github.com/nodejs/node/commit/045b37b32d)] - **test**: add eslint rule to verify assertion input (Ruben Bridgewater) [#20718](https://github.com/nodejs/node/pull/20718) +* [[`1ae076b30e`](https://github.com/nodejs/node/commit/1ae076b30e)] - **test**: add loaded modules test (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`9e432ca79c`](https://github.com/nodejs/node/commit/9e432ca79c)] - **test**: add promise API test for appendFile() (Rich Trott) [#20739](https://github.com/nodejs/node/pull/20739) +* [[`a6667d68f3`](https://github.com/nodejs/node/commit/a6667d68f3)] - **test**: slightly improve test-util-inspect assertions (Anna Henningsen) [#20721](https://github.com/nodejs/node/pull/20721) +* [[`a4cbe30791`](https://github.com/nodejs/node/commit/a4cbe30791)] - **test**: improve reliability of http2-session-timeout (Rich Trott) [#20692](https://github.com/nodejs/node/pull/20692) +* [[`0d28b4b6ba`](https://github.com/nodejs/node/commit/0d28b4b6ba)] - **test**: disable colors in test-assert-checktag.js (cjihrig) [#20695](https://github.com/nodejs/node/pull/20695) +* [[`dccbc3a153`](https://github.com/nodejs/node/commit/dccbc3a153)] - **test**: disable colors in test-assert-deep.js (cjihrig) [#20695](https://github.com/nodejs/node/pull/20695) +* [[`90c77bcc18`](https://github.com/nodejs/node/commit/90c77bcc18)] - **test**: disable colors in test-assert.js (cjihrig) [#20695](https://github.com/nodejs/node/pull/20695) +* [[`2b6e8ccfd4`](https://github.com/nodejs/node/commit/2b6e8ccfd4)] - **test**: increase test coverage for fs/promises.js (David Humphrey) [#19811](https://github.com/nodejs/node/pull/19811) +* [[`e6c0bbe185`](https://github.com/nodejs/node/commit/e6c0bbe185)] - **test**: display values in AssertionErrors (RakshithNM) [#20545](https://github.com/nodejs/node/pull/20545) +* [[`886116f837`](https://github.com/nodejs/node/commit/886116f837)] - **test**: apply test-fs-access to promises API (Rich Trott) [#20667](https://github.com/nodejs/node/pull/20667) +* [[`2a7c863d3d`](https://github.com/nodejs/node/commit/2a7c863d3d)] - **test**: modernize and correct test-doctool-html.js (Vse Mozhet Byt) [#20676](https://github.com/nodejs/node/pull/20676) +* [[`9c1c03e5d4`](https://github.com/nodejs/node/commit/9c1c03e5d4)] - **test**: better error message in trace events test (Anna Henningsen) [#20655](https://github.com/nodejs/node/pull/20655) +* [[`0aab92f6b2`](https://github.com/nodejs/node/commit/0aab92f6b2)] - **test**: add test for async hooks parity for async/await (Maya Lekova) [#20626](https://github.com/nodejs/node/pull/20626) +* [[`2db83fdc0c`](https://github.com/nodejs/node/commit/2db83fdc0c)] - **test**: remove deepStrictEqual() third argument (Francesco Falanga) [#20702](https://github.com/nodejs/node/pull/20702) +* [[`87f3f5af2e`](https://github.com/nodejs/node/commit/87f3f5af2e)] - **test**: plug AliasedBuffer cctest memory leak (Anna Henningsen) [#20665](https://github.com/nodejs/node/pull/20665) +* [[`eb21a6b7f6`](https://github.com/nodejs/node/commit/eb21a6b7f6)] - **test**: remove crypto.DEFAULT\_ENCODING usage (Daniel Bevenius) [#20221](https://github.com/nodejs/node/pull/20221) +* [[`de34cfad58`](https://github.com/nodejs/node/commit/de34cfad58)] - **test**: make sure linked lists are inspectable with defaults (Anna Henningsen) [#20017](https://github.com/nodejs/node/pull/20017) +* [[`41e1dc09de`](https://github.com/nodejs/node/commit/41e1dc09de)] - **test**: add regression test for #11257 (Benjamin Coe) [#20391](https://github.com/nodejs/node/pull/20391) +* [[`56530f0844`](https://github.com/nodejs/node/commit/56530f0844)] - **(SEMVER-MINOR)** **timers**: make timer.refresh() a public API (Jeremiah Senkpiel) [#20298](https://github.com/nodejs/node/pull/20298) +* [[`bd500af2ff`](https://github.com/nodejs/node/commit/bd500af2ff)] - **tools**: update prohibited-strings md linting (Rich Trott) [#20742](https://github.com/nodejs/node/pull/20742) +* [[`2361f6454c`](https://github.com/nodejs/node/commit/2361f6454c)] - **tools**: stricter eslint rule for globals (Ruben Bridgewater) [#20567](https://github.com/nodejs/node/pull/20567) +* [[`38fc741c36`](https://github.com/nodejs/node/commit/38fc741c36)] - **tools**: eliminate intermediate module in doctools (Vse Mozhet Byt) [#20701](https://github.com/nodejs/node/pull/20701) +* [[`6f4e9ffb7b`](https://github.com/nodejs/node/commit/6f4e9ffb7b)] - **tools**: fix "the the" typos in comments (Masashi Hirano) [#20716](https://github.com/nodejs/node/pull/20716) +* [[`b795953b5f`](https://github.com/nodejs/node/commit/b795953b5f)] - **tools**: hide symbols for builtin JS files in binary (Anna Henningsen) [#20634](https://github.com/nodejs/node/pull/20634) +* [[`44960a0d5a`](https://github.com/nodejs/node/commit/44960a0d5a)] - **tools**: make C++ linter reject `template\<` (Anna Henningsen) [#20675](https://github.com/nodejs/node/pull/20675) +* [[`7bff6d15b2`](https://github.com/nodejs/node/commit/7bff6d15b2)] - **tools**: overhaul tools/doc/html.js (Vse Mozhet Byt) [#20613](https://github.com/nodejs/node/pull/20613) +* [[`f2ad1d5d22`](https://github.com/nodejs/node/commit/f2ad1d5d22)] - **(SEMVER-MINOR)** **tools**: remove `--quiet` from run-valgrind.py (Anna Henningsen) [#19377](https://github.com/nodejs/node/pull/19377) +* [[`ebd102e473`](https://github.com/nodejs/node/commit/ebd102e473)] - **tools**: use macOS as operating system name (Rich Trott) [#20579](https://github.com/nodejs/node/pull/20579) +* [[`08097ccf84`](https://github.com/nodejs/node/commit/08097ccf84)] - **tools**: ignore VS compiler output (Yulong Wang) [#20527](https://github.com/nodejs/node/pull/20527) +* [[`8781bcb1ee`](https://github.com/nodejs/node/commit/8781bcb1ee)] - **tools, doc**: wrap manpage links in code elements (Vse Mozhet Byt) [#20785](https://github.com/nodejs/node/pull/20785) +* [[`e1ff587a26`](https://github.com/nodejs/node/commit/e1ff587a26)] - **tools, doc**: fix stability index isssues (Vse Mozhet Byt) [#20731](https://github.com/nodejs/node/pull/20731) +* [[`526163cff9`](https://github.com/nodejs/node/commit/526163cff9)] - **url**: introduce `URL\_FLAGS\_IS\_DEFAULT\_SCHEME\_PORT` flag (Ayush Gupta) [#20479](https://github.com/nodejs/node/pull/20479) +* [[`c8c9211fa6`](https://github.com/nodejs/node/commit/c8c9211fa6)] - **util**: improve error inspection (Ruben Bridgewater) [#20802](https://github.com/nodejs/node/pull/20802) +* [[`f0d6a37c5c`](https://github.com/nodejs/node/commit/f0d6a37c5c)] - **util**: fix inspected stack indentation (Ruben Bridgewater) [#20802](https://github.com/nodejs/node/pull/20802) +* [[`38bc5fbd6b`](https://github.com/nodejs/node/commit/38bc5fbd6b)] - **util**: remove erroneous whitespace (Ruben Bridgewater) [#20802](https://github.com/nodejs/node/pull/20802) +* [[`5ce85a72cb`](https://github.com/nodejs/node/commit/5ce85a72cb)] - **util**: wrap error in brackets without stack (Ruben Bridgewater) [#20802](https://github.com/nodejs/node/pull/20802) +* [[`b308a07301`](https://github.com/nodejs/node/commit/b308a07301)] - **util**: support inspecting namespaces of unevaluated modules (Gus Caplan) [#20782](https://github.com/nodejs/node/pull/20782) +* [[`105f606202`](https://github.com/nodejs/node/commit/105f606202)] - **v8**: backport 9fb02b526f1cd3b859a530a01adb08bc0d089f4f (Gus Caplan) [#20575](https://github.com/nodejs/node/pull/20575) +* [[`8604481b2e`](https://github.com/nodejs/node/commit/8604481b2e)] - **vm**: move emitExperimentalWarning (Daniel Bevenius) [#20593](https://github.com/nodejs/node/pull/20593) +* [[`740bf783e5`](https://github.com/nodejs/node/commit/740bf783e5)] - **vm,trace_events**: add node.vm.script trace events category (James M Snell) [#20728](https://github.com/nodejs/node/pull/20728) +* [[`d5db576d15`](https://github.com/nodejs/node/commit/d5db576d15)] - **zlib**: reduce number of static internal methods (Anna Henningsen) [#20674](https://github.com/nodejs/node/pull/20674) + ## 2018-05-08, Version 10.1.0 (Current), @MylesBorins @@ -118,7 +353,7 @@ * [[`9cf3ae5bc3`](https://github.com/nodejs/node/commit/9cf3ae5bc3)] - **doc**: add missing backticks in n-api.md (Vse Mozhet Byt) [#20390](https://github.com/nodejs/node/pull/20390) * [[`be34388a07`](https://github.com/nodejs/node/commit/be34388a07)] - **doc**: unify and dedupe returned values in timers.md (Vse Mozhet Byt) [#20310](https://github.com/nodejs/node/pull/20310) * [[`9c11a18f70`](https://github.com/nodejs/node/commit/9c11a18f70)] - **doc**: remove eu-strip from tarball (jvelezpo) [#20304](https://github.com/nodejs/node/pull/20304) -* [[`b47044ac0f`](https://github.com/nodejs/node/commit/b47044ac0f)] - **doc**: improve parameters for Http2Session:goaway event (Ujjwal Sharma) +* [[`b47044ac0f`](https://github.com/nodejs/node/commit/b47044ac0f)] - **doc**: improve parameters for Http2Session:goaway event (Ujjwal Sharma) * [[`701f536ef4`](https://github.com/nodejs/node/commit/701f536ef4)] - **doc**: remove superfluous URL require statement (Mark Tiedemann) [#20364](https://github.com/nodejs/node/pull/20364) * [[`d9bc9217a7`](https://github.com/nodejs/node/commit/d9bc9217a7)] - **doc**: fix typo in console.md (Daniel Hritzkiv) [#20349](https://github.com/nodejs/node/pull/20349) * [[`cc09d7ec5b`](https://github.com/nodejs/node/commit/cc09d7ec5b)] - **doc**: remove console.table() as inspector-dependent (Rich Trott) [#20346](https://github.com/nodejs/node/pull/20346) @@ -152,7 +387,7 @@ * [[`7b8e9ca7b8`](https://github.com/nodejs/node/commit/7b8e9ca7b8)] - **lib**: expose FixedQueue internally and fix nextTick bug (Anatoli Papirovski) [#20468](https://github.com/nodejs/node/pull/20468) * [[`b6de6a7e35`](https://github.com/nodejs/node/commit/b6de6a7e35)] - **lib**: named anonymous functions (Carrie Coxwell) [#20408](https://github.com/nodejs/node/pull/20408) * [[`9eacd66bcb`](https://github.com/nodejs/node/commit/9eacd66bcb)] - **lib**: make sure `console` is writable (Kyle Farnung) [#20185](https://github.com/nodejs/node/pull/20185) -* [[`17dbf6c77f`](https://github.com/nodejs/node/commit/17dbf6c77f)] - **n-api**: make test\_error functions static (Gabriel Schulhof) +* [[`17dbf6c77f`](https://github.com/nodejs/node/commit/17dbf6c77f)] - **n-api**: make test\_error functions static (Gabriel Schulhof) * [[`ad793ab93c`](https://github.com/nodejs/node/commit/ad793ab93c)] - **n-api**: test and doc napi\_throw() of a primitive (Gabriel Schulhof) [#20428](https://github.com/nodejs/node/pull/20428) * [[`1908668826`](https://github.com/nodejs/node/commit/1908668826)] - **n-api**: document the look of napi\_external values (Gabriel Schulhof) [#20426](https://github.com/nodejs/node/pull/20426) * [[`7ac491b8ac`](https://github.com/nodejs/node/commit/7ac491b8ac)] - **n-api**: document that native strings are copied (Gabriel Schulhof) [#20425](https://github.com/nodejs/node/pull/20425) diff --git a/src/node_version.h b/src/node_version.h index 2c6daf8588eeb7..7cc0a91c2f65de 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -23,13 +23,13 @@ #define SRC_NODE_VERSION_H_ #define NODE_MAJOR_VERSION 10 -#define NODE_MINOR_VERSION 1 -#define NODE_PATCH_VERSION 1 +#define NODE_MINOR_VERSION 2 +#define NODE_PATCH_VERSION 0 #define NODE_VERSION_IS_LTS 0 #define NODE_VERSION_LTS_CODENAME "" -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)