Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions src/js/node/readline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2699,28 +2699,26 @@ var PromisesInterface = class Interface extends _Interface {
super(input, output, completer, terminal);
}
question(query, options = kEmptyObject) {
var signal = options?.signal;
if (signal) {
validateAbortSignal(signal, "options.signal");
if (signal.aborted) {
return PromiseReject($makeAbortError(undefined, { cause: signal.reason }));
return new Promise((resolve, reject) => {
var cb = resolve;
var signal = options?.signal;
if (signal) {
validateAbortSignal(signal, "options.signal");
if (signal.aborted) {
return reject($makeAbortError(undefined, { cause: signal.reason }));
}
var onAbort = () => {
this[kQuestionCancel]();
reject($makeAbortError(undefined, { cause: signal.reason }));
};
signal.addEventListener("abort", onAbort, { once: true });
cb = answer => {
signal.removeEventListener("abort", onAbort);
resolve(answer);
};
}
}
const { promise, resolve, reject } = $newPromiseCapability(Promise);
var cb = resolve;
if (options?.signal) {
var onAbort = () => {
this[kQuestionCancel]();
reject($makeAbortError(undefined, { cause: signal.reason }));
};
signal.addEventListener("abort", onAbort, { once: true });
cb = answer => {
signal.removeEventListener("abort", onAbort);
resolve(answer);
};
}
this[kQuestion](query, cb);
return promise;
this[kQuestion](query, cb);
});
}
};

Expand Down
49 changes: 49 additions & 0 deletions test/js/node/readline/readline_promises.node.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { createTest } from "node-harness";
import { EventEmitter } from "node:events";
import readlinePromises from "node:readline/promises";
import { PassThrough } from "node:stream";
const { describe, it, expect, createDoneDotAll, createCallCheckCtx, assert } = createTest(import.meta.path);

// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -93,3 +94,51 @@ describe("readline/promises.createInterface()", () => {
assert.strictEqual(rl.closed, true);
});
});

describe("readline/promises.Interface.question()", () => {
it("returns a rejected promise (not a sync throw) on a closed interface", async () => {
const rl = readlinePromises.createInterface({ input: new PassThrough() });
rl.close();
const result = rl.question("q? ");
expect(result).toBeInstanceOf(Promise);
const err = await result.then(
() => null,
e => e,
);
expect({ name: err?.name, code: err?.code }).toEqual({ name: "Error", code: "ERR_USE_AFTER_CLOSE" });
});

it("returns a rejected promise (not a sync throw) for an invalid options.signal", async () => {
const rl = readlinePromises.createInterface({ input: new PassThrough() });
try {
const result = rl.question("q? ", { signal: 42 as any });
expect(result).toBeInstanceOf(Promise);
const err = await result.then(
() => null,
e => e,
);
expect({ name: err?.name, code: err?.code }).toEqual({ name: "TypeError", code: "ERR_INVALID_ARG_TYPE" });
} finally {
rl.close();
}
});

it("returns a rejected promise for an already-aborted signal", async () => {
const rl = readlinePromises.createInterface({ input: new PassThrough() });
try {
const result = rl.question("q? ", { signal: AbortSignal.abort("why") });
expect(result).toBeInstanceOf(Promise);
const err = await result.then(
() => null,
e => e,
);
expect({ name: err?.name, code: err?.code, cause: err?.cause }).toEqual({
name: "AbortError",
code: "ABORT_ERR",
cause: "why",
});
} finally {
rl.close();
}
});
});
Loading