wip: storage auth

Author: antfu

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

@@ -1,6 +1,8 @@
 import * as p from '@clack/prompts'
 import { defineRpcFunction } from '@vitejs/devtools-kit'
 import c from 'ansis'
+import { join } from 'pathe'
+import { createStorage } from '../../storage'
 
 export interface DevToolsAuthInput {
   authId: string
@@ -12,24 +14,33 @@ export interface DevToolsAuthReturn {
   isTrusted: boolean
 }
 
-// TODO: Replace with a proper storage solution
-const TEMPORARY_STORAGE = new Map<string, {
-  authId: string
-  ua: string
-  timestamp: number
-}>()
+interface AnonymousAuthStorage {
+  trusted: Record<string, {
+    authId: string
+    ua: string
+    origin: string
+    timestamp: number
+  }>
+}
 
 export const anonymousAuth = defineRpcFunction({
   name: 'vite:anonymous:auth',
   type: 'action',
   setup: (context) => {
+    const storage = createStorage<AnonymousAuthStorage>({
+      filepath: join(context.cwd, 'node_modules/.vite/devtools/auth.json'),
+      initialValue: {
+        trusted: {},
+      },
+    })
+
     return {
       handler: async (query: DevToolsAuthInput): Promise<DevToolsAuthReturn> => {
         const session = context.rpc.getCurrentRpcSession()
         if (!session)
           throw new Error('Failed to retrieve the current RPC session')
 
-        if (TEMPORARY_STORAGE.has(query.authId)) {
+        if (storage.get().trusted[query.authId]) {
           session.meta.clientAuthId = query.authId
           session.meta.isTrusted = true
           return {
@@ -59,10 +70,13 @@ export const anonymousAuth = defineRpcFunction({
         })
 
         if (answer) {
-          TEMPORARY_STORAGE.set(query.authId, {
-            authId: query.authId,
-            ua: query.ua,
-            timestamp: Date.now(),
+          storage.mutate((state) => {
+            state.trusted[query.authId] = {
+              authId: query.authId,
+              ua: query.ua,
+              origin: query.origin,
+              timestamp: Date.now(),
+            }
           })
           session.meta.clientAuthId = query.authId
           session.meta.isTrusted = true

packages/core/src/node/storage.ts

@@ -1,15 +1,16 @@
 import fs from 'node:fs'
 import { createSharedState } from '@vitejs/devtools-kit/utils/shared-state'
+import { dirname } from 'pathe'
 
 export interface CreateStorageOptions<T extends object> {
   filepath: string
   initialValue: T
 }
 
-export async function createStorage<T extends object>(options: CreateStorageOptions<T>) {
+export function createStorage<T extends object>(options: CreateStorageOptions<T>) {
   let initialState: T
   if (fs.existsSync(options.filepath)) {
-    initialState = JSON.parse(await fs.readFileSync(options.filepath, 'utf-8')) as T
+    initialState = JSON.parse(fs.readFileSync(options.filepath, 'utf-8')) as T
   }
   else {
     initialState = options.initialValue
@@ -21,6 +22,7 @@ export async function createStorage<T extends object>(options: CreateStorageOpti
   })
 
   state.on('updated', (newState) => {
+    fs.mkdirSync(dirname(options.filepath), { recursive: true })
     fs.writeFileSync(options.filepath, `${JSON.stringify(newState, null, 2)}\n`)
   })
 

packages/vite/src/app/composables/rpc.ts

@@ -40,6 +40,10 @@ export async function connect() {
           connectionState.error = e
           console.error(`[vite-devtools] RPC error on executing "${name}":`)
         },
+        onFunctionError: (e, name) => {
+          connectionState.error = e
+          console.error(`[vite-devtools] RPC error on executing "${name}":`)
+        },
       },
     })