Commit 8e2cc5e
report: refactor triggerReport()
This commit fixes the triggerReport() argument validation. The
existing test is also updated, as it was not passing the Error
object to triggerReport().
PR-URL: #26268
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent b0c310d commit 8e2cc5e
3 files changed
Lines changed: 17 additions & 20 deletions
File tree
- lib/internal/process
- src
- test/node-report
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -75,20 +75,18 @@ const report = { | |||
| 75 | 75 | }, | |
| 76 | 76 | triggerReport(file, err) { | |
| 77 | 77 | emitExperimentalWarning('report'); | |
| 78 | - if (err == null) { | ||
| 79 | - if (file == null) { | ||
| 80 | - return nr.triggerReport(new ERR_SYNTHETIC().stack); | ||
| 81 | - } | ||
| 82 | - if (typeof file !== 'string') | ||
| 83 | - throw new ERR_INVALID_ARG_TYPE('file', 'String', file); | ||
| 84 | - return nr.triggerReport(file, new ERR_SYNTHETIC().stack); | ||
| 85 | - } | ||
| 86 | - if (typeof err !== 'object') | ||
| 87 | - throw new ERR_INVALID_ARG_TYPE('err', 'Object', err); | ||
| 88 | - if (file == null) | ||
| 89 | - return nr.triggerReport(err.stack); | ||
| 90 | - if (typeof file !== 'string') | ||
| 78 | + | ||
| 79 | + if (typeof file === 'object' && file !== null) { | ||
| 80 | + err = file; | ||
| 81 | + file = undefined; | ||
| 82 | + } else if (file !== undefined && typeof file !== 'string') { | ||
| 91 | 83 | throw new ERR_INVALID_ARG_TYPE('file', 'String', file); | |
| 84 | + } else if (err === undefined) { | ||
| 85 | + err = new ERR_SYNTHETIC(); | ||
| 86 | + } else if (err === null || typeof err !== 'object') { | ||
| 87 | + throw new ERR_INVALID_ARG_TYPE('err', 'Object', err); | ||
| 88 | + } | ||
| 89 | + | ||
| 92 | 90 | return nr.triggerReport(file, err.stack); | |
| 93 | 91 | }, | |
| 94 | 92 | getReport(err) { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -48,12 +48,11 @@ void TriggerReport(const FunctionCallbackInfo<Value>& info) { | |||
| 48 | 48 | std::string filename; | |
| 49 | 49 | Local<String> stackstr; | |
| 50 | 50 | ||
| 51 | - if (info.Length() == 1) { | ||
| 52 | - stackstr = info[0].As<String>(); | ||
| 53 | - } else { | ||
| 51 | + CHECK_EQ(info.Length(), 2); | ||
| 52 | + stackstr = info[1].As<String>(); | ||
| 53 | + | ||
| 54 | + if (info[0]->IsString()) | ||
| 54 | 55 | filename = *String::Utf8Value(isolate, info[0]); | |
| 55 | - stackstr = info[1].As<String>(); | ||
| 56 | - } | ||
| 57 | 56 | ||
| 58 | 57 | filename = TriggerNodeReport( | |
| 59 | 58 | isolate, env, "JavaScript API", __func__, filename, stackstr); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,8 +7,8 @@ const assert = require('assert'); | |||
| 7 | 7 | if (process.argv[2] === 'child') { | |
| 8 | 8 | try { | |
| 9 | 9 | throw new Error('Testing error handling'); | |
| 10 | - } catch { | ||
| 11 | - process.report.triggerReport(); | ||
| 10 | + } catch (err) { | ||
| 11 | + process.report.triggerReport(err); | ||
| 12 | 12 | } | |
| 13 | 13 | } else { | |
| 14 | 14 | const helper = require('../common/report.js'); | |
0 commit comments