ci: merge staging to master

package.json

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

src/bootstrap/utils.ts

@@ -5,7 +5,7 @@ import type {
   PasswordOpsLimit,
   PasswordMemLimit,
 } from '../keys/types.js';
-import type { AgentClientManifest } from '#nodes/agent/callers/index.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';

src/client/handlers/NodesAdd.ts

@@ -9,7 +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 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';

src/client/handlers/NodesClaim.ts

@@ -7,7 +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 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';

src/client/handlers/NodesFind.ts

@@ -8,7 +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 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';

src/client/handlers/NodesPing.ts

@@ -6,7 +6,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 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';

src/discovery/Discovery.ts

@@ -28,7 +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 type { AgentClientManifest } from '../nodes/agent/callers/index.js';
 import Logger from '@matrixai/logger';
 import { createDestroyStartStop } from '@matrixai/async-init';
 import { decorators } from '@matrixai/contexts';

src/nodes/NodeConnectionManager.ts

@@ -5,6 +5,7 @@ import type {
   ClientManifest,
   JSONRPCRequest,
   JSONRPCResponse,
+  ServerManifest,
 } from '@matrixai/rpc';
 import type {
   AuthenticateNetworkForwardCallback,
@@ -16,7 +17,6 @@ import type {
   NodesAuthenticateConnectionMessage,
   SuccessMessage,
 } from './agent/types.js';
-import type { AgentServerManifest } from './agent/handlers/index.js';
 import type { AgentClientManifestNodeConnectionManager } from './agent/callers/index.js';
 import type KeyRing from '../keys/KeyRing.js';
 import type { CertificatePEM } from '../keys/types.js';
@@ -566,7 +566,7 @@ class NodeConnectionManager<
     reuseAddr,
     ipv6Only,
   }: {
-    agentService: AgentServerManifest;
+    agentService: ServerManifest;
     host?: Host;
     port?: Port;
     reuseAddr?: boolean;

src/nodes/agent/handlers/NodesClaimNetworkSign.ts

@@ -5,7 +5,7 @@ import type {
 } from '../types.js';
 import type NodeManager from '../../../nodes/NodeManager.js';
 import type { JSONValue } from '../../../types.js';
-import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
+import type { AgentClientManifest } from '../callers/index.js';
 import { UnaryHandler } from '@matrixai/rpc';
 import * as agentUtils from '../utils.js';
 import * as nodesErrors from '../../errors.js';

src/nodes/agent/handlers/NodesClaimNetworkVerify.ts

@@ -5,7 +5,7 @@ import type {
 } from '../types.js';
 import type NodeManager from '../../../nodes/NodeManager.js';
 import type { JSONValue } from '../../../types.js';
-import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
+import type { AgentClientManifest } from '../callers/index.js';
 import { UnaryHandler } from '@matrixai/rpc';
 import * as agentUtils from '../utils.js';
 import * as nodesErrors from '../../errors.js';

src/nodes/agent/handlers/NodesCrossSignClaim.ts

@@ -6,7 +6,7 @@ import type {
 } from '../types.js';
 import type NodeManager from '../../NodeManager.js';
 import type ACL from '../../../acl/ACL.js';
-import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
+import type { AgentClientManifest } from '../callers/index.js';
 import { DuplexHandler } from '@matrixai/rpc';
 import * as agentUtils from '../utils.js';
 import * as nodesErrors from '../../errors.js';

src/notifications/NotificationsManager.ts

@@ -16,7 +16,7 @@ import type {
 } from '../ids/types.js';
 import type { Task, TaskHandler, TaskInfo } from '../tasks/types.js';
 import type { TaskManager } from '../tasks/index.js';
-import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
+import type { AgentClientManifest } from '../nodes/agent/callers/index.js';
 import Logger from '@matrixai/logger';
 import { IdInternal } from '@matrixai/id';
 import { createDestroyStartStop } from '@matrixai/async-init';

src/vaults/VaultManager.ts

@@ -19,7 +19,7 @@ import type ACL from '../acl/ACL.js';
 import type { PolykeyWorkerManager } from '../workers/types.js';
 import type { RemoteInfo } from './VaultInternal.js';
 import type { VaultAction } from './types.js';
-import type { AgentClientManifest } from '#nodes/agent/callers/index.js';
+import type { AgentClientManifest } from '../nodes/agent/callers/index.js';
 import path from 'node:path';
 import { DB } from '@matrixai/db';
 import { EncryptedFS, errors as encryptedFsErrors } from 'encryptedfs';