diff --git a/package-lock.json b/package-lock.json index 3649a90c1..bb93f336f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@matrixai/mdns": "^1.2.6", "@matrixai/quic": "^1.3.1", "@matrixai/resources": "^1.1.5", - "@matrixai/rpc": "^0.6.0", + "@matrixai/rpc": "^0.6.2", "@matrixai/timer": "^1.1.3", "@matrixai/workers": "^1.3.7", "@matrixai/ws": "^1.1.7", @@ -1696,9 +1696,9 @@ "integrity": "sha512-m/DEZEe3wHqWEPTyoBtzFF6U9vWYhEnQtGgwvqiAlTxTM0rk96UBpWjDZCTF/vYG11ZlmlQFtg5H+zGgbjaB3Q==" }, "node_modules/@matrixai/rpc": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@matrixai/rpc/-/rpc-0.6.0.tgz", - "integrity": "sha512-ENjJO2h7CmPLaHhObHs2nvpv98YZPxa79/jf+TqEPEfbhE1BkNCys9pXDE/CYDP9vxb4seS39WkR9cNivQU50A==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@matrixai/rpc/-/rpc-0.6.3.tgz", + "integrity": "sha512-jLR+SpAnv6NR2xRtXGBnyBGipLBv/Nnn/8b6OYx2loyNT4WHoxtqh51U6QwKCHU6qZii/K/2L5XRRKxYUgmmVg==", "dependencies": { "@matrixai/async-init": "^1.10.0", "@matrixai/contexts": "^1.2.0", diff --git a/src/client/types.ts b/src/client/types.ts index 6748bf1a8..c8843e334 100644 --- a/src/client/types.ts +++ b/src/client/types.ts @@ -1,8 +1,7 @@ import type { ClientManifest, JSONObject, - JSONRPCResponseMetadata, - // JSONRPCResponseResult, + JSONRPCResponseResult, RPCClient, } from '@matrixai/rpc'; import type { @@ -26,17 +25,6 @@ import type { } from '../nodes/types'; import type { AuditEventsGetTypeOverride } from './callers/auditEventsGet'; -// TEMP: For testing and debugging. This will go into js-rpc or something. -type JSONRPCResponseResult< - T extends JSONObject = JSONObject, - M extends JSONObject = JSONObject, -> = T & { - metadata?: JSONRPCResponseMetadata & - M & - (T extends { metadata: infer U } ? U : JSONObject) & - JSONObject; -}; - type ClientRPCRequestParams = JSONRPCResponseResult< T,