chore: update

Author: antfu

packages/core/src/node/auth-revoke.ts

@@ -14,7 +14,7 @@ export async function revokeAuthToken(
 ): Promise<void> {
   // Remove from persistent storage
   storage.mutate((state) => {
-    delete state.trusted[token]
+    state.trusted[token] = undefined
   })
 
   const rpcHost = context.rpc as unknown as RpcFunctionsHost

packages/core/src/node/context-internal.ts

@@ -11,7 +11,7 @@ export interface InternalAnonymousAuthStorage {
     ua: string
     origin: string
     timestamp: number
-  }>
+  } | undefined>
 }
 
 export interface DevToolsInternalContext {

packages/core/src/node/rpc/anonymous/auth.ts

@@ -32,6 +32,7 @@ export const anonymousAuth = defineRpcFunction({
           throw new Error('Failed to retrieve the current RPC session')
 
         if (session.meta.isTrusted || storage.value().trusted[query.authId]) {
+          console.log('trusted', { isTrusted: session.meta.isTrusted, trusted: storage.value().trusted[query.authId] })
           session.meta.clientAuthId = query.authId
           session.meta.isTrusted = true
           return {
@@ -76,8 +77,8 @@ export const anonymousAuth = defineRpcFunction({
           `Origin       : ${c.yellow(c.bold(query.origin || 'Unknown'))}`,
           `Client Token : ${c.green(c.bold(query.authId))}`,
           '',
-          `Auth URL     : ${c.cyan(c.underline(authUrl))}`,
-          `Temp Token   : ${c.cyan(c.bold(tempId))}`,
+          `Manual Auth URL   : ${c.cyan(c.underline(authUrl))}`,
+          `Manual Auth Token : ${c.cyan(c.bold(tempId))}`,
           '',
           'This will allow the browser to interact with the server, make file changes and run commands.',
           c.red(c.bold('You should only trust your local development browsers.')),

packages/core/src/node/ws.ts

@@ -46,17 +46,17 @@ export async function createWsServer(options: CreateWsServerOptions) {
     https,
     onConnected: (ws, req, meta) => {
       const url = new URL(req.url ?? '', 'http://localhost')
-      const authId = url.searchParams.get('vite_devtools_auth_id') ?? undefined
+      const authToken = url.searchParams.get('vite_devtools_auth_token') ?? undefined
       if (isClientAuthDisabled) {
         meta.isTrusted = true
       }
-      else if (authId && contextInternal.storage.auth.value().trusted[authId]) {
+      else if (authToken && contextInternal.storage.auth.value().trusted[authToken]) {
         meta.isTrusted = true
-        meta.clientAuthId = authId
+        meta.clientAuthId = authToken
       }
-      else if (authId && ((context.viteConfig.devtools?.config as any)?.clientAuthTokens ?? []).includes(authId)) {
+      else if (authToken && ((context.viteConfig.devtools?.config as any)?.clientAuthTokens ?? []).includes(authToken)) {
         meta.isTrusted = true
-        meta.clientAuthId = authId
+        meta.clientAuthId = authToken
       }
 
       wsClients.add(ws)

packages/rpc/src/presets/ws/client.ts

@@ -16,7 +16,7 @@ function NOOP() {}
 export const createWsRpcPreset: RpcClientPreset<(options: WebSocketRpcClientOptions) => ChannelOptions> = defineRpcClientPreset((options: WebSocketRpcClientOptions) => {
   let url = options.url
   if (options.authId) {
-    url = `${url}?vite_devtools_auth_id=${encodeURIComponent(options.authId)}`
+    url = `${url}?vite_devtools_auth_token=${encodeURIComponent(options.authId)}`
   }
   const ws = new WebSocket(url)
   const {

packages/self-inspect/src/node/rpc/functions/get-auth-tokens.ts

@@ -10,7 +10,7 @@ export const getAuthTokens = defineRpcFunction({
     return {
       handler: async () => {
         const trusted = storage.value().trusted
-        return Object.values(trusted)
+        return Object.values(trusted).filter(x => !!x)
       },
     }
   },