feat: migrate to tested third party module ports for some deps.

.github/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## [0.6.1] - 29-05-2020
+
+- refactor: Replace internal ports of NPM modules with tested third party module equivalents.
+
 ## [0.6.0] - 29-05-2020
 
 - feat: deliver content negotiation with the `res.format()` and `res.vary()` methods.

deps.ts

@@ -34,9 +34,14 @@ export {
   contentType,
   charset,
 } from "https://deno.land/x/[email protected]/mod.ts";
-export { createHttpError } from "https://deno.land/x/[email protected]/httpError.ts";
+export { createError } from "https://deno.land/x/http_errors/mod.ts";
 export { Accepts } from "https://deno.land/x/accepts@master/mod.ts";
-export { typeofrequest } from "https://deno.land/x/type_is@master/mod.ts";
+export {
+  typeofrequest,
+  hasBody,
+} from "https://deno.land/x/type_is@master/mod.ts";
 export { isIP } from "https://deno.land/x/isIP@master/mod.ts";
 export { vary } from "https://deno.land/x/vary@master/mod.ts";
 export { lookup } from "https://deno.land/x/[email protected]/mod.ts";
+export { escapeHtml } from "https://deno.land/x/escape_html/mod.ts";
+export { encodeUrl } from "https://deno.land/x/encodeurl/mod.ts";

src/middleware/bodyParser/json.ts

@@ -29,11 +29,10 @@
  * 
  */
 
-import { createHttpError } from "../../../deps.ts";
+import { createError, hasBody } from "../../../deps.ts";
 import { read } from "./read.ts";
 import { getCharset } from "./getCharset.ts";
 import { typeChecker } from "./typeChecker.ts";
-import { hasBody } from "./hasBody.ts";
 import { Request, Response, NextFunction } from "../../types.ts";
 
 /**
@@ -106,7 +105,7 @@ export function json(options: any = {}) {
     }
 
     // skip requests without bodies
-    if (!hasBody(req)) {
+    if (!hasBody(req.headers)) {
       req.parsedBody = {};
       next();
       return;
@@ -122,7 +121,7 @@ export function json(options: any = {}) {
     const charset = getCharset(req) || "utf-8";
     if (charset.substr(0, 4) !== "utf-") {
       next(
-        createHttpError(
+        createError(
           415,
           'unsupported charset "' + charset.toUpperCase() + '"',
         ),

src/middleware/bodyParser/raw.ts

@@ -31,7 +31,7 @@
 
 import { read } from "./read.ts";
 import { Request, Response, NextFunction } from "../../types.ts";
-import { hasBody } from "./hasBody.ts";
+import { hasBody } from "../../../deps.ts";
 import { typeChecker } from "./typeChecker.ts";
 
 /**
@@ -64,7 +64,7 @@ export function raw(options: any = {}) {
     }
 
     // skip requests without bodies
-    if (!hasBody(req)) {
+    if (!hasBody(req.headers)) {
       req.parsedBody = "";
       next();
       return;

src/middleware/bodyParser/read.ts

@@ -30,7 +30,7 @@
  */
 
 import { Request, Response, NextFunction } from "../../types.ts";
-import { createHttpError } from "../../../deps.ts";
+import { createError } from "../../../deps.ts";
 
 const decoder = new TextDecoder();
 
@@ -71,15 +71,15 @@ export async function read(
     const raw = await Deno.readAll(reader);
     body = decoder.decode(raw);
   } catch (err) {
-    next(createHttpError(400, err));
+    next(createError(400, err));
   }
 
   // verify
   if (verify) {
     try {
       verify(req, res, body, encoding);
     } catch (err) {
-      next(createHttpError(403, err));
+      next(createError(403, err));
       return;
     }
   }
