From review: use QuicError class for thrown QUIC transport/app errors

Signed-off-by: Tim Perry <pimterry@gmail.com>

Author: pimterry

lib/eslint.config_partial.mjs

@@ -23,7 +23,7 @@ const noRestrictedSyntax = [
     message: "`btoa` supports only latin-1 charset, use Buffer.from(str).toString('base64') instead",
   },
   {
-    selector: 'NewExpression[callee.name=/Error$/]:not([callee.name=/^(AssertionError|NghttpError|AbortError|NodeAggregateError|QuotaExceededError)$/])',
+    selector: 'NewExpression[callee.name=/Error$/]:not([callee.name=/^(AssertionError|NghttpError|AbortError|NodeAggregateError|QuicError|QuotaExceededError)$/])',
     message: "Use an error exported by 'internal/errors' instead.",
   },
   {

lib/internal/errors.js

@@ -1687,14 +1687,12 @@ E('ERR_PERFORMANCE_INVALID_TIMESTAMP',
 E('ERR_PERFORMANCE_MEASURE_INVALID_OPTIONS', '%s', TypeError);
 E('ERR_PROXY_INVALID_CONFIG', '%s', Error);
 E('ERR_PROXY_TUNNEL', '%s', Error);
-E('ERR_QUIC_APPLICATION_ERROR', '%s', Error);
 E('ERR_QUIC_CONNECTION_FAILED', 'QUIC connection failed', Error);
 E('ERR_QUIC_ENDPOINT_CLOSED', 'QUIC endpoint closed: %s (%d)', Error);
 E('ERR_QUIC_OPEN_STREAM_FAILED', 'Failed to open QUIC stream', Error);
 E('ERR_QUIC_STREAM_ABORTED', '%s', Error);
 E('ERR_QUIC_STREAM_RESET',
   'The QUIC stream was reset by the peer with error code %d', Error);
-E('ERR_QUIC_TRANSPORT_ERROR', '%s', Error);
 E('ERR_QUIC_VERSION_NEGOTIATION_ERROR', 'The QUIC session requires version negotiation', Error);
 E('ERR_REQUIRE_ASYNC_MODULE', function(filename, parentFilename) {
   let message = 'require() cannot be used on an ESM ' +

lib/internal/quic/quic.js

@@ -104,13 +104,11 @@ const {
     ERR_INVALID_THIS,
     ERR_MISSING_ARGS,
     ERR_OUT_OF_RANGE,
-    ERR_QUIC_APPLICATION_ERROR,
     ERR_QUIC_CONNECTION_FAILED,
     ERR_QUIC_ENDPOINT_CLOSED,
     ERR_QUIC_OPEN_STREAM_FAILED,
     ERR_QUIC_STREAM_ABORTED,
     ERR_QUIC_STREAM_RESET,
-    ERR_QUIC_TRANSPORT_ERROR,
     ERR_QUIC_VERSION_NEGOTIATION_ERROR,
   },
 } = require('internal/errors');
@@ -984,11 +982,10 @@ function quicErrorMessage(prefix, errorCode, reason, errorName) {
   return msg;
 }
 
-function makeQuicError(ErrorClass, prefix, type, errorCode, reason, errorName) {
-  const err = new ErrorClass(
-    quicErrorMessage(prefix, errorCode, reason, errorName));
-  err.errorCode = errorCode;
-  err.type = type;
+function makeQuicError(code, prefix, type, errorCode, reason, errorName) {
+  const err = new QuicError(
+    quicErrorMessage(prefix, errorCode, reason, errorName),
+    { errorCode, code, type });
   if (reason) err.reason = reason;
   if (errorName) err.errorName = errorName;
   return err;
@@ -1001,17 +998,17 @@ function convertQuicError(error) {
   const errorName = error[3];
   switch (type) {
     case 'transport':
-      return makeQuicError(ERR_QUIC_TRANSPORT_ERROR,
+      return makeQuicError('ERR_QUIC_TRANSPORT_ERROR',
                            'QUIC transport error',
                            'transport', code, reason, errorName);
     case 'application':
-      return makeQuicError(ERR_QUIC_APPLICATION_ERROR,
+      return makeQuicError('ERR_QUIC_APPLICATION_ERROR',
                            'QUIC application error',
                            'application', code, reason, errorName);
     case 'version_negotiation':
       return new ERR_QUIC_VERSION_NEGOTIATION_ERROR();
     default:
-      return makeQuicError(ERR_QUIC_TRANSPORT_ERROR,
+      return makeQuicError('ERR_QUIC_TRANSPORT_ERROR',
                            'QUIC transport error',
                            'transport', code, reason, errorName);
   }
@@ -3531,12 +3528,12 @@ class QuicSession {
     // session would leak with `closed` hanging forever.
     switch (errorType) {
       case 0: /* Transport Error */
-        this.destroy(makeQuicError(ERR_QUIC_TRANSPORT_ERROR,
+        this.destroy(makeQuicError('ERR_QUIC_TRANSPORT_ERROR',
                                    'QUIC transport error',
                                    'transport', code, reason, errorName));
         break;
       case 1: /* Application Error */
-        this.destroy(makeQuicError(ERR_QUIC_APPLICATION_ERROR,
+        this.destroy(makeQuicError('ERR_QUIC_APPLICATION_ERROR',
                                    'QUIC application error',
                                    'application', code, reason, errorName));
         break;
@@ -3547,7 +3544,7 @@ class QuicSession {
         this.destroy();
         break;
       default:
-        this.destroy(makeQuicError(ERR_QUIC_TRANSPORT_ERROR,
+        this.destroy(makeQuicError('ERR_QUIC_TRANSPORT_ERROR',
                                    'QUIC transport error',
                                    'transport', code, reason, errorName));
         break;