diff --git a/httpd-client/index.ts b/httpd-client/index.ts index dff635dd2..ea5983a7a 100644 --- a/httpd-client/index.ts +++ b/httpd-client/index.ts @@ -76,6 +76,7 @@ export type Node = z.infer; const nodeSchema = object({ id: string(), + version: string(), config: object({ alias: string(), peers: union([ @@ -91,6 +92,8 @@ const nodeSchema = object({ routingMaxSize: number(), routingMaxAge: number(), fetchConcurrency: number(), + gossipMaxAge: number(), + maxOpenFiles: number(), rate: object({ inbound: object({ fillRate: number(), @@ -114,7 +117,7 @@ const nodeInfoSchema = object({ message: string(), service: string(), version: string(), - node: nodeSchema.pick({ id: true }), + nid: string(), path: string(), links: array( object({ diff --git a/httpd-client/tests/support/httpd.ts b/httpd-client/tests/support/httpd.ts index 4be96b128..98d43853c 100644 --- a/httpd-client/tests/support/httpd.ts +++ b/httpd-client/tests/support/httpd.ts @@ -11,7 +11,6 @@ export async function authenticate( "http://localhost:3001", "--no-open", "--connect", - "--listen", `${peer.httpdBaseUrl.hostname}:${peer.httpdBaseUrl.port}`, ]); const match = stdout.match(/Visit (http:\/\/\S+) to connect/); diff --git a/src/views/nodes/router.ts b/src/views/nodes/router.ts index b00c7dfd1..3d01c776e 100644 --- a/src/views/nodes/router.ts +++ b/src/views/nodes/router.ts @@ -94,8 +94,7 @@ export async function loadNodeRoute( const api = new HttpdClient(params.baseUrl); try { const projectPageIndex = 0; - const [nodeInfo, node, { projects, total }] = await Promise.all([ - api.getNodeInfo(), + const [node, { projects, total }] = await Promise.all([ api.getNode(), loadProjects(projectPageIndex, params.baseUrl), ]); @@ -104,9 +103,9 @@ export async function loadNodeRoute( params: { projectPageIndex: projectPageIndex + 1, baseUrl: params.baseUrl, - nid: nodeInfo.node.id, + nid: node.id, externalAddresses: node.config?.externalAddresses ?? [], - version: nodeInfo.version, + version: node.version, projects: projects, projectCount: total, }, diff --git a/tests/support/fixtures.ts b/tests/support/fixtures.ts index e720d40b5..f6e7e2b8c 100644 --- a/tests/support/fixtures.ts +++ b/tests/support/fixtures.ts @@ -152,7 +152,6 @@ export const test = base.extend<{ "http://localhost:3001", "--no-open", "--connect", - "--listen", `${peer.httpdBaseUrl.hostname}:${peer.httpdBaseUrl.port}`, ]); const match = stdout.match(/Visit (http:\/\/\S+) to connect/); diff --git a/tests/support/heartwood-version b/tests/support/heartwood-version index 88d91e2d0..a43fe949b 100644 --- a/tests/support/heartwood-version +++ b/tests/support/heartwood-version @@ -1 +1 @@ -6bc7d297a5e7e3feecec3f61327a9adbdf532f61 \ No newline at end of file +5dbd9bb2a32dca6aafbd2b4a50dd73d237ca025d \ No newline at end of file diff --git a/tests/support/peerManager.ts b/tests/support/peerManager.ts index 66f7bf24f..248a2f38d 100644 --- a/tests/support/peerManager.ts +++ b/tests/support/peerManager.ts @@ -136,6 +136,7 @@ export const NodeConfigSchema = object({ routingMaxAge: number(), fetchConcurrency: number(), gossipMaxAge: number(), + maxOpenFiles: number(), rate: object({ inbound: object({ fillRate: number(), capacity: number() }), outbound: object({ fillRate: number(), capacity: number() }), @@ -307,6 +308,7 @@ export class RadiclePeer { routingMaxAge: 604800, fetchConcurrency: 1, gossipMaxAge: 1209600, + maxOpenFiles: 4096, rate: { inbound: { fillRate: 0.2, capacity: 32 }, outbound: { fillRate: 1.0, capacity: 64 },