cleanup

Author: jkyberneees

demos/basic.js

@@ -21,7 +21,4 @@ router.delete('/:id', async (req) => {
   })
 })
 
-module.exports = {
-  port: 3000,
-  fetch: (request) => router.lookup(request)
-}
+module.exports = router

demos/minimal.js

@@ -7,7 +7,4 @@ router.get('/hi', async (req) => {
   return new Response('Hello World!')
 })
 
-module.exports = {
-  port: 3000,
-  fetch: (request) => router.lookup(request)
-}
+module.exports = router

lib/next.js

@@ -1,34 +1,19 @@
-module.exports = function next (middlewares, req, index, routers = {}, defaultRoute, errorHandler) {
+module.exports = function next(middlewares, req, index, defaultRoute, errorHandler) {
   const middleware = middlewares[index]
   if (!middleware) {
     return defaultRoute(req)
   }
 
-  function step (err) {
+  function step(err) {
     if (err) {
       return errorHandler(err, req)
     } else {
-      return next(middlewares, req, index + 1, routers, defaultRoute, errorHandler)
+      return next(middlewares, req, index + 1, defaultRoute, errorHandler)
     }
   }
 
   try {
-    if (middleware.id) {
-      // nested routes support
-      const pattern = routers[middleware.id]
-      if (pattern) {
-        req.preRouterPath = req.path
-
-        req.path = req.path.replace(pattern, '')
-        if (!req.path.startsWith('/')) {
-          req.path = '/' + req.path
-        }
-      }
-
-      return middleware.lookup(req, step)
-    } else {
-      return middleware(req, step)
-    }
+    return middleware(req, step)
   } catch (err) {
     return errorHandler(err, req)
   }

lib/router/sequential.js

@@ -2,11 +2,9 @@
 
 const Trouter = require('trouter')
 const next = require('./../next')
-const LRU = require('lru-cache')
-const { parse } = require('regexparam')
 
 module.exports = (config = {}) => {
-  if (config.defaultRoute === undefined) {
+  if (!config.defaultRoute) {
     config.defaultRoute = (req) => {
       const res = new Response(null, {
         status: 404
@@ -15,7 +13,7 @@ module.exports = (config = {}) => {
       return res
     }
   }
-  if (config.errorHandler === undefined) {
+  if (!config.errorHandler) {
     config.errorHandler = (err, req) => {
       const res = new Response(err.message, {
         status: 500
@@ -24,18 +22,9 @@ module.exports = (config = {}) => {
       return res
     }
   }
-  if (config.cacheSize === undefined) {
-    config.cacheSize = 1000
-  }
-  if (config.id === undefined) {
-    config.id = (Date.now().toString(36) + Math.random().toString(36).substring(2, 5)).toUpperCase()
-  }
 
-  const routers = {}
-  const isCacheEnabled = config.cacheSize > 0
-  const cache = isCacheEnabled ? new LRU({ max: config.cacheSize }) : null
   const router = new Trouter()
-  router.id = config.id
+  router.port = config.port || 3000
 
   const _use = router.use
 
@@ -46,53 +35,24 @@ module.exports = (config = {}) => {
     }
     _use.call(router, prefix, middlewares)
 
-    if (middlewares[0].id) {
-      // caching router -> pattern relation for urls pattern replacement
-      const { pattern } = parse(prefix, true)
-      routers[middlewares[0].id] = pattern
-    }
-
     return this
   }
 
-  router.lookup = (req, step) => {
+  router.fetch = (req, step) => {
     const url = new URL(req.url)
     req.path = url.pathname || '/'
     req.query = url.queryparams
     req.search = url.search
     req.hostname = url.hostname
 
-    let match
-    if (isCacheEnabled) {
-      const reqCacheKey = req.method + req.path
-      match = cache.get(reqCacheKey)
-      if (!match) {
-        match = router.find(req.method, req.path)
-        cache.set(reqCacheKey, match)
-      }
-    } else {
-      match = router.find(req.method, req.path)
-    }
-
-    if (match.handlers.length !== 0) {
-      const middlewares = [...match.handlers]
-      if (step !== undefined) {
-        // router is being used as a nested router
-        middlewares.push((req, next) => {
-          req.path = req.preRouterPath
-
-          delete req.preRouterPath
-
-          return step()
-        })
-      }
-
+    const match = router.find(req.method, req.path)
+    if (match.handlers.length > 0) {
       if (!req.params) {
         req.params = {}
       }
       Object.assign(req.params, match.params)
 
-      return next(middlewares, req, 0, routers, config.defaultRoute, config.errorHandler)
+      return next(match.handlers, req, 0, config.defaultRoute, config.errorHandler)
     } else {
       return config.defaultRoute(req)
     }

package.json

@@ -4,12 +4,11 @@
   "description": "0http alternative for Bun",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "lint": "bun x rome ci . --semicolons=as-needed",
+    "format": "bun x rome format . --semicolons=as-needed --write"
   },
   "dependencies": {
-    "lru-cache": "^7.10.1",
-    "regexparam": "^2.0.0",
-    "trouter": "^3.2.0"
+    "trouter": "^3.2.1"
   },
   "repository": {
     "type": "git",

rome.json

@@ -0,0 +1,23 @@
+{
+    "formatter": {
+        "enabled": true,
+        "indentStyle": "space",
+        "indentSize": 2,
+        "lineWidth": 120,
+        "ignore": [
+            "dist"
+        ]
+    },
+    "javascript": {
+        "formatter": {
+            "quoteStyle": "single",
+            "trailingComma": "none"
+        }
+    },
+    "linter": {
+        "enabled": true,
+        "ignore": [
+            "dist"
+        ]
+    }
+}