quic: fix lint issues

PR-URL: #213 Reviewed-By: Anna Henningsen <anna@addaleax.net>
nodejs · Dec 11, 2019 · 048cdcb · 048cdcb
1 parent ed6a4d0
commit 048cdcb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 31 deletions.
diff --git a/doc/api/quic.md b/doc/api/quic.md
@@ -107,7 +107,7 @@ const { createSocket } = require('quic');
 // Create a QuicSocket associated with localhost and port 1234
 const socket = createSocket({ port: 1234 });
 
-const client = client.connect({
+const client = socket.connect({
   address: 'example.com',
   port: 4567,
   alpn: 'foo'
@@ -131,7 +131,7 @@ New instance of `QuicServerSession` are created internally by the
 `QuicSocket` if it has been configured to listen for new connections
 using the `listen()` method.
 
-```
+```js
 const key = getTLSKeySomehow();
 const cert = getTLSCertSomehow();
 
@@ -405,7 +405,6 @@ added: REPLACEME
 An object containing the local address information for the `QuicSocket` to which
 the `QuicSession` is currently associated.
 
-
 #### quicsession.alpnProtocol
 <!-- YAML
 added: REPLACEME

diff --git a/lib/internal/quic/core.js b/lib/internal/quic/core.js
@@ -155,10 +155,6 @@ const {
     IDX_QUIC_SESSION_STATS_MAX_BYTES_IN_FLIGHT,
     IDX_QUIC_SESSION_STATS_BLOCK_COUNT,
     IDX_QUIC_STREAM_STATS_CREATED_AT,
-    IDX_QUIC_STREAM_STATS_SENT_AT,
-    IDX_QUIC_STREAM_STATS_RECEIVED_AT,
-    IDX_QUIC_STREAM_STATS_ACKED_AT,
-    IDX_QUIC_STREAM_STATS_CLOSING_AT,
     IDX_QUIC_STREAM_STATS_BYTES_RECEIVED,
     IDX_QUIC_STREAM_STATS_BYTES_SENT,
     IDX_QUIC_STREAM_STATS_MAX_OFFSET,
@@ -262,7 +258,7 @@ function setTransportParams(config) {
     maxPacketSize,
     maxAckDelay,
     maxCryptoBuffer,
-    h3 : {
+    h3: {
       qpackMaxTableCapacity,
       qpackBlockedStreams,
       maxHeaderListSize,
@@ -1382,6 +1378,11 @@ class QuicSocket extends EventEmitter {
     return stats[IDX_QUIC_SOCKET_STATS_PACKETS_SENT];
   }
 
+  get packetsIgnored() {
+    const stats = this.#stats || this[kHandle].stats;
+    return stats[IDX_QUIC_SOCKET_STATS_PACKETS_IGNORED];
+  }
+
   get serverBusy() {
     return this.#serverBusy;
   }
@@ -2641,14 +2642,14 @@ class QuicStream extends Duplex {
     let validator;
     if (this.session instanceof QuicServerSession) {
       validator =
-          this.clientInitiated ?
-              assertValidPseudoHeaderResponse :
-              assertValidPseudoHeader;
+        this.clientInitiated ?
+          assertValidPseudoHeaderResponse :
+          assertValidPseudoHeader;
     } else {  // QuicClientSession
       validator =
-          this.clientInitiated ?
-              assertValidPseudoHeader :
-              assertValidPseudoHeaderResponse;
+        this.clientInitiated ?
+          assertValidPseudoHeader :
+          assertValidPseudoHeaderResponse;
     }
 
     return this[kHandle].submitInformationalHeaders(
@@ -2676,14 +2677,14 @@ class QuicStream extends Duplex {
     let validator;
     if (this.session instanceof QuicServerSession) {
       validator =
-          this.clientInitiated ?
-              assertValidPseudoHeaderResponse :
-              assertValidPseudoHeader;
+        this.clientInitiated ?
+          assertValidPseudoHeaderResponse :
+          assertValidPseudoHeader;
     } else {  // QuicClientSession
       validator =
-          this.clientInitiated ?
-              assertValidPseudoHeader :
-              assertValidPseudoHeaderResponse;
+        this.clientInitiated ?
+          assertValidPseudoHeader :
+          assertValidPseudoHeaderResponse;
     }
 
     return this[kHandle].submitHeaders(

diff --git a/lib/internal/quic/util.js b/lib/internal/quic/util.js
@@ -136,7 +136,7 @@ function validateTransportParams(params) {
     preferredAddress,
     rejectUnauthorized,
     requestCert,
-    h3 : {
+    h3: {
       qpackMaxTableCapacity,
       qpackBlockedStreams,
       maxHeaderListSize,

diff --git a/test/parallel/test-quic-client-server.js b/test/parallel/test-quic-client-server.js
@@ -144,7 +144,7 @@ server.on('session', common.mustCall((session) => {
     // cause anything else to fail.
 
     // TODO(@jasnell): Move updateKey to a separate test
-    //setTimeout(() => assert(session.updateKey()), 500);
+    // setTimeout(() => assert(session.updateKey()), 500);
 
     debug('QuicServerSession TLS Handshake Complete');
     debug('  Server name: %s', servername);

diff --git a/test/parallel/test-quic-http3-client-server.js b/test/parallel/test-quic-http3-client-server.js
@@ -7,14 +7,6 @@ const common = require('../common');
 if (!common.hasQuic)
   common.skip('missing quic');
 
-const { internalBinding } = require('internal/test/binding');
-const {
-  constants: {
-    NGTCP2_NO_ERROR,
-    QUIC_ERROR_APPLICATION,
-  }
-} = internalBinding('quic');
-
 const Countdown = require('../common/countdown');
 const assert = require('assert');
 const fs = require('fs');
@@ -35,7 +27,6 @@ const kClientPort = process.env.NODE_DEBUG_KEYLOG ? 5679 : 0;
 let client;
 const server = createSocket({ port: kServerPort, validateAddress: true });
 
-const unidata = ['I wonder if it worked.', 'test'];
 const kServerName = 'agent2';  // Intentionally the wrong servername
 const kALPN = 'h3-24';