diff --git a/package-lock.json b/package-lock.json index 309e26074..344713647 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "polykey", - "version": "2.3.0", + "version": "2.3.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "polykey", - "version": "2.3.0", + "version": "2.3.2", "license": "GPL-3.0", "dependencies": { "@matrixai/async-cancellable": "^2.0.1", diff --git a/package.json b/package.json index c00a03fa4..7868b3776 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "polykey", - "version": "2.3.0", + "version": "2.3.2", "homepage": "https://polykey.com", "author": "Matrix AI", "contributors": [ diff --git a/src/bootstrap/utils.ts b/src/bootstrap/utils.ts index 500c2e00a..c03d89d9a 100644 --- a/src/bootstrap/utils.ts +++ b/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'; diff --git a/src/client/handlers/NodesAdd.ts b/src/client/handlers/NodesAdd.ts index 9ad91b477..78bb0cdf5 100644 --- a/src/client/handlers/NodesAdd.ts +++ b/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'; diff --git a/src/client/handlers/NodesClaim.ts b/src/client/handlers/NodesClaim.ts index fb27aa263..1abf04869 100644 --- a/src/client/handlers/NodesClaim.ts +++ b/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'; diff --git a/src/client/handlers/NodesFind.ts b/src/client/handlers/NodesFind.ts index 83b2ab0d4..10399ee63 100644 --- a/src/client/handlers/NodesFind.ts +++ b/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'; diff --git a/src/client/handlers/NodesPing.ts b/src/client/handlers/NodesPing.ts index 70db69829..056e60186 100644 --- a/src/client/handlers/NodesPing.ts +++ b/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'; diff --git a/src/discovery/Discovery.ts b/src/discovery/Discovery.ts index ebd5c1b9f..7e51b52ab 100644 --- a/src/discovery/Discovery.ts +++ b/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'; diff --git a/src/nodes/NodeConnectionManager.ts b/src/nodes/NodeConnectionManager.ts index 05baefdb4..11649a4ea 100644 --- a/src/nodes/NodeConnectionManager.ts +++ b/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; diff --git a/src/nodes/agent/handlers/NodesClaimNetworkSign.ts b/src/nodes/agent/handlers/NodesClaimNetworkSign.ts index c56498b42..a68fa9289 100644 --- a/src/nodes/agent/handlers/NodesClaimNetworkSign.ts +++ b/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'; diff --git a/src/nodes/agent/handlers/NodesClaimNetworkVerify.ts b/src/nodes/agent/handlers/NodesClaimNetworkVerify.ts index 9561cded4..362ec58cd 100644 --- a/src/nodes/agent/handlers/NodesClaimNetworkVerify.ts +++ b/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'; diff --git a/src/nodes/agent/handlers/NodesCrossSignClaim.ts b/src/nodes/agent/handlers/NodesCrossSignClaim.ts index 7d635f36a..c7ed8482f 100644 --- a/src/nodes/agent/handlers/NodesCrossSignClaim.ts +++ b/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'; diff --git a/src/notifications/NotificationsManager.ts b/src/notifications/NotificationsManager.ts index 9bfc04298..2f8342ccc 100644 --- a/src/notifications/NotificationsManager.ts +++ b/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'; diff --git a/src/vaults/VaultManager.ts b/src/vaults/VaultManager.ts index ab470ce56..dde35af08 100644 --- a/src/vaults/VaultManager.ts +++ b/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';