fix: fixing up RPC handler imports

[ci skip]

src/agent/handlers/nodesClaimsGet.ts

@@ -1,6 +1,6 @@
-import type Sigchain from '../../sigchain/Sigchain';
 import type { DB } from '@matrixai/db';
 import type { ClaimIdMessage, AgentClaimMessage } from './types';
+import type Sigchain from '../../sigchain/Sigchain';
 import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import * as claimsUtils from '../../claims/utils';
 import { ServerHandler } from '../../rpc/handlers';

src/agent/handlers/nodesClosestLocalNodesGet.ts

@@ -1,7 +1,7 @@
-import type { NodeAddressMessage, NodeIdMessage } from './types';
-import type { NodeGraph } from '../../nodes';
 import type { DB } from '@matrixai/db';
+import type { NodeAddressMessage, NodeIdMessage } from './types';
 import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
+import type { NodeGraph } from '../../nodes';
 import type { NodeId } from '../../ids';
 import { validateSync } from '../../validation';
 import { matchSync } from '../../utils';

src/agent/handlers/nodesCrossSignClaim.ts

@@ -2,10 +2,10 @@ import type { AgentClaimMessage } from './types';
 import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import type ACL from '../../acl/ACL';
 import type NodeManager from '../../nodes/NodeManager';
-import * as nodesErrors from '../../nodes/errors';
-import { DuplexHandler } from '../../rpc/handlers';
 import * as agentErrors from '../errors';
 import * as agentUtils from '../utils';
