chore: moved rpc handler from agent rpc to client rpc

Author: aryanjassal

src/client/callers/index.ts

@@ -46,6 +46,7 @@ import nodesFind from './nodesFind.js';
 import nodesGetAll from './nodesGetAll.js';
 import nodesListConnections from './nodesListConnections.js';
 import nodesPing from './nodesPing.js';
+import nodesSyncGraph from './nodesSyncGraph.js';
 import notificationsInboxClear from './notificationsInboxClear.js';
 import notificationsInboxRead from './notificationsInboxRead.js';
 import notificationsInboxRemove from './notificationsInboxRemove.js';
@@ -128,6 +129,7 @@ const clientManifest = {
   nodesGetAll,
   nodesListConnections,
   nodesPing,
+  nodesSyncGraph,
   notificationsInboxClear,
   notificationsInboxRead,
   notificationsInboxRemove,
@@ -209,6 +211,7 @@ export {
   nodesGetAll,
   nodesListConnections,
   nodesPing,
+  nodesSyncGraph,
   notificationsInboxClear,
   notificationsInboxRead,
   notificationsInboxRemove,

src/client/callers/nodesSyncGraph.ts

@@ -0,0 +1,12 @@
+import type { HandlerTypes } from '@matrixai/rpc';
+import type NodesSyncGraph from '../handlers/NodesSyncGraph.js';
+import { UnaryCaller } from '@matrixai/rpc';
+
+type CallerTypes = HandlerTypes<NodesSyncGraph>;
+
+const nodesSyncGraph = new UnaryCaller<
+  CallerTypes['input'],
+  CallerTypes['output']
+>();
+
+export default nodesSyncGraph;

…c/nodes/agent/handlers/NodesSyncGraph.ts src/client/handlers/NodesSyncGraph.tssrc/nodes/agent/handlers/NodesSyncGraph.ts renamed to src/client/handlers/NodesSyncGraph.ts src/nodes/agent/handlers/NodesSyncGraph.ts renamed to src/client/handlers/NodesSyncGraph.ts

@@ -1,27 +1,27 @@
 import type { ContextTimed } from '@matrixai/contexts';
 import type { JSONValue } from '@matrixai/rpc';
-import type NodeManager from '../../NodeManager.js';
+import type NodeManager from '../../nodes/NodeManager.js';
 import type {
-  AgentRPCRequestParams,
-  AgentRPCResponseResult,
+  ClientRPCRequestParams,
+  ClientRPCResponseResult,
   NodesSyncGraphMessage,
 } from '../types.js';
-import type { AgentClientManifest } from '../callers/index.js';
+import type { AgentClientManifest } from '../../nodes/agent/callers/index.js';
 import { UnaryHandler } from '@matrixai/rpc';
 
 class NodesSyncGraph extends UnaryHandler<
   {
     nodeManager: NodeManager<AgentClientManifest>;
   },
-  AgentRPCRequestParams<NodesSyncGraphMessage>,
-  AgentRPCResponseResult
+  ClientRPCRequestParams<NodesSyncGraphMessage>,
+  ClientRPCResponseResult
 > {
   public handle = async (
-    input: AgentRPCRequestParams<NodesSyncGraphMessage>,
+    input: ClientRPCRequestParams<NodesSyncGraphMessage>,
     _cancel: (reason?: any) => void,
     _meta: Record<string, JSONValue> | undefined,
     ctx: ContextTimed,
-  ): Promise<AgentRPCResponseResult> => {
+  ): Promise<ClientRPCResponseResult> => {
     const {
       nodeManager,
     }: {

src/client/handlers/index.ts

@@ -64,6 +64,7 @@ import NodesFind from './NodesFind.js';
 import NodesGetAll from './NodesGetAll.js';
 import NodesListConnections from './NodesListConnections.js';
 import NodesPing from './NodesPing.js';
+import NodesSyncGraph from './NodesSyncGraph.js';
 import NotificationsInboxClear from './NotificationsInboxClear.js';
 import NotificationsInboxRead from './NotificationsInboxRead.js';
 import NotificationsInboxRemove from './NotificationsInboxRemove.js';
@@ -169,6 +170,7 @@ const serverManifest = (container: {
     nodesGetAll: new NodesGetAll(container),
     nodesListConnections: new NodesListConnections(container),
     nodesPing: new NodesPing(container),
+    nodesSyncGraph: new NodesSyncGraph(container),
     notificationsInboxClear: new NotificationsInboxClear(container),
     notificationsInboxRead: new NotificationsInboxRead(container),
     notificationsInboxRemove: new NotificationsInboxRemove(container),
@@ -252,6 +254,7 @@ export {
   NodesGetAll,
   NodesListConnections,
   NodesPing,
+  NodesSyncGraph,
   NotificationsInboxClear,
   NotificationsInboxRead,
   NotificationsInboxRemove,

src/client/types.ts

@@ -27,6 +27,7 @@ import type {
   NodeContact,
   NodeAddress,
   NodeContactAddressData,
+  NodeId,
 } from '../nodes/types.js';
 import type { AuditEventsGetTypeOverride } from './callers/auditEventsGet.js';
 
@@ -151,6 +152,12 @@ type NodeConnectionMessage = NodeAddressMessage & {
   authenticated: boolean;
 };
 
+type NodesSyncGraphMessage = {
+  network: string;
+  initialNodes: Array<[NodeId, NodeAddress]>;
+  connectionTimeout?: number;
+};
+
 // Gestalts messages
 
 type ActionsListMessage = {
@@ -428,6 +435,7 @@ export type {
   NodeAddressMessage,
   NodesFindMessage,
   NodeConnectionMessage,
+  NodesSyncGraphMessage,
   ActionsListMessage,
   SetIdentityActionMessage,
   SetNodeActionMessage,

src/nodes/agent/types.ts

@@ -13,12 +13,7 @@ import type {
 import type { VaultAction, VaultName } from '../../vaults/types.js';
 import type { SignedNotification } from '../../notifications/types.js';
 import type { Host, Hostname, Port } from '../../network/types.js';
-import type {
-  NetworkId,
-  NodeContact,
-  NodeId,
-  NodeAddress,
-} from '../../nodes/types.js';
+import type { NetworkId, NodeContact } from '../../nodes/types.js';
 import type { AuditEvent } from '../../audit/types.js';
 import type { SignedClaimEncoded } from '../../claims/types.js';
 
@@ -130,12 +125,6 @@ type NodesAuthenticateConnectionMessageNone = {
   type: 'NodesAuthenticateConnectionMessageNone';
 };
 
-type NodesSyncGraphMessage = {
-  network: string;
-  initialNodes: Array<[NodeId, NodeAddress]>;
-  connectionTimeout: number;
-};
-
 export type {
   AgentRPCRequestParams,
   AgentRPCResponseResult,
@@ -158,5 +147,4 @@ export type {
   NodesAuthenticateConnectionMessagePrivate,
   NodesAuthenticateConnectionMessageBasicPublic,
   NodesAuthenticateConnectionMessageNone,
-  NodesSyncGraphMessage,
 };