Commit b0c310d
inspector: return Error objects on error
The inspector communicates errors via POJOs. This commit
wraps the error information in an actual Error object.
PR-URL: #26255
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>1 parent 0034820 commit b0c310d
2 files changed
Lines changed: 20 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,6 +3,7 @@ | |||
| 3 | 3 | const { | |
| 4 | 4 | ERR_INSPECTOR_ALREADY_CONNECTED, | |
| 5 | 5 | ERR_INSPECTOR_CLOSED, | |
| 6 | + ERR_INSPECTOR_COMMAND, | ||
| 6 | 7 | ERR_INSPECTOR_NOT_AVAILABLE, | |
| 7 | 8 | ERR_INSPECTOR_NOT_CONNECTED, | |
| 8 | 9 | ERR_INVALID_ARG_TYPE, | |
@@ -48,8 +49,14 @@ class Session extends EventEmitter { | |||
| 48 | 49 | if (parsed.id) { | |
| 49 | 50 | const callback = this[messageCallbacksSymbol].get(parsed.id); | |
| 50 | 51 | this[messageCallbacksSymbol].delete(parsed.id); | |
| 51 | - if (callback) | ||
| 52 | - callback(parsed.error || null, parsed.result || null); | ||
| 52 | + if (callback) { | ||
| 53 | + if (parsed.error) { | ||
| 54 | + return callback(new ERR_INSPECTOR_COMMAND(parsed.error.code, | ||
| 55 | + parsed.error.message)); | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + callback(null, parsed.result); | ||
| 59 | + } | ||
| 53 | 60 | } else { | |
| 54 | 61 | this.emit(parsed.method, parsed); | |
| 55 | 62 | this.emit('inspectorNotification', parsed); | |
Lines changed: 11 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,17 +5,22 @@ const common = require('../common'); | |||
| 5 | 5 | common.skipIfInspectorDisabled(); | |
| 6 | 6 | ||
| 7 | 7 | (async function test() { | |
| 8 | - const { strictEqual } = require('assert'); | ||
| 8 | + const assert = require('assert'); | ||
| 9 | 9 | const { Session } = require('inspector'); | |
| 10 | 10 | const { promisify } = require('util'); | |
| 11 | 11 | ||
| 12 | 12 | const session = new Session(); | |
| 13 | 13 | session.connect(); | |
| 14 | 14 | session.post = promisify(session.post); | |
| 15 | - const result = await session.post('Runtime.evaluate', { | ||
| 16 | - expression: 'for(;;);', | ||
| 17 | - timeout: 0 | ||
| 18 | - }).catch((e) => e); | ||
| 19 | - strictEqual(result.message, 'Execution was terminated'); | ||
| 15 | + await assert.rejects( | ||
| 16 | + session.post('Runtime.evaluate', { | ||
| 17 | + expression: 'for(;;);', | ||
| 18 | + timeout: 0 | ||
| 19 | + }), | ||
| 20 | + { | ||
| 21 | + code: 'ERR_INSPECTOR_COMMAND', | ||
| 22 | + message: 'Inspector error -32000: Execution was terminated' | ||
| 23 | + } | ||
| 24 | + ); | ||
| 20 | 25 | session.disconnect(); | |
| 21 | 26 | })(); | |
0 commit comments