hono 0.0.16 → 0.1.0

package/dist/context.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Context = void 0;
-const util_1 = require("./util");
+const url_1 = require("./utils/url");
 class Context {
     constructor(req, opts) {
         this.req = req;
@@ -49,7 +49,7 @@ class Context {
         if (typeof location !== 'string') {
             throw new TypeError('location must be a string!');
         }
-        if (!(0, util_1.isAbsoluteURL)(location)) {
+        if (!(0, url_1.isAbsoluteURL)(location)) {
             const url = new URL(this.req.url);
             url.pathname = location;
             location = url.toString();

package/dist/hono.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Hono = exports.Router = void 0;
 const node_1 = require("./node");
 const compose_1 = require("./compose");
-const util_1 = require("./util");
+const url_1 = require("./utils/url");
 const middleware_1 = require("./middleware");
 const context_1 = require("./context");
 const METHOD_NAME_OF_ALL = 'ALL';
@@ -94,7 +94,7 @@ class Hono {
         return this.router.match(method, path);
     }
     async dispatch(request, env, event) {
-        const [method, path] = [request.method, (0, util_1.getPathFromURL)(request.url)];
+        const [method, path] = [request.method, (0, url_1.getPathFromURL)(request.url)];
         const result = await this.matchRoute(method, path);
         request.params = (key) => {
             if (result) {

package/dist/middleware/basic-auth/basic-auth.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.basicAuth = void 0;
-const util_1 = require("../../util");
+const buffer_1 = require("../../utils/buffer");
 const CREDENTIALS_REGEXP = /^ *(?:[Bb][Aa][Ss][Ii][Cc]) +([A-Za-z0-9._~+/-]+=*) *$/;
 const USER_PASS_REGEXP = /^([^:]*):(.*)$/;
 const auth = (req) => {
@@ -33,8 +33,8 @@ const basicAuth = (options) => {
     }
     return async (ctx, next) => {
         const user = auth(ctx.req);
-        const usernameEqual = user && await (0, util_1.timingSafeEqual)(options.username, user.username);
-        const passwordEqual = user && await (0, util_1.timingSafeEqual)(options.password, user.password);
+        const usernameEqual = user && await (0, buffer_1.timingSafeEqual)(options.username, user.username);
+        const passwordEqual = user && await (0, buffer_1.timingSafeEqual)(options.password, user.password);
         if (!user || !usernameEqual || !passwordEqual) {
             ctx.res = new Response('Unauthorized', {
                 status: 401,

package/dist/middleware/default.js

@@ -8,21 +8,16 @@ const defaultMiddleware = async (c, next) => {
         return url.searchParams.get(key);
     };
     await next();
-    /*
-    TODO:
-    Adding Content-Length header make it more slower.
-    This should not be default middleware...
     if (c.res.body) {
-      // Do not clone Response, ex: c.res.clone().arrayBuffer()
-      const response = new Response(c.res.body, {
-        status: c.res.status,
-        statusText: c.res.statusText,
-        headers: c.res.headers,
-      })
-      c.res = response
-      const buff = await c.res.clone().arrayBuffer()
-      c.res.headers.append('Content-Length', buff.byteLength.toString())
+        // Do not clone Response, ex: c.res.clone().arrayBuffer()
+        const buffer = await c.res.arrayBuffer();
+        const res = new Response(buffer, {
+            status: c.res.status,
+            statusText: c.res.statusText,
+            headers: c.res.headers,
+        });
+        res.headers.append('Content-Length', buffer.byteLength.toString());
+        c.res = res;
     }
-    */
 };
 exports.defaultMiddleware = defaultMiddleware;

package/dist/middleware/logger/logger.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = void 0;
-const util_1 = require("../../util");
+const url_1 = require("../../utils/url");
 const humanize = (n, opts) => {
     const options = opts || {};
     const d = options.delimiter || ',';
@@ -33,16 +33,16 @@ const colorStatus = (status = 0) => {
     };
     return out[(status / 100) | 0];
 };
-function log(fn, prefix, method, path, status, elasped) {
+function log(fn, prefix, method, path, status, elasped, contentLength) {
     const out = prefix === LogPrefix.Incoming
         ? `  ${prefix} ${method} ${path}`
-        : `  ${prefix} ${method} ${path} ${colorStatus(status)} ${elasped}`;
+        : `  ${prefix} ${method} ${path} ${colorStatus(status)} ${elasped} ${contentLength}`;
     fn(out);
 }
 const logger = (fn = console.log) => {
     return async (c, next) => {
         const { method } = c.req;
-        const path = (0, util_1.getPathFromURL)(c.req.url);
+        const path = (0, url_1.getPathFromURL)(c.req.url);
         log(fn, LogPrefix.Incoming, method, path);
         const start = Date.now();
         try {
@@ -52,7 +52,13 @@ const logger = (fn = console.log) => {
             log(fn, LogPrefix.Error, method, path, c.res.status || 500, time(start));
             throw e;
         }
-        log(fn, LogPrefix.Outgoing, method, path, c.res.status, time(start));
+        const len = parseFloat(c.res.headers.get('Content-Length'));
+        const contentLength = isNaN(len)
+            ? '0'
+            : len < 1024
+                ? `${len}b`
+                : `${len / 1024}kB`;
+        log(fn, LogPrefix.Outgoing, method, path, c.res.status, time(start), contentLength);
     };
 };
 exports.logger = logger;

package/dist/node.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Node = exports.Result = void 0;
-const util_1 = require("./util");
+const url_1 = require("./utils/url");
 const METHOD_NAME_OF_ALL = 'ALL';
 class Result {
     constructor(handler, params) {
@@ -25,7 +25,7 @@ class Node {
     insert(method, path, handler) {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         let curNode = this;
-        const parts = (0, util_1.splitPath)(path);
+        const parts = (0, url_1.splitPath)(path);
         for (let i = 0, len = parts.length; i < len; i++) {
             const p = parts[i];
             if (Object.keys(curNode.children).includes(p)) {
@@ -42,7 +42,7 @@ class Node {
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         let curNode = this;
         const params = {};
-        const parts = (0, util_1.splitPath)(path);
+        const parts = (0, url_1.splitPath)(path);
         for (let i = 0, len = parts.length; i < len; i++) {
             const p = parts[i];
             // '*' => match any path
@@ -74,7 +74,7 @@ class Node {
                     isWildcard = true;
                     break;
                 }
-                const pattern = (0, util_1.getPattern)(key);
+                const pattern = (0, url_1.getPattern)(key);
                 // Named match
                 if (pattern) {
                     const match = p.match(new RegExp(pattern[1]));

package/dist/utils/buffer.d.ts

@@ -0,0 +1,2 @@
+export declare const equal: (a: ArrayBuffer, b: ArrayBuffer) => boolean;
+export declare const timingSafeEqual: (a: any, b: any) => Promise<boolean>;

package/dist/utils/buffer.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.timingSafeEqual = exports.equal = void 0;
+const equal = (a, b) => {
+    if (a === b) {
+        return true;
+    }
+    if (a.byteLength !== b.byteLength) {
+        return false;
+    }
+    const va = new DataView(a);
+    const vb = new DataView(b);
+    let i = va.byteLength;
+    while (i--) {
+        if (va.getUint8(i) !== vb.getUint8(i)) {
+            return false;
+        }
+    }
+    return true;
+};
+exports.equal = equal;
+const timingSafeEqual = async (a, b) => {
+    const sa = await crypto.subtle.digest({
+        name: 'SHA-256',
+    }, new TextEncoder().encode(String(a)));
+    const sb = await crypto.subtle.digest({
+        name: 'SHA-256',
+    }, new TextEncoder().encode(String(b)));
+    return (0, exports.equal)(sa, sb) && a === b;
+};
+exports.timingSafeEqual = timingSafeEqual;

package/dist/{util.d.ts → utils/url.d.ts}

@@ -2,4 +2,3 @@ export declare const splitPath: (path: string) => string[];
 export declare const getPattern: (label: string) => string[] | null;
 export declare const getPathFromURL: (url: string) => string;
 export declare const isAbsoluteURL: (url: string) => boolean;
-export declare const timingSafeEqual: (a: any, b: any) => Promise<boolean>;

package/dist/{util.js → utils/url.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timingSafeEqual = exports.isAbsoluteURL = exports.getPathFromURL = exports.getPattern = exports.splitPath = void 0;
+exports.isAbsoluteURL = exports.getPathFromURL = exports.getPattern = exports.splitPath = void 0;
 const URL_REGEXP = /^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/;
 const splitPath = (path) => {
     const paths = path.split(/\//); // faster than path.split('/')
@@ -27,7 +27,6 @@ const getPattern = (label) => {
 };
 exports.getPattern = getPattern;
 const getPathFromURL = (url) => {
-    // XXX
     const match = url.match(URL_REGEXP);
     if (match) {
         return match[5];
@@ -43,30 +42,3 @@ const isAbsoluteURL = (url) => {
     return false;
 };
 exports.isAbsoluteURL = isAbsoluteURL;
-const bufferEqual = (a, b) => {
-    if (a === b) {
-        return true;
-    }
-    if (a.byteLength !== b.byteLength) {
-        return false;
-    }
-    const va = new DataView(a);
-    const vb = new DataView(b);
-    let i = va.byteLength;
-    while (i--) {
-        if (va.getUint8(i) !== vb.getUint8(i)) {
-            return false;
-        }
-    }
-    return true;
-};
-const timingSafeEqual = async (a, b) => {
-    const sa = await crypto.subtle.digest({
-        name: 'SHA-256',
-    }, new TextEncoder().encode(String(a)));
-    const sb = await crypto.subtle.digest({
-        name: 'SHA-256',
-    }, new TextEncoder().encode(String(b)));
-    return bufferEqual(sa, sb) && a === b;
-};
-exports.timingSafeEqual = timingSafeEqual;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "0.0.16",
+  "version": "0.1.0",
   "description": "[炎] Ultrafast web framework for Cloudflare Workers.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",