Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 83 additions & 1 deletion packages/kit/src/client/rpc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,60 @@ function isNumeric(str: string | number | undefined) {
return `${+str}` === `${str}`
}

interface RpcCacheOptions {
functions: string[]
}

// @TODO: should be moved to birpc-x?
Copy link
Member Author

@webfansplz webfansplz Nov 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to discussion.

class RpcCacheManager {
private cacheMap = new Map<string, Map<string, unknown>>()
private options: RpcCacheOptions

constructor(options: RpcCacheOptions) {
this.options = options
}

updateOptions(options: Partial<RpcCacheOptions>) {
this.options = {
...this.options,
...options,
}
}

cached(m: string, a: unknown[]) {
const methodCache = this.cacheMap.get(m)
if (methodCache) {
return methodCache.get(JSON.stringify(a))
}
return undefined
}

apply(req: { m: string, a: unknown[] }, res: unknown) {
const methodCache = this.cacheMap.get(req.m) || new Map<string, unknown>()
methodCache.set(JSON.stringify(req.a), res)
this.cacheMap.set(req.m, methodCache)
}

validate(m: string) {
return this.options.functions.includes(m)
}

invalidate(key?: string) {
if (key) {
this.cacheMap.delete(key)
}
else {
this.cacheMap.clear()
}
}
}

export interface DevToolsRpcClientOptions {
connectionMeta?: ConnectionMeta
baseURL?: string[]
wsOptions?: Partial<WebSocketRpcClientOptions>
rpcOptions?: Partial<BirpcOptions<DevToolsRpcServerFunctions>>
cacheOptions?: boolean | Partial<RpcCacheOptions>
}

export type DevToolsRpcClient = BirpcReturn<DevToolsRpcServerFunctions, DevToolsRpcClientFunctions>
Expand All @@ -27,12 +76,25 @@ export interface ClientRpcReturn {
clientRpc: DevToolsClientRpcHost
}

export async function getDevToolsRpcClient(
options: DevToolsRpcClientOptions & { cacheOptions: false },
): Promise<ClientRpcReturn>
export async function getDevToolsRpcClient(
options: DevToolsRpcClientOptions & { cacheOptions: true },
): Promise<ClientRpcReturn & { cacheManager: RpcCacheManager }>
export async function getDevToolsRpcClient(
options: DevToolsRpcClientOptions & { cacheOptions: Partial<RpcCacheOptions> },
): Promise<ClientRpcReturn & { cacheManager: RpcCacheManager }>
export async function getDevToolsRpcClient(
options?: DevToolsRpcClientOptions,
): Promise<ClientRpcReturn>
export async function getDevToolsRpcClient(
options: DevToolsRpcClientOptions = {},
): Promise<ClientRpcReturn> {
const {
baseURL = '/.devtools/',
rpcOptions = {},
cacheOptions = false,
} = options
const urls = Array.isArray(baseURL) ? baseURL : [baseURL]
let connectionMeta: ConnectionMeta | undefined = options.connectionMeta
Expand Down Expand Up @@ -60,6 +122,7 @@ export async function getDevToolsRpcClient(
? `${location.protocol.replace('http', 'ws')}//${location.hostname}:${connectionMeta.websocket}`
: connectionMeta.websocket as string

const cacheManager = cacheOptions ? new RpcCacheManager({ functions: [], ...(typeof options.cacheOptions === 'object' ? options.cacheOptions : {}) }) : null
const context: DevToolsClientContext = {
rpc: undefined!,
}
Expand All @@ -71,7 +134,25 @@ export async function getDevToolsRpcClient(
url,
...options.wsOptions,
}),
rpcOptions,
rpcOptions: {
...rpcOptions,
onRequest: async (req, next, resolve) => {
await rpcOptions.onRequest?.(req, next, resolve)
if (cacheOptions && cacheManager?.validate(req.m)) {
const cached = cacheManager.cached(req.m, req.a)
if (cached) {
return resolve(cached)
}
else {
const res = await next(req)
cacheManager?.apply(req, res)
}
}
else {
await next(req)
}
},
},
},
)
// @ts-expect-error assign to readonly property
Expand All @@ -81,5 +162,6 @@ export async function getDevToolsRpcClient(
connectionMeta,
rpc,
clientRpc,
...(cacheOptions ? { cacheManager } : {}),
}
}
11 changes: 11 additions & 0 deletions packages/vite/src/app/composables/rpc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export async function connect() {
'/.devtools/',
runtimeConfig.app.baseURL,
],
cacheOptions: true,
connectionMeta: runtimeConfig.app.connection,
wsOptions: {
onConnected: () => {
Expand All @@ -44,6 +45,16 @@ export async function connect() {
})

rpc.value = result.rpc

const functions = await rpc.value.$call('vite:core:list-rpc-functions')

// TODO: add cacheable option to birpc-x and use it here
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO

// @ts-expect-error skip type check
const cacheableFunctions = Object.keys(functions).filter(name => functions[name]?.cacheable)
result.cacheManager.updateOptions({
functions: [...cacheableFunctions],
})

connectionState.connected = true
}
catch (e) {
Expand Down
Loading