fix: nodes optional values taken from config

[ci skip]

Author: tegefaulkes

src/nodes/NodeConnection.ts

@@ -21,6 +21,7 @@ import * as rpcUtils from '../rpc/utils';
 import * as keysUtils from '../keys/utils';
 import * as nodesUtils from '../nodes/utils';
 import { never } from '../utils';
+import config from '../config';
 
 /**
  * Encapsulates the unidirectional client-side connection of one node to another.
@@ -64,7 +65,8 @@ class NodeConnection<M extends ClientManifest> {
       targetHostname,
       tlsConfig,
       connectionKeepAliveIntervalTime,
-      connectionMaxIdleTimeout = 60_000,
+      connectionKeepAliveTimeoutTime = config.defaultsSystem
+        .nodesConnectionIdleTimeoutTime,
       quicSocket,
       manifest,
       logger,
@@ -76,14 +78,17 @@ class NodeConnection<M extends ClientManifest> {
       crypto: ClientCrypto;
       tlsConfig: TLSConfig;
       connectionKeepAliveIntervalTime?: number;
-      connectionMaxIdleTimeout?: number;
+      connectionKeepAliveTimeoutTime?: number;
       quicSocket?: QUICSocket;
       manifest: M;
       logger?: Logger;
     },
     ctx?: Partial<ContextTimedInput>,
   ): PromiseCancellable<NodeConnection<M>>;
-  @timedCancellable(true, 20000)
+  @timedCancellable(
+    true,
+    config.defaultsSystem.nodesConnectionConnectTimeoutTime,
+  )
   static async createNodeConnection<M extends ClientManifest>(
     {
       targetNodeIds,
@@ -94,7 +99,8 @@ class NodeConnection<M extends ClientManifest> {
       tlsConfig,
       manifest,
       connectionKeepAliveIntervalTime,
-      connectionMaxIdleTimeout = 60_000,
+      connectionKeepAliveTimeoutTime = config.defaultsSystem
+        .nodesConnectionIdleTimeoutTime,
       quicSocket,
       logger = new Logger(this.name),
     }: {
@@ -106,7 +112,7 @@ class NodeConnection<M extends ClientManifest> {
       tlsConfig: TLSConfig;
       manifest: M;
       connectionKeepAliveIntervalTime?: number;
-      connectionMaxIdleTimeout?: number;
+      connectionKeepAliveTimeoutTime?: number;
       quicSocket?: QUICSocket;
       logger?: Logger;
     },
@@ -125,7 +131,7 @@ class NodeConnection<M extends ClientManifest> {
         socket: quicSocket,
         config: {
           keepAliveIntervalTime: connectionKeepAliveIntervalTime,
-          maxIdleTimeout: connectionMaxIdleTimeout,
+          maxIdleTimeout: connectionKeepAliveTimeoutTime,
           verifyPeer: true,
           verifyAllowFail: true,
           ca: undefined,

src/nodes/NodeConnectionManager.ts

@@ -35,6 +35,7 @@ import * as validationUtils from '../validation/utils';
 import * as networkUtils from '../network/utils';
 import { clientManifest as agentClientManifest } from '../agent/handlers/clientManifest';
 import * as utils from '../utils';
+import config from '../config';
 
 type AgentClientManifest = typeof agentClientManifest;
 
@@ -178,12 +179,18 @@ class NodeConnectionManager {
     nodeGraph,
     tlsConfig,
     seedNodes = {},
-    connectionFindConcurrencyLimit = 3,
-    connectionIdleTimeoutTime = 60_000,
-    connectionConnectTimeoutTime = 15_000,
-    connectionKeepAliveTimeoutTime = 30_000,
-    connectionKeepAliveIntervalTime = 10_000,
-    connectionHolePunchIntervalTime = 1_000,
+    connectionFindConcurrencyLimit = config.defaultsSystem
+      .nodesConnectionFindConcurrencyLimit,
+    connectionIdleTimeoutTime = config.defaultsSystem
+      .nodesConnectionIdleTimeoutTime,
+    connectionConnectTimeoutTime = config.defaultsSystem
+      .clientConnectTimeoutTime,
+    connectionKeepAliveTimeoutTime = config.defaultsSystem
+      .clientKeepAliveTimeoutTime,
+    connectionKeepAliveIntervalTime = config.defaultsSystem
+      .clientKeepAliveIntervalTime,
+    connectionHolePunchIntervalTime = config.defaultsSystem
+      .nodesConnectionHolePunchIntervalTime,
     logger,
   }: {
     keyRing: KeyRing;
@@ -728,7 +735,7 @@ class NodeConnectionManager {
           targetPort: address.port,
           tlsConfig: this.tlsConfig,
           connectionKeepAliveIntervalTime: this.connectionKeepAliveIntervalTime,
-          connectionMaxIdleTimeout: this.connectionKeepAliveTimeoutTime,
+          connectionKeepAliveTimeoutTime: this.connectionKeepAliveTimeoutTime,
           quicSocket: this.quicSocket,
           logger: this.logger.getChild(
             `${NodeConnection.name} [${address.host}:${address.port}]`,

tests/nodes/NodeConnection.test.ts

@@ -166,7 +166,7 @@ describe(`${NodeConnection.name}`, () => {
         targetHost: localHost as Host,
         targetPort: 12345 as Port,
         manifest: {},
-        connectionMaxIdleTimeout: 1000,
+        connectionKeepAliveTimeoutTime: 1000,
         tlsConfig: clientTlsConfig,
         crypto,
         quicSocket: clientSocket,
@@ -186,7 +186,7 @@ describe(`${NodeConnection.name}`, () => {
         targetHost: localHost as Host,
         targetPort: quicServer.port as Port,
         manifest: {},
-        connectionMaxIdleTimeout: 100,
+        connectionKeepAliveTimeoutTime: 100,
         tlsConfig: clientTlsConfig,
         crypto,
         quicSocket: clientSocket,
@@ -274,7 +274,7 @@ describe(`${NodeConnection.name}`, () => {
         targetPort: quicServer.port as Port,
         manifest: {},
         connectionKeepAliveIntervalTime: 100,
-        connectionMaxIdleTimeout: 200,
+        connectionKeepAliveTimeoutTime: 200,
         tlsConfig: clientTlsConfig,
         crypto,
         quicSocket: clientSocket,
@@ -296,7 +296,7 @@ describe(`${NodeConnection.name}`, () => {
         targetHost: localHost as Host,
         targetPort: quicServer.port as Port,
         manifest: {},
-        connectionMaxIdleTimeout: 200,
+        connectionKeepAliveTimeoutTime: 200,
         connectionKeepAliveIntervalTime: 100,
         tlsConfig: clientTlsConfig,
         crypto,
@@ -323,7 +323,7 @@ describe(`${NodeConnection.name}`, () => {
         targetHost: localHost as Host,
         targetPort: quicServer.port as Port,
         manifest: {},
-        connectionMaxIdleTimeout: 200,
+        connectionKeepAliveTimeoutTime: 200,
         connectionKeepAliveIntervalTime: 100,
         tlsConfig: clientTlsConfig,
         crypto,