fix: review fixes

- moved `withMonitor` utility to `QUICConnection`
- fixes to `withMonitor` utility
- renamed `fun()` to `f()`
- renamed `connectionConnectTime` to `connectTimeoutTime`

Author: tegefaulkes

src/QUICConnection.ts

@@ -531,7 +531,7 @@ class QUICConnection extends EventTarget {
     this.stopKeepAliveIntervalTimer();
 
     // Trigger closing connection in the background and await close later.
-    void utils.withMonitor(mon, this.lockbox, RWLockWriter, async (mon) => {
+    void this.withMonitor(mon, this.lockbox, RWLockWriter, async (mon) => {
       await mon.withF(this.lockCode, async (mon) => {
         // If this is already closed, then `Done` will be thrown
         // Otherwise it can send `CONNECTION_CLOSE` frame
@@ -663,7 +663,7 @@ class QUICConnection extends EventTarget {
     remoteInfo: RemoteInfo,
     mon?: Monitor<RWLockWriter>,
   ): Promise<void> {
-    await utils.withMonitor(mon, this.lockbox, RWLockWriter, async (mon) => {
+    await this.withMonitor(mon, this.lockbox, RWLockWriter, async (mon) => {
       if (!mon.isLocked(this.lockCode)) {
         return mon.withF(this.lockCode, async (mon) => {
           return this.recv(data, remoteInfo, mon);
@@ -773,7 +773,7 @@ class QUICConnection extends EventTarget {
    * @internal
    */
   public async send(mon?: Monitor<RWLockWriter>): Promise<void> {
-    await utils.withMonitor(mon, this.lockbox, RWLockWriter, async (mon) => {
+    await this.withMonitor(mon, this.lockbox, RWLockWriter, async (mon) => {
       if (!mon.isLocked(this.lockCode)) {
         return mon.withF(this.lockCode, async (mon) => {
           return this.send(mon);
@@ -1081,6 +1081,26 @@ class QUICConnection extends EventTarget {
       return quicStream;
     });
   }
+
+  /**
+   * Used as a clean way to create a new monitor if it doesn't exist, otherwise uses the existing one.
+   */
+  protected async withMonitor<T>(
+    mon: Monitor<RWLockWriter> | undefined,
+    lockBox: LockBox<RWLockWriter>,
+    lockConstructor: { new (): RWLockWriter },
+    f: (mon: Monitor<RWLockWriter>) => Promise<T>,
+    locksPending?: Map<string, { count: number }>,
+  ): Promise<T> {
+    if (mon == null) {
+      return await withF(
+        [contextsUtils.monitor(lockBox, lockConstructor, locksPending)],
+        ([mon]) => f(mon),
+      );
+    } else {
+      return f(mon);
+    }
+  }
 }
 
 export default QUICConnection;

src/QUICServer.ts

@@ -53,7 +53,7 @@ class QUICServer extends EventTarget {
   protected codeToReason: StreamCodeToReason | undefined;
   protected verifyCallback: VerifyCallback | undefined;
   protected connectionMap: QUICConnectionMap;
-  protected connectionConnectTime: number;
+  protected connectTimeoutTime: number;
   // Used to track address string for logging ONLY
   protected address: string;
 
@@ -110,7 +110,7 @@ class QUICServer extends EventTarget {
     reasonToCode,
     codeToReason,
     verifyCallback,
-    connectionConnectTime = 2000,
+    connectTimeoutTime = 15000,
     logger,
   }: {
     crypto: {
@@ -126,7 +126,7 @@ class QUICServer extends EventTarget {
     reasonToCode?: StreamReasonToCode;
     codeToReason?: StreamCodeToReason;
     verifyCallback?: VerifyCallback;
-    connectionConnectTime?: number;
+    connectTimeoutTime?: number;
     logger?: Logger;
   }) {
     super();
@@ -154,7 +154,7 @@ class QUICServer extends EventTarget {
     this.reasonToCode = reasonToCode;
     this.codeToReason = codeToReason;
     this.verifyCallback = verifyCallback;
-    this.connectionConnectTime = connectionConnectTime;
+    this.connectTimeoutTime = connectTimeoutTime;
   }
 
   @ready(new errors.ErrorQUICServerNotRunning())
@@ -379,7 +379,7 @@ class QUICServer extends EventTarget {
               .slice(32)}-${clientConnRef}`,
           ),
         },
-        { timer: this.connectionConnectTime },
+        { timer: this.connectTimeoutTime },
       );
     } catch (e) {
       // Ignoring any errors here as a failure to connect

src/utils.ts

@@ -8,12 +8,8 @@ import type {
   ServerCrypto,
 } from './types';
 import type { Connection } from './native';
-import type { LockBox, RWLockWriter } from '@matrixai/async-locks';
-import type { Monitor } from '@matrixai/async-locks';
 import dns from 'dns';
 import { IPv4, IPv6, Validator } from 'ip-num';
-import { withF } from '@matrixai/resources';
-import { utils as contextsUtils } from '@matrixai/contexts';
 import QUICConnectionId from './QUICConnectionId';
 import * as errors from './errors';
 
@@ -466,28 +462,6 @@ function streamStats(
 `;
 }
 
-/**
- * Used as a clean way to create a new monitor if it doesn't exist, otherwise uses the existing one.
- */
-async function withMonitor<T>(
-  mon: Monitor<RWLockWriter> | undefined,
-  lockBox: LockBox<RWLockWriter>,
-  lockConstructor: { new (): RWLockWriter },
-  fun: (mon: Monitor<RWLockWriter>) => Promise<T>,
-  locksPending?: Map<string, { count: number }>,
-): Promise<T> {
-  if (mon == null) {
-    return await withF(
-      [contextsUtils.monitor(lockBox, lockConstructor, locksPending)],
-      async ([mon]) => {
-        return await fun(mon);
-      },
-    );
-  } else {
-    return await fun(mon);
-  }
-}
-
 export {
   isIPv4,
   isIPv6,
@@ -519,5 +493,4 @@ export {
   validateToken,
   sleep,
   streamStats,
-  withMonitor,
 };