replace cookie w/ builtin methods

Author: v1rtl

examples/mongodb/index.ts

@@ -0,0 +1,82 @@
+import { App } from '../../app.ts'
+// import { MongoClient, Bson } from 'https://deno.land/x/mongo@v0.21.0/mod.ts'
+// import * as dotenv from 'https://deno.land/x/dotenv/mod.ts'
+
+// dotenv.config()
+
+const app = new App()
+const port = parseInt(Deno.env.get('PORT') || '') || 3000
+
+// connect to mongodb
+/* const client = new MongoClient()
+
+await client.connect(Deno.env.get('DB_URI') || '')
+
+const db = client.database('notes')
+const coll = db.collection('notes') */
+
+app.get(async (req, res) => {
+  const buf: Uint8Array = await Deno.readAll(req.body)
+
+  console.log(buf.toString())
+
+  res.send('bruh')
+})
+
+/* // get all notes
+app.get('/notes', async (_, res, next) => {
+  try {
+    const r = await coll.find({}).toArray()
+    res.send(r)
+    next()
+  } catch (err) {
+    next(err)
+  }
+})
+
+// add new note
+app.post('/notes', async (req, res, next) => {
+  try {
+
+
+    if (result?.value) {
+      const { title, desc } = result.value
+      const r = await coll.insertOne({ title, desc })
+      assertStrictEquals(1, r.insertedCount)
+      res.send(`Note with title of "${title}" has been added`)
+    } else {
+      next('No body provided')
+    }
+  } catch (err) {
+    next(err)
+  }
+})
+ */
+/* // delete note
+app.delete('/notes', async (req, res, next) => {
+  try {
+    const { id } = req.body
+    const r = await coll.deleteOne({ _id: new Bson.ObjectId(id) })
+    assertStrictEquals(1, r)
+    res.send(`Note with id of ${id} has been deleted`)
+  } catch (err) {
+    next(err)
+  }
+})
+
+// update existing note
+app.put('/notes', async (req, res, next) => {
+  try {
+    const { title, desc, id } = req.body
+    await coll.findOneAndUpdate(
+      { _id: new mongodb.ObjectId(id) },
+      { $set: { title, desc } },
+      { returnOriginal: false, upsert: true }
+    )
+    res.send(`Note with title of ${title} has been updated`)
+  } catch (err) {
+    next(err)
+  }
+})
+ */
+app.listen(port, () => console.log(`Started on http://localhost:${port}`))

extend.ts

@@ -33,8 +33,8 @@ import {
   setVaryHeader,
   attachment,
   download,
-  clearCookie,
-  setCookie
+  setCookie,
+  clearCookie
 } from './extensions/res/mod.ts'
 import { getQueryParams } from './utils/parseUrl.ts'
 import { Response, renderTemplate } from './response.ts'
@@ -106,7 +106,7 @@ export const extendMiddleware = <
   res.attachment = attachment<Res>(res)
 
   res.cookie = setCookie<Req, Res>(req, res)
-  res.clearCookie = clearCookie<Req, Res>(req, res)
+  res.clearCookie = clearCookie<Res>(res)
 
   next?.()
 }

extensions/req/accepts.ts

@@ -1,4 +1,4 @@
-import { Accepts } from 'https://deno.land/x/accepts/mod.ts'
+import { Accepts } from 'https://deno.land/x/accepts@2.1.0/mod.ts'
 import { Request } from '../../request.ts'
 
 export const getAccepts = (req: Request) => (...types: string[]) => new Accepts(req.headers).types(types)

extensions/req/headers.ts

@@ -1,8 +1,8 @@
 import { Request } from '../../request.ts'
 import { Response } from '../../response.ts'
 import parseRange, { Options } from 'https://esm.sh/range-parser'
