Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(workerd): stream eval #31

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(workerd): stream eval #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/workerd/src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,12 @@ export async function createWorkerdDevEnvironment(
JSON.stringify({
entry: ctx.entry,
fnString: ctx.fn.toString(),
stream: ctx.stream,
} satisfies EvalMetadata),
);
const body = JSON.stringify(ctx.data ?? (null as any));
const body: any = ctx.stream
? ctx.data
: 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",
Expand All @@ -217,8 +220,8 @@ export async function createWorkerdDevEnvironment(
duplex: "half",
});
tinyassert(response.ok);
const result = await response.json();
return result as any;
const result: any = ctx.stream ? response.body : await response.json();
return result;
},
};

Expand Down
2 changes: 2 additions & 0 deletions packages/workerd/src/shared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ export type EvalApi = <In = any, Out = any>(request: {
entry: string;
data?: In;
fn: EvalFn<In, Out>;
stream?: boolean;
}) => Promise<Awaited<Out>>;

export type EvalMetadata = {
entry: string;
fnString: string;
stream?: boolean;
};
4 changes: 2 additions & 2 deletions packages/workerd/src/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ export class RunnerObject implements DurableObject {
request.headers.get("x-vite-eval")!,
) as EvalMetadata;
const mod = await this.#runner.import(meta.entry);
const data = await request.json();
const data = meta.stream ? request.body : 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);
const body = meta.stream ? result : JSON.stringify(result ?? null);
return new Response(body);
}

Expand Down