Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8e2cc5e

Browse filesBrowse files
cjihrigaddaleax
authored andcommitted
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
Copy full SHA for 8e2cc5e

File tree

Expand file treeCollapse file tree

3 files changed

+17
-20
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+17
-20
lines changed
Open diff view settings
Collapse file

‎lib/internal/process/report.js‎

Copy file name to clipboardExpand all lines: lib/internal/process/report.js
+11-13Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,18 @@ const report = {
7575
},
7676
triggerReport(file, err) {
7777
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') {
9183
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+
9290
return nr.triggerReport(file, err.stack);
9391
},
9492
getReport(err) {
Collapse file

‎src/node_report_module.cc‎

Copy file name to clipboardExpand all lines: src/node_report_module.cc
+4-5Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,11 @@ void TriggerReport(const FunctionCallbackInfo<Value>& info) {
4848
std::string filename;
4949
Local<String> stackstr;
5050

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())
5455
filename = *String::Utf8Value(isolate, info[0]);
55-
stackstr = info[1].As<String>();
56-
}
5756

5857
filename = TriggerNodeReport(
5958
isolate, env, "JavaScript API", __func__, filename, stackstr);
Collapse file

‎test/node-report/test-api-pass-error.js‎

Copy file name to clipboardExpand all lines: test/node-report/test-api-pass-error.js
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ const assert = require('assert');
77
if (process.argv[2] === 'child') {
88
try {
99
throw new Error('Testing error handling');
10-
} catch {
11-
process.report.triggerReport();
10+
} catch (err) {
11+
process.report.triggerReport(err);
1212
}
1313
} else {
1414
const helper = require('../common/report.js');

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.