make-fetch 3.0.0 → 3.1.0

package/README.md

@@ -73,12 +73,14 @@ Instead of having a separate parameter for the body and the response options, th
 
 This will then return a standard [fetch](https://developer.mozilla.org/en-US/docs/Web/API/fetch) API which takes request info, and returns responses.
 
-`makeRoutedFetch({onNotFound}) => {router: Router, fetch}`
+`makeRoutedFetch({onNotFound, onError}) => {router: Router, fetch}`
 
 If you want to have an easier way of routing different methods/hostnames/paths, you can use a routed make-fetch which can make it easier to register handlers for different routes.
 This will creat a Router, and a `fetch()` instance for that router.
 Handlers you add on the router will be useful to match URLs+methods from the fetch request and will use the matched handler to generate the response.
 You can optionally supply a `onNotFound` handler to be invoked if no other routes match.
+You can optionally supply a `onError` handler to be invoked when an error is thrown from your handlers which will take the `Error` instance and the `Request` instance as arguments.
+The default `onError` handler will print the stack trace to the body with a `500` status code.
 
 `router.add(method, urlPattern, handler) => Router`
 

package/index.js

@@ -18,7 +18,8 @@ export function makeFetch (handler, {
 }
 
 export function makeRoutedFetch ({
-  onNotFound = DEFAULT_NOT_FOUND
+  onNotFound = DEFAULT_NOT_FOUND,
+  onError = DEFAULT_ON_ERROR
 } = {}) {
   const router = new Router()
 
@@ -27,7 +28,11 @@ export function makeRoutedFetch ({
     if (!route) {
       return onNotFound(request)
     }
-    return route.handler(request)
+    try {
+      return route.handler(request)
+    } catch (e) {
+      return await onError(e, request)
+    }
   })
 
   return { fetch, router }
@@ -37,6 +42,16 @@ export function DEFAULT_NOT_FOUND () {
   return { status: 404, statusText: 'Invalid URL' }
 }
 
+export function DEFAULT_ON_ERROR (e) {
+  return {
+    status: 500,
+    headers: {
+      'Content-Type': 'text/plain; charset=utf-8'
+    },
+    body: e.stack
+  }
+}
+
 export class Router {
   constructor () {
     this.routes = []
@@ -116,7 +131,7 @@ function matches (request, route, property) {
 
       const routeSegment = routeSegments[i]
       const requestSegment = requestSegments[i]
-      const routeWild = routeSegments === WILDCARD
+      const routeWild = routeSegment === WILDCARD
       const matches = routeWild || (routeSegment === requestSegment)
 
       if (routeLast) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "make-fetch",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Implement your own `fetch()` with node.js streams",
   "main": "index.js",
   "type": "module",