@whatwg-node/server 0.9.14 → 0.9.15-rc-20231018171614-c2590b1

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 (5) hide show
  1. package/cjs/plugins/useErrorHandling.js +18 -12
  2. package/esm/plugins/useErrorHandling.js +18 -12
  3. package/package.json +1 -1
  4. package/typings/plugins/useErrorHandling.d.cts +1 -0
  5. package/typings/plugins/useErrorHandling.d.ts +1 -0
package/cjs/plugins/useErrorHandling.js CHANGED
@@ -2,24 +2,28 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useErrorHandling = exports.HTTPError = exports.createDefaultErrorHandler = void 0;
4
4
  const fetch_1 = require("@whatwg-node/fetch");
5
+ const utils_js_1 = require("../utils.js");
5
6
  function createDefaultErrorHandler(ResponseCtor = fetch_1.Response) {
6
7
  return function defaultErrorHandler(e) {
7
- return new ResponseCtor(typeof e.details === 'object'
8
- ? JSON.stringify(e.details)
9
- : e.stack || e.message || e.toString(), {
10
- status: e.statusCode || e.status || 500,
11
- headers: e.headers || {},
12
- });
8
+ if (e.details || e.status || e.headers || e.name === 'HTTPError') {
9
+ return new ResponseCtor(typeof e.details === 'object' ? JSON.stringify(e.details) : e.message, {
10
+ status: e.status,
11
+ headers: e.headers || {},
12
+ });
13
+ }
14
+ console.error(e);
15
+ return Response.error();
13
16
  };
14
17
  }
15
18
  exports.createDefaultErrorHandler = createDefaultErrorHandler;
16
19
  class HTTPError extends Error {
17
- constructor(status, message, headers = {}, details) {
20
+ constructor(status = 500, message, headers = {}, details) {
18
21
  super(message);
19
22
  this.status = status;
20
23
  this.message = message;
21
24
  this.headers = headers;
22
25
  this.details = details;
26
+ this.name = 'HTTPError';
23
27
  Error.captureStackTrace(this, HTTPError);
24
28
  }
25
29
  }
@@ -28,14 +32,16 @@ function useErrorHandling(onError) {
28
32
  return {
29
33
  onRequest({ requestHandler, setRequestHandler, fetchAPI }) {
30
34
  const errorHandler = onError || createDefaultErrorHandler(fetchAPI.Response);
31
- setRequestHandler(async function handlerWithErrorHandling(request, serverContext) {
35
+ setRequestHandler(function handlerWithErrorHandling(request, serverContext) {
32
36
  try {
33
- const response = await requestHandler(request, serverContext);
34
- return response;
37
+ const response$ = requestHandler(request, serverContext);
38
+ if ((0, utils_js_1.isPromise)(response$)) {
39
+ return response$.catch(e => errorHandler(e, request, serverContext));
40
+ }
41
+ return response$;
35
42
  }
36
43
  catch (e) {
37
- const response = await errorHandler(e, request, serverContext);
38
- return response;
44
+ return errorHandler(e, request, serverContext);
39
45
  }
40
46
  });
41
47
  },
package/esm/plugins/useErrorHandling.js CHANGED
@@ -1,21 +1,25 @@
1
1
  import { Response as DefaultResponseCtor } from '@whatwg-node/fetch';
2
+ import { isPromise } from '../utils.js';
2
3
  export function createDefaultErrorHandler(ResponseCtor = DefaultResponseCtor) {
3
4
  return function defaultErrorHandler(e) {
4
- return new ResponseCtor(typeof e.details === 'object'
5
- ? JSON.stringify(e.details)
6
- : e.stack || e.message || e.toString(), {
7
- status: e.statusCode || e.status || 500,
8
- headers: e.headers || {},
9
- });
5
+ if (e.details || e.status || e.headers || e.name === 'HTTPError') {
6
+ return new ResponseCtor(typeof e.details === 'object' ? JSON.stringify(e.details) : e.message, {
7
+ status: e.status,
8
+ headers: e.headers || {},
9
+ });
10
+ }
11
+ console.error(e);
12
+ return Response.error();
10
13
  };
11
14
  }
12
15
  export class HTTPError extends Error {
13
- constructor(status, message, headers = {}, details) {
16
+ constructor(status = 500, message, headers = {}, details) {
14
17
  super(message);
15
18
  this.status = status;
16
19
  this.message = message;
17
20
  this.headers = headers;
18
21
  this.details = details;
22
+ this.name = 'HTTPError';
19
23
  Error.captureStackTrace(this, HTTPError);
20
24
  }
21
25
  }
@@ -23,14 +27,16 @@ export function useErrorHandling(onError) {
23
27
  return {
24
28
  onRequest({ requestHandler, setRequestHandler, fetchAPI }) {
25
29
  const errorHandler = onError || createDefaultErrorHandler(fetchAPI.Response);
26
- setRequestHandler(async function handlerWithErrorHandling(request, serverContext) {
30
+ setRequestHandler(function handlerWithErrorHandling(request, serverContext) {
27
31
  try {
28
- const response = await requestHandler(request, serverContext);
29
- return response;
32
+ const response$ = requestHandler(request, serverContext);
33
+ if (isPromise(response$)) {
34
+ return response$.catch(e => errorHandler(e, request, serverContext));
35
+ }
36
+ return response$;
30
37
  }
31
38
  catch (e) {
32
- const response = await errorHandler(e, request, serverContext);
33
- return response;
39
+ return errorHandler(e, request, serverContext);
34
40
  }
35
41
  });
36
42
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@whatwg-node/server",
3
- "version": "0.9.14",
3
+ "version": "0.9.15-rc-20231018171614-c2590b1",
4
4
  "description": "Fetch API compliant HTTP Server adapter",
5
5
  "sideEffects": false,
6
6
  "dependencies": {
package/typings/plugins/useErrorHandling.d.cts CHANGED
@@ -5,6 +5,7 @@ export declare class HTTPError extends Error {
5
5
  message: string;
6
6
  headers: HeadersInit;
7
7
  details?: any;
8
+ name: string;
8
9
  constructor(status: number, message: string, headers?: HeadersInit, details?: any);
9
10
  }
10
11
  export type ErrorHandler<TServerContext> = (e: any, request: Request, ctx: TServerContext) => Response | Promise<Response>;
package/typings/plugins/useErrorHandling.d.ts CHANGED
@@ -5,6 +5,7 @@ export declare class HTTPError extends Error {
5
5
  message: string;
6
6
  headers: HeadersInit;
7
7
  details?: any;
8
+ name: string;
8
9
  constructor(status: number, message: string, headers?: HeadersInit, details?: any);
9
10
  }
10
11
  export type ErrorHandler<TServerContext> = (e: any, request: Request, ctx: TServerContext) => Response | Promise<Response>;