Try

Author: ardatan

packages/node-fetch/src/FormData.ts

@@ -96,7 +96,7 @@ export function getStreamFromFormData(
 ): PonyfillReadableStream<Uint8Array> {
   let entriesIterator: FormDataIterator<[string, FormDataEntryValue]>;
   let sentInitialHeader = false;
-  let currentAsyncIterator: AsyncIterator<[string, FormDataEntryValue]> | undefined;
+  let currentAsyncIterator: AsyncIterator<Uint8Array> | undefined;
   let hasBefore = false;
   function handleNextEntry(controller: ReadableStreamController<Buffer>) {
     const { done, value } = entriesIterator.next();
@@ -123,7 +123,8 @@ export function getStreamFromFormData(
         controller.enqueue(
           Buffer.from(`Content-Type: ${blobOrString.type || 'application/octet-stream'}\r\n\r\n`),
         );
-        const entryStream: any = blobOrString.stream();
+        const entryStream = blobOrString.stream();
+        // @ts-expect-error - ReadableStream is async iterable
         currentAsyncIterator = entryStream[Symbol.asyncIterator]();
       }
       hasBefore = true;

packages/promise-helpers/src/index.ts

@@ -32,13 +32,36 @@ export function handleMaybePromise<TInput, TOutput>(
   outputErrorFactory?: (err: any) => MaybePromiseLike<TOutput>,
   finallyFactory?: () => MaybePromiseLike<void>,
 ): MaybePromiseLike<TOutput> {
-  let result$ = fakePromise().then(inputFactory).then(outputSuccessFactory, outputErrorFactory);
-
   if (finallyFactory) {
-    result$ = result$.finally(finallyFactory);
+    return unfakePromise(
+      fakePromise()
+        .then(inputFactory)
+        .then(outputSuccessFactory, outputErrorFactory)
+        .finally(finallyFactory),
+    );
+  }
+  // Faster impl without finallyFactory
+  function _handleMaybePromise() {
+    const input$ = inputFactory();
+    if (isFakePromise<TInput>(input$)) {
+      return outputSuccessFactory(input$.__fakePromiseValue);
+    }
+    if (isFakeRejectPromise(input$)) {
+      throw input$.__fakeRejectError;
+    }
+    if (isPromise(input$)) {
+      return input$.then(outputSuccessFactory, outputErrorFactory);
+    }
+    return outputSuccessFactory(input$);
+  }
+  if (!outputErrorFactory) {
+    return _handleMaybePromise();
+  }
+  try {
+    return _handleMaybePromise();
+  } catch (err) {
+    return outputErrorFactory(err);
   }
-
-  return unfakePromise(result$);
 }
 
 export function fakePromise<T>(value: MaybePromise<T>): Promise<T>;

packages/server/src/createServerAdapter.ts

@@ -30,7 +30,6 @@ import {
   isServerResponse,
   iterateAsyncVoid,
   NodeRequest,
-  nodeRequestResponseMap,
   NodeResponse,
   normalizeNodeRequest,
   sendNodeResponse,
@@ -278,8 +277,13 @@ function createServerAdapter<
   ) {
     const nodeResponse: NodeResponse =
       (nodeResponseOrContainer as any).raw || nodeResponseOrContainer;
-    nodeRequestResponseMap.set(nodeRequest, nodeResponse);
-    return handleNodeRequest(nodeRequest, ...ctx);
+    const serverContext = ctx.length > 1 ? completeAssign(...ctx) : ctx[0] || {};
+    // Ensure `waitUntil` is available in the server context
+    if (!serverContext.waitUntil) {
+      serverContext.waitUntil = waitUntil;
+    }
+    const request = normalizeNodeRequest(nodeRequest, fetchAPI, nodeResponse);
+    return handleRequest(request, serverContext);
   }
 
   function requestListener(

packages/server/src/utils.ts

@@ -91,9 +91,11 @@ function isRequestBody(body: any): body is BodyInit {
   return false;
 }
 
-export const nodeRequestResponseMap = new WeakMap<NodeRequest, NodeResponse>();
-
-export function normalizeNodeRequest(nodeRequest: NodeRequest, fetchAPI: FetchAPI): Request {
+export function normalizeNodeRequest(
+  nodeRequest: NodeRequest,
+  fetchAPI: FetchAPI,
+  nodeResponse?: NodeResponse,
+): Request {
   const rawRequest = nodeRequest.raw || nodeRequest.req || nodeRequest;
   let fullUrl = buildFullUrl(rawRequest);
   if (nodeRequest.query) {
@@ -104,8 +106,6 @@ export function normalizeNodeRequest(nodeRequest: NodeRequest, fetchAPI: FetchAP
     fullUrl = url.toString();
   }
 
-  const nodeResponse = nodeRequestResponseMap.get(nodeRequest);
-  nodeRequestResponseMap.delete(nodeRequest);
   let normalizedHeaders: Record<string, string> = nodeRequest.headers;
   if (nodeRequest.headers?.[':method']) {
     normalizedHeaders = {};

test.mjs

@@ -0,0 +1,8 @@
+import { createServer } from 'node:http';
+import { Response } from '@whatwg-node/fetch';
+import { createServerAdapter } from '@whatwg-node/server';
+
+createServer(createServerAdapter(() => Response.json({ hello: 'world' }))).listen(3000, () => {
+  console.log('Server is running at http://localhost:3000');
+  console.log('Press Ctrl+C to stop the server.');
+});