+import * as nodesErrors from '../../nodes/errors';
+import { DuplexHandler } from '../../rpc/handlers';
 
 class NodesCrossSignClaimHandler extends DuplexHandler<
   {

src/agent/handlers/nodesHolePunchMessageSend.ts

@@ -1,18 +1,18 @@
 import type { DB } from '@matrixai/db';
+import type Logger from '@matrixai/logger';
+import type { HolePunchRelayMessage } from './types';
+import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import type NodeConnectionManager from '../../nodes/NodeConnectionManager';
+import type NodeManager from '../../nodes/NodeManager';
 import type KeyRing from '../../keys/KeyRing';
-import type Logger from '@matrixai/logger';
 import type { Host, Port } from '../../network/types';
-import type NodeManager from '../../nodes/NodeManager';
-import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import type { NodeId } from '../../ids';
-import type { HolePunchRelayMessage } from './types';
 import * as agentErrors from '../errors';
+import * as agentUtils from '../utils';
 import { validateSync } from '../../validation';
 import { matchSync } from '../../utils';
 import * as validationUtils from '../../validation/utils';
 import * as nodesUtils from '../../nodes/utils';
-import * as agentUtils from '../utils';
 import { UnaryHandler } from '../../rpc/handlers';
 
 class NodesHolePunchMessageSendHandler extends UnaryHandler<

src/agent/handlers/notificationsSend.ts

@@ -1,9 +1,9 @@
 import type { DB } from '@matrixai/db';
+import type { SignedNotificationEncoded } from './types';
+import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import type KeyRing from '../../keys/KeyRing';
 import type NotificationsManager from '../../notifications/NotificationsManager';
 import type { SignedNotification } from '../../notifications/types';
-import type { SignedNotificationEncoded } from './types';
-import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import { UnaryHandler } from '../../rpc/handlers';
 import * as notificationsUtils from '../../notifications/utils';
 

src/agent/handlers/serverManifest.ts

@@ -1,11 +1,11 @@
 import type { DB } from '@matrixai/db';
+import type Logger from '@matrixai/logger';
+import type KeyRing from '../../keys/KeyRing';
 import type Sigchain from '../../sigchain/Sigchain';
-import type NodeGraph from '../../nodes/NodeGraph';
 import type ACL from '../../acl/ACL';
+import type NodeGraph from '../../nodes/NodeGraph';
 import type NodeManager from '../../nodes/NodeManager';
-import type KeyRing from '../../keys/KeyRing';
 import type NodeConnectionManager from '../../nodes/NodeConnectionManager';
-import type Logger from '@matrixai/logger';
 import type { NotificationsManager } from '../../notifications';
 import type { VaultManager } from '../../vaults';
 import { NodesClosestLocalNodesGetHandler } from './nodesClosestLocalNodesGet';

src/agent/handlers/vaultsGitPackGet.ts

@@ -1,18 +1,18 @@
-import type { VaultAction, VaultName } from '../../vaults/types';
-import type VaultManager from '../../vaults/VaultManager';
-import type ACL from '../../acl/ACL';
 import type { DB } from '@matrixai/db';
 import type { GitPackMessage, VaultsGitPackGetMessage } from './types';
 import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
+import type { VaultAction, VaultName } from '../../vaults/types';
+import type VaultManager from '../../vaults/VaultManager';
+import type ACL from '../../acl/ACL';
 import * as agentErrors from '../errors';
+import * as agentUtils from '../utils';
 import * as nodesUtils from '../../nodes/utils';
 import * as vaultsUtils from '../../vaults/utils';
 import * as vaultsErrors from '../../vaults/errors';
 import { validateSync } from '../../validation';
 import { matchSync } from '../../utils';
 import * as validationUtils from '../../validation/utils';
 import { ServerHandler } from '../../rpc/handlers';
-import * as agentUtils from '../utils';
 
 class VaultsGitPackGetHandler extends ServerHandler<
   {

src/agent/handlers/vaultsScan.ts

@@ -1,11 +1,11 @@
+import type { DB } from '@matrixai/db';
 import type { VaultsScanMessage } from './types';
 import type { AgentRPCRequestParams, AgentRPCResponseResult } from '../types';
 import type VaultManager from '../../vaults/VaultManager';
-import type { DB } from '@matrixai/db';
 import * as agentErrors from '../errors';
+import * as agentUtils from '../utils';
 import { ServerHandler } from '../../rpc/handlers';
 import * as vaultsUtils from '../../vaults/utils';
-import * as agentUtils from '../utils';
 
 class VaultsScanHandler extends ServerHandler<
   {

src/client/handlers/agentLockAll.ts

@@ -1,5 +1,5 @@
-import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { DB } from '@matrixai/db';
+import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type SessionManager from '../../sessions/SessionManager';
 import { UnaryHandler } from '../../rpc/handlers';
 

src/client/handlers/agentStatus.ts

@@ -1,5 +1,5 @@
-import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { StatusResultMessage } from './types';
+import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type PolykeyAgent from '../../PolykeyAgent';
 import * as nodesUtils from '../../nodes/utils';
 import * as keysUtils from '../../keys/utils';

src/client/handlers/gestaltsActionsGetByIdentity.ts

@@ -1,13 +1,13 @@
+import type { DB } from '@matrixai/db';
+import type { IdentityMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type GestaltGraph from '../../gestalts/GestaltGraph';
-import type { DB } from '@matrixai/db';
-import type { IdentityId, ProviderId } from '../../ids/index';
 import type { GestaltAction } from '../../gestalts/types';
-import type { IdentityMessage } from './types';
+import type { IdentityId, ProviderId } from '../../ids/index';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsActionsGetByIdentityHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsActionsGetByNode.ts

@@ -1,13 +1,13 @@
+import type { DB } from '@matrixai/db';
+import type { ActionsListMessage, NodeIdMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type GestaltGraph from '../../gestalts/GestaltGraph';
-import type { DB } from '@matrixai/db';
 import type { GestaltAction } from '../../gestalts/types';
 import type { NodeId } from '../../ids/index';
-import type { ActionsListMessage, NodeIdMessage } from './types';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsActionsGetByNodeHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsActionsSetByIdentity.ts

@@ -1,13 +1,13 @@
-import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { DB } from '@matrixai/db';
+import type { SetIdentityActionMessage } from './types';
+import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { IdentityId, ProviderId } from '../../ids/index';
 import type { GestaltAction } from '../../gestalts/types';
 import type GestaltGraph from '../../gestalts/GestaltGraph';
-import type { SetIdentityActionMessage } from './types';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsActionsSetByIdentityHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsActionsSetByNode.ts

@@ -1,13 +1,13 @@
-import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { DB } from '@matrixai/db';
+import type { SetNodeActionMessage } from './types';
+import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { GestaltAction } from '../../gestalts/types';
 import type GestaltGraph from '../../gestalts/GestaltGraph';
 import type { NodeId } from '../../ids/index';
-import type { SetNodeActionMessage } from './types';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsActionsSetByNodeHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsActionsUnsetByIdentity.ts

@@ -1,13 +1,13 @@
-import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { DB } from '@matrixai/db';
+import type { SetIdentityActionMessage } from './types';
+import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { IdentityId, ProviderId } from '../../ids/index';
 import type { GestaltAction } from '../../gestalts/types';
 import type GestaltGraph from '../../gestalts/GestaltGraph';
-import type { SetIdentityActionMessage } from './types';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsActionsUnsetByIdentityHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsActionsUnsetByNode.ts

@@ -1,13 +1,13 @@
-import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { DB } from '@matrixai/db';
+import type { SetNodeActionMessage } from './types';
+import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { GestaltAction } from '../../gestalts/types';
 import type GestaltGraph from '../../gestalts/GestaltGraph';
 import type { NodeId } from '../../ids/index';
-import type { SetNodeActionMessage } from './types';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsActionsUnsetByNodeHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsDiscoveryByIdentity.ts

@@ -1,11 +1,11 @@
+import type { IdentityMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { IdentityId, ProviderId } from '../../ids/index';
 import type Discovery from '../../discovery/Discovery';
-import type { IdentityMessage } from './types';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsDiscoveryByIdentityHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsDiscoveryByNode.ts

@@ -1,11 +1,11 @@
+import type { NodeIdMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { NodeId } from '../../ids/index';
 import type Discovery from '../../discovery/Discovery';
-import type { NodeIdMessage } from './types';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsDiscoveryByNodeHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsGestaltGetByIdentity.ts

@@ -1,13 +1,13 @@
+import type { DB } from '@matrixai/db';
+import type { GestaltMessage, IdentityMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { IdentityId, ProviderId } from '../../ids/index';
 import type GestaltGraph from '../../gestalts/GestaltGraph';
-import type { DB } from '@matrixai/db';
-import type { GestaltMessage, IdentityMessage } from './types';
 import * as nodesUtils from '../../nodes/utils';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsGestaltGetByIdentityHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsGestaltGetByNode.ts

@@ -1,13 +1,13 @@
+import type { DB } from '@matrixai/db';
+import type { GestaltMessage, NodeIdMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type GestaltGraph from '../../gestalts/GestaltGraph';
-import type { DB } from '@matrixai/db';
 import type { NodeId } from '../../ids/index';
-import type { GestaltMessage, NodeIdMessage } from './types';
 import * as nodesUtils from '../../nodes/utils';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsGestaltGetByNodeHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsGestaltList.ts

@@ -1,7 +1,7 @@
-import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { DB } from '@matrixai/db';
-import type GestaltGraph from '../../gestalts/GestaltGraph';
 import type { GestaltMessage } from './types';
+import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
+import type GestaltGraph from '../../gestalts/GestaltGraph';
 import * as nodesUtils from '../../nodes/utils';
 import { ServerHandler } from '../../rpc/handlers';
 

src/client/handlers/gestaltsGestaltTrustByIdentity.ts

@@ -1,13 +1,13 @@
+import type { DB } from '@matrixai/db';
+import type { IdentityMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type GestaltGraph from '../../gestalts/GestaltGraph';
-import type { DB } from '@matrixai/db';
 import type { IdentityId, ProviderId } from '../../ids/index';
 import type Discovery from '../../discovery/Discovery';
-import type { IdentityMessage } from './types';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsGestaltTrustByIdentityHandler extends UnaryHandler<
   {

src/client/handlers/gestaltsGestaltTrustByNode.ts

@@ -1,13 +1,13 @@
+import type { DB } from '@matrixai/db';
+import type { NodeIdMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type GestaltGraph from '../../gestalts/GestaltGraph';
-import type { DB } from '@matrixai/db';
 import type { NodeId } from '../../ids/index';
 import type Discovery from '../../discovery/Discovery';
-import type { NodeIdMessage } from './types';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class GestaltsGestaltTrustByNodeHandler extends UnaryHandler<
   {

src/client/handlers/identitiesAuthenticate.ts

@@ -1,12 +1,12 @@
+import type { AuthProcessMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { ProviderId } from '../../ids/index';
 import type IdentitiesManager from '../../identities/IdentitiesManager';
-import type { AuthProcessMessage } from './types';
 import * as identitiesErrors from '../../identities/errors';
 import { ServerHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync, never } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync, never } from '../../utils/index';
 
 class IdentitiesAuthenticateHandler extends ServerHandler<
   {

src/client/handlers/identitiesAuthenticatedGet.ts

@@ -1,11 +1,11 @@
+import type { IdentityMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { ProviderId } from '../../ids/index';
 import type IdentitiesManager from '../../identities/IdentitiesManager';
-import type { IdentityMessage } from './types';
 import { ServerHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class IdentitiesAuthenticatedGetHandler extends ServerHandler<
   {

src/client/handlers/identitiesClaim.ts

@@ -1,11 +1,11 @@
+import type { ClaimIdMessage, IdentityMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { IdentityId, ProviderId } from '../../ids/index';
 import type IdentitiesManager from '../../identities/IdentitiesManager';
-import type { ClaimIdMessage, IdentityMessage } from './types';
 import { UnaryHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 
 class IdentitiesClaimHandler extends UnaryHandler<
   {

src/client/handlers/identitiesInfoConnectedGet.ts

@@ -1,12 +1,12 @@
+import type { ProviderSearchMessage, IdentityInfoMessage } from './types';
 import type { ClientRPCRequestParams, ClientRPCResponseResult } from '../types';
 import type { IdentityId, ProviderId } from '../../ids/index';
 import type IdentitiesManager from '../../identities/IdentitiesManager';
-import type { ProviderSearchMessage, IdentityInfoMessage } from './types';
 import type { IdentityData } from '../../identities/types';
 import { ServerHandler } from '../../rpc/handlers';
 import { validateSync } from '../../validation/index';
-import { matchSync } from '../../utils/index';
 import * as validationUtils from '../../validation/utils';
+import { matchSync } from '../../utils/index';
 import * as identitiesErrors from '../../identities/errors';
 
 class IdentitiesInfoConnectedGetHandler extends ServerHandler<