ci: merge staging to master

package.json

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

src/PolykeyAgent.ts

@@ -182,7 +182,7 @@ class PolykeyAgent {
     let nodeConnectionManager:
       | NodeConnectionManager<AgentClientManifest>
       | undefined;
-    let nodeManager: NodeManager | undefined;
+    let nodeManager: NodeManager<AgentClientManifest> | undefined;
     let discovery: Discovery | undefined;
     let notificationsManager: NotificationsManager | undefined;
     let vaultManager: VaultManager | undefined;
@@ -475,7 +475,7 @@ class PolykeyAgent {
   public readonly nodeGraph: NodeGraph;
   public readonly taskManager: TaskManager;
   public readonly nodeConnectionManager: NodeConnectionManager<AgentClientManifest>;
-  public readonly nodeManager: NodeManager;
+  public readonly nodeManager: NodeManager<AgentClientManifest>;
   public readonly discovery: Discovery;
   public readonly vaultManager: VaultManager;
   public readonly notificationsManager: NotificationsManager;
@@ -546,7 +546,7 @@ class PolykeyAgent {
     nodeGraph: NodeGraph;
     taskManager: TaskManager;
     nodeConnectionManager: NodeConnectionManager<AgentClientManifest>;
-    nodeManager: NodeManager;
+    nodeManager: NodeManager<AgentClientManifest>;
     discovery: Discovery;
     vaultManager: VaultManager;
     notificationsManager: NotificationsManager;

src/bootstrap/utils.ts

@@ -5,6 +5,7 @@ import type {
   PasswordOpsLimit,
   PasswordMemLimit,
 } from '../keys/types.js';
+import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
 import path from 'node:path';
 import Logger from '@matrixai/logger';
 import { DB } from '@matrixai/db';
@@ -168,7 +169,7 @@ async function bootstrapState({
       logger: logger.getChild(NodeGraph.name),
     });
 
-    const nodeManager = new NodeManager({
+    const nodeManager = new NodeManager<AgentClientManifest>({
       db,
       keyRing,
       nodeGraph,

src/client/handlers/NodesAdd.ts

@@ -9,6 +9,7 @@ import type {
 import type { NodeId } from '../../ids/index.js';
 import type { Host, Port } from '../../network/types.js';
 import type NodeManager from '../../nodes/NodeManager.js';
+import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
 import { UnaryHandler } from '@matrixai/rpc';
 import { matchSync } from '../../utils/index.js';
 import { validateSync } from '../../validation/index.js';
@@ -19,7 +20,7 @@ import * as nodeErrors from '../../nodes/errors.js';
 class NodesAdd extends UnaryHandler<
   {
     db: DB;
-    nodeManager: NodeManager;
+    nodeManager: NodeManager<AgentClientManifest>;
   },
   ClientRPCRequestParams<NodesAddMessage>,
   ClientRPCResponseResult
@@ -30,7 +31,10 @@ class NodesAdd extends UnaryHandler<
     _meta: Record<string, JSONValue>,
     ctx: ContextTimed,
   ): Promise<ClientRPCResponseResult> => {
-    const { db, nodeManager }: { db: DB; nodeManager: NodeManager } =
+    const {
+      db,
+      nodeManager,
+    }: { db: DB; nodeManager: NodeManager<AgentClientManifest> } =
       this.container;
     const {
       nodeId,

src/client/handlers/NodesClaim.ts

@@ -7,6 +7,7 @@ import type {
 } from '../types.js';
 import type { NodeId } from '../../ids/index.js';
 import type NodeManager from '../../nodes/NodeManager.js';
+import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
 import { UnaryHandler } from '@matrixai/rpc';
 import * as ids from '../../ids/index.js';
 import { matchSync } from '../../utils/index.js';
@@ -15,15 +16,18 @@ import { validateSync } from '../../validation/index.js';
 class NodesClaim extends UnaryHandler<
   {
     db: DB;
-    nodeManager: NodeManager;
+    nodeManager: NodeManager<AgentClientManifest>;
   },
   ClientRPCRequestParams<ClaimNodeMessage>,
   ClientRPCResponseResult<SuccessMessage>
 > {
   public handle = async (
     input: ClientRPCRequestParams<ClaimNodeMessage>,
   ): Promise<ClientRPCResponseResult<SuccessMessage>> => {
-    const { db, nodeManager }: { db: DB; nodeManager: NodeManager } =
+    const {
+      db,
+      nodeManager,
+    }: { db: DB; nodeManager: NodeManager<AgentClientManifest> } =
       this.container;
     const {
       nodeId,

src/client/handlers/NodesFind.ts

@@ -8,6 +8,7 @@ import type {
 } from '../types.js';
 import type { NodeId } from '../../ids/index.js';
 import type NodeManager from '../../nodes/NodeManager.js';
+import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
 import { UnaryHandler } from '@matrixai/rpc';
 import { validateSync } from '../../validation/index.js';
 import { matchSync } from '../../utils/index.js';
@@ -16,7 +17,7 @@ import * as nodesErrors from '../../nodes/errors.js';
 
 class NodesFind extends UnaryHandler<
   {
-    nodeManager: NodeManager;
+    nodeManager: NodeManager<AgentClientManifest>;
   },
   ClientRPCRequestParams<NodeIdMessage>,
   ClientRPCResponseResult<NodesFindMessage>
@@ -27,7 +28,8 @@ class NodesFind extends UnaryHandler<
     _meta: Record<string, JSONValue>,
     ctx: ContextTimed,
   ): Promise<ClientRPCResponseResult<NodesFindMessage>> => {
-    const { nodeManager }: { nodeManager: NodeManager } = this.container;
+    const { nodeManager }: { nodeManager: NodeManager<AgentClientManifest> } =
+      this.container;
     const {
       nodeId,
     }: {

src/client/handlers/NodesPing.ts

@@ -6,22 +6,24 @@ import type {
 } from '../types.js';
 import type { NodeId } from '../../ids/index.js';
 import type NodeManager from '../../nodes/NodeManager.js';
+import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
 import { UnaryHandler } from '@matrixai/rpc';
 import * as ids from '../../ids/index.js';
 import { validateSync } from '../../validation/index.js';
 import { matchSync } from '../../utils/index.js';
 
 class NodesPing extends UnaryHandler<
   {
-    nodeManager: NodeManager;
+    nodeManager: NodeManager<AgentClientManifest>;
   },
   ClientRPCRequestParams<NodeIdMessage>,
   ClientRPCResponseResult<SuccessMessage>
 > {
   public handle = async (
     input: ClientRPCRequestParams<NodeIdMessage>,
   ): Promise<ClientRPCResponseResult<SuccessMessage>> => {
-    const { nodeManager }: { nodeManager: NodeManager } = this.container;
+    const { nodeManager }: { nodeManager: NodeManager<AgentClientManifest> } =
+      this.container;
     const {
       nodeId,
     }: {

src/client/handlers/index.ts

@@ -108,7 +108,7 @@ const serverManifest = (container: {
   acl: ACL;
   audit: Audit;
   notificationsManager: NotificationsManager;
-  nodeManager: NodeManager;
+  nodeManager: NodeManager<AgentClientManifest>;
   nodeConnectionManager: NodeConnectionManager<AgentClientManifest>;
   nodeGraph: NodeGraph;
   vaultManager: VaultManager;

src/discovery/Discovery.ts

@@ -28,6 +28,7 @@ import type {
   ClaimLinkNode,
 } from '../claims/payloads/index.js';
 import type { DiscoveryQueueInfo } from './types.js';
+import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
 import Logger from '@matrixai/logger';
 import { createDestroyStartStop } from '@matrixai/async-init';
 import { decorators } from '@matrixai/contexts';
@@ -90,7 +91,7 @@ class Discovery {
     keyRing: KeyRing;
     gestaltGraph: GestaltGraph;
     identitiesManager: IdentitiesManager;
-    nodeManager: NodeManager;
+    nodeManager: NodeManager<AgentClientManifest>;
     taskManager: TaskManager;
     discoverVertexTimeoutTime?: number;
     rediscoverCheckIntervalTime?: number;
@@ -125,7 +126,7 @@ class Discovery {
   protected keyRing: KeyRing;
   protected gestaltGraph: GestaltGraph;
   protected identitiesManager: IdentitiesManager;
-  protected nodeManager: NodeManager;
+  protected nodeManager: NodeManager<AgentClientManifest>;
   protected taskManager: TaskManager;
   protected discoverVertexTimeoutTime: number;
   /**
@@ -242,7 +243,7 @@ class Discovery {
     keyRing: KeyRing;
     gestaltGraph: GestaltGraph;
     identitiesManager: IdentitiesManager;
-    nodeManager: NodeManager;
+    nodeManager: NodeManager<AgentClientManifest>;
     taskManager: TaskManager;
     discoverVertexTimeoutTime: number;
     rediscoverCheckIntervalTime: number;

src/nodes/NodeConnectionManager.ts

@@ -17,7 +17,7 @@ import type {
   SuccessMessage,
 } from './agent/types.js';
 import type { AgentServerManifest } from './agent/handlers/index.js';
-import type { AgentClientManifestCore } from './agent/callers/index.js';
+import type { AgentClientManifestNodeConnectionManager } from './agent/callers/index.js';
 import type KeyRing from '../keys/KeyRing.js';
 import type { CertificatePEM } from '../keys/types.js';
 import type {
@@ -125,16 +125,19 @@ const rpcMethodsWhitelist = ['nodesAuthenticateConnection'];
  * The NodeConnectionManager encapsulates `QUICServer`.
  * While the NodeConnection encapsulates `QUICClient`.
  */
-// eslint-disable-next-line
-interface NodeConnectionManager<Manifest extends AgentClientManifestCore>
-  extends startStop.StartStop {}
+interface NodeConnectionManager<
+  // eslint-disable-next-line
+  Manifest extends AgentClientManifestNodeConnectionManager,
+> extends startStop.StartStop {}
 @startStop.StartStop({
   eventStart: nodesEvents.EventNodeConnectionManagerStart,
   eventStarted: nodesEvents.EventNodeConnectionManagerStarted,
   eventStop: nodesEvents.EventNodeConnectionManagerStop,
   eventStopped: nodesEvents.EventNodeConnectionManagerStopped,
 })
-class NodeConnectionManager<Manifest extends AgentClientManifestCore> {
+class NodeConnectionManager<
+  Manifest extends AgentClientManifestNodeConnectionManager,
+> {
   /**
    * Alpha constant for kademlia
    * The number of the closest nodes to contact initially