Skip to content

Commit b8b13dc

Browse files
ShogunPandatargos
ShogunPanda
authored and
targos
committed
net: add autoSelectFamily and autoSelectFamilyAttemptTimeout options
PR-URL: #44731 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
1 parent 9f51b9e commit b8b13dc

File tree

9 files changed

+932
-7
lines changed

9 files changed

+932
-7
lines changed

‎doc/api/net.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,9 @@ behavior.
856856
<!-- YAML
857857
added: v0.1.90
858858
changes:
859+
- version: REPLACEME
860+
pr-url: https://github.com/nodejs/node/pull/44731
861+
description: Added the `autoSelectFamily` option.
859862
- version:
860863
- v17.7.0
861864
- v16.15.0
@@ -902,6 +905,20 @@ For TCP connections, available `options` are:
902905
**Default:** `false`.
903906
* `keepAliveInitialDelay` {number} If set to a positive number, it sets the initial delay before
904907
the first keepalive probe is sent on an idle socket.**Default:** `0`.
908+
* `autoSelectFamily` {boolean}: If set to `true`, it enables a family autodetection algorithm
909+
that loosely implements section 5 of [RFC 8305][].
910+
The `all` option passed to lookup is set to `true` and the sockets attempts to connect to all
911+
obtained IPv6 and IPv4 addresses, in sequence, until a connection is established.
912+
The first returned AAAA address is tried first, then the first returned A address and so on.
913+
Each connection attempt is given the amount of time specified by the `autoSelectFamilyAttemptTimeout`
914+
option before timing out and trying the next address.
915+
Ignored if the `family` option is not `0` or if `localAddress` is set.
916+
Connection errors are not emitted if at least one connection succeeds.
917+
**Default:** `false`.
918+
* `autoSelectFamilyAttemptTimeout` {number}: The amount of time in milliseconds to wait
919+
for a connection attempt to finish before trying the next address when using the `autoSelectFamily` option.
920+
If set to a positive integer less than `10`, then the value `10` will be used instead.
921+
**Default:** `250`.
905922

906923
For [IPC][] connections, available `options` are:
907924

@@ -1630,6 +1647,7 @@ net.isIPv6('fhqwhgads'); // returns false
16301647

16311648
[IPC]: #ipc-support
16321649
[Identifying paths for IPC connections]: #identifying-paths-for-ipc-connections
1650+
[RFC 8305]: https://www.rfc-editor.org/rfc/rfc8305.txt
16331651
[Readable Stream]: stream.md#class-streamreadable
16341652
[`'close'`]: #event-close
16351653
[`'connect'`]: #event-connect

‎lib/_tls_wrap.js

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ const EE = require('events');
5454
const net = require('net');
5555
const tls = require('tls');
5656
const common = require('_tls_common');
57+
const { kWrapConnectedHandle } = require('internal/net');
5758
const JSStreamSocket = require('internal/js_stream_socket');
5859
const { Buffer } = require('buffer');
5960
let debug = require('internal/util/debuglog').debuglog('tls', (fn) => {
@@ -598,11 +599,10 @@ TLSSocket.prototype.disableRenegotiation = function disableRenegotiation() {
598599
this[kDisableRenegotiation] = true;
599600
};
600601

601-
TLSSocket.prototype._wrapHandle = function(wrap) {
602-
let handle;
603-
604-
if (wrap)
602+
TLSSocket.prototype._wrapHandle = function(wrap, handle) {
603+
if (!handle && wrap) {
605604
handle = wrap._handle;
605+
}
606606

607607
const options = this._tlsOptions;
608608
if (!handle) {
@@ -633,6 +633,16 @@ TLSSocket.prototype._wrapHandle = function(wrap) {
633633
return res;
634634
};
635635

636+
TLSSocket.prototype[kWrapConnectedHandle] = function(handle) {
637+
this._handle = this._wrapHandle(null, handle);
638+
this.ssl = this._handle;
639+
this._init();
640+
641+
if (this._tlsOptions.enableTrace) {
642+
this._handle.enableTrace();
643+
}
644+
};
645+
636646
// This eliminates a cyclic reference to TLSWrap
637647
// Ref: https://github.com/nodejs/node/commit/f7620fb96d339f704932f9bb9a0dceb9952df2d4
638648
function defineHandleReading(socket, handle) {

‎lib/internal/errors.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,13 @@ const aggregateTwoErrors = hideStackFrames((innerError, outerError) => {
168168
return innerError || outerError;
169169
});
170170

171+
const aggregateErrors = hideStackFrames((errors, message, code) => {
172+
// eslint-disable-next-line no-restricted-syntax
173+
const err = new AggregateError(new SafeArrayIterator(errors), message);
174+
err.code = errors[0]?.code;
175+
return err;
176+
});
177+
171178
// Lazily loaded
172179
let util;
173180
let assert;
@@ -893,6 +900,7 @@ function determineSpecificType(value) {
893900
module.exports = {
894901
AbortError,
895902
aggregateTwoErrors,
903+
aggregateErrors,
896904
captureLargerStackTrace,
897905
codes,
898906
connResetException,

‎lib/internal/net.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ function makeSyncWrite(fd) {
6767
}
6868

6969
module.exports = {
70+
kWrapConnectedHandle: Symbol('wrapConnectedHandle'),
7071
isIP,
7172
isIPv4,
7273
isIPv6,

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy