Skip to content
This repository was archived by the owner on Aug 11, 2020. It is now read-only.

Commit 7ba53ab

Browse files
jasnelljasnell
committed
quic: fixup after rebase from nodejs/node master
1 parent 158fe1d commit 7ba53ab

16 files changed

+80
-35
lines changed

‎doc/api/errors.md

Lines changed: 55 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,91 +1641,128 @@ A non-context-aware native addon was loaded in a process that disallows them.
16411641
A given value is out of the accepted range.
16421642

16431643
<a id="ERR_QUIC_CANNOT_SET_GROUPS"></a>
1644-
### ERR_QUIC_CANNOT_SET_GROUPS
1644+
### `ERR_QUIC_CANNOT_SET_GROUPS`
1645+
1646+
> Stability: 1 - Experimental
16451647
16461648
TBD
16471649

16481650
<a id="ERR_QUIC_ERROR"></a>
1649-
### ERR_QUIC_ERROR
1651+
### `ERR_QUIC_ERROR`
1652+
1653+
> Stability: 1 - Experimental
16501654
16511655
TBD
16521656

16531657
<a id="ERR_QUIC_TLS13_REQUIRED"></a>
1654-
### ERR_QUIC_TLS13_REQUIRED
1658+
### `ERR_QUIC_TLS13_REQUIRED`
1659+
1660+
> Stability: 1 - Experimental
16551661
16561662
TBD
16571663

16581664
<a id="ERR_QUICCLIENTSESSION_FAILED"></a>
1659-
### ERR_QUICCLIENTSESSION_FAILED
1665+
### `ERR_QUICCLIENTSESSION_FAILED`
1666+
1667+
> Stability: 1 - Experimental
16601668
16611669
TBD
16621670

16631671
<a id="ERR_QUICCLIENTSESSION_FAILED_SETSOCKET"></a>
1664-
### ERR_QUICCLIENTSESSION_FAILED_SETSOCKET
1672+
### `ERR_QUICCLIENTSESSION_FAILED_SETSOCKET`
1673+
1674+
> Stability: 1 - Experimental
16651675
16661676
TBD
16671677

16681678
<a id="ERR_QUICSESSION_DESTROYED"></a>
1669-
### ERR_QUICSESSION_DESTROYED
1679+
### `ERR_QUICSESSION_DESTROYED`
1680+
1681+
> Stability: 1 - Experimental
16701682
16711683
TBD
16721684

16731685
<a id="ERR_QUICSESSION_INVALID_DCID"></a>
1674-
### ERR_QUICSESSION_INVALID_DCID
1686+
### `ERR_QUICSESSION_INVALID_DCID`
1687+
1688+
> Stability: 1 - Experimental
16751689
16761690
TBD
16771691

16781692
<a id="ERR_QUICSESSION_UPDATEKEY"></a>
1679-
### ERR_QUICSESSION_UPDATEKEY
1693+
### `ERR_QUICSESSION_UPDATEKEY`
1694+
1695+
> Stability: 1 - Experimental
16801696
16811697
TBD
16821698

16831699
<a id="ERR_QUICSESSION_VERSION_NEGOTIATION"></a>
1684-
### ERR_QUICSESSION_VERSION_NEGOTIATION
1700+
### `ERR_QUICSESSION_VERSION_NEGOTIATION`
1701+
1702+
> Stability: 1 - Experimental
16851703
16861704
TBD
16871705

16881706
<a id="ERR_QUICSOCKET_CLOSING"></a>
1689-
### ERR_QUICSOCKET_CLOSING
1707+
### `ERR_QUICSOCKET_CLOSING`
1708+
1709+
> Stability: 1 - Experimental
16901710
16911711
TBD
16921712

16931713
<a id="ERR_QUICSOCKET_DESTROYED"></a>
1694-
### ERR_QUICSOCKET_DESTROYED
1714+
### `ERR_QUICSOCKET_DESTROYED`
1715+
1716+
> Stability: 1 - Experimental
16951717
16961718
TBD
16971719

16981720
<a id="ERR_QUICSOCKET_INVALID_STATELESS_RESET_SECRET_LENGTH"></a>
1699-
### ERR_QUICSOCKET_INVALID_STATELESS_RESET_SECRET_LENGTH
1721+
### `ERR_QUICSOCKET_INVALID_STATELESS_RESET_SECRET_LENGTH`
1722+
1723+
> Stability: 1 - Experimental
1724+
17001725
TBD
17011726

17021727
<a id="ERR_QUICSOCKET_LISTENING"></a>
1703-
### ERR_QUICSOCKET_LISTENING
1728+
### `ERR_QUICSOCKET_LISTENING`
1729+
1730+
> Stability: 1 - Experimental
17041731
17051732
TBD
17061733

17071734
<a id="ERR_QUICSOCKET_UNBOUND"></a>
1708-
### ERR_QUICSOCKET_UNBOUND
1735+
### `ERR_QUICSOCKET_UNBOUND`
1736+
1737+
> Stability: 1 - Experimental
17091738
17101739
TBD
17111740

17121741
<a id="ERR_QUICSTREAM_DESTROYED"></a>
1713-
### ERR_QUICSTREAM_DESTROYED
1742+
### `ERR_QUICSTREAM_DESTROYED`
1743+
1744+
> Stability: 1 - Experimental
17141745
17151746
TBD
17161747

17171748
<a id="ERR_QUICSTREAM_INVALID_PUSH"></a>
1718-
### ERR_QUICSTREAM_INVALID_PUSH
1749+
### `ERR_QUICSTREAM_INVALID_PUSH`
1750+
1751+
> Stability: 1 - Experimental
17191752
17201753
TBD
17211754

17221755
<a id="ERR_QUICSTREAM_OPEN_FAILED"></a>
1723-
### ERR_QUICSTREAM_OPEN_FAILED
1756+
### `ERR_QUICSTREAM_OPEN_FAILED`
1757+
1758+
> Stability: 1 - Experimental
17241759
17251760
TBD
17261761

17271762
<a id="ERR_QUICSTREAM_UNSUPPORTED_PUSH"></a>
1728-
### ERR_QUICSTREAM_UNSUPPORTED_PUSH
1763+
### `ERR_QUICSTREAM_UNSUPPORTED_PUSH`
1764+
1765+
> Stability: 1 - Experimental
17291766
17301767
TBD
17311768

‎doc/api/quic.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ added: REPLACEME
250250
using `quicsocket.connect()`.
251251
* `endpoint` {Object} An object describing the local address to bind to.
252252
* `address` {string} The local address to bind to. This may be an IPv4 or
253-
IPv6 address or a hostname. If a hostname is given, it will be resolved
253+
IPv6 address or a host name. If a host name is given, it will be resolved
254254
to an IP address.
255255
* `port` {number} The local port to bind to.
256256
* `type` {string} Either `'udp4'` or `'upd6'` to use either IPv4 or IPv6,
@@ -1134,7 +1134,7 @@ is updated to use the server-advertised preferred address. The callback is
11341134
invoked with a single `address` argument:
11351135

11361136
* `address` {Object}
1137-
* `address` {string} The preferred hostname
1137+
* `address` {string} The preferred host name
11381138
* `port` {number} The preferred IP port
11391139
* `type` {string} Either `'udp4'` or `'udp6'`.
11401140

@@ -1285,7 +1285,7 @@ added: REPLACEME
12851285

12861286
* `options`: {Object} An object describing the local address to bind to.
12871287
* `address` {string} The local address to bind to. This may be an IPv4 or
1288-
IPv6 address or a hostname. If a hostname is given, it will be resolved
1288+
IPv6 address or a host name. If a host name is given, it will be resolved
12891289
to an IP address.
12901290
* `port` {number} The local port to bind to.
12911291
* `type` {string} Either `'udp4'` or `'upd6'` to use either IPv4 or IPv6,

‎lib/internal/histogram.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const {
55
} = require('internal/util');
66

77
const { format } = require('util');
8-
const { Symbol } = primordials;
8+
const { Map, Symbol } = primordials;
99

1010
const kHandle = Symbol('kHandle');
1111
const kDestroy = Symbol('kDestroy');

