wip

src/agent/agentService.ts

@@ -178,13 +178,10 @@ function createAgentService({
       });
     },
     nodesScan: async (
-      call: grpc.ServerWritableStream<
-        agentPB.NodeIdMessage,
-        agentPB.VaultListMessage
-      >,
+      call: grpc.ServerWritableStream<nodesPB.Node, vaultsPB.List>,
     ): Promise<void> => {
       const genWritable = grpcUtils.generatorWritable(call);
-      const response = new agentPB.VaultListMessage();
+      const response = new vaultsPB.List();
       const nodeId = makeNodeId(call.request.getNodeId());
       const perms = await gestaltGraph.getGestaltActionsByNode(nodeId);
       if (!perms) {

src/client/clientService.ts

@@ -16,14 +16,7 @@ import {
   IClientServiceServer,
 } from '../proto/js/polykey/v1/client_service_grpc_pb';
 import * as utilsPB from '../proto/js/polykey/v1/utils/utils_pb';
-import * as vaultsPB from '../proto/js/polykey/v1/vaults/vaults_pb';
 import * as nodesPB from '../proto/js/polykey/v1/nodes/nodes_pb';
-import * as notificationsPB from '../proto/js/polykey/v1/notifications/notifications_pb';
-import * as sessionsPB from '../proto/js/polykey/v1/sessions/sessions_pb';
-import * as gestaltsPB from '../proto/js/polykey/v1/gestalts/gestalts_pb';
-import * as identitiesPB from '../proto/js/polykey/v1/identities/identities_pb';
-import * as keysPB from '../proto/js/polykey/v1/keys/keys_pb';
-import * as permissionsPB from '../proto/js/polykey/v1/permissions/permissions_pb';
 import createEchoRPC from './rpcEcho';
 import createSessionRPC from './rpcSession';
 import createVaultRPC from './rpcVaults';

src/client/rpcNodes.ts

@@ -7,6 +7,7 @@ import type { NotificationsManager } from '../notifications';
 import * as grpc from '@grpc/grpc-js';
 import * as utilsPB from '../proto/js/polykey/v1/utils/utils_pb';
 import * as nodesPB from '../proto/js/polykey/v1/nodes/nodes_pb';
+import * as vaultsPB from '../proto/js/polykey/v1/vaults/vaults_pb';
 import * as utils from '../client/utils';
 import * as nodesUtils from '../nodes/utils';
 import * as grpcUtils from '../grpc/utils';
@@ -151,10 +152,7 @@ const createNodesRPC = ({
       callback(null, response);
     },
     nodesScan: async (
-      call: grpc.ServerWritableStream<
-        clientPB.NodeMessage,
-        clientPB.VaultListMessage
-      >,
+      call: grpc.ServerWritableStream<nodesPB.Node, vaultsPB.List>,
     ): Promise<void> => {
       const genWritable = grpcUtils.generatorWritable(call);
       const nodeId = makeNodeId(call.request.getNodeId());
@@ -166,7 +164,7 @@ const createNodesRPC = ({
         call.sendMetadata(responseMeta);
         const list = await nodeManager.scanNodeVaults(nodeId);
         for (const vault of list) {
-          const vaultListMessage = new clientPB.VaultListMessage();
+          const vaultListMessage = new vaultsPB.List();
           vaultListMessage.setVaultName(vault[0]);
           vaultListMessage.setVaultId(vaultsUtils.makeVaultIdPretty(vault[1]));
           await genWritable.next(vaultListMessage);

src/client/rpcVaults.ts

@@ -8,7 +8,7 @@ import * as grpcUtils from '../grpc/utils';
 import * as utilsPB from '../proto/js/polykey/v1/utils/utils_pb';
 import * as vaultsPB from '../proto/js/polykey/v1/vaults/vaults_pb';
 import * as secretsPB from '../proto/js/polykey/v1/secrets/secrets_pb';
-import { isNodeId, makeNodeId } from '../nodes/utils';
+import { makeNodeId } from '../nodes/utils';
 import { vaultOps } from '../vaults';
 import { makeVaultId, makeVaultIdPretty } from '../vaults/utils';
 
@@ -423,10 +423,7 @@ const createVaultRPC = ({
       }
     },
     vaultsShare: async (
-      call: grpc.ServerUnaryCall<
-        vaultsPB.PermSet,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<vaultsPB.PermSet, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       try {
@@ -456,10 +453,7 @@ const createVaultRPC = ({
       }
     },
     vaultsUnshare: async (
-      call: grpc.ServerUnaryCall<
-        vaultsPB.PermUnset,
-        utilsPB.StatusMessage
-      >,
+      call: grpc.ServerUnaryCall<vaultsPB.PermUnset, utilsPB.StatusMessage>,
       callback: grpc.sendUnaryData<utilsPB.StatusMessage>,
     ): Promise<void> => {
       try {

src/nodes/NodeConnection.ts

@@ -430,7 +430,7 @@ class NodeConnection {
   public async scanVaults(
     nodeId: NodeId,
   ): Promise<Array<[VaultName, VaultId]>> {
-    const nodeIdMessage = new agentPB.NodeIdMessage();
+    const nodeIdMessage = new nodesPB.Node();
     nodeIdMessage.setNodeId(nodeId);
     const vaults: Array<[VaultName, VaultId]> = [];
     const genReadable = this.client.nodesScan(nodeIdMessage);