fix multivalue query in searchParams for node

Author: conico974

packages/open-next/src/overrides/converters/edge.ts

@@ -7,6 +7,7 @@ import type {
   MiddlewareResult,
 } from "types/open-next";
 import type { Converter } from "types/overrides";
+import { getQueryFromSearchParams } from "./utils.js";
 
 declare global {
   // Makes convertTo returns the request instead of fetching it.
@@ -18,18 +19,7 @@ const converter: Converter<InternalEvent, InternalResult | MiddlewareResult> = {
     const url = new URL(event.url);
 
     const searchParams = url.searchParams;
-    const query: Record<string, string | string[]> = {};
-    for (const [key, value] of searchParams.entries()) {
-      if (key in query) {
-        if (Array.isArray(query[key])) {
-          query[key].push(value);
-        } else {
-          query[key] = [query[key], value];
-        }
-      } else {
-        query[key] = value;
-      }
-    }
+    const query = getQueryFromSearchParams(searchParams);
     // Transform body into Buffer
     const body = await event.arrayBuffer();
     const headers: Record<string, string> = {};

packages/open-next/src/overrides/converters/node.ts

@@ -3,7 +3,7 @@ import type { IncomingMessage } from "node:http";
 import { parseCookies } from "http/util";
 import type { InternalResult } from "types/open-next";
 import type { Converter } from "types/overrides";
-import { extractHostFromHeaders } from "./utils";
+import { extractHostFromHeaders, getQueryFromSearchParams } from "./utils.js";
 
 const converter: Converter = {
   convertFrom: async (req: IncomingMessage) => {
@@ -26,7 +26,7 @@ const converter: Converter = {
         .filter(([key]) => key),
     );
     const url = new URL(req.url!, `http://${extractHostFromHeaders(headers)}`);
-    const query = Object.fromEntries(url.searchParams.entries());
+    const query = getQueryFromSearchParams(url.searchParams);
     return {
       type: "core",
       method: req.method ?? "GET",

packages/open-next/src/overrides/converters/utils.ts

@@ -21,3 +21,25 @@ export function extractHostFromHeaders(
 ): string {
   return headers["x-forwarded-host"] ?? headers.host ?? "on";
 }
+
+/**
+ * Get the query object from an URLSearchParams
+ *
+ * @param searchParams
+ * @returns
+ */
+export function getQueryFromSearchParams(searchParams: URLSearchParams) {
+  const query: Record<string, string | string[]> = {};
+  for (const [key, value] of searchParams.entries()) {
+    if (key in query) {
+      if (Array.isArray(query[key])) {
+        query[key].push(value);
+      } else {
+        query[key] = [query[key], value];
+      }
+    } else {
+      query[key] = value;
+    }
+  }
+  return query;
+}