diff options
author | Joyee Cheung <joyeec9h3@gmail.com> | 2019-06-20 07:13:26 +0800 |
---|---|---|
committer | Joyee Cheung <joyeec9h3@gmail.com> | 2019-06-27 20:22:08 +0800 |
commit | 94454927f697840a25c1ae73ebbcf9a5324b9060 (patch) | |
tree | 14d7579730ebbaf77d5f9b6945bbf408457b76e4 /lib | |
parent | ed8fc7e11d688cbcdf33d0d149830064758bdcd2 (diff) | |
download | node-new-94454927f697840a25c1ae73ebbcf9a5324b9060.tar.gz |
process: split routines used to enhance fatal exception stack traces
Previously the enhancement were done right after emitting
`'uncaughtException'`, which meant by the time we knew the
exception was fatal in C++, the error.stack had already been
patched.
This patch moves those routines to be called later during the
fatal exception handling, and split them into two stages:
before and after the inspector is notified by the invocation of
`V8Inspector::exceptionThrown`. We now expand the stack to include
additional informations about unhandled 'error' events before
the inspector is notified, but delay the highlighting of the
frames until after the inspector is notified, so that the
ANSI escape sequences won't show up in the inspector console.
PR-URL: https://github.com/nodejs/node/pull/28308
Fixes: https://github.com/nodejs/node/issues/28287
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/events.js | 13 | ||||
-rw-r--r-- | lib/internal/bootstrap/node.js | 17 | ||||
-rw-r--r-- | lib/internal/errors.js | 41 | ||||
-rw-r--r-- | lib/internal/process/execution.js | 12 | ||||
-rw-r--r-- | lib/internal/util.js | 1 | ||||
-rw-r--r-- | lib/internal/util/inspect.js | 3 |
6 files changed, 66 insertions, 21 deletions
diff --git a/lib/events.js b/lib/events.js index 438c8f8306..6f279a0bff 100644 --- a/lib/events.js +++ b/lib/events.js @@ -26,10 +26,14 @@ const { Math, Object, Reflect } = primordials; var spliceOne; const { + kEnhanceStackBeforeInspector, + codes +} = require('internal/errors'); +const { ERR_INVALID_ARG_TYPE, ERR_OUT_OF_RANGE, ERR_UNHANDLED_ERROR -} = require('internal/errors').codes; +} = codes; const { inspect @@ -142,8 +146,8 @@ function enhanceStackTrace(err, own) { ownStack.splice(off + 1, len - 2, ' [... lines matching original stack trace ...]'); } - // Do this last, because it is the only operation with side effects. - err.stack = err.stack + sep + ownStack.join('\n'); + + return err.stack + sep + ownStack.join('\n'); } EventEmitter.prototype.emit = function emit(type, ...args) { @@ -162,11 +166,10 @@ EventEmitter.prototype.emit = function emit(type, ...args) { er = args[0]; if (er instanceof Error) { try { - const { kExpandStackSymbol } = require('internal/util'); const capture = {}; // eslint-disable-next-line no-restricted-syntax Error.captureStackTrace(capture, EventEmitter.prototype.emit); - Object.defineProperty(er, kExpandStackSymbol, { + Object.defineProperty(er, kEnhanceStackBeforeInspector, { value: enhanceStackTrace.bind(null, er, capture), configurable: true }); diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 22dabf4d7e..e8735c2049 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -299,9 +299,22 @@ process.emitWarning = emitWarning; } function setupPrepareStackTrace() { - const { setPrepareStackTraceCallback } = internalBinding('errors'); - const { prepareStackTrace } = require('internal/errors'); + const { + setEnhanceStackForFatalException, + setPrepareStackTraceCallback + } = internalBinding('errors'); + const { + prepareStackTrace, + fatalExceptionStackEnhancers: { + beforeInspector, + afterInspector + } + } = require('internal/errors'); + // Tell our PrepareStackTraceCallback passed to the V8 API + // to call prepareStackTrace(). setPrepareStackTraceCallback(prepareStackTrace); + // Set the function used to enhance the error stack for printing + setEnhanceStackForFatalException(beforeInspector, afterInspector); } function setupProcessObject() { diff --git a/lib/internal/errors.js b/lib/internal/errors.js index a45d71e8f6..ff1449f519 100644 --- a/lib/internal/errors.js +++ b/lib/internal/errors.js @@ -622,6 +622,45 @@ function addNumericalSeparator(val) { return `${val.slice(0, i)}${res}`; } +// Used to enhance the stack that will be picked up by the inspector +const kEnhanceStackBeforeInspector = Symbol('kEnhanceStackBeforeInspector'); + +// These are supposed to be called only on fatal exceptions before +// the process exits. +const fatalExceptionStackEnhancers = { + beforeInspector(error) { + if (typeof error[kEnhanceStackBeforeInspector] !== 'function') { + return error.stack; + } + + try { + // Set the error.stack here so it gets picked up by the + // inspector. + error.stack = error[kEnhanceStackBeforeInspector](); + } catch { + // We are just enhancing the error. If it fails, ignore it. + } + return error.stack; + }, + afterInspector(error) { + const originalStack = error.stack; + const { + inspect, + inspectDefaultOptions: { + colors: defaultColors + } + } = lazyInternalUtilInspect(); + const colors = internalBinding('util').guessHandleType(2) === 'TTY' && + require('internal/tty').hasColors() || + defaultColors; + try { + return inspect(error, { colors }); + } catch { + return originalStack; + } + } +}; + module.exports = { addCodeToName, // Exported for NghttpError codes, @@ -638,6 +677,8 @@ module.exports = { // This is exported only to facilitate testing. E, prepareStackTrace, + kEnhanceStackBeforeInspector, + fatalExceptionStackEnhancers }; // To declare an error message, use the E(sym, val, def) function above. The sym diff --git a/lib/internal/process/execution.js b/lib/internal/process/execution.js index 962bf0c809..06dfbce295 100644 --- a/lib/internal/process/execution.js +++ b/lib/internal/process/execution.js @@ -150,10 +150,6 @@ function createOnGlobalUncaughtException() { } else if (!process.emit('uncaughtException', er, type)) { // If someone handled it, then great. Otherwise, die in C++ land // since that means that we'll exit the process, emit the 'exit' event. - const { inspect } = require('internal/util/inspect'); - const colors = internalBinding('util').guessHandleType(2) === 'TTY' && - require('internal/tty').hasColors() || - inspect.defaultOptions.colors; try { if (!process._exiting) { process._exiting = true; @@ -163,14 +159,6 @@ function createOnGlobalUncaughtException() { } catch { // Nothing to be done about it at this point. } - try { - const { kExpandStackSymbol } = require('internal/util'); - if (typeof er[kExpandStackSymbol] === 'function') - er[kExpandStackSymbol](); - er.stack = inspect(er, { colors }); - } catch { - // Nothing to be done about it at this point. - } return false; } diff --git a/lib/internal/util.js b/lib/internal/util.js index 931bcea5b4..67d4130ddd 100644 --- a/lib/internal/util.js +++ b/lib/internal/util.js @@ -414,6 +414,5 @@ module.exports = { // Used by the buffer module to capture an internal reference to the // default isEncoding implementation, just in case userland overrides it. kIsEncodingSymbol: Symbol('kIsEncodingSymbol'), - kExpandStackSymbol: Symbol('kExpandStackSymbol'), kVmBreakFirstLineSymbol: Symbol('kVmBreakFirstLineSymbol') }; diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js index ea8cec6598..2f3b6cd11d 100644 --- a/lib/internal/util/inspect.js +++ b/lib/internal/util/inspect.js @@ -1683,5 +1683,6 @@ function formatWithOptions(inspectOptions, ...args) { module.exports = { inspect, format, - formatWithOptions + formatWithOptions, + inspectDefaultOptions }; |