Skip to content
Open
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
9 changes: 1 addition & 8 deletions lib/internal/streams/readable.js
Original file line number Diff line number Diff line change
Expand Up @@ -1453,16 +1453,9 @@ function createAsyncIterator(stream, options) {
function finalize() {
completed = true;

const preserveHalfOpenDuplex =
error === null &&
stream.allowHalfOpen === true &&
stream.writable === true &&
stream.writableEnded !== true;

if (
(error || options?.destroyOnReturn !== false) &&
(error === undefined || stream._readableState.autoDestroy) &&
!preserveHalfOpenDuplex
(error === undefined || stream._readableState.autoDestroy)
) {
destroyImpl.destroyer(stream, null);
} else {
Expand Down
53 changes: 53 additions & 0 deletions test/parallel/test-net-allow-half-open-async-iter-destroy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
'use strict';

const common = require('../common');
const assert = require('assert');
const net = require('net');

(async function() {
let resolveServerSocket;
const serverSocketPromise = new Promise((resolve) => {
resolveServerSocket = resolve;
});

const server = net.createServer({
allowHalfOpen: true,
}, common.mustCall((socket) => {
resolveServerSocket(socket);
}));

server.on('error', common.mustNotCall());
server.on('close', common.mustCall());

await new Promise((resolve) => {
server.listen(0, common.localhostIPv4, resolve);
});

const clientSocket = net.createConnection({
port: server.address().port,
host: server.address().address,
});
clientSocket.on('error', common.mustNotCall());

await new Promise((resolve) => {
clientSocket.end('data', resolve);
});

const serverSocket = await serverSocketPromise;

let serverRead = '';
for await (const chunk of serverSocket) {
serverRead += chunk;
}

const destroyed = serverSocket.destroyed;
serverSocket.destroy();
clientSocket.destroy();

await new Promise((resolve) => {
server.close(resolve);
});

assert.strictEqual(serverRead, 'data');
assert.strictEqual(destroyed, true);
})().then(common.mustCall());
2 changes: 1 addition & 1 deletion test/parallel/test-net-allow-half-open-async-iter.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const net = require('net');
});

let serverRead = '';
for await (const chunk of serverSocket) {
for await (const chunk of serverSocket.iterator({ destroyOnReturn: false })) {
serverRead += chunk;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const {

(async () => {
let read = '';
for await (const chunk of duplex) {
for await (const chunk of duplex.iterator({ destroyOnReturn: false })) {
read += chunk;
}

Expand Down
Loading