@whatwg-node/server 0.9.40 → 0.9.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/cjs/createServerAdapter.js +10 -17
  2. package/esm/createServerAdapter.js +11 -18
  3. package/package.json +1 -1
package/cjs/createServerAdapter.js CHANGED
@@ -235,25 +235,18 @@ function createServerAdapter(serverAdapterBaseObject, options) {
235
235
  return response$;
236
236
  }
237
237
  const fetchFn = (input, ...maybeCtx) => {
238
- function getResponse() {
239
- if (typeof input === 'string' || 'href' in input) {
240
- const [initOrCtx, ...restOfCtx] = maybeCtx;
241
- if ((0, utils_js_1.isRequestInit)(initOrCtx)) {
242
- const request = new fetchAPI.Request(input, initOrCtx);
243
- const res$ = handleRequestWithWaitUntil(request, ...restOfCtx);
244
- return (0, utils_js_1.handleAbortSignalAndPromiseResponse)(res$, initOrCtx?.signal);
245
- }
246
- const request = new fetchAPI.Request(input);
247
- return handleRequestWithWaitUntil(request, ...maybeCtx);
238
+ if (typeof input === 'string' || 'href' in input) {
239
+ const [initOrCtx, ...restOfCtx] = maybeCtx;
240
+ if ((0, utils_js_1.isRequestInit)(initOrCtx)) {
241
+ const request = new fetchAPI.Request(input, initOrCtx);
242
+ const res$ = handleRequestWithWaitUntil(request, ...restOfCtx);
243
+ return (0, utils_js_1.handleAbortSignalAndPromiseResponse)(res$, initOrCtx?.signal);
248
244
  }
249
- const res$ = handleRequestWithWaitUntil(input, ...maybeCtx);
250
- return (0, utils_js_1.handleAbortSignalAndPromiseResponse)(res$, input._signal);
251
- }
252
- const res$ = getResponse();
253
- if ((0, utils_js_1.isPromise)(res$)) {
254
- return res$.then(res => (0, utils_js_1.handleResponseDecompression)(res, fetchAPI.Response));
245
+ const request = new fetchAPI.Request(input);
246
+ return handleRequestWithWaitUntil(request, ...maybeCtx);
255
247
  }
256
- return (0, utils_js_1.handleResponseDecompression)(res$, fetchAPI.Response);
248
+ const res$ = handleRequestWithWaitUntil(input, ...maybeCtx);
249
+ return (0, utils_js_1.handleAbortSignalAndPromiseResponse)(res$, input._signal);
257
250
  };
258
251
  const genericRequestHandler = (input, ...maybeCtx) => {
259
252
  // If it is a Node request
package/esm/createServerAdapter.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /* eslint-disable @typescript-eslint/ban-types */
2
2
  import * as DefaultFetchAPI from '@whatwg-node/fetch';
3
- import { completeAssign, handleAbortSignalAndPromiseResponse, handleErrorFromRequestHandler, handleResponseDecompression, isFetchEvent, isNodeRequest, isolateObject, isPromise, isRequestInit, isServerResponse, iterateAsyncVoid, nodeRequestResponseMap, normalizeNodeRequest, sendNodeResponse, ServerAdapterRequestAbortSignal, } from './utils.js';
3
+ import { completeAssign, handleAbortSignalAndPromiseResponse, handleErrorFromRequestHandler, isFetchEvent, isNodeRequest, isolateObject, isPromise, isRequestInit, isServerResponse, iterateAsyncVoid, nodeRequestResponseMap, normalizeNodeRequest, sendNodeResponse, ServerAdapterRequestAbortSignal, } from './utils.js';
4
4
  import { getRequestFromUWSRequest, isUWSResponse, sendResponseToUwsOpts, } from './uwebsockets.js';
5
5
  async function handleWaitUntils(waitUntilPromises) {
6
6
  await Promise.allSettled(waitUntilPromises);
@@ -231,25 +231,18 @@ function createServerAdapter(serverAdapterBaseObject, options) {
231
231
  return response$;
232
232
  }
233
233
  const fetchFn = (input, ...maybeCtx) => {
234
- function getResponse() {
235
- if (typeof input === 'string' || 'href' in input) {
236
- const [initOrCtx, ...restOfCtx] = maybeCtx;
237
- if (isRequestInit(initOrCtx)) {
238
- const request = new fetchAPI.Request(input, initOrCtx);
239
- const res$ = handleRequestWithWaitUntil(request, ...restOfCtx);
240
- return handleAbortSignalAndPromiseResponse(res$, initOrCtx?.signal);
241
- }
242
- const request = new fetchAPI.Request(input);
243
- return handleRequestWithWaitUntil(request, ...maybeCtx);
234
+ if (typeof input === 'string' || 'href' in input) {
235
+ const [initOrCtx, ...restOfCtx] = maybeCtx;
236
+ if (isRequestInit(initOrCtx)) {
237
+ const request = new fetchAPI.Request(input, initOrCtx);
238
+ const res$ = handleRequestWithWaitUntil(request, ...restOfCtx);
239
+ return handleAbortSignalAndPromiseResponse(res$, initOrCtx?.signal);
244
240
  }
245
- const res$ = handleRequestWithWaitUntil(input, ...maybeCtx);
246
- return handleAbortSignalAndPromiseResponse(res$, input._signal);
247
- }
248
- const res$ = getResponse();
249
- if (isPromise(res$)) {
250
- return res$.then(res => handleResponseDecompression(res, fetchAPI.Response));
241
+ const request = new fetchAPI.Request(input);
242
+ return handleRequestWithWaitUntil(request, ...maybeCtx);
251
243
  }
252
- return handleResponseDecompression(res$, fetchAPI.Response);
244
+ const res$ = handleRequestWithWaitUntil(input, ...maybeCtx);
245
+ return handleAbortSignalAndPromiseResponse(res$, input._signal);
253
246
  };
254
247
  const genericRequestHandler = (input, ...maybeCtx) => {
255
248
  // If it is a Node request
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@whatwg-node/server",
3
- "version": "0.9.40",
3
+ "version": "0.9.41",
4
4
  "description": "Fetch API compliant HTTP Server adapter",
5
5
  "sideEffects": false,
6
6
  "dependencies": {