ci: merge staging to master

package.json

@@ -1,6 +1,6 @@
 {
   "name": "polykey",
-  "version": "1.21.1",
+  "version": "1.21.2",
   "homepage": "https://polykey.com",
   "author": "Matrix AI",
   "contributors": [

src/client/handlers/NodesListConnections.ts

@@ -37,6 +37,7 @@ class NodesListConnections extends ServerHandler<
         port: connection.address.port,
         timeout: connection.timeout ?? -1,
         usageCount: connection.usageCount,
+        authenticated: connection.authenticated,
       };
     }
   };

src/client/types.ts

@@ -135,6 +135,7 @@ type NodeConnectionMessage = NodeAddressMessage & {
   hostname: string;
   usageCount: number;
   timeout: number;
+  authenticated: boolean;
 };
 
 // Gestalts messages

src/nodes/NodeConnectionManager.ts

@@ -1370,6 +1370,7 @@ class NodeConnectionManager {
     address: { host: Host; port: Port; hostname: Hostname | undefined };
     usageCount: number;
     timeout: number | undefined;
+    authenticated: boolean;
   }> {
     const results: Array<{
       nodeId: NodeId;
@@ -1378,13 +1379,18 @@ class NodeConnectionManager {
       address: { host: Host; port: Port; hostname: Hostname | undefined };
       usageCount: number;
       timeout: number | undefined;
+      authenticated: boolean;
     }> = [];
     for (const [nodeIdString, connectionsEntry] of this.connections.entries()) {
       const nodeId = IdInternal.fromString<NodeId>(nodeIdString);
       const connections = connectionsEntry.connections;
       for (const connectionId of Object.keys(connections)) {
         const connectionAndTimer = connections[connectionId];
         const connection = connectionAndTimer.connection;
+        const forwardAuthenticated =
+          connectionsEntry.authenticatedForward === AuthenticatingState.SUCCESS;
+        const reverseAuthenticated =
+          connectionsEntry.authenticatedReverse === AuthenticatingState.SUCCESS;
         results.push({
           nodeId,
           connectionId: connection.connectionId,
@@ -1397,6 +1403,7 @@ class NodeConnectionManager {
           },
           usageCount: connectionAndTimer.usageCount,
           timeout: connectionAndTimer.timer?.getTimeout(),
+          authenticated: forwardAuthenticated && reverseAuthenticated,
         });
       }
     }

src/nodes/NodeManager.ts

@@ -192,7 +192,7 @@ class NodeManager {
     this.logger.debug('Checking connections');
     let connectionCount = 0;
     for (const connection of this.nodeConnectionManager.listConnections()) {
-      if (connection.primary) {
+      if (connection.primary && connection.authenticated) {
         const [bucketId] = this.nodeGraph.bucketIndex(connection.nodeId);
         if (bucketId === 255) connectionCount++;
       }