chore: added network to syncNodeGraphHandler

Author: aryanjassal

src/PolykeyAgent.ts

@@ -774,6 +774,7 @@ class PolykeyAgent {
         });
         const initialNodesShortlist = initialNodes.slice(0, 3);
         await this.nodeManager.syncNodeGraph(
+          options.network,
           initialNodesShortlist,
           undefined,
           false,

src/nodes/NodeManager.ts

@@ -253,6 +253,7 @@ class NodeManager<Manifest extends AgentClientManifestNodeManager> {
   protected syncNodeGraphHandler = async (
     ctx: ContextTimed,
     _taskInfo: TaskInfo | undefined,
+    network: string | undefined,
     initialNodes: Array<[NodeIdEncoded, NodeAddress]>,
     connectionConnectTimeoutTime: number | undefined,
   ) => {
@@ -299,6 +300,14 @@ class NodeManager<Manifest extends AgentClientManifestNodeManager> {
     }
     if (ctx.signal.aborted) return;
 
+    if (network != null) {
+      try {
+        await this.claimNetwork(successfulConnections[0].value.nodeId, network);
+      } catch {
+        await this.switchNetwork(network);
+      }
+    }
+
     // Attempt a findNode operation looking for ourselves
     await this.findNode(
       {
@@ -1877,10 +1886,10 @@ class NodeManager<Manifest extends AgentClientManifestNodeManager> {
     );
 
     // Error out if a network access claim already exists
-    if (await this.getClaimNetworkAccess(network, tran) != null) {
-      throw new Error('TMP network access claim already exists')
+    if ((await this.getClaimNetworkAccess(network, tran)) != null) {
+      throw new Error('TMP network access claim already exists');
     }
-    
+
     const encodedNetworkAuthority = claimsUtils.generateSignedClaim(
       claimNetworkAuthority.toSigned(),
     );
@@ -2793,6 +2802,7 @@ class NodeManager<Manifest extends AgentClientManifestNodeManager> {
    *
    */
   public syncNodeGraph(
+    network: string | undefined,
     initialNodes: Array<[NodeId, NodeAddress]>,
     connectionConnectTimeoutTime?: number,
     blocking?: boolean,
@@ -2801,6 +2811,7 @@ class NodeManager<Manifest extends AgentClientManifestNodeManager> {
   @startStop.ready(new nodesErrors.ErrorNodeManagerNotRunning())
   @decorators.timedCancellable(true)
   public async syncNodeGraph(
+    network: string,
     initialNodes: Array<[NodeId, NodeAddress]>,
     connectionConnectTimeoutTime: number = this.connectionConnectTimeoutTime,
     blocking: boolean = false,
@@ -2823,6 +2834,7 @@ class NodeManager<Manifest extends AgentClientManifestNodeManager> {
       await this.syncNodeGraphHandler(
         ctx,
         undefined,
+        network,
         initialNodesParameter,
         connectionConnectTimeoutTime,
       );
@@ -2832,7 +2844,11 @@ class NodeManager<Manifest extends AgentClientManifestNodeManager> {
         delay: 0,
         handlerId: this.syncNodeGraphHandlerId,
         lazy: true,
-        parameters: [initialNodesParameter, connectionConnectTimeoutTime],
+        parameters: [
+          network,
+          initialNodesParameter,
+          connectionConnectTimeoutTime,
+        ],
         path: [this.tasksPath, this.syncNodeGraphHandlerId],
         priority: 0,
       });

tests/nodes/NodeManager.test.ts

@@ -2144,6 +2144,7 @@ describe(`${NodeManager.name}`, () => {
       const mockedRefreshBucket = jest.spyOn(nodeManager, 'refreshBucket');
 
       await nodeManager.syncNodeGraph(
+        undefined,
         [
           [
             ncmPeers[0].nodeId,
@@ -2203,6 +2204,7 @@ describe(`${NodeManager.name}`, () => {
       const mockedRefreshBucket = jest.spyOn(nodeManager, 'refreshBucket');
 
       await nodeManager.syncNodeGraph(
+        undefined,
         [
           [
             ncmPeers[0].nodeId,
@@ -2225,6 +2227,7 @@ describe(`${NodeManager.name}`, () => {
     });
     test('network entry with syncNodeGraph handles failure to resolve hostnames', async () => {
       const syncP = nodeManager.syncNodeGraph(
+        undefined,
         [
           [ncmPeers[0].nodeId, ['some.random.host' as Host, 55555 as Port]],
           [ncmPeers[0].nodeId, [localHost, 55555 as Port]],
@@ -2309,6 +2312,7 @@ describe(`${NodeManager.name}`, () => {
       expect(await nodeGraph.nodesTotal()).toBe(0);
 
       await nodeManager.syncNodeGraph(
+        undefined,
         [
           [
             ncmPeers[0].nodeId,
@@ -2963,5 +2967,11 @@ describe(`${NodeManager.name}`, () => {
         node1.nodeManager.claimNetwork(seedNodeId, network),
       ).rejects.toThrow(claimsErrors.ErrorEmptyStream);
     });
+    // verify the claim exists
+    test.todo(
+      'node should automatically request NetworkAccessClaim if it does not exist',
+    );
+    // verify the claim is unmodified
+    test.todo('node should not request new NetworkAccessClaim if it exist');
   });
 });