tsndr/cloudflare-worker-router
1
0
Fork 0
Code Activity

Added query support

Browse Source
This commit is contained in:
Toby
2021-05-30 19:28:03 +02:00
parent e3105eafa1
commit 324d28806b
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -120,6 +120,7 @@ Key | Type | Description
`headers` | `object` | Object containing request headers `headers` | `object` | Object containing request headers
`method` | `string` | HTTP request method `method` | `string` | HTTP request method
`params` | `object` | Object containing all parameters defined in the url string `params` | `object` | Object containing all parameters defined in the url string
`query` | `object` | Object containing all query parameters
### `res`-Object ### `res`-Object

1
index.d.ts vendored
View File

@@ -35,6 +35,7 @@ declare class Router {
* @typedef RouterRequest * @typedef RouterRequest
* @property {string} method HTTP request method * @property {string} method HTTP request method
* @property {Object<string, string>} params Object containing all parameters defined in the url string * @property {Object<string, string>} params Object containing all parameters defined in the url string
* @property {Object<string, string>} query Object containing all query parameters
* @property {Object<string, string>} headers Object containing request headers * @property {Object<string, string>} headers Object containing request headers
* @property {Object<string, string>|string} body Only available if method is `POST`, `PUT` or `PATCH`. Contains either the received body string or a parsed object if valid JSON was sent. * @property {Object<string, string>|string} body Only available if method is `POST`, `PUT` or `PATCH`. Contains either the received body string or a parsed object if valid JSON was sent.
*/ */

15
index.js
View File

@@ -40,6 +40,7 @@ class Router {
* @typedef RouterRequest * @typedef RouterRequest
* @property {string} method HTTP request method * @property {string} method HTTP request method
* @property {Object<string, string>} params Object containing all parameters defined in the url string * @property {Object<string, string>} params Object containing all parameters defined in the url string
* @property {Object<string, string>} query Object containing all query parameters
* @property {Object<string, string>} headers Object containing request headers * @property {Object<string, string>} headers Object containing request headers
* @property {Object<string, string>|string} body Only available if method is `POST`, `PUT` or `PATCH`. Contains either the received body string or a parsed object if valid JSON was sent. * @property {Object<string, string>|string} body Only available if method is `POST`, `PUT` or `PATCH`. Contains either the received body string or a parsed object if valid JSON was sent.
*/ */
@@ -247,19 +248,25 @@ class Router {
* @returns {Route|undefined} * @returns {Route|undefined}
*/ */
getRoute(request) { getRoute(request) {
const urlArr = (new URL(request.url)).pathname.split('/').filter(i => i) const url = new URL(request.url)
const pathArr = url.pathname.split('/').filter(i => i)
return this.routes.find(r => { return this.routes.find(r => {
const routeArr = r.url.split('/').filter(i => i) const routeArr = r.url.split('/').filter(i => i)
if (![request.method, '*'].includes(r.method) || routeArr.length !== urlArr.length) if (![request.method, '*'].includes(r.method) || routeArr.length !== pathArr.length)
return false return false
const params = {} const params = {}
for (let i = 0; i < routeArr.length; i++) { for (let i = 0; i < routeArr.length; i++) {
if (routeArr[i] !== urlArr[i] && routeArr[i][0] !== ':') if (routeArr[i] !== pathArr[i] && routeArr[i][0] !== ':')
return false return false
if (routeArr[i][0] === ':') if (routeArr[i][0] === ':')
params[routeArr[i].substring(1)] = urlArr[i] params[routeArr[i].substring(1)] = pathArr[i]
} }
request.params = params request.params = params
const query = {}
for (const [k, v] of url.searchParams.entries()) {
query[k] = v
}
request.query = query
return true return true
}) })
} }

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "@tsndr/cloudflare-worker-router", "name": "@tsndr/cloudflare-worker-router",
"version": "1.0.4", "version": "1.1.0",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": {}, "scripts": {},