Merge pull request #101 from nksaraf/49-bug-_server-request-gets-stuc…

…k-with-async-code-inside-middleware-solidjssolid-start1165 fix: toWebRequest lazily creates readable stream for `body` access
nksaraf · Jan 6, 2024 · a881707 · edivados · Jan 6, 2024 · a881707
2 parents ed8b02f + bb16563
commit a881707
Show file tree

Hide file tree

Showing 4 changed files with 267 additions and 2 deletions.
diff --git a/.changeset/good-garlics-rest.md b/.changeset/good-garlics-rest.md
@@ -0,0 +1,5 @@
+---
+"vinxi": patch
+---
+
+fix: toWebRequest lazily creates readable stream for `body` access
diff --git a/packages/vinxi/package.json b/packages/vinxi/package.json
@@ -48,7 +48,7 @@
     },
     "./server": {
       "import": "./runtime/server.js",
-      "types": "./dist/types/runtime/server.d.ts"
+      "types": "./runtime/server-types.d.ts"
     },
     "./party": {
       "import": "./runtime/party.js",

diff --git a/packages/vinxi/runtime/server-types.d.ts b/packages/vinxi/runtime/server-types.d.ts
@@ -0,0 +1,28 @@
+import { EventHandlerRequest, _RequestMiddleware } from "h3";
+
+export * from "h3";
+
+export function getContext(event: import("h3").H3Event, key: string): any;
+export function setContext(
+	event: import("h3").H3Event,
+	key: string,
+	value: any,
+): any;
+
+export function defineMiddleware(options: {
+	onRequest?:
+		| import("h3")._RequestMiddleware
+		| import("h3")._RequestMiddleware[];
+	onBeforeResponse?:
+		| import("h3")._ResponseMiddleware
+		| import("h3")._ResponseMiddleware[];
+}): {
+	onRequest?:
+		| import("h3")._RequestMiddleware
+		| import("h3")._RequestMiddleware[]
+		| undefined;
+	onBeforeResponse?:
+		| import("h3")._ResponseMiddleware
+		| import("h3")._ResponseMiddleware[]
+		| undefined;
+};
diff --git a/packages/vinxi/runtime/server.js b/packages/vinxi/runtime/server.js
@@ -1,4 +1,109 @@
-export * from "h3";
+import {
+	H3Error,
+	H3Event,
+	MIMES,
+	appendCorsHeaders,
+	appendCorsPreflightHeaders,
+	appendHeader,
+	appendHeaders,
+	appendResponseHeader,
+	appendResponseHeaders,
+	assertMethod,
+	callNodeListener,
+	clearResponseHeaders,
+	clearSession,
+	createApp,
+	createAppEventHandler,
+	createError,
+	createEvent,
+	createRouter,
+	defaultContentType,
+	defineEventHandler,
+	defineLazyEventHandler,
+	defineNodeListener,
+	defineNodeMiddleware,
+	defineRequestMiddleware,
+	defineResponseMiddleware,
+	deleteCookie,
+	dynamicEventHandler,
+	eventHandler,
+	fetchWithEvent,
+	fromNodeMiddleware,
+	fromPlainHandler,
+	fromWebHandler,
+	getCookie,
+	getHeader,
+	getHeaders,
+	getMethod,
+	getProxyRequestHeaders,
+	getQuery,
+	getRequestFingerprint,
+	getRequestHeader,
+	getRequestHeaders,
+	getRequestHost,
+	getRequestIP,
+	getRequestPath,
+	getRequestProtocol,
+	getRequestURL,
+	getRequestWebStream,
+	getResponseHeader,
+	getResponseHeaders,
+	getResponseStatus,
+	getResponseStatusText,
+	getRouterParam,
+	getRouterParams,
+	getSession,
+	getValidatedQuery,
+	getValidatedRouterParams,
+	handleCacheHeaders,
+	handleCors,
+	isCorsOriginAllowed,
+	isError,
+	isEvent,
+	isEventHandler,
+	isMethod,
+	isPreflightRequest,
+	isStream,
+	isWebResponse,
+	lazyEventHandler,
+	parseCookies,
+	promisifyNodeListener,
+	proxyRequest,
+	readBody,
+	readFormData,
+	readMultipartFormData,
+	readRawBody,
+	readValidatedBody,
+	removeResponseHeader,
+	sanitizeStatusCode,
+	sanitizeStatusMessage,
+	sealSession,
+	send,
+	sendError,
+	sendNoContent,
+	sendProxy,
+	sendRedirect,
+	sendStream,
+	sendWebResponse,
+	serveStatic,
+	setCookie,
+	setHeader,
+	setHeaders,
+	setResponseHeader,
+	setResponseHeaders,
+	setResponseStatus,
+	splitCookiesString,
+	toEventHandler,
+	toNodeListener,
+	toPlainHandler,
+	toWebHandler,
+	unsealSession,
+	updateSession,
+	use,
+	useBase,
+	useSession,
+	writeEarlyHints,
+} from "h3";
 
 /**
  *
@@ -27,3 +132,130 @@ export function getContext(event, key) {
 export function defineMiddleware(options) {
 	return options;
 }
+
+export function toWebRequest(/** @type {H3Event} */ event) {
+	/**
+	 * @type {ReadableStream | undefined}
+	 */
+	let readableStream;
+	return new Request(getRequestURL(event), {
+		// @ts-ignore Undici option
+		duplex: "half",
+		method: event.method,
+		headers: event.headers,
+		get body() {
+			if (readableStream) {
+				return readableStream;
+			}
+			readableStream = getRequestWebStream(event);
+			return readableStream;
+		},
+	});
+}
+
+export {
+	H3Error,
+	H3Event,
+	MIMES,
+	appendCorsHeaders,
+	appendCorsPreflightHeaders,
+	appendHeader,
+	appendHeaders,
+	appendResponseHeader,
+	appendResponseHeaders,
+	assertMethod,
+	callNodeListener,
+	clearResponseHeaders,
+	clearSession,
+	createApp,
+	createAppEventHandler,
+	createError,
+	createEvent,
+	createRouter,
+	defaultContentType,
+	defineEventHandler,
+	defineLazyEventHandler,
+	defineNodeListener,
+	defineNodeMiddleware,
+	defineRequestMiddleware,
+	defineResponseMiddleware,
+	deleteCookie,
+	dynamicEventHandler,
+	eventHandler,
+	fetchWithEvent,
+	fromNodeMiddleware,
+	fromPlainHandler,
+	fromWebHandler,
+	getCookie,
+	getHeader,
+	getHeaders,
+	getMethod,
+	getProxyRequestHeaders,
+	getQuery,
+	getRequestFingerprint,
+	getRequestHeader,
+	getRequestHeaders,
+	getRequestHost,
+	getRequestIP,
+	getRequestPath,
+	getRequestProtocol,
+	getRequestURL,
+	getRequestWebStream,
+	getResponseHeader,
+	getResponseHeaders,
+	getResponseStatus,
+	getResponseStatusText,
+	getRouterParam,
+	getRouterParams,
+	getSession,
+	getValidatedQuery,
+	getValidatedRouterParams,
+	handleCacheHeaders,
+	handleCors,
+	isCorsOriginAllowed,
+	isError,
+	isEvent,
+	isEventHandler,
+	isMethod,
+	isPreflightRequest,
+	isStream,
+	isWebResponse,
+	lazyEventHandler,
+	parseCookies,
+	promisifyNodeListener,
+	proxyRequest,
+	readBody,
+	readFormData,
+	readMultipartFormData,
+	readRawBody,
+	readValidatedBody,
+	removeResponseHeader,
+	sanitizeStatusCode,
+	sanitizeStatusMessage,
+	sealSession,
+	send,
+	sendError,
+	sendNoContent,
+	sendProxy,
+	sendRedirect,
+	sendStream,
+	sendWebResponse,
+	serveStatic,
+	setCookie,
+	setHeader,
+	setHeaders,
+	setResponseHeader,
+	setResponseHeaders,
+	setResponseStatus,
+	splitCookiesString,
+	toEventHandler,
+	toNodeListener,
+	toPlainHandler,
+	toWebHandler,
+	unsealSession,
+	updateSession,
+	use,
+	useBase,
+	useSession,
+	writeEarlyHints,
+};