net: honor default values in Socket constructor

Specifically `readable` and `writable` that default to `false`.

PR-URL: https://github.com/nodejs/node/pull/19971
Fixes: https://github.com/libuv/libuv/issues/1794
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
This commit is contained in:
Santiago Gimeno 2018-04-12 11:15:31 +02:00 committed by Ruben Bridgewater
parent 8786889656
commit 67e2a15d75
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
4 changed files with 55 additions and 8 deletions

View File

@ -131,8 +131,11 @@ const handleConversion = {
},
got: function(message, handle, emit) {
var socket = new net.Socket({ handle: handle });
socket.readable = socket.writable = true;
var socket = new net.Socket({
handle: handle,
readable: true,
writable: true
});
// if the socket was created by net.Server we will track the socket
if (message.key) {

View File

@ -72,6 +72,8 @@ class JSStreamWrap extends Socket {
this.stream = stream;
this[kCurrentWriteRequest] = null;
this[kCurrentShutdownRequest] = null;
this.readable = stream.readable;
this.writable = stream.writable;
// Start reading.
this.read(0);

View File

@ -244,6 +244,8 @@ function Socket(options) {
else
options = util._extend({}, options);
options.readable = options.readable || false;
options.writable = options.writable || false;
const allowHalfOpen = options.allowHalfOpen;
// Prevent the "no-half-open enforcer" from being inherited from `Duplex`.
@ -283,9 +285,6 @@ function Socket(options) {
value: 0, writable: true
});
}
} else {
// these will be set once there is a connection
this.readable = this.writable = false;
}
// shut down the socket when we're finished with it.
@ -1537,10 +1536,10 @@ function onconnection(err, clientHandle) {
var socket = new Socket({
handle: clientHandle,
allowHalfOpen: self.allowHalfOpen,
pauseOnCreate: self.pauseOnConnect
pauseOnCreate: self.pauseOnConnect,
readable: true,
writable: true
});
socket.readable = socket.writable = true;
self._connections++;
socket.server = self;

View File

@ -0,0 +1,43 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const net = require('net');
function test(sock, readable, writable) {
let socket;
if (sock instanceof net.Socket) {
socket = sock;
} else {
socket = new net.Socket(sock);
socket.unref();
}
assert.strictEqual(socket.readable, readable);
assert.strictEqual(socket.writable, writable);
}
test(undefined, false, false);
const server = net.createServer(common.mustCall((socket) => {
test(socket, true, true);
test({ handle: socket._handle }, false, false);
test({ handle: socket._handle, readable: true, writable: true }, true, true);
if (socket._handle.fd >= 0) {
test(socket._handle.fd, false, false);
test({ fd: socket._handle.fd }, false, false);
test({ fd: socket._handle.fd, readable: true, writable: true }, true, true);
}
server.close();
}));
server.listen(common.mustCall(() => {
const { port } = server.address();
const socket = net.connect(port, common.mustCall(() => {
test(socket, true, true);
socket.end();
}));
test(socket, false, true);
}));