hono 0.0.5 → 0.0.9

package/.github/workflows/ci.yml

@@ -0,0 +1,24 @@
+name: ci
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: yarn install --frozen-lockfile
+    - run: npm test

package/CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+yusuke@kamawada.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

package/README.md

@@ -3,8 +3,8 @@
 Hono [炎] - Tiny web framework for Cloudflare Workers and others.
 
 ```js
-const Hono = require('Hono')
-const app = Hono()
+const { Hono } = require('hono')
+const app = new Hono()
 
 app.get('/', () => new Response('Hono!!'))
 
@@ -24,7 +24,7 @@ app.fire()
 ```
 hono x 813,001 ops/sec ±2.96% (75 runs sampled)
 itty-router x 160,415 ops/sec ±3.31% (85 runs sampled)
-sundar x 307,438 ops/sec ±4.77% (73 runs sampled)
+sunder x 307,438 ops/sec ±4.77% (73 runs sampled)
 Fastest is hono
 ✨  Done in 37.03s.
 ```
@@ -102,6 +102,19 @@ app
 
 ## Middleware
 
+### Builtin Middleware
+
+```js
+const { Hono, Middleware } = require('hono')
+
+...
+
+app.use('*', Middleware.poweredBy)
+
+```
+
+### Custom Middleware
+
 ```js
 const logger = (c, next) => {
   console.log(`[${c.req.method}] ${c.req.url}`)
@@ -113,12 +126,25 @@ const addHeader = (c, next) => {
   c.res.headers.add('x-message', 'This is middleware!')
 }
 
-app = app.use('*', logger)
-app = app.use('/message/*', addHeader)
+app.use('*', logger)
+app.use('/message/*', addHeader)
 
 app.get('/message/hello', () => 'Hello Middleware!')
 ```
 
+### Custom 404 Response
+
+```js
+const customNotFound = (c, next) => {
+  next()
+  if (c.res.status === 404) {
+    c.res = new Response('Custom 404 Not Found', { status: 404 })
+  }
+}
+
+app.use('*', customNotFound)
+```
+
 ## Context
 
 ### req

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hono",
-  "version": "0.0.5",
-  "description": "Minimal web framework for Cloudflare Workers",
+  "version": "0.0.9",
+  "description": "Minimal web framework for Cloudflare Workers and Fastly Compute@Edge",
   "main": "src/hono.js",
   "scripts": {
     "test": "jest"
@@ -17,4 +17,4 @@
     "jest": "^27.4.5",
     "node-fetch": "^2.6.6"
   }
-}
+}

package/src/hono.d.ts

@@ -0,0 +1,48 @@
+declare class FetchEvent {}
+declare class Request {}
+declare class Response {}
+declare class Context {}
+
+declare class Node {}
+
+declare class Router {
+  tempPath: string
+  node: Node
+
+  add(method: string, path: string, handlers: any[]): Node
+  match(method: string, path: string): Node
+}
+
+export class Hono {
+  router: Router
+  middlewareRouters: Router[]
+
+  getRouter(): Router
+  addRoute(method: string, args: any[]): Hono
+  matchRoute(method: string, path: string): Node
+  createContext(req: Request, res: Response): Context
+  dispatch(req: Request, res: Response): Response
+  handleEvent(event: FetchEvent): Response
+  fire(): void
+
+  notFound(): Response
+
+  route(path: string): Hono
+
+  use(path: string, middleware: any): void
+
+  all(path: string, handler: any): Hono
+  get(path: string, handler: any): Hono
+  post(path: string, handler: any): Hono
+  put(path: string, handler: any): Hono
+  head(path: string, handler: any): Hono
+  delete(path: string, handler: any): Hono
+}
+
+// XXX
+declare interface BuiltinMiddleware {}
+
+export class Middleware {
+  static defaultFilter: BuiltinMiddleware
+  static poweredBy: BuiltinMiddleware
+}

package/src/hono.js

@@ -1,8 +1,12 @@
 'use strict'
 
 const Node = require('./node')
+const Middleware = require('./middleware')
 const compose = require('./compose')
-const defaultFilter = require('./middleware/defaultFilter')
+const methods = require('./methods')
+const { getPathFromURL } = require('./util')
+
+const METHOD_NAME_OF_ALL = 'ALL'
 
 class Router {
   constructor() {
@@ -19,33 +23,24 @@ class Router {
   }
 }
 
-const getPathFromURL = (url) => {
-  // XXX
-  const match = url.match(/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/)
-  return match[5]
-}
-
 class Hono {
   constructor() {
     this.router = new Router()
-    this.middlewareRouter = new Router()
     this.middlewareRouters = []
-  }
 
-  get(...args) {
-    return this.addRoute('GET', ...args)
-  }
-  post(...args) {
-    return this.addRoute('POST', ...args)
-  }
-  put(...args) {
-    return this.addRoute('PUT', ...args)
+    for (const method of methods) {
+      this[method] = (...args) => {
+        return this.addRoute(method, ...args)
+      }
+    }
   }
-  delete(...args) {
-    return this.addRoute('DELETE', ...args)
+
+  all(...args) {
+    this.addRoute('ALL', ...args)
   }
-  patch(...args) {
-    return this.addRoute('PATCH', ...args)
+
+  getRouter() {
+    return this.router
   }
 
   addRoute(method, ...args) {
@@ -58,24 +53,23 @@ class Hono {
     return this
   }
 
-  getRouter() {
-    return this.router
-  }
-
   route(path) {
     this.router.tempPath = path
     return this
   }
 
   use(path, middleware) {
+    if (middleware.constructor.name !== 'Function') {
+      throw new TypeError('middleware must be a function!')
+    }
+
     const router = new Router()
-    router.add('all', path, middleware)
+    router.add(METHOD_NAME_OF_ALL, path, middleware)
     this.middlewareRouters.push(router)
   }
 
   async matchRoute(method, path) {
-    const res = this.router.match(method, path)
-    return res
+    return this.router.match(method, path)
   }
 
   // XXX
@@ -93,16 +87,15 @@ class Hono {
     const [method, path] = [request.method, getPathFromURL(request.url)]
 
     const result = await this.matchRoute(method, path)
-    if (!result) return this.notFound()
 
     request.params = (key) => result.params[key]
 
-    let handler = result.handler[0] // XXX
+    let handler = result ? result.handler[0] : this.notFound // XXX
 
-    const middleware = [defaultFilter] // add defaultFilter later
+    const middleware = [Middleware.defaultFilter] // add defaultFilter later
 
     for (const mr of this.middlewareRouters) {
-      const mwResult = mr.match('all', path)
+      const mwResult = mr.match(METHOD_NAME_OF_ALL, path)
       if (mwResult) {
         middleware.push(...mwResult.handler)
       }
@@ -137,8 +130,10 @@ class Hono {
   }
 }
 
-const CreateApp = () => {
-  return new Hono()
-}
+// Default Export
+module.exports = Hono
+exports = module.exports
 
-module.exports = CreateApp
+// Named Export
+exports.Hono = Hono
+exports.Middleware = Middleware

package/src/hono.test.js

@@ -1,8 +1,9 @@
-const Hono = require('./hono')
 const fetch = require('node-fetch')
+const { Hono } = require('./hono')
 
 describe('GET Request', () => {
-  const app = Hono()
+  const app = new Hono()
+
   app.get('/hello', () => {
     return new fetch.Response('hello', {
       status: 200,
@@ -29,7 +30,7 @@ describe('GET Request', () => {
 })
 
 describe('params and query', () => {
-  const app = Hono()
+  const app = new Hono()
 
   app.get('/entry/:id', async (c) => {
     const id = await c.req.params('id')
@@ -60,29 +61,94 @@ describe('params and query', () => {
 })
 
 describe('Middleware', () => {
-  const app = Hono()
+  const app = new Hono()
 
   const logger = (c, next) => {
     console.log(`${c.req.method} : ${c.req.url}`)
     next()
   }
 
+  const rootHeader = (c, next) => {
+    next()
+    c.res.headers.append('x-custom', 'root')
+  }
+
   const customHeader = (c, next) => {
     next()
     c.res.headers.append('x-message', 'custom-header')
   }
+  const customHeader2 = (c, next) => {
+    next()
+    c.res.headers.append('x-message-2', 'custom-header-2')
+  }
 
   app.use('*', logger)
+  app.use('*', rootHeader)
   app.use('/hello', customHeader)
+  app.use('/hello/*', customHeader2)
   app.get('/hello', () => {
     return new fetch.Response('hello')
   })
+  app.get('/hello/:message', (c) => {
+    const message = c.req.params('message')
+    return new fetch.Response(`${message}`)
+  })
 
   it('logging and custom header', async () => {
     let req = new fetch.Request('https://example.com/hello')
     let res = await app.dispatch(req)
     expect(res.status).toBe(200)
     expect(await res.text()).toBe('hello')
+    expect(await res.headers.get('x-custom')).toBe('root')
     expect(await res.headers.get('x-message')).toBe('custom-header')
+    expect(await res.headers.get('x-message-2')).toBe('custom-header-2')
+  })
+
+  it('logging and custom header with named params', async () => {
+    let req = new fetch.Request('https://example.com/hello/message')
+    let res = await app.dispatch(req)
+    expect(res.status).toBe(200)
+    expect(await res.text()).toBe('message')
+    expect(await res.headers.get('x-custom')).toBe('root')
+    expect(await res.headers.get('x-message-2')).toBe('custom-header-2')
+  })
+})
+
+describe('Custom 404', () => {
+  const app = new Hono()
+
+  const customNotFound = (c, next) => {
+    next()
+    if (c.res.status === 404) {
+      c.res = new fetch.Response('Custom 404 Not Found', { status: 404 })
+    }
+  }
+
+  app.notFound = () => {
+    return new fetch.Response('Default 404 Nout Found', { status: 404 })
+  }
+
+  app.use('*', customNotFound)
+  app.get('/hello', () => {
+    return new fetch.Response('hello')
+  })
+  it('Custom 404 Not Found', async () => {
+    let req = new fetch.Request('https://example.com/hello')
+    let res = await app.dispatch(req)
+    expect(res.status).toBe(200)
+    req = new fetch.Request('https://example.com/foo')
+    res = await app.dispatch(req)
+    expect(res.status).toBe(404)
+    expect(await res.text()).toBe('Custom 404 Not Found')
+  })
+})
+
+describe('Error Handling', () => {
+  const app = new Hono()
+
+  it('Middleware must be function', () => {
+    expect(() => {
+      app.use('*', {})
+    }).toThrow(TypeError)
   })
 })

package/src/methods.js

@@ -0,0 +1,30 @@
+const methods = [
+  'get',
+  'post',
+  'put',
+  'head',
+  'delete',
+  'options',
+  'trace',
+  'copy',
+  'lock',
+  'mkcol',
+  'move',
+  'patch',
+  'purge',
+  'propfind',
+  'proppatch',
+  'unlock',
+  'report',
+  'mkactivity',
+  'checkout',
+  'merge',
+  'm-search',
+  'notify',
+  'subscribe',
+  'unsubscribe',
+  'search',
+  'connect',
+]
+
+module.exports = methods

package/src/middleware/poweredBy.js

@@ -0,0 +1,6 @@
+const poweredBy = (c, next) => {
+  next()
+  c.res.headers.append('X-Powered-By', 'Hono')
+}
+
+module.exports = poweredBy

package/src/middleware/poweredBy.test.js

@@ -0,0 +1,17 @@
+const fetch = require('node-fetch')
+const { Hono, Middleware } = require('../hono')
+
+describe('Powered by Middleware', () => {
+  const app = new Hono()
+
+  app.use('*', Middleware.poweredBy)
+  app.get('/', () => new fetch.Response('root'))
+
+  it('Response headers include X-Powered-By', async () => {
+    let req = new fetch.Request('https://example.com/')
+    let res = await app.dispatch(req, new fetch.Response())
+    expect(res).not.toBeNull()
+    expect(res.status).toBe(200)
+    expect(res.headers.get('X-Powered-By')).toBe('Hono')
+  })
+})

package/src/middleware.js

@@ -0,0 +1,9 @@
+const defaultFilter = require('./middleware/defaultFilter')
+const poweredBy = require('./middleware/poweredBy')
+
+function Middleware() {}
+
+Middleware.defaultFilter = defaultFilter
+Middleware.poweredBy = poweredBy
+
+module.exports = Middleware

package/src/middleware.test.js

@@ -0,0 +1,17 @@
+const fetch = require('node-fetch')
+const { Hono, Middleware } = require('./hono')
+
+describe('Builtin Middleware', () => {
+  const app = new Hono()
+
+  app.use('*', Middleware.poweredBy)
+  app.get('/', () => new fetch.Response('root'))
+
+  it('Builtin Powered By Middleware', async () => {
+    let req = new fetch.Request('https://example.com/')
+    let res = await app.dispatch(req, new fetch.Response())
+    expect(res).not.toBeNull()
+    expect(res.status).toBe(200)
+    expect(res.headers.get('X-Powered-By')).toBe('Hono')
+  })
+})

package/src/node.js

@@ -2,7 +2,7 @@
 
 const { splitPath, getPattern } = require('./util')
 
-const METHOD_NAME_OF_ALL = 'all'
+const METHOD_NAME_OF_ALL = 'ALL'
 
 const createResult = (handler, params) => {
   return { handler: handler, params: params }
@@ -18,6 +18,7 @@ function Node(method, handler, children) {
   if (method && handler) {
     this.method[method] = handler
   }
+  this.middlewares = []
 }
 
 Node.prototype.insert = function (method, path, handler) {
@@ -50,6 +51,7 @@ Node.prototype.search = function (method, path) {
       continue
     }
 
+    let isWildcard = false
     let isParamMatch = false
     const keys = Object.keys(curNode.children)
     for (let j = 0; j < keys.length; j++) {
@@ -57,7 +59,7 @@ Node.prototype.search = function (method, path) {
       // Wildcard
       if (key === '*') {
         curNode = curNode.children['*']
-        isParamMatch = true
+        isWildcard = true
         break
       }
       const pattern = getPattern(key)
@@ -74,6 +76,10 @@ Node.prototype.search = function (method, path) {
       }
     }
 
+    if (isWildcard) {
+      break
+    }
+
     if (isParamMatch === false) {
       return noRoute()
     }

package/src/node.test.js

@@ -123,7 +123,7 @@ describe('Regexp', () => {
 
 describe('All', () => {
   const node = new Node()
-  node.insert('all', '/all-methods', 'all methods')
+  node.insert('ALL', '/all-methods', 'all methods') // ALL
   it('/all-methods', () => {
     res = node.search('get', '/all-methods')
     expect(res).not.toBeNull()

package/src/router.test.js

@@ -1,7 +1,7 @@
-const App = require('./hono')
+const { Hono } = require('./hono')
 
 describe('Basic Usage', () => {
-  const router = App()
+  const router = new Hono()
 
   it('get, post hello', async () => {
     router.get('/hello', 'get hello')
@@ -24,7 +24,7 @@ describe('Basic Usage', () => {
 })
 
 describe('Complex', () => {
-  let router = App()
+  let router = new Hono()
 
   it('Named Param', async () => {
     router.get('/entry/:id', 'get entry')
@@ -56,7 +56,7 @@ describe('Complex', () => {
 })
 
 describe('Chained Route', () => {
-  let router = App()
+  let router = new Hono()
 
   it('Return rooter object', async () => {
     router = router.patch('/hello', 'patch hello')

package/src/util.js

@@ -20,7 +20,14 @@ const getPattern = (label) => {
   }
 }
 
+const getPathFromURL = (url) => {
+  // XXX
+  const match = url.match(/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/)
+  return match[5]
+}
+
 module.exports = {
   splitPath,
   getPattern,
+  getPathFromURL,
 }

package/src/util.test.js

@@ -1,4 +1,4 @@
-const { splitPath, getPattern, getParamName } = require('./util')
+const { splitPath, getPattern, getPathFromURL } = require('./util')
 
 describe('Utility methods', () => {
   it('splitPath', () => {
@@ -26,4 +26,19 @@ describe('Utility methods', () => {
     expect(res[0]).toBe('id')
     expect(res[1]).toBe('([0-9]+)')
   })
+
+  it('getPathFromURL', () => {
+    let path = getPathFromURL('https://example.com/')
+    expect(path).toBe('/')
+    path = getPathFromURL('https://example.com/hello')
+    expect(path).toBe('/hello')
+    path = getPathFromURL('https://example.com/hello/hey')
+    expect(path).toBe('/hello/hey')
+    path = getPathFromURL('https://example.com/hello?name=foo')
+    expect(path).toBe('/hello')
+    path = getPathFromURL('https://example.com/hello/hey?name=foo&name=bar')
+    expect(path).toBe('/hello/hey')
+    path = getPathFromURL('https://example.com/hello/hey#fragment')
+    expect(path).toBe('/hello/hey')
+  })
 })