wip: updating errors

* Related #9

[ci skip]

Author: tegefaulkes

src/QUICConnection.ts

@@ -12,6 +12,7 @@ import {
 } from '@matrixai/async-init/dist/CreateDestroy';
 import Logger from '@matrixai/logger';
 import { Lock } from '@matrixai/async-locks';
+import { destroyed } from '@matrixai/async-init';
 import QUICStream from './QUICStream';
 import { quiche } from './native';
 import * as events from './events';
@@ -291,11 +292,7 @@ class QUICConnection extends EventTarget {
     await this.closedP;
     this.logger.debug('closeP resolved');
     this.connectionMap.delete(this.connectionId);
-    // Checking for errors
-    const localError = this.conn.localError();
-    const peerError = this.conn.peerError();
-    if (localError != null) this.logger.error(JSON.stringify(localError));
-    if (peerError != null) this.logger.error(JSON.stringify(peerError));
+    // Checking if timed out
     if (this.conn.isTimedOut()) {
       this.logger.error('Connection timed out');
       this.dispatchEvent(
@@ -345,11 +342,31 @@ class QUICConnection extends EventTarget {
         this.conn.recv(data, recvInfo);
       } catch (e) {
         this.logger.error(e.message);
-        // Console.error(e);
-        // console.log(this.conn.isClosed());
         // Depending on the exception, the `this.conn.recv`
         // may have automatically started closing the connection
-        this.dispatchEvent(new events.QUICConnectionErrorEvent({ detail: e }));
+        if (e.message === 'TlsFail') {
+          const newError = new errors.ErrorQUICConnectionTLSFailure(undefined, {
+            data: {
+              localError: this.conn.localError(),
+              peerError: this.conn.peerError(),
+            },
+          });
+          this.dispatchEvent(
+            new events.QUICConnectionErrorEvent({ detail: newError }),
+          );
+        } else {
+          this.dispatchEvent(
+            new events.QUICConnectionErrorEvent({
+              detail: new errors.ErrorQUICConnection(e.message, {
+                cause: e,
+                data: {
+                  localError: this.conn.localError(),
+                  peerError: this.conn.peerError(),
+                },
+              }),
+            }),
+          );
+        }
         return;
       }
       // Here we can resolve our promises!
@@ -483,7 +500,15 @@ class QUICConnection extends EventTarget {
             }
           }
           this.dispatchEvent(
-            new events.QUICConnectionErrorEvent({ detail: e }),
+            new events.QUICConnectionErrorEvent({
+              detail: new errors.ErrorQUICConnection(e.message, {
+                cause: e,
+                data: {
+                  localError: this.conn.localError(),
+                  peerError: this.conn.peerError(),
+                },
+              }),
+            }),
           );
           return;
         }
@@ -610,7 +635,7 @@ class QUICConnection extends EventTarget {
       `state are draining: ${this.conn.isDraining()}, closed: ${this.conn.isClosed()}`,
     );
     this.logger.debug('timeout SEND');
-    await this.send();
+    if (this[destroyed] === false) await this.send();
     this.logger.debug('timeout SENDAFTER');
     if (
       this[status] !== 'destroying' &&

src/errors.ts

@@ -70,6 +70,10 @@ class ErrorQUICConnectionTimeout<T> extends ErrorQUICConnection<T> {
   static description = 'QUIC Connection reached idle timeout';
 }
 
+class ErrorQUICConnectionTLSFailure<T> extends ErrorQUICConnection<T> {
+  static description = 'QUIC connection had failure with TLS negotiation';
+}
+
 class ErrorQUICStream<T> extends ErrorQUIC<T> {
   static description = 'QUIC Stream error';
 }
@@ -109,6 +113,7 @@ export {
   ErrorQUICConnection,
   ErrorQUICConnectionDestroyed,
   ErrorQUICConnectionTimeout,
+  ErrorQUICConnectionTLSFailure,
   ErrorQUICStream,
   ErrorQUICStreamDestroyed,
   ErrorQUICStreamLocked,

tests/QUICClient.test.ts

@@ -10,27 +10,23 @@ import * as testsUtils from './utils';
 import * as certFixtures from './fixtures/certFixtures';
 import * as tlsUtils from './tlsUtils';
 
-const tlsArb = fc.oneof(
-  certFixtures.tlsConfigExampleArb,
-  tlsUtils.tlsConfigArb(),
-);
 const tlsConfigWithCaArb = fc
   .oneof(
-    // Fc.record({
-    //   type: fc.constant('RSA'),
-    //   ca: fc.constant(certFixtures.tlsConfigMemRSACa),
-    //   tlsConfig: certFixtures.tlsConfigRSAExampleArb,
-    // }),
-    // fc.record({
-    //   type: fc.constant('OKP'),
-    //   ca: fc.constant(certFixtures.tlsConfigMemOKPCa),
-    //   tlsConfig: certFixtures.tlsConfigOKPExampleArb,
-    // }),
-    // fc.record({
-    //   type: fc.constant('ECDSA'),
-    //   ca: fc.constant(certFixtures.tlsConfigMemECDSACa),
-    //   tlsConfig: certFixtures.tlsConfigECDSAExampleArb,
-    // }),
+    fc.record({
+      type: fc.constant('RSA'),
+      ca: fc.constant(certFixtures.tlsConfigMemRSACa),
+      tlsConfig: certFixtures.tlsConfigRSAExampleArb,
+    }),
+    fc.record({
+      type: fc.constant('OKP'),
+      ca: fc.constant(certFixtures.tlsConfigMemOKPCa),
+      tlsConfig: certFixtures.tlsConfigOKPExampleArb,
+    }),
+    fc.record({
+      type: fc.constant('ECDSA'),
+      ca: fc.constant(certFixtures.tlsConfigMemECDSACa),
+      tlsConfig: certFixtures.tlsConfigECDSAExampleArb,
+    }),
     tlsUtils.tlsConfigArb().map(async (configProm) => {
       const config = await configProm;
       return {