refactor: make internal invoke event to use the same interface with handleInvoke (#18902)

Author: sapphi-red

packages/vite/src/node/server/hmr.ts

@@ -193,7 +193,7 @@ export const normalizeHotChannel = (
   ) => {
     if (!invokeHandlers) {
       return {
-        e: {
+        error: {
           name: 'TransportError',
           message: 'invokeHandlers is not set',
           stack: new Error().stack,
@@ -207,10 +207,10 @@ export const normalizeHotChannel = (
       const invokeHandler = invokeHandlers[name]
       // @ts-expect-error `invokeHandler` is `InvokeMethods[T]`, so passing the args is fine
       const result = await invokeHandler(...args)
-      return { r: result }
+      return { result }
     } catch (error) {
       return {
-        e: {
+        error: {
           name: error.name,
           message: error.message,
           stack: error.stack,
@@ -301,13 +301,7 @@ export const normalizeHotChannel = (
       }
       channel.on?.('vite:invoke', listenerForInvokeHandler)
     },
-    handleInvoke: async (payload) => {
-      const data = await handleInvoke(payload)
-      if (data.e) {
-        return { error: data.e }
-      }
-      return { result: data.r }
-    },
+    handleInvoke,
     send: (...args: any[]) => {
       let payload: HotPayload
       if (typeof args[0] === 'string') {

packages/vite/src/shared/invokeMethods.ts

@@ -72,8 +72,8 @@ export type InvokeResponseData<
   /** 'response' is for responses without an id */
   id: 'response' | `response:${string}`
   data:
-    | { r: Awaited<ReturnType<InvokeMethods[T]>>; e?: undefined }
-    | { r?: undefined; e: any }
+    | { result: Awaited<ReturnType<InvokeMethods[T]>>; error?: undefined }
+    | { result?: undefined; error: any }
 }
 
 export type InvokeMethods = {

packages/vite/src/shared/moduleRunnerTransport.ts

@@ -96,11 +96,11 @@ const createInvokeableTransport = (
 
               rpcPromises.delete(invokeId)
 
-              const { e, r } = data.data
-              if (e) {
-                promise.reject(e)
+              const { error, result } = data.data
+              if (error) {
+                promise.reject(error)
               } else {
-                promise.resolve(r)
+                promise.resolve(result)
               }
               return
             }