@@ -88,7 +88,7 @@ export async function read(
   try {
     req.parsedBody = parse(body);
   } catch (err) {
-    next(createHttpError(400, err));
+    next(createError(400, err));
     return;
   }
 
@@ -108,7 +108,7 @@ function getBodyReader(req: Request, inflate: boolean = true) {
     .toLowerCase();
 
   if (inflate === false && encoding !== "identity") {
-    throw createHttpError(
+    throw createError(
       415,
       'unsupported content encoding "' + encoding + '"',
     );
@@ -121,7 +121,7 @@ function getBodyReader(req: Request, inflate: boolean = true) {
     case "deflate":
     case "gzip":
     default:
-      throw createHttpError(
+      throw createError(
         415,
         'unsupported content encoding "' + encoding + '"',
       );

src/middleware/bodyParser/text.ts

@@ -32,7 +32,7 @@
 import { read } from "./read.ts";
 import { getCharset } from "./getCharset.ts";
 import { Request, Response, NextFunction } from "../../types.ts";
-import { hasBody } from "./hasBody.ts";
+import { hasBody } from "../../../deps.ts";
 import { typeChecker } from "./typeChecker.ts";
 
 /**
@@ -66,7 +66,7 @@ export function text(options: any = {}) {
     }
 
     // skip requests without bodies
-    if (!hasBody(req)) {
+    if (!hasBody(req.headers)) {
       req.parsedBody = "";
       next();
       return;

src/middleware/bodyParser/typeChecker.ts

@@ -30,20 +30,7 @@
  */
 
 import { Request } from "../../types.ts";
-import { hasBody } from "./hasBody.ts";
-import { contentType } from "../../../deps.ts";
-
-function normalize(type: any) {
-  return contentType(type || "")?.split(";")[0];
-}
-
-function typeIs(req: Request, type: string) {
-  if (!hasBody(req)) {
-    return false;
-  }
-
-  return normalize(req.headers.get("Content-Type")) === normalize(type);
-}
+import { typeofrequest } from "../../../deps.ts";
 
 /**
  * Get the simple type checker.
@@ -53,6 +40,6 @@ function typeIs(req: Request, type: string) {
  */
 export function typeChecker(type: string) {
   return function checkType(req: Request) {
-    return Boolean(typeIs(req, type));
+    return Boolean(typeofrequest(req.headers, [type]));
   };
 }

src/middleware/bodyParser/urlencoded.ts

@@ -29,11 +29,11 @@
  * 
  */
 
-import { createHttpError } from "../../../deps.ts";
+import { createError } from "../../../deps.ts";
 import { read } from "./read.ts";
 import { getCharset } from "./getCharset.ts";
 import { Request, Response, NextFunction } from "../../types.ts";
-import { hasBody } from "./hasBody.ts";
+import { hasBody } from "../../../deps.ts";
 import { typeChecker } from "./typeChecker.ts";
 
 /**
@@ -74,7 +74,7 @@ export function urlencoded(options: any = {}) {
     }
 
     // skip requests without bodies
-    if (!hasBody(req)) {
+    if (!hasBody(req.headers)) {
       (req as any).parsedBody = Object.fromEntries(
         new URLSearchParams().entries(),
       );
@@ -90,7 +90,7 @@ export function urlencoded(options: any = {}) {
     const charset = getCharset(req) || "utf-8";
     if (charset !== "utf-8") {
       return next(
-        createHttpError(
+        createError(
           415,
           'unsupported charset "' + charset.toUpperCase() + '"',
         ),

src/middleware/serveStatic.ts

@@ -31,9 +31,13 @@
  *
  */
 
-import { join, fromFileUrl, createHttpError } from "../../deps.ts";
-import { escapeHtml } from "../utils/escapeHtml.ts";
-import { encodeUrl } from "../utils/encodeUrl.ts";
+import {
+  join,
+  fromFileUrl,
+  createError,
+  escapeHtml,
+  encodeUrl,
+} from "../../deps.ts";
 import { originalUrl as original, parseUrl } from "../utils/parseUrl.ts";
 import {
   Response,
@@ -184,7 +188,7 @@ function createNotFoundDirectoryListener(): Function {
     forwardError: boolean,
   ): void {
     if (forwardError) {
-      return next(createHttpError(404));
+      return next(createError(404));
     }
 
     next();
@@ -206,7 +210,7 @@ function createRedirectDirectoryListener(): Function {
   ): void {
     if (fullPath.endsWith("/")) {
       if (forwardError) {
-        return next(createHttpError(404));
+        return next(createError(404));
       }
 
       return next();

src/response.ts

@@ -1,6 +1,5 @@
 import { contentDisposition } from "./utils/contentDisposition.ts";
 import { stringify } from "./utils/stringify.ts";
-import { encodeUrl } from "./utils/encodeUrl.ts";
 import { normalizeType, normalizeTypes } from "./utils/normalizeType.ts";
 import {
   setCookie,
@@ -12,6 +11,7 @@ import {
   basename,
   contentType,
   vary,
+  encodeUrl,
 } from "../deps.ts";
 import {
   Response as DenoResponse,

src/utils/contentDisposition.ts

@@ -1,4 +1,4 @@
-import { encodeUrl } from "./encodeUrl.ts";
+import { encodeUrl } from "../../deps.ts";
 
 /**
  * Creates a Content-Disposition Header value from