add donation page and hopelessly trying to guess the proper dispatch algorithm

v1rtl · v1rtl · commit 9887cf0ea93f · 2020-07-18T23:47:29.000+03:00
diff --git a/README.md b/README.md
@@ -55,6 +55,7 @@ import { logger } from '@tinyhttp/logger'
 const app = new App()
 
 app
+  .use(logger())
   .use(function someMiddleware(req, res, next) {
     console.log('Did a request')
     next()
@@ -65,7 +66,6 @@ app
   .get('/page/:page/', (req, res) => {
     res.status(200).send(`You just opened ${req.params.page}`)
   })
-  .use(logger())
   .listen(3000)
 ```
 
diff --git a/examples/auth/index.js b/examples/auth/index.js
@@ -6,17 +6,17 @@ import jsonwebtoken from 'jsonwebtoken'
 const app = new App()
 const secretToken = 'very secret key'
 
+app.use(jwt({ secret: secretToken, algorithm: 'HS256' }))
+app.use(bodyParser.urlencoded({ extended: false }))
+
 app.get('/', (_req, res) => {
   res.send('Go to "/login" page to login')
 })
 
-app.use(jwt({ secret: secretToken, algorithm: 'HS256' }))
-app.use(bodyParser.urlencoded({ extended: false }))
-
 app.post('/login', (req, res) => {
   const { body } = req
 
-  console.log(`Received body: ${JSON.stringify(body)}`)
+  console.log(`Received body: ${req}`)
 
   if (body.user !== 'admin' || body.pwd !== 'admin') {
     res.send('Incorrect login')
diff --git a/examples/auth/package.json b/examples/auth/package.json
@@ -8,9 +8,5 @@
     "body-parser": "^1.19.0",
     "jsonwebtoken": "^8.5.1"
   },
-  "type": "module",
-  "devDependencies": {
-    "@types/body-parser": "^1.19.0",
-    "@types/mongodb": "^3.5.25"
-  }
+  "type": "module"
 }
diff --git a/examples/basic/index.js b/examples/basic/index.js
@@ -4,6 +4,7 @@ import { logger } from '@tinyhttp/logger'
 const app = new App()
 
 app
+  .use(logger())
   .get('/', (_, res) => void res.send('<h1>Hello World</h1>'))
   .get('/page/:page/', (req, res) => {
     res.status(200).send(`
@@ -14,5 +15,5 @@ app
     ${JSON.stringify(req.params, null, 2)}
   `)
   })
-  .use(logger())
+
   .listen(3000)
diff --git a/examples/mongodb/index.js b/examples/mongodb/index.js
@@ -2,7 +2,8 @@
 import { App } from '@tinyhttp/app'
 import dotenv from 'dotenv'
 import mongodb from 'mongodb'
-import { form } from 'body-parsec'
+import assert from 'assert'
+import * as parser from 'body-parsec'
 
 dotenv.config()
 
@@ -15,6 +16,7 @@ const client = new mongodb.MongoClient(process.env.DB_URI, {
 })
 const dbName = 'notes'
 client.connect((err) => {
+  assert.equal(null, err)
   console.log('successfully connected with mongodb')
   db = client.db(dbName)
 })
@@ -29,16 +31,13 @@ app.get('/notes', async (_, res, next) => {
   }
 })
 
-app.use('/notes', async (req, res, next) => {
-  await form()(req, res, next)
-})
-
 // add new note
 app.post('/notes', async (req, res, next) => {
+  await parser.form()(req, res)
   try {
-    await db.collection('notes').insertOne({ title: req.query.title, desc: req.query.desc })
-
-    res.send(`Note with title of "${req.query.title}" has been added`)
+    const r = await db.collection('notes').insertOne({ title: req.body.title, desc: req.body.desc })
+    assert.equal(1, r.insertedCount)
+    res.send(`Note with title of "${req.body.title}" has been added`)
   } catch (err) {
     next(err)
   }
@@ -47,7 +46,8 @@ app.post('/notes', async (req, res, next) => {
 // delete note
 app.delete('/notes', async (req, res, next) => {
   try {
-    await db.collection('notes').deleteOne({ _id: new mongodb.ObjectId(req.query.id) })
+    const r = await db.collection('notes').deleteOne({ _id: new mongodb.ObjectId(req.query.id) })
+    assert.equal(1, r.deletedCount)
     res.send(`Note with id of ${req.query.id} has been deleted`)
   } catch (err) {
     next(err)
diff --git a/examples/mongodb/package.json b/examples/mongodb/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@tinyhttp/app": "0.2.13",
+    "@tinyhttp/app": "workspace:*",
     "body-parsec": "^2.0.12",
     "dotenv": "^8.2.0",
     "mongodb": "^3.5.9"
diff --git a/packages/app/README.md b/packages/app/README.md
@@ -55,6 +55,7 @@ import { logger } from '@tinyhttp/logger'
 const app = new App()
 
 app
+  .use(logger())
   .use(function someMiddleware(req, res, next) {
     console.log('Did a request')
     next()
@@ -65,7 +66,6 @@ app
   .get('/page/:page/', (req, res) => {
     res.status(200).send(`You just opened ${req.params.page}`)
   })
-  .use(logger())
   .listen(3000)
 ```
 
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tinyhttp/app",
-  "version": "0.2.21",
+  "version": "0.2.24",
   "description": "tinyhttp core with App, Request, Response and Router",
   "type": "module",
   "homepage": "https://github.com/talentlessguy/tinyhttp#readme",
@@ -23,7 +23,9 @@
     "./package.json": "./package.json",
     "./": "./"
   },
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "engines": {
     "node": ">=12.x"
   },
diff --git a/packages/app/src/app.ts b/packages/app/src/app.ts
@@ -78,10 +78,11 @@ export class App extends Router {
       const { path, method, handler, type } = mw
 
       if (type === 'route') {
+        // strip query parameters for req.params
+        const queryParamStart = req.url.lastIndexOf('?')
+        const reqUrlWithoutParams = req.url.slice(0, queryParamStart === -1 ? req.url.length : queryParamStart)
+
         if (req.method === method) {
-          // strip query parameters for req.params
-          const queryParamStart = req.url.lastIndexOf('?')
-          const reqUrlWithoutParams = req.url.slice(0, queryParamStart === -1 ? req.url.length : queryParamStart)
           if (rg(path).pattern.test(reqUrlWithoutParams)) {
             req.params = getURLParams(req.url, path)
             req.route = getRouteFromApp(this, handler)
@@ -118,9 +119,9 @@ export class App extends Router {
    * @param host server listening host
    */
   listen(port?: number, cb?: () => void, host = 'localhost') {
-    const server = createServer((req: Request, res: Response) => {
-      this.handler(req, res)
-    })
+    const server = createServer()
+
+    server.on('request', (req, res) => this.handler(req, res))
 
     return server.listen(port, host, cb)
   }
diff --git a/packages/app/src/onError.ts b/packages/app/src/onError.ts
@@ -3,11 +3,7 @@ import { ErrorHandler } from './router'
 import { Request } from './request'
 import { Response } from './response'
 
-export const onErrorHandler: ErrorHandler = (
-  err: any,
-  _req: Request,
-  res: Response
-) => {
+export const onErrorHandler: ErrorHandler = (err: any, _req: Request, res: Response) => {
   if (!res.headersSent) {
     const code = (res.statusCode = err.code || err.status || 500)
     if (typeof err === 'string' || Buffer.isBuffer(err)) res.end(err)
diff --git a/packages/app/src/router.ts b/packages/app/src/router.ts
@@ -10,7 +10,7 @@ export type AsyncHandler = (req: Request, res: Response, next?: NextFunction) =>
 
 export type Handler = AsyncHandler | SyncHandler
 
-export type ErrorHandler = (err: any, req: Request, res: Response) => void
+export type ErrorHandler = (err: any, req: Request, res: Response, next?: NextFunction) => void
 
 type Method = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'HEAD' | 'OPTIONS' | 'DELETE' | string
 
diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -1,8 +1,8 @@
 {
   "name": "@tinyhttp/logger",
-  "version": "0.3.1",
+  "version": "0.3.5",
   "type": "module",
-  "description": "tinyhttp logger module",
+  "description": "simple HTTP logger for tinyhttp",
   "homepage": "https://github.com/talentlessguy/tinyhttp#readme",
   "repository": {
     "type": "git",
@@ -43,6 +43,7 @@
     "typescript": "^3.9.7"
   },
   "scripts": {
-    "build": "rollup -c"
+    "build": "rollup -c",
+    "prepare": "pnpm build"
   }
 }
diff --git a/packages/logger/src/index.ts b/packages/logger/src/index.ts
@@ -4,12 +4,17 @@ import { IncomingMessage as Request, ServerResponse as Response, METHODS } from
 
 export type LoggerProperties = Partial<{
   methods: string[]
-  timestamp: {
-    format: string
-  }
+  timestamp:
+    | {
+        format?: string
+      }
+    | boolean
 }>
 
-export const logger = ({ timestamp, methods = METHODS }: LoggerProperties) => {
+export const logger = (options?: LoggerProperties) => {
+  const methods = options ? options.methods : METHODS
+  const timestamp = options ? options.timestamp : false
+
   const logger = (req: Request, res: Response, next?: () => void) => {
     res.on('finish', () => {
       const { method, url } = req
@@ -23,7 +28,11 @@ export const logger = ({ timestamp, methods = METHODS }: LoggerProperties) => {
 
         let time = ''
         if (timestamp) {
-          time += `${dayjs().format(timestamp.format).toString()} - `
+          if (typeof timestamp !== 'boolean' && timestamp.format) {
+            time += `${dayjs().format(timestamp.format).toString()} - `
+          } else {
+            time += `${dayjs().toString()} - `
+          }
         }
 
         switch (s[0]) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/site/server.ts b/site/server.ts
diff --git a/site/static/css/home.css b/site/static/css/home.css
diff --git a/site/static/donate.html b/site/static/donate.html
diff --git a/site/static/index.html b/site/static/index.html
