feat: added nodes domain stats to agent status command

[ci skip]
MatrixAI · Nov 15, 2023 · 0bbb7d1 · 0bbb7d1
1 parent 9c6c70a
commit 0bbb7d1
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -109,7 +109,7 @@
     "@matrixai/errors": "^1.2.0",
     "@matrixai/logger": "^3.1.0",
     "commander": "^8.3.0",
-    "polykey": "^1.2.1-alpha.27",
+    "polykey": "^1.2.1-alpha.28",
     "threads": "^1.6.5",
     "@swc/core": "1.3.82",
     "@swc/jest": "^0.2.29",

diff --git a/src/agent/CommandStatus.ts b/src/agent/CommandStatus.ts
@@ -48,11 +48,6 @@ class CommandStatus extends CommandPolykey {
           if (pkClient != null) await pkClient.stop();
         });
         let response: StatusResultMessage;
-        let output: Array<any> = [];
-        let data: Array<any> = [];
-        let lenActive: number;
-        let lenVaults: number;
-
         try {
           pkClient = await PolykeyClient.createPolykeyClient({
             nodeId: clientStatus.nodeId!,
@@ -70,24 +65,6 @@ class CommandStatus extends CommandPolykey {
               }),
             auth,
           );
-          const result = await binUtils.retryAuthentication(
-            (auth) =>
-              pkClient.rpcClient.methods.nodesGetAll({
-                metadata: auth,
-              }),
-            auth,
-          );
-          for await (const nodesGetMessage of result) {
-            output.push(1);
-          }
-          lenActive = output.length;
-          const stream = await pkClient.rpcClient.methods.vaultsList({
-            metadata: auth,
-          });
-          for await (const vaultListMessage of stream) {
-            data.push(1);
-          }
-          lenVaults = data.length;
         } finally {
           if (pkClient! != null) await pkClient.stop();
         }
@@ -102,8 +79,16 @@ class CommandStatus extends CommandPolykey {
               clientPort: response.clientPort,
               agentHost: response.agentHost,
               agentPort: response.agentPort,
-              numberActiveConnections: lenActive,
-              vaultsMade: lenVaults,
+              upTime: response.upTime,
+              connectionsActive: response.connectionsActive,
+              connectionsMadeForward: response.connectionsMadeForward,
+              connectionsMadeReverse: response.connectionsMadeReverse,
+              connectionsUsage: response.connectionsUsage,
+              connectionsAcquired: response.connectionsAcquired,
+              streamsMadeForward: response.streamsMadeForward,
+              streamsMadeReverse: response.streamsMadeReverse,
+              streamsActive: response.streamsActive,
+              nodesKnown: response.nodesKnown,
             },
           }),
         );

diff --git a/tests/agent/status.test.ts b/tests/agent/status.test.ts
@@ -179,6 +179,16 @@ describe('status', () => {
         clientPort: statusInfo.data.clientPort,
         agentHost: statusInfo.data.agentHost,
         agentPort: statusInfo.data.agentPort,
+        upTime: expect.any(Number),
+        connectionsActive: expect.any(Number),
+        connectionsMadeForward: expect.any(Number),
+        connectionsMadeReverse: expect.any(Number),
+        connectionsUsage: expect.any(Number),
+        connectionsAcquired: expect.any(Number),
+        streamsMadeForward: expect.any(Number),
+        streamsMadeReverse: expect.any(Number),
+        streamsActive: expect.any(Number),
+        nodesKnown: expect.any(Number),
       });
     });
     testUtils.testIf(
@@ -227,6 +237,16 @@ describe('status', () => {
         clientPort: statusInfo.data.clientPort,
         agentHost: statusInfo.data.agentHost,
         agentPort: statusInfo.data.agentPort,
+        upTime: expect.any(Number),
+        connectionsActive: expect.any(Number),
+        connectionsMadeForward: expect.any(Number),
+        connectionsMadeReverse: expect.any(Number),
+        connectionsUsage: expect.any(Number),
+        connectionsAcquired: expect.any(Number),
+        streamsMadeForward: expect.any(Number),
+        streamsMadeReverse: expect.any(Number),
+        streamsActive: expect.any(Number),
+        nodesKnown: expect.any(Number),
       });
     });
   });