chore: remove eval api (#142)

hi-ogawa · Oct 27, 2024 · 60fda51 · 60fda51
1 parent c6010e7
commit 60fda51
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 73 deletions.
diff --git a/packages/workerd/src/plugin.ts b/packages/workerd/src/plugin.ts
@@ -16,14 +16,7 @@ import {
   type ResolvedConfig,
 } from "vite";
 import type { SourcelessWorkerOptions } from "wrangler";
-import {
-  ANY_URL,
-  type EvalApi,
-  type EvalMetadata,
-  type FetchMetadata,
-  RUNNER_EVAL_PATH,
-  RUNNER_INIT_PATH,
-} from "./shared";
+import { ANY_URL, type FetchMetadata, RUNNER_INIT_PATH } from "./shared";
 
 interface WorkerdPluginOptions extends WorkerdEnvironmentOptions {
   entry?: string;
@@ -84,7 +77,6 @@ export type WorkerdDevEnvironment = DevEnvironment & {
 
 type WorkerdDevApi = {
   dispatchFetch: (entry: string, request: Request) => Promise<Response>;
-  eval: EvalApi;
 };
 
 export async function createWorkerdDevEnvironment(
@@ -210,30 +202,6 @@ export async function createWorkerdDevEnvironment(
         headers: res.headers,
       });
     },
-
-    // playwright-like eval interface https://playwright.dev/docs/evaluating
-    eval: async (ctx) => {
-      const headers = new Headers();
-      headers.set(
-        "x-vite-eval",
-        JSON.stringify({
-          entry: ctx.entry,
-          fnString: ctx.fn.toString(),
-        } satisfies EvalMetadata),
-      );
-      const body = JSON.stringify(ctx.data ?? (null as any));
-      const fetch_ = runnerObject.fetch as any as typeof fetch; // fix web/undici types
-      const response = await fetch_(ANY_URL + RUNNER_EVAL_PATH, {
-        method: "POST",
-        headers,
-        body,
-        // @ts-ignore undici
-        duplex: "half",
-      });
-      tinyassert(response.ok);
-      const result = await response.json();
-      return result as any;
-    },
   };
 
   return Object.assign(devEnv, { api }) as WorkerdDevEnvironment;

diff --git a/packages/workerd/src/shared.ts b/packages/workerd/src/shared.ts
@@ -1,7 +1,4 @@
-import type { ModuleRunner } from "vite/module-runner";
-
 export const RUNNER_INIT_PATH = "/__viteInit";
-export const RUNNER_EVAL_PATH = "/__viteEval";
 export const ANY_URL = "https://any.local";
 
 export type RunnerEnv = {
@@ -18,21 +15,3 @@ export type RunnerEnv = {
 export type FetchMetadata = {
   entry: string;
 };
-
-export type EvalFn<In = any, Out = any> = (ctx: {
-  mod: any;
-  data?: In;
-  env: any;
-  runner: ModuleRunner;
-}) => Promise<Out> | Out;
-
-export type EvalApi = <In = any, Out = any>(request: {
-  entry: string;
-  data?: In;
-  fn: EvalFn<In, Out>;
-}) => Promise<Awaited<Out>>;
-
-export type EvalMetadata = {
-  entry: string;
-  fnString: string;
-};
diff --git a/packages/workerd/src/worker.ts b/packages/workerd/src/worker.ts
@@ -6,10 +6,7 @@ import {
 } from "vite/module-runner";
 import {
   ANY_URL,
-  type EvalFn,
-  type EvalMetadata,
   type FetchMetadata,
-  RUNNER_EVAL_PATH,
   RUNNER_INIT_PATH,
   type RunnerEnv,
 } from "./shared";
@@ -46,22 +43,6 @@ export class RunnerObject implements DurableObject {
       return new Response(null, { status: 101, webSocket: pair[1] });
     }
 
-    if (url.pathname === RUNNER_EVAL_PATH) {
-      tinyassert(this.#runner);
-      const meta = JSON.parse(
-        request.headers.get("x-vite-eval")!,
-      ) as EvalMetadata;
-      const mod = await this.#runner.import(meta.entry);
-      const data = await request.json();
-      const env = objectPickBy(this.#env, (_v, k) => !k.startsWith("__vite"));
-      const fn: EvalFn = this.#env.__viteUnsafeEval.eval(
-        `() => ${meta.fnString}`,
-      )();
-      const result = await fn({ mod, data, env, runner: this.#runner });
-      const body = JSON.stringify(result ?? null);
-      return new Response(body);
-    }
-
     tinyassert(this.#runner);
     const options = JSON.parse(
       request.headers.get("x-vite-fetch")!,