refactor!: change internal rpc and storage namespaces

antfu · antfu · commit 293b95bea696 · 2026-01-16T15:43:39.000+09:00
diff --git a/packages/core/src/client/webcomponents/components/ViewBuiltinTerminalPanel.vue b/packages/core/src/client/webcomponents/components/ViewBuiltinTerminalPanel.vue
@@ -46,7 +46,7 @@ onMounted(async () => {
   props.terminal.terminal = term
 
   if (props.terminal.buffer == null) {
-    const { buffer } = await props.context.rpc.call('vite:internal:terminals:read', props.terminal.info.id)
+    const { buffer } = await props.context.rpc.call('devtoolskit:internal:terminals:read', props.terminal.info.id)
     props.terminal.buffer = markRaw(buffer)
   }
 
diff --git a/packages/core/src/client/webcomponents/components/ViewLauncher.vue b/packages/core/src/client/webcomponents/components/ViewLauncher.vue
@@ -10,7 +10,7 @@ const props = defineProps<{
 }>()
 
 function onLaunch() {
-  props.context.rpc.call('vite:internal:docks:on-launch', props.entry.id)
+  props.context.rpc.call('devtoolskit:internal:docks:on-launch', props.entry.id)
 }
 
 const status = computed(() => props.entry.launcher.status || 'idle')
diff --git a/packages/core/src/client/webcomponents/state/context.ts b/packages/core/src/client/webcomponents/state/context.ts
@@ -86,7 +86,7 @@ export async function createDocksContext(
   const getSettingsStore = async () => {
     if (!_settingsStorePromise) {
       _settingsStorePromise = rpc.sharedState.get(
-        'vite:internal:user-settings',
+        'devtoolskit:internal:user-settings',
         { initialValue: DEFAULT_STATE_DOCKS_SETTINGS() },
       )
     }
diff --git a/packages/core/src/client/webcomponents/state/docks.ts b/packages/core/src/client/webcomponents/state/docks.ts
@@ -78,7 +78,7 @@ export async function useDocksEntries(rpc: DevToolsRpcClient): Promise<Ref<DevTo
   if (_docksEntriesRef) {
     return _docksEntriesRef
   }
-  const state = await rpc.sharedState.get('vite:internal:docks', { initialValue: [] })
+  const state = await rpc.sharedState.get('devtoolskit:internal:docks', { initialValue: [] })
   _docksEntriesRef = sharedStateToRef(state)
   return _docksEntriesRef
 }
diff --git a/packages/core/src/client/webcomponents/state/terminals.ts b/packages/core/src/client/webcomponents/state/terminals.ts
@@ -17,7 +17,7 @@ export function useTerminals(context: DocksContext): Reactive<Map<string, Termin
   }
   const map: Reactive<Map<string, TerminalState>> = _terminalsMap = reactive(new Map())
   async function updateTerminals() {
-    const terminals = await context.rpc.call('vite:internal:terminals:list')
+    const terminals = await context.rpc.call('devtoolskit:internal:terminals:list')
 
     for (const terminal of terminals) {
       if (map.has(terminal.id)) {
@@ -35,12 +35,12 @@ export function useTerminals(context: DocksContext): Reactive<Map<string, Termin
     console.log('[VITE DEVTOOLS] Terminals Updated', [...map.values()])
   }
   context.rpc.client.register({
-    name: 'vite:internal:terminals:updated' satisfies keyof DevToolsRpcClientFunctions,
+    name: 'devtoolskit:internal:terminals:updated' satisfies keyof DevToolsRpcClientFunctions,
     type: 'action',
     handler: () => updateTerminals(),
   })
   context.rpc.client.register({
-    name: 'vite:internal:terminals:stream-chunk' satisfies keyof DevToolsRpcClientFunctions,
+    name: 'devtoolskit:internal:terminals:stream-chunk' satisfies keyof DevToolsRpcClientFunctions,
     type: 'action',
     handler: (data: DevToolsTerminalSessionStreamChunkEvent) => {
       const terminal = map.get(data.id)
diff --git a/packages/core/src/node/context.ts b/packages/core/src/node/context.ts
@@ -46,7 +46,7 @@ export async function createDevToolsContext(
 
   await docksHost.init()
 
-  const docksSharedState = await rpcHost.sharedState.get('vite:internal:docks', { initialValue: [] })
+  const docksSharedState = await rpcHost.sharedState.get('devtoolskit:internal:docks', { initialValue: [] })
 
   // Register hosts side effects
   docksHost.events.on('dock:entry:updated', debounce(() => {
@@ -55,14 +55,14 @@ export async function createDevToolsContext(
 
   terminalsHost.events.on('terminal:session:updated', debounce(() => {
     rpcHost.broadcast({
-      method: 'vite:internal:terminals:updated',
+      method: 'devtoolskit:internal:terminals:updated',
       args: [],
     })
     docksSharedState.mutate(() => context.docks.values())
   }, 10))
   terminalsHost.events.on('terminal:session:stream-chunk', (data) => {
     rpcHost.broadcast({
-      method: 'vite:internal:terminals:stream-chunk',
+      method: 'devtoolskit:internal:terminals:stream-chunk',
       args: [data],
     })
   })
diff --git a/packages/core/src/node/host-docks.ts b/packages/core/src/node/host-docks.ts
@@ -16,7 +16,7 @@ export class DevToolsDockHost implements DevToolsDockHostType {
   }
 
   async init() {
-    this.userSettings = await this.context.rpc.sharedState.get('vite:internal:user-settings', {
+    this.userSettings = await this.context.rpc.sharedState.get('devtoolskit:internal:user-settings', {
       sharedState: createStorage({
         filepath: join(this.context.workspaceRoot, 'node_modules/.vite/devtools/settings.json'),
         initialValue: {
diff --git a/packages/core/src/node/rpc-shared-state.ts b/packages/core/src/node/rpc-shared-state.ts
@@ -18,15 +18,15 @@ export function createRpcSharedStateServerHost(
         if (patches) {
           debug('patch', { key, syncId })
           rpc.broadcast({
-            method: 'vite:internal:rpc:client-state:patch',
+            method: 'devtoolskit:internal:rpc:client-state:patch',
             args: [key, patches, syncId],
             filter: client => client.$meta.subscribedStates.has(key),
           })
         }
         else {
           debug('updated', { key, syncId })
           rpc.broadcast({
-            method: 'vite:internal:rpc:client-state:updated',
+            method: 'devtoolskit:internal:rpc:client-state:updated',
             args: [key, fullState, syncId],
             filter: client => client.$meta.subscribedStates.has(key),
           })
diff --git a/packages/core/src/node/rpc/index.ts b/packages/core/src/node/rpc/index.ts
@@ -55,16 +55,16 @@ declare module '@vitejs/devtools-kit' {
 
   // @keep-sorted
   export interface DevToolsRpcClientFunctions {
-    'vite:internal:rpc:client-state:patch': (key: string, patches: SharedStatePatch[], syncId: string) => Promise<void>
-    'vite:internal:rpc:client-state:updated': (key: string, fullState: any, syncId: string) => Promise<void>
+    'devtoolskit:internal:rpc:client-state:patch': (key: string, patches: SharedStatePatch[], syncId: string) => Promise<void>
+    'devtoolskit:internal:rpc:client-state:updated': (key: string, fullState: any, syncId: string) => Promise<void>
 
-    'vite:internal:terminals:stream-chunk': (data: DevToolsTerminalSessionStreamChunkEvent) => Promise<void>
-    'vite:internal:terminals:updated': () => Promise<void>
+    'devtoolskit:internal:terminals:stream-chunk': (data: DevToolsTerminalSessionStreamChunkEvent) => Promise<void>
+    'devtoolskit:internal:terminals:updated': () => Promise<void>
   }
 
   // @keep-sorted
   export interface DevToolsRpcSharedStates {
-    'vite:internal:docks': DevToolsDockEntry[]
-    'vite:internal:user-settings': DevToolsDocksUserSettings
+    'devtoolskit:internal:docks': DevToolsDockEntry[]
+    'devtoolskit:internal:user-settings': DevToolsDocksUserSettings
   }
 }
diff --git a/packages/core/src/node/rpc/internal/docks-on-launch.ts b/packages/core/src/node/rpc/internal/docks-on-launch.ts
@@ -1,7 +1,7 @@
 import { defineRpcFunction } from '@vitejs/devtools-kit'
 
 export const docksOnLaunch = defineRpcFunction({
-  name: 'vite:internal:docks:on-launch',
+  name: 'devtoolskit:internal:docks:on-launch',
   type: 'action',
   setup: (context) => {
     const launchMap = new Map<string, Promise<void>>()
diff --git a/packages/core/src/node/rpc/internal/rpc-server-list.ts b/packages/core/src/node/rpc/internal/rpc-server-list.ts
@@ -1,7 +1,7 @@
 import { defineRpcFunction } from '@vitejs/devtools-kit'
 
 export const rpcServerList = defineRpcFunction({
-  name: 'vite:internal:rpc:server:list',
+  name: 'devtoolskit:internal:rpc:server:list',
   type: 'static',
   setup: (context) => {
     return {
diff --git a/packages/core/src/node/rpc/internal/state/get.ts b/packages/core/src/node/rpc/internal/state/get.ts
@@ -2,7 +2,7 @@ import type { DevToolsNodeContext, DevToolsRpcSharedStates } from '@vitejs/devto
 import { defineRpcFunction } from '@vitejs/devtools-kit'
 
 export const sharedStateGet = defineRpcFunction({
-  name: 'vite:internal:rpc:server-state:get',
+  name: 'devtoolskit:internal:rpc:server-state:get',
   type: 'query',
   setup: (context: DevToolsNodeContext) => {
     return {
diff --git a/packages/core/src/node/rpc/internal/state/patch.ts b/packages/core/src/node/rpc/internal/state/patch.ts
@@ -3,7 +3,7 @@ import type { SharedStatePatch } from '@vitejs/devtools-kit/utils/shared-state'
 import { defineRpcFunction } from '@vitejs/devtools-kit'
 
 export const sharedStatePatch = defineRpcFunction({
-  name: 'vite:internal:rpc:server-state:patch',
+  name: 'devtoolskit:internal:rpc:server-state:patch',
   type: 'query',
   setup: (context: DevToolsNodeContext) => {
     return {
diff --git a/packages/core/src/node/rpc/internal/state/set.ts b/packages/core/src/node/rpc/internal/state/set.ts
@@ -2,7 +2,7 @@ import type { DevToolsNodeContext, DevToolsRpcSharedStates } from '@vitejs/devto
 import { defineRpcFunction } from '@vitejs/devtools-kit'
 
 export const sharedStateSet = defineRpcFunction({
-  name: 'vite:internal:rpc:server-state:set',
+  name: 'devtoolskit:internal:rpc:server-state:set',
   type: 'query',
   setup: (context: DevToolsNodeContext) => {
     return {
diff --git a/packages/core/src/node/rpc/internal/state/subscribe.ts b/packages/core/src/node/rpc/internal/state/subscribe.ts
@@ -5,7 +5,7 @@ import { createDebug } from 'obug'
 const debug = createDebug('vite:devtools:rpc:state:subscribe')
 
 export const sharedStateSubscribe = defineRpcFunction({
-  name: 'vite:internal:rpc:server-state:subscribe',
+  name: 'devtoolskit:internal:rpc:server-state:subscribe',
   type: 'event',
   setup: (context: DevToolsNodeContext) => {
     return {
diff --git a/packages/core/src/node/rpc/internal/terminals-list.ts b/packages/core/src/node/rpc/internal/terminals-list.ts
@@ -2,7 +2,7 @@ import type { DevToolsTerminalSessionBase } from '@vitejs/devtools-kit'
 import { defineRpcFunction } from '@vitejs/devtools-kit'
 
 export const terminalsList = defineRpcFunction({
-  name: 'vite:internal:terminals:list',
+  name: 'devtoolskit:internal:terminals:list',
   type: 'static',
   setup: (context) => {
     return {
diff --git a/packages/core/src/node/rpc/internal/terminals-read.ts b/packages/core/src/node/rpc/internal/terminals-read.ts
@@ -1,7 +1,7 @@
 import { defineRpcFunction } from '@vitejs/devtools-kit'
 
 export const terminalsRead = defineRpcFunction({
-  name: 'vite:internal:terminals:read',
+  name: 'devtoolskit:internal:terminals:read',
   type: 'query',
   setup: (context) => {
     return {
diff --git a/packages/kit/src/client/rpc-shared-state.ts b/packages/kit/src/client/rpc-shared-state.ts
@@ -7,7 +7,7 @@ export function createRpcSharedStateClientHost(rpc: DevToolsRpcClient): RpcShare
   const sharedState = new Map<string, SharedState<any>>()
 
   rpc.client.register({
-    name: 'vite:internal:rpc:client-state:updated',
+    name: 'devtoolskit:internal:rpc:client-state:updated',
     type: 'event',
     handler: (key: string, fullState: any, syncId: string) => {
       const state = sharedState.get(key)
@@ -18,7 +18,7 @@ export function createRpcSharedStateClientHost(rpc: DevToolsRpcClient): RpcShare
   })
 
   rpc.client.register({
-    name: 'vite:internal:rpc:client-state:patch',
+    name: 'devtoolskit:internal:rpc:client-state:patch',
     type: 'event',
     handler: (key: string, patches: SharedStatePatch[], syncId: string) => {
       const state = sharedState.get(key)
@@ -32,10 +32,10 @@ export function createRpcSharedStateClientHost(rpc: DevToolsRpcClient): RpcShare
     const offs: (() => void)[] = []
     offs.push(state.on('updated', (fullState, patches, syncId) => {
       if (patches) {
-        rpc.callEvent('vite:internal:rpc:server-state:patch', key, patches, syncId)
+        rpc.callEvent('devtoolskit:internal:rpc:server-state:patch', key, patches, syncId)
       }
       else {
-        rpc.callEvent('vite:internal:rpc:server-state:set', key, fullState, syncId)
+        rpc.callEvent('devtoolskit:internal:rpc:server-state:set', key, fullState, syncId)
       }
     }))
 
@@ -58,10 +58,10 @@ export function createRpcSharedStateClientHost(rpc: DevToolsRpcClient): RpcShare
       })
 
       async function initSharedState() {
-        rpc.callEvent('vite:internal:rpc:server-state:subscribe', key)
+        rpc.callEvent('devtoolskit:internal:rpc:server-state:subscribe', key)
         if (options?.initialValue !== undefined) {
           sharedState.set(key, state)
-          rpc.call('vite:internal:rpc:server-state:get', key)
+          rpc.call('devtoolskit:internal:rpc:server-state:get', key)
             .then((serverState) => {
               state.mutate(() => serverState)
             })
@@ -72,7 +72,7 @@ export function createRpcSharedStateClientHost(rpc: DevToolsRpcClient): RpcShare
           return state
         }
         else {
-          const initialValue = await rpc.call('vite:internal:rpc:server-state:get', key) as T
+          const initialValue = await rpc.call('devtoolskit:internal:rpc:server-state:get', key) as T
           state.mutate(() => initialValue)
           sharedState.set(key, state)
           registerSharedState(key, state)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ onMounted(async () => {`
`46`	`46`	`props.terminal.terminal = term`
`47`	`47`
`48`	`48`	`if (props.terminal.buffer == null) {`
`49`		`- const { buffer } = await props.context.rpc.call('vite:internal:terminals:read', props.terminal.info.id)`
	`49`	`+ const { buffer } = await props.context.rpc.call('devtoolskit:internal:terminals:read', props.terminal.info.id)`
`50`	`50`	`props.terminal.buffer = markRaw(buffer)`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ const props = defineProps<{`
`10`	`10`	`}>()`
`11`	`11`
`12`	`12`	`function onLaunch() {`
`13`		`- props.context.rpc.call('vite:internal:docks:on-launch', props.entry.id)`
	`13`	`+ props.context.rpc.call('devtoolskit:internal:docks:on-launch', props.entry.id)`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`const status = computed(() => props.entry.launcher.status \|\| 'idle')`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ export async function createDocksContext(`
`86`	`86`	`const getSettingsStore = async () => {`
`87`	`87`	`if (!_settingsStorePromise) {`
`88`	`88`	`_settingsStorePromise = rpc.sharedState.get(`
`89`		`- 'vite:internal:user-settings',`
	`89`	`+ 'devtoolskit:internal:user-settings',`
`90`	`90`	`{ initialValue: DEFAULT_STATE_DOCKS_SETTINGS() },`
`91`	`91`	`)`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ export async function useDocksEntries(rpc: DevToolsRpcClient): Promise<Ref<DevTo`
`78`	`78`	`if (_docksEntriesRef) {`
`79`	`79`	`return _docksEntriesRef`
`80`	`80`	`}`
`81`		`- const state = await rpc.sharedState.get('vite:internal:docks', { initialValue: [] })`
	`81`	`+ const state = await rpc.sharedState.get('devtoolskit:internal:docks', { initialValue: [] })`
`82`	`82`	`_docksEntriesRef = sharedStateToRef(state)`
`83`	`83`	`return _docksEntriesRef`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export class DevToolsDockHost implements DevToolsDockHostType {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`async init() {`
`19`		`- this.userSettings = await this.context.rpc.sharedState.get('vite:internal:user-settings', {`
	`19`	`+ this.userSettings = await this.context.rpc.sharedState.get('devtoolskit:internal:user-settings', {`
`20`	`20`	`sharedState: createStorage({`
`21`	`21`	`filepath: join(this.context.workspaceRoot, 'node_modules/.vite/devtools/settings.json'),`
`22`	`22`	`initialValue: {`