-import fresh from 'https://deno.land/x/fresh/mod.ts'
-import { is } from 'https://deno.land/x/type_is/mod.ts'
+import fresh from 'https://deno.land/x/fresh@v1.0.0/mod.ts'
+import { is } from 'https://deno.land/x/type_is@1.0.2/mod.ts'
 
 export const getRequestHeader = (req: Request) => (header: string): string | string[] | null => {
   const lc = header.toLowerCase()

extensions/req/security.ts

@@ -1,4 +1,4 @@
-import { isIP } from 'https://deno.land/x/isIP/mod.ts'
+import { isIP } from 'https://deno.land/x/isIP@1.0.0/mod.ts'
 import { Request } from '../../request.ts'
 import { compile, proxyaddr, all } from '../../utils/proxyAddr.ts'
 import { Protocol } from '../../request.ts'

extensions/res/cookie.ts

@@ -1,51 +1,23 @@
 import { Request as Req } from '../../request.ts'
 import { Response as Res } from '../../response.ts'
-import { append } from './append.ts'
-import * as cookie from 'https://esm.sh/@tinyhttp/cookie'
-import { sign } from '../../utils/cookieSignature.ts'
+import * as cookie from 'https://deno.land/std@0.88.0/http/cookie.ts'
 
-export const setCookie = <Request extends Req = Req, Response extends Res = Res>(
-  req: Request & {
-    secret?: string | string[]
-  },
-  res: Response
-) => (
+export const setCookie = <Request extends Req = Req, Response extends Res = Res>(req: Request, res: Response) => (
   name: string,
-  value: string | Record<string, unknown>,
-  options: cookie.SerializeOptions &
-    Partial<{
-      signed: boolean
-    }> = {}
+  value: string,
+  options?: Omit<cookie.Cookie, 'value' | 'name'>
 ): Response => {
-  const secret = req.secret as string
-
-  const signed = options.signed || false
-
-  if (signed && !secret) throw new Error('cookieParser("secret") required for signed cookies')
-
-  let val = typeof value === 'object' ? 'j:' + JSON.stringify(value) : String(value)
-
-  if (signed) val = 's:' + sign(val, secret)
-
-  if (options.maxAge) {
-    options.expires = new Date(Date.now() + options.maxAge)
-    options.maxAge /= 1000
-  }
-
-  if (options.path == null) options.path = '/'
-
-  append(res)('Set-Cookie', `${cookie.serialize(name, String(val), options)}`)
+  cookie.setCookie(req, {
+    value,
+    name,
+    ...options
+  })
 
   return res
 }
 
-export const clearCookie = <Request extends Req = Req, Response extends Res = Res>(req: Request, res: Response) => (
-  name: string,
-  options?: cookie.SerializeOptions
-): Response => {
-  return setCookie<Request, Response>(req, res)(
-    name,
-    '',
-    Object.assign({}, { expires: new Date(1), path: '/' }, options)
-  )
+export const clearCookie = <Response extends Res = Res>(res: Response) => (name: string): Response => {
+  cookie.deleteCookie(res, name)
+
+  return res
 }

extensions/res/download.ts

@@ -1,6 +1,6 @@
 import { contentDisposition } from 'https://esm.sh/@tinyhttp/content-disposition'
 import { SendFileOptions, sendFile } from './sendFile.ts'
-import { resolve, extname } from 'https://deno.land/std/path/mod.ts'
+import { resolve, extname } from 'https://deno.land/std@0.88.0/path/mod.ts'
 import { setContentType, setHeader } from './headers.ts'
 import { Request as Req } from '../../request.ts'
 import { Response as Res } from '../../response.ts'

extensions/res/redirect.ts

@@ -3,7 +3,7 @@ import { formatResponse } from './format.ts'
 import { setLocationHeader } from './headers.ts'
 import { Request as Req } from '../../request.ts'
 import { Response as Res } from '../../response.ts'
-import { status as getStatus } from 'https://deno.land/x/status/status.ts'
+import { status as getStatus } from 'https://deno.land/x/status@0.1.0/status.ts'
 import { escapeHTML } from 'https://esm.sh/es-escape-html'
 
 export const redirect = <

request.ts

@@ -1,5 +1,5 @@
 // deno-lint-ignore-file
-import { ServerRequest } from 'https://deno.land/std@0.87.0/http/server.ts'
+import { ServerRequest } from 'https://deno.land/std/http/server.ts'
 import { Ranges } from 'https://esm.sh/range-parser'
 import { App } from './app.ts'
 import { Handler, Middleware } from 'https://esm.sh/@tinyhttp/router'

response.ts

@@ -1,10 +1,10 @@
 // deno-lint-ignore-file
 
-import { Response as ServerResponse } from 'https://deno.land/std@0.87.0/http/server.ts'
+import { Response as ServerResponse } from 'https://deno.land/std/http/server.ts'
 import type { SendFileOptions } from './extensions/res/sendFile.ts'
 import type { TemplateEngineOptions, App } from './app.ts'
-import type { FormatProps } from './extensions/format.ts'
-import type { DownloadOptions } from './extensions/download.ts'
+import type { FormatProps } from './extensions/res/format.ts'
+import type { DownloadOptions } from './extensions/res/download.ts'
 import { SerializeOptions } from 'https://esm.sh/@tinyhttp/cookie'
 
 export const renderTemplate = <O = any, Res extends Response = Response>(res: Res, app: App) => (
@@ -57,6 +57,6 @@ export interface Response<O = any> extends ServerResponse {
     value: string | Record<string, unknown>,
     options?: SerializeOptions & Partial<{ signed: boolean }>
   ): Response
-  clearCookie(name: string, options?: SerializeOptions): Response
+  clearCookie(name: string): Response
   jsonp(obj: any): Response
 }