debugger: reduce scope of eslint disable comment

Current code masks setInterval and setTimeout with promisified versions.
This can be confusing to read and causes lint errors. Replace masking
with use of pSetInterval and pSetTimeout instead.

Move disabling of lint rule from entire file to the one remaining line
(after the above changes) that still needs it.

PR-URL: https://github.com/nodejs/node/pull/38946
Backport-PR-URL: https://github.com/nodejs/node/pull/39446
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Rich Trott 2021-06-05 18:57:30 -07:00 committed by Richard Lau
parent 0ef5e088c0
commit 249acd5e69
No known key found for this signature in database
GPG Key ID: C43CEC45C17AB93C

View File

@ -20,9 +20,6 @@
* IN THE SOFTWARE.
*/
// TODO(aduh95): remove restricted syntax errors
/* eslint-disable no-restricted-syntax */
'use strict';
const {
@ -56,10 +53,10 @@ const {
AbortController,
} = require('internal/abort_controller');
const setTimeout = util.promisify(require('timers').setTimeout);
async function* setInterval(delay) {
const pSetTimeout = util.promisify(require('timers').setTimeout);
async function* pSetInterval(delay) {
while (true) {
await setTimeout(delay);
await pSetTimeout(delay);
yield;
}
}
@ -89,13 +86,13 @@ async function portIsFree(host, port, timeout = 9999) {
const ac = new AbortController();
const { signal } = ac;
setTimeout(timeout).then(() => ac.abort());
pSetTimeout(timeout).then(() => ac.abort());
const asyncIterator = setInterval(retryDelay);
const asyncIterator = pSetInterval(retryDelay);
while (true) {
await asyncIterator.next();
if (signal.aborted) {
throw new StartupError(
throw new StartupError( // eslint-disable-line no-restricted-syntax
`Timeout (${timeout}) waiting for ${host}:${port} to be free`);
}
const error = await new Promise((resolve) => {
@ -255,7 +252,7 @@ class NodeInspector {
return;
} catch (error) {
debuglog('connect failed', error);
await setTimeout(1000);
await pSetTimeout(1000);
}
}
this.stdout.write(' failed to connect, please retry\n');