@srfnstack/spliffy 1.1.5 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@srfnstack/spliffy",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "author": "snowbldr",
   "private": false,
   "homepage": "https://github.com/narcolepticsnowman/spliffy",
@@ -33,7 +33,7 @@
     "cookie": "^0.4.1",
     "etag": "^1.8.1",
     "uuid": "^8.3.2",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.34.0"
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.40.0"
   },
   "devDependencies": {
     "helmet": "^4.6.0",

package/src/decorator.mjs

@@ -45,20 +45,15 @@ export function decorateRequest (uwsReq, pathParameters, res, {
   const query = uwsReq.getQuery()
   req.path = uwsReq.getUrl()
   req.url = `${req.path}${query ? '?' + query : ''}`
+  const paramToIndex = pathParameters.reduce((acc, cur, i) => {
+    acc[cur] = i
+    return acc
+  }, {})
   req.spliffyUrl = {
     path: req.path,
     query: (query && parseQuery(query, decodeQueryParameters)) || {},
-    pathParameters: {}
+    param: name => uwsReq.getParameter(paramToIndex[name])
   }
-  if (pathParameters && pathParameters.length > 0) {
-    for (const i in pathParameters) {
-      req.spliffyUrl.pathParameters[pathParameters[i]] =
-        decodePathParameters
-          ? decodeURIComponent(uwsReq.getParameter(i))
-          : uwsReq.getParameter(i)
-    }
-  }
-  req.params = req.spliffyUrl.pathParameters
   req.query = req.spliffyUrl.query
   req.headers = {}
   uwsReq.forEach((header, value) => { req.headers[header] = value })

package/src/handler.mjs

@@ -47,7 +47,11 @@ const endError = (res, e, refId, errorTransformer) => {
     e = errorTransformer(e, refId)
   }
   res.headers['x-ref-id'] = refId
-  end(res, e.statusCode || 500, null, e.body || '')
+  const status = e.statusCode || 500
+  if (status === 500) {
+    log.error(e)
+  }
+  end(res, status, null, e.body || '')
 }
 
 const end = (res, defaultStatusCode, statusCodeOverride, body) => {
@@ -236,7 +240,7 @@ export const createNotFoundHandler = config => {
             res.statusCode = 500
           })
         } else {
-          res.statusCode = 405
+          res.statusCode = 404
           res.end()
         }
       } else {

package/src/server.mjs

@@ -39,7 +39,7 @@ const startHttpRedirect = (host, port) => {
   uws.App().any('/*',
     (req, res) => {
       try {
-        res.writeHead(301, { Location: `https://${req.headers.host}:${port}${req.url}` })
+        res.writeHead(301, { Location: `https://${req.headers.get('host')}:${port}${req.url}` })
         res.end()
       } catch (e) {
         log.error(`Failed to handle http request on port ${port}`, req.url, e)
@@ -91,18 +91,27 @@ export async function startServer (config) {
       if (config.defaultRoute && config.defaultRoute.match(routePattern)) {
         config.defaultRouteHandler = route
       }
+      let hadSlash = false
+      if (route.urlPath.endsWith('/')) {
+        hadSlash = true
+        route.urlPath = route.urlPath.substring(0, route.urlPath.length - 1)
+      }
       for (const method in route.handlers) {
         const theHandler = createHandler(route.handlers[method], route.middleware, route.pathParameters, config)
         app[appMethods[method]](route.urlPath, theHandler)
-        if (route.urlPath.endsWith('/') && route.urlPath.length > 1) {
-          app[appMethods[method]](route.urlPath.substr(0, route.urlPath.length - 1), theHandler)
+        if (hadSlash && config.serveRoutesWithSlash) {
+          app[appMethods[method]](route.urlPath + '/', theHandler)
         }
         if (route.urlPath.endsWith('/*')) {
           app[appMethods[method]](route.urlPath.substr(0, route.urlPath.length - 2), theHandler)
         }
       }
       if (config.autoOptions && !route.handlers.OPTIONS) {
-        app.options(route.urlPath, optionsHandler(config, route.middleware, Object.keys(route.handlers).join(', ')))
+        const theHandler = optionsHandler(config, route.middleware, Object.keys(route.handlers).join(', '))
+        app.options(route.urlPath, theHandler)
+        if (hadSlash && config.serveRoutesWithSlash) {
+          app.options(route.urlPath + '/', theHandler)
+        }
       }
     }