@whatwg-node/server 0.9.9 → 0.9.10-rc-20230808164856-baf5e38

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 (7) hide show
  1. package/cjs/createServerAdapter.js +16 -2
  2. package/cjs/utils.js +7 -1
  3. package/esm/createServerAdapter.js +17 -3
  4. package/esm/utils.js +5 -0
  5. package/package.json +1 -1
  6. package/typings/utils.d.cts +1 -0
  7. package/typings/utils.d.ts +1 -0
package/cjs/createServerAdapter.js CHANGED
@@ -123,9 +123,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
123
123
  res: serverResponse,
124
124
  };
125
125
  addWaitUntil(defaultServerContext, waitUntilPromises);
126
- const response$ = handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
126
+ let response$;
127
+ try {
128
+ response$ = handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
129
+ }
130
+ catch (err) {
131
+ response$ = (0, utils_js_1.handleErrorFromRequestHandler)(err, fetchAPI.Response);
132
+ }
127
133
  if ((0, utils_js_1.isPromise)(response$)) {
128
134
  return response$
135
+ .catch((e) => (0, utils_js_1.handleErrorFromRequestHandler)(e, fetchAPI.Response))
129
136
  .then(response => (0, utils_js_1.sendNodeResponse)(response, serverResponse, nodeRequest))
130
137
  .catch(err => {
131
138
  console.error(`Unexpected error while handling request: ${err.message || err}`);
@@ -155,9 +162,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
155
162
  res.onAborted(() => {
156
163
  resAborted = true;
157
164
  });
158
- const response$ = handleRequest(request, serverContext);
165
+ let response$;
166
+ try {
167
+ response$ = handleRequest(request, serverContext);
168
+ }
169
+ catch (err) {
170
+ response$ = (0, utils_js_1.handleErrorFromRequestHandler)(err, fetchAPI.Response);
171
+ }
159
172
  if ((0, utils_js_1.isPromise)(response$)) {
160
173
  return response$
174
+ .catch((e) => (0, utils_js_1.handleErrorFromRequestHandler)(e, fetchAPI.Response))
161
175
  .then(response => {
162
176
  if (!resAborted) {
163
177
  return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response);
package/cjs/utils.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.iterateAsyncVoid = exports.isPromise = exports.completeAssign = exports.isRequestInit = exports.sendNodeResponse = exports.isFetchEvent = exports.isReadableStream = exports.isServerResponse = exports.isNodeRequest = exports.isReadable = exports.normalizeNodeRequest = exports.isAsyncIterable = void 0;
3
+ exports.handleErrorFromRequestHandler = exports.iterateAsyncVoid = exports.isPromise = exports.completeAssign = exports.isRequestInit = exports.sendNodeResponse = exports.isFetchEvent = exports.isReadableStream = exports.isServerResponse = exports.isNodeRequest = exports.isReadable = exports.normalizeNodeRequest = exports.isAsyncIterable = void 0;
4
4
  const fetch_1 = require("@whatwg-node/fetch");
5
5
  function isAsyncIterable(body) {
6
6
  return (body != null && typeof body === 'object' && typeof body[Symbol.asyncIterator] === 'function');
@@ -283,3 +283,9 @@ function iterateAsyncVoid(iterable, callback) {
283
283
  return iterate();
284
284
  }
285
285
  exports.iterateAsyncVoid = iterateAsyncVoid;
286
+ function handleErrorFromRequestHandler(error, ResponseCtor) {
287
+ return new ResponseCtor(error.stack || error.message || error.toString(), {
288
+ status: error.status || 500,
289
+ });
290
+ }
291
+ exports.handleErrorFromRequestHandler = handleErrorFromRequestHandler;
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, isFetchEvent, isNodeRequest, isPromise, isRequestInit, isServerResponse, iterateAsyncVoid, normalizeNodeRequest, sendNodeResponse, } from './utils.js';
3
+ import { completeAssign, handleErrorFromRequestHandler, isFetchEvent, isNodeRequest, isPromise, isRequestInit, isServerResponse, iterateAsyncVoid, normalizeNodeRequest, sendNodeResponse, } from './utils.js';
4
4
  import { getRequestFromUWSRequest, isUWSResponse, sendResponseToUwsOpts, } from './uwebsockets.js';
5
5
  async function handleWaitUntils(waitUntilPromises) {
6
6
  const waitUntils = await Promise.allSettled(waitUntilPromises);
@@ -119,9 +119,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
119
119
  res: serverResponse,
120
120
  };
121
121
  addWaitUntil(defaultServerContext, waitUntilPromises);
122
- const response$ = handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
122
+ let response$;
123
+ try {
124
+ response$ = handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
125
+ }
126
+ catch (err) {
127
+ response$ = handleErrorFromRequestHandler(err, fetchAPI.Response);
128
+ }
123
129
  if (isPromise(response$)) {
124
130
  return response$
131
+ .catch((e) => handleErrorFromRequestHandler(e, fetchAPI.Response))
125
132
  .then(response => sendNodeResponse(response, serverResponse, nodeRequest))
126
133
  .catch(err => {
127
134
  console.error(`Unexpected error while handling request: ${err.message || err}`);
@@ -151,9 +158,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
151
158
  res.onAborted(() => {
152
159
  resAborted = true;
153
160
  });
154
- const response$ = handleRequest(request, serverContext);
161
+ let response$;
162
+ try {
163
+ response$ = handleRequest(request, serverContext);
164
+ }
165
+ catch (err) {
166
+ response$ = handleErrorFromRequestHandler(err, fetchAPI.Response);
167
+ }
155
168
  if (isPromise(response$)) {
156
169
  return response$
170
+ .catch((e) => handleErrorFromRequestHandler(e, fetchAPI.Response))
157
171
  .then(response => {
158
172
  if (!resAborted) {
159
173
  return sendResponseToUwsOpts(res, response);
package/esm/utils.js CHANGED
@@ -268,3 +268,8 @@ export function iterateAsyncVoid(iterable, callback) {
268
268
  }
269
269
  return iterate();
270
270
  }
271
+ export function handleErrorFromRequestHandler(error, ResponseCtor) {
272
+ return new ResponseCtor(error.stack || error.message || error.toString(), {
273
+ status: error.status || 500,
274
+ });
275
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@whatwg-node/server",
3
- "version": "0.9.9",
3
+ "version": "0.9.10-rc-20230808164856-baf5e38",
4
4
  "description": "Fetch API compliant HTTP Server adapter",
5
5
  "sideEffects": false,
6
6
  "dependencies": {
package/typings/utils.d.cts CHANGED
@@ -33,3 +33,4 @@ export declare function isRequestInit(val: unknown): val is RequestInit;
33
33
  export declare function completeAssign(...args: any[]): any;
34
34
  export declare function isPromise<T>(val: T | Promise<T>): val is Promise<T>;
35
35
  export declare function iterateAsyncVoid<TInput>(iterable: Iterable<TInput>, callback: (input: TInput, stopEarly: () => void) => Promise<void> | void): Promise<void> | void;
36
+ export declare function handleErrorFromRequestHandler(error: any, ResponseCtor: typeof Response): Response;
package/typings/utils.d.ts CHANGED
@@ -33,3 +33,4 @@ export declare function isRequestInit(val: unknown): val is RequestInit;
33
33
  export declare function completeAssign(...args: any[]): any;
34
34
  export declare function isPromise<T>(val: T | Promise<T>): val is Promise<T>;
35
35
  export declare function iterateAsyncVoid<TInput>(iterable: Iterable<TInput>, callback: (input: TInput, stopEarly: () => void) => Promise<void> | void): Promise<void> | void;
36
+ export declare function handleErrorFromRequestHandler(error: any, ResponseCtor: typeof Response): Response;