summaryrefslogtreecommitdiff
path: root/lib/zlib.js
diff options
context:
space:
mode:
authorRuben Bridgewater <ruben@bridgewater.de>2019-03-18 02:29:39 +0100
committerRuben Bridgewater <ruben@bridgewater.de>2019-03-23 02:55:54 +0100
commitbfbce289c33b12aafb82bd5b45bcb4412850b28f (patch)
treefa9c21007fbe096b11e5a10d80de4b0af91137e4 /lib/zlib.js
parent1ed3c54ecbd72a33693e5954f86bcc9fd9b1cc09 (diff)
downloadandroid-node-v8-bfbce289c33b12aafb82bd5b45bcb4412850b28f.tar.gz
android-node-v8-bfbce289c33b12aafb82bd5b45bcb4412850b28f.tar.bz2
android-node-v8-bfbce289c33b12aafb82bd5b45bcb4412850b28f.zip
lib: refactor Error.captureStackTrace() usage
When using `Errors.captureStackFrames` the error's stack property is set again. This adds a helper function that wraps this functionality in a simple API that does not only set the stack including the `code` property but it also improves the performance to create the error. The helper works for thrown errors and errors returned from wrapped functions in case they are Node.js core errors. PR-URL: https://github.com/nodejs/node/pull/26738 Fixes: https://github.com/nodejs/node/issues/26669 Fixes: https://github.com/nodejs/node/issues/20253 Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Michaƫl Zasso <targos@protonmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Diffstat (limited to 'lib/zlib.js')
-rw-r--r--lib/zlib.js49
1 files changed, 24 insertions, 25 deletions
diff --git a/lib/zlib.js b/lib/zlib.js
index ec08db9f7c..9220b11b0f 100644
--- a/lib/zlib.js
+++ b/lib/zlib.js
@@ -22,12 +22,15 @@
'use strict';
const {
- ERR_BROTLI_INVALID_PARAM,
- ERR_BUFFER_TOO_LARGE,
- ERR_INVALID_ARG_TYPE,
- ERR_OUT_OF_RANGE,
- ERR_ZLIB_INITIALIZATION_FAILED,
-} = require('internal/errors').codes;
+ codes: {
+ ERR_BROTLI_INVALID_PARAM,
+ ERR_BUFFER_TOO_LARGE,
+ ERR_INVALID_ARG_TYPE,
+ ERR_OUT_OF_RANGE,
+ ERR_ZLIB_INITIALIZATION_FAILED,
+ },
+ hideStackFrames
+} = require('internal/errors');
const Transform = require('_stream_transform');
const {
deprecate,
@@ -170,7 +173,7 @@ function zlibOnError(message, errno, code) {
// 2. Returns true for finite numbers
// 3. Throws ERR_INVALID_ARG_TYPE for non-numbers
// 4. Throws ERR_OUT_OF_RANGE for infinite numbers
-function checkFiniteNumber(number, name) {
+const checkFiniteNumber = hideStackFrames((number, name) => {
// Common case
if (number === undefined) {
return false;
@@ -186,33 +189,29 @@ function checkFiniteNumber(number, name) {
// Other non-numbers
if (typeof number !== 'number') {
- const err = new ERR_INVALID_ARG_TYPE(name, 'number', number);
- Error.captureStackTrace(err, checkFiniteNumber);
- throw err;
+ throw new ERR_INVALID_ARG_TYPE(name, 'number', number);
}
// Infinite numbers
- const err = new ERR_OUT_OF_RANGE(name, 'a finite number', number);
- Error.captureStackTrace(err, checkFiniteNumber);
- throw err;
-}
+ throw new ERR_OUT_OF_RANGE(name, 'a finite number', number);
+});
// 1. Returns def for number when it's undefined or NaN
// 2. Returns number for finite numbers >= lower and <= upper
// 3. Throws ERR_INVALID_ARG_TYPE for non-numbers
// 4. Throws ERR_OUT_OF_RANGE for infinite numbers or numbers > upper or < lower
-function checkRangesOrGetDefault(number, name, lower, upper, def) {
- if (!checkFiniteNumber(number, name)) {
- return def;
- }
- if (number < lower || number > upper) {
- const err = new ERR_OUT_OF_RANGE(name,
- `>= ${lower} and <= ${upper}`, number);
- Error.captureStackTrace(err, checkRangesOrGetDefault);
- throw err;
+const checkRangesOrGetDefault = hideStackFrames(
+ (number, name, lower, upper, def) => {
+ if (!checkFiniteNumber(number, name)) {
+ return def;
+ }
+ if (number < lower || number > upper) {
+ throw new ERR_OUT_OF_RANGE(name,
+ `>= ${lower} and <= ${upper}`, number);
+ }
+ return number;
}
- return number;
-}
+);
// The base class for all Zlib-style streams.
function ZlibBase(opts, mode, handle, { flush, finishFlush, fullFlush }) {