‎lib/internal/quic/core.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,16 @@ const {
99

1010
assertCrypto();
1111

12-
const { Symbol, Array } = primordials;
12+
const {
13+
Array,
14+
BigInt64Array,
15+
Boolean,
16+
Error,
17+
Map,
18+
RegExp,
19+
Set,
20+
Symbol,
21+
} = primordials;
1322

1423
const { Buffer } = require('buffer');
1524
const { isArrayBufferView } = require('internal/util/types');

‎src/quic/node_quic.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "debug_utils.h"
1+
#include "debug_utils-inl.h"
22
#include "node.h"
33
#include "env-inl.h"
44
#include "node_crypto.h" // SecureContext

‎src/quic/node_quic_default_application.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "debug_utils.h"
1+
#include "debug_utils-inl.h"
22
#include "node_quic_buffer-inl.h"
33
#include "node_quic_default_application.h"
44
#include "node_quic_session-inl.h"

‎src/quic/node_quic_http3_application.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "node.h"
2-
#include "debug_utils.h"
2+
#include "debug_utils-inl.h"
33
#include "node_mem-inl.h"
44
#include "node_quic_buffer-inl.h"
55
#include "node_quic_http3_application.h"

‎src/quic/node_quic_session-inl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6-
#include "debug_utils.h"
6+
#include "debug_utils-inl.h"
77
#include "node_crypto.h"
88
#include "node_crypto_common.h"
99
#include "node_quic_crypto.h"

‎src/quic/node_quic_session.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "node_quic_session-inl.h" // NOLINT(build/include)
22
#include "aliased_buffer.h"
3-
#include "debug_utils.h"
3+
#include "debug_utils-inl.h"
44
#include "env-inl.h"
55
#include "node_crypto_common.h"
66
#include "ngtcp2/ngtcp2.h"

‎src/quic/node_quic_socket-inl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "node_sockaddr.h"
88
#include "node_quic_session.h"
99
#include "node_crypto.h"
10-
#include "debug_utils.h"
10+
#include "debug_utils-inl.h"
1111

1212
namespace node {
1313

‎src/quic/node_quic_socket.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "node_quic_socket-inl.h" // NOLINT(build/include)
22
#include "async_wrap-inl.h"
3-
#include "debug_utils.h"
3+
#include "debug_utils-inl.h"
44
#include "env-inl.h"
55
#include "memory_tracker-inl.h"
66
#include "nghttp2/nghttp2.h"

‎src/quic/node_quic_stream-inl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6-
#include "debug_utils.h"
6+
#include "debug_utils-inl.h"
77
#include "node_quic_session.h"
88
#include "node_quic_stream.h"
99
#include "node_quic_buffer-inl.h"

‎src/quic/node_quic_stream.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "node_quic_stream-inl.h" // NOLINT(build/include)
22
#include "async_wrap-inl.h"
3-
#include "debug_utils.h"
3+
#include "debug_utils-inl.h"
44
#include "env-inl.h"
55
#include "node.h"
66
#include "node_buffer.h"

‎src/quic/node_quic_util-inl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef SRC_QUIC_NODE_QUIC_UTIL_INL_H_
22
#define SRC_QUIC_NODE_QUIC_UTIL_INL_H_
33

4-
#include "debug_utils.h"
4+
#include "debug_utils-inl.h"
55
#include "node_internals.h"
66
#include "node_quic_crypto.h"
77
#include "node_quic_util.h"

‎test/common/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,6 @@ module.exports = {
687687
hasIntl,
688688
hasCrypto,
689689
hasQuic,
690-
hasIPv6,
691690
hasMultiLocalhost,
692691
invalidArgTypeHelper,
693692
isAIX,

‎test/parallel/test-quic-client-server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ server.on('ready', common.mustCall(() => {
292292
debug('QuicClientSession server is %sauthenticated',
293293
req.authenticated ? '' : 'not ');
294294
assert(!req.authenticated);
295-
common.expectsError(() => { throw req.authenticationError; }, {
295+
assert.throws(() => { throw req.authenticationError; }, {
296296
code: 'ERR_QUIC_VERIFY_HOSTNAME_MISMATCH',
297297
message: 'Hostname mismatch'
298298
});

0 commit comments

Comments
 (0)