Merge pull request cloudflare#14 from grempe/http-verbs

Router enhancement for full set of HTTP methods. Run project prettier task.

worker-router/README.md

@@ -24,4 +24,5 @@ wrangler publish
 ```
 
 #### Serverless
+
 To deploy using serverless add a [`serverless.yml`](https://serverless.com/framework/docs/providers/cloudflare/) file.

worker-router/index.js

@@ -4,27 +4,27 @@ const Router = require('./router')
  * Example of how router can be used in an application
  *  */
 addEventListener('fetch', event => {
-  event.respondWith(handleRequest(event.request))
+    event.respondWith(handleRequest(event.request))
 })
 
 function handler(request) {
-  const init = {
-    headers: { 'content-type': 'application/json' },
-  }
-  const body = JSON.stringify({ some: 'json' })
-  return new Response(body, init)
+    const init = {
+        headers: { 'content-type': 'application/json' },
+    }
+    const body = JSON.stringify({ some: 'json' })
+    return new Response(body, init)
 }
 
 async function handleRequest(request) {
-  const r = new Router()
-  // Replace with the approriate paths and handlers
-  r.get('.*/bar', () => new Response('responding for /bar'))
-  r.get('.*/foo', req => handler(req))
-  r.post('.*/foo.*', req => handler(req))
-  r.get('/demos/router/foo', req => fetch(req)) // return the response from the origin
+    const r = new Router()
+    // Replace with the approriate paths and handlers
+    r.get('.*/bar', () => new Response('responding for /bar'))
+    r.get('.*/foo', req => handler(req))
+    r.post('.*/foo.*', req => handler(req))
+    r.get('/demos/router/foo', req => fetch(req)) // return the response from the origin
 
-  r.get('/', () => new Response('Hello worker!')) // return a default message for the root route
-  
-  const resp = await r.route(request)
-  return resp
+    r.get('/', () => new Response('Hello worker!')) // return a default message for the root route
+
+    const resp = await r.route(request)
+    return resp
 }

worker-router/router.js

@@ -1,96 +1,121 @@
 /**
- * Conditions are helper functions that when passed a request
- * will return a boolean for if that request uses
- * that method, header, etc..
- *  */
-const Method = method => req => req.method.toLowerCase() === method.toLowerCase()
-const Get = Method('get')
-const Post = Method('post')
-const Put = Method('put')
-const Patch = Method('patch')
+ * Helper functions that when passed a request will return a
+ * boolean indicating if the request uses that HTTP method,
+ * header, host or referrer.
+ */
+const Method = method => req =>
+    req.method.toLowerCase() === method.toLowerCase()
+const Connect = Method('connect')
 const Delete = Method('delete')
+const Get = Method('get')
 const Head = Method('head')
 const Options = Method('options')
+const Patch = Method('patch')
+const Post = Method('post')
+const Put = Method('put')
+const Trace = Method('trace')
 
 const Header = (header, val) => req => req.headers.get(header) === val
 const Host = host => Header('host', host.toLowerCase())
 const Referrer = host => Header('referrer', host.toLowerCase())
 
 const Path = regExp => req => {
-  const url = new URL(req.url)
-  const path = url.pathname
-  const match = path.match(regExp) || []
-  return match[0] === path
+    const url = new URL(req.url)
+    const path = url.pathname
+    const match = path.match(regExp) || []
+    return match[0] === path
 }
 
 /**
- * Router handles the logic of what handler is matched given conditions
- * for each request
- *  */
+ * The Router handles determines which handler is matched given the
+ * conditions present for each request.
+ */
 class Router {
-  constructor() {
-    this.routes = []
-  }
-
-  handle(conditions, handler) {
-    this.routes.push({
-      conditions,
-      handler,
-    })
-    return this
-  }
-
-  get(url, handler) {
-    return this.handle([Get, Path(url)], handler)
-  }
-
-  post(url, handler) {
-    return this.handle([Post, Path(url)], handler)
-  }
-
-  patch(url, handler) {
-    return this.handle([Patch, Path(url)], handler)
-  }
-
-  delete(url, handler) {
-    return this.handle([Delete, Path(url)], handler)
-  }
-
-  all(handler) {
-    return this.handle([], handler)
-  }
-
-  route(req) {
-    const route = this.resolve(req)
-
-    if (route) {
-      return route.handler(req)
+    constructor() {
+        this.routes = []
+    }
+
+    handle(conditions, handler) {
+        this.routes.push({
+            conditions,
+            handler,
+        })
+        return this
+    }
+
+    connect(url, handler) {
+        return this.handle([Connect, Path(url)], handler)
+    }
+
+    delete(url, handler) {
+        return this.handle([Delete, Path(url)], handler)
+    }
+
+    get(url, handler) {
+        return this.handle([Get, Path(url)], handler)
+    }
+
+    head(url, handler) {
+        return this.handle([Head, Path(url)], handler)
     }
 
-    return new Response('resource not found', {
-      status: 404,
-      statusText: 'not found',
-      headers: {
-        'content-type': 'text/plain',
-      },
-    })
-  }
-
-  // resolve returns the matching route that returns true for
-  // all the conditions if any
-  resolve(req) {
-    return this.routes.find(r => {
-      if (!r.conditions || (Array.isArray(r) && !r.conditions.length)) {
-        return true
-      }
-
-      if (typeof r.conditions === 'function') {
-        return r.conditions(req)
-      }
-
-      return r.conditions.every(c => c(req))
-    })
-  }
+    options(url, handler) {
+        return this.handle([Options, Path(url)], handler)
+    }
+
+    patch(url, handler) {
+        return this.handle([Patch, Path(url)], handler)
+    }
+
+    post(url, handler) {
+        return this.handle([Post, Path(url)], handler)
+    }
+
+    put(url, handler) {
+        return this.handle([Put, Path(url)], handler)
+    }
+
+    trace(url, handler) {
+        return this.handle([Trace, Path(url)], handler)
+    }
+
+    all(handler) {
+        return this.handle([], handler)
+    }
+
+    route(req) {
+        const route = this.resolve(req)
+
+        if (route) {
+            return route.handler(req)
+        }
+
+        return new Response('resource not found', {
+            status: 404,
+            statusText: 'not found',
+            headers: {
+                'content-type': 'text/plain',
+            },
+        })
+    }
+
+    /**
+     * resolve returns the matching route for a request that returns
+     * true for all conditions (if any).
+     */
+    resolve(req) {
+        return this.routes.find(r => {
+            if (!r.conditions || (Array.isArray(r) && !r.conditions.length)) {
+                return true
+            }
+
+            if (typeof r.conditions === 'function') {
+                return r.conditions(req)
+            }
+
+            return r.conditions.every(c => c(req))
+        })
+    }
 }
 
 module.exports = Router