hono 0.5.0 → 0.5.1

package/README.md

@@ -31,12 +31,12 @@ app.fire()
 **Hono is fastest** compared to other routers for Cloudflare Workers.
 
 ```plain
-hono x 779,197 ops/sec ±6.55% (78 runs sampled)
-itty-router x 161,813 ops/sec ±3.87% (87 runs sampled)
-sunder x 334,096 ops/sec ±1.33% (93 runs sampled)
-worktop x 212,661 ops/sec ±4.40% (81 runs sampled)
+hono x 809,503 ops/sec ±6.94% (73 runs sampled)
+itty-router x 157,310 ops/sec ±4.31% (87 runs sampled)
+sunder x 328,350 ops/sec ±2.30% (95 runs sampled)
+worktop x 209,758 ops/sec ±4.28% (83 runs sampled)
 Fastest is hono
-✨  Done in 58.29s.
+✨  Done in 60.66s.
 ```
 
 ## Hono in 1 minute
@@ -184,15 +184,13 @@ app.use('*', async (c, next) => {
 // Add a custom header
 app.use('/message/*', async (c, next) => {
   await next()
-  await c.header('x-message', 'This is middleware!')
+  c.header('x-message', 'This is middleware!')
 })
 
 app.get('/message/hello', (c) => c.text('Hello Middleware!'))
 ```
 
-## Error
-
-### Not Found
+## Not Found
 
 `app.notFound` for customizing Not Found Response.
 
@@ -202,7 +200,7 @@ app.notFound((c) => {
 })
 ```
 
-### Error Handling
+## Error Handling
 
 `app.onError` handle the error and return the customized Response.
 

package/dist/compose.d.ts

@@ -1,2 +1,2 @@
 import type { ErrorHandler } from './hono';
-export declare const compose: <T>(middleware: Function[], onError?: ErrorHandler) => (context: T, next?: Function) => Promise<T>;
+export declare const compose: <C>(middleware: Function[], onError?: ErrorHandler) => (context: C) => Promise<C>;

package/dist/compose.js

@@ -4,36 +4,31 @@ exports.compose = void 0;
 const context_1 = require("./context");
 // Based on the code in the MIT licensed `koa-compose` package.
 const compose = (middleware, onError) => {
-    return function (context, next) {
+    return function (context) {
         let index = -1;
         return dispatch(0);
         async function dispatch(i) {
-            if (i <= index)
+            if (i === middleware.length) {
+                return context;
+            }
+            if (i <= index) {
                 return Promise.reject(new Error('next() called multiple times'));
+            }
+            const handler = middleware[i];
             index = i;
-            let fn = middleware[i];
-            if (i === middleware.length)
-                fn = next;
-            if (!fn)
+            return Promise.resolve(handler(context, dispatch.bind(null, i + 1)))
+                .then(() => {
                 return context;
-            try {
-                return Promise.resolve(fn(context, dispatch.bind(null, i + 1)))
-                    .then(() => {
+            })
+                .catch((err) => {
+                if (onError && context instanceof context_1.Context) {
+                    context.res = onError(err, context);
                     return context;
-                })
-                    .catch((err) => {
-                    if (onError && context instanceof context_1.Context) {
-                        context.res = onError(err, context);
-                        return context;
-                    }
-                    else {
-                        throw err;
-                    }
-                });
-            }
-            catch (err) {
-                return Promise.reject(err);
-            }
+                }
+                else {
+                    throw err;
+                }
+            });
         }
     };
 };

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.basicAuth = void 0;
 const buffer_1 = require("../../utils/buffer");
+const crypto_1 = require("../../utils/crypto");
 const CREDENTIALS_REGEXP = /^ *(?:[Bb][Aa][Ss][Ii][Cc]) +([A-Za-z0-9._~+/-]+=*) *$/;
 const USER_PASS_REGEXP = /^([^:]*):(.*)$/;
 const auth = (req) => {
@@ -18,7 +19,7 @@ const auth = (req) => {
     if (!match) {
         return undefined;
     }
-    const userPass = USER_PASS_REGEXP.exec((0, buffer_1.decodeBase64)(match[1]));
+    const userPass = USER_PASS_REGEXP.exec((0, crypto_1.decodeBase64)(match[1]));
     if (!userPass) {
         return undefined;
     }

package/dist/middleware/body-parse/body-parse.js

@@ -1,26 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bodyParse = void 0;
+const body_1 = require("../../utils/body");
 const bodyParse = () => {
     return async (ctx, next) => {
-        const contentType = ctx.req.headers.get('Content-Type') || '';
-        if (contentType.includes('application/json')) {
-            ctx.req.parsedBody = await ctx.req.json();
-        }
-        else if (contentType.includes('application/text')) {
-            ctx.req.parsedBody = await ctx.req.text();
-        }
-        else if (contentType.includes('text/html')) {
-            ctx.req.parsedBody = await ctx.req.text();
-        }
-        else if (contentType.includes('form')) {
-            const form = {};
-            const data = [...(await ctx.req.formData())].reduce((acc, cur) => {
-                acc[cur[0]] = cur[1];
-                return acc;
-            }, form);
-            ctx.req.parsedBody = data;
-        }
+        ctx.req.parsedBody = await (0, body_1.parseBody)(ctx.req);
         await next();
     };
 };

package/dist/middleware/etag/etag.d.ts

@@ -0,0 +1,6 @@
+import type { Context } from '../../context';
+declare type ETagOptions = {
+    weak: boolean;
+};
+export declare const etag: (options?: ETagOptions) => (c: Context, next: Function) => Promise<void>;
+export {};

package/dist/middleware/etag/etag.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.etag = void 0;
+const crypto_1 = require("../../utils/crypto");
+const body_1 = require("../../utils/body");
+const etag = (options = { weak: false }) => {
+    return async (c, next) => {
+        const ifNoneMatch = c.req.header('If-None-Match') || c.req.header('if-none-match');
+        await next();
+        const clone = c.res.clone();
+        const body = await (0, body_1.parseBody)(c.res);
+        const hash = await (0, crypto_1.sha1)(body);
+        const etag = options.weak ? `W/"${hash}"` : `"${hash}"`;
+        if (ifNoneMatch && ifNoneMatch === etag) {
+            await clone.blob(); // Force using body
+            c.res = new Response(null, {
+                status: 304,
+                statusText: 'Not Modified',
+            });
+            c.res.headers.delete('Content-Length');
+        }
+        else {
+            c.res = new Response(clone.body, clone);
+            c.res.headers.append('ETag', etag);
+        }
+    };
+};
+exports.etag = etag;

package/dist/utils/body.d.ts

@@ -0,0 +1 @@
+export declare const parseBody: (r: Request | Response) => Promise<string | object | Record<string, string | File>>;

package/dist/utils/body.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseBody = void 0;
+const parseBody = async (r) => {
+    const contentType = r.headers.get('Content-Type') || '';
+    if (contentType.includes('application/json')) {
+        return await r.json();
+    }
+    else if (contentType.includes('application/text')) {
+        return r.text();
+    }
+    else if (contentType.startsWith('text')) {
+        return r.text();
+    }
+    else if (contentType.includes('form')) {
+        const form = {};
+        const data = [...(await r.formData())].reduce((acc, cur) => {
+            acc[cur[0]] = cur[1];
+            return acc;
+        }, form);
+        return data;
+    }
+};
+exports.parseBody = parseBody;

package/dist/utils/buffer.d.ts

@@ -1,4 +1,2 @@
 export declare const equal: (a: ArrayBuffer, b: ArrayBuffer) => boolean;
-export declare const decodeBase64: (str: string) => any;
-export declare const sha256: (a: string | object | boolean) => Promise<string>;
 export declare const timingSafeEqual: (a: string | object | boolean, b: string | object | boolean) => Promise<boolean>;

package/dist/utils/buffer.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timingSafeEqual = exports.sha256 = exports.decodeBase64 = exports.equal = void 0;
+exports.timingSafeEqual = exports.equal = void 0;
+const crypto_1 = require("./crypto");
 const equal = (a, b) => {
     if (a === b) {
         return true;
@@ -19,52 +20,9 @@ const equal = (a, b) => {
     return true;
 };
 exports.equal = equal;
-const decodeBase64 = (str) => {
-    try {
-        const text = atob(str);
-        const length = text.length;
-        const bytes = new Uint8Array(length);
-        for (let i = 0; i < length; i++) {
-            bytes[i] = text.charCodeAt(i);
-        }
-        const decoder = new TextDecoder();
-        return decoder.decode(bytes);
-    }
-    catch (_a) { }
-    try {
-        const { Buffer } = require('buffer');
-        return Buffer.from(str, 'base64').toString();
-    }
-    catch (e) {
-        console.error('If you want to do "decodeBase64", polyfill "buffer" module.');
-        throw e;
-    }
-};
-exports.decodeBase64 = decodeBase64;
-const sha256 = async (a) => {
-    if (crypto && crypto.subtle) {
-        const buffer = await crypto.subtle.digest({
-            name: 'SHA-256',
-        }, new TextEncoder().encode(String(a)));
-        const hash = Array.prototype.map
-            .call(new Uint8Array(buffer), (x) => ('00' + x.toString(16)).slice(-2))
-            .join('');
-        return hash;
-    }
-    try {
-        const crypto = require('crypto');
-        const hash = crypto.createHash('sha256').update(a).digest('hex');
-        return hash;
-    }
-    catch (e) {
-        console.error('If you want to do "sha256", polyfill "crypto" module.');
-        throw e;
-    }
-};
-exports.sha256 = sha256;
 const timingSafeEqual = async (a, b) => {
-    const sa = await (0, exports.sha256)(a);
-    const sb = await (0, exports.sha256)(b);
+    const sa = await (0, crypto_1.sha256)(a);
+    const sb = await (0, crypto_1.sha256)(b);
     return sa === sb && a === b;
 };
 exports.timingSafeEqual = timingSafeEqual;

package/dist/utils/crypto.d.ts

@@ -0,0 +1,10 @@
+declare type Algorithm = {
+    name: string;
+    alias: string;
+};
+declare type Data = string | object | boolean;
+export declare const sha256: (data: Data) => Promise<string>;
+export declare const sha1: (data: Data) => Promise<string>;
+export declare const createHash: (data: Data, algorithm: Algorithm) => Promise<string>;
+export declare const decodeBase64: (str: string) => any;
+export {};

package/dist/utils/crypto.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeBase64 = exports.createHash = exports.sha1 = exports.sha256 = void 0;
+const sha256 = async (data) => {
+    const algorithm = { name: 'SHA-256', alias: 'sha256' };
+    const hash = await (0, exports.createHash)(data, algorithm);
+    return hash;
+};
+exports.sha256 = sha256;
+const sha1 = async (data) => {
+    const algorithm = { name: 'SHA-1', alias: 'sha1' };
+    const hash = await (0, exports.createHash)(data, algorithm);
+    return hash;
+};
+exports.sha1 = sha1;
+const createHash = async (data, algorithm) => {
+    if (crypto && crypto.subtle) {
+        const buffer = await crypto.subtle.digest({
+            name: algorithm.name,
+        }, new TextEncoder().encode(String(data)));
+        const hash = Array.prototype.map
+            .call(new Uint8Array(buffer), (x) => ('00' + x.toString(16)).slice(-2))
+            .join('');
+        return hash;
+    }
+    try {
+        const crypto = require('crypto');
+        const hash = crypto.createHash(algorithm.alias).update(data).digest('hex');
+        return hash;
+    }
+    catch (e) {
+        console.error(`If you want to create hash ${algorithm.name}, polyfill "crypto" module.`);
+        throw e;
+    }
+};
+exports.createHash = createHash;
+const decodeBase64 = (str) => {
+    try {
+        const text = atob(str);
+        const length = text.length;
+        const bytes = new Uint8Array(length);
+        for (let i = 0; i < length; i++) {
+            bytes[i] = text.charCodeAt(i);
+        }
+        const decoder = new TextDecoder();
+        return decoder.decode(bytes);
+    }
+    catch (_a) { }
+    try {
+        const { Buffer } = require('buffer');
+        return Buffer.from(str, 'base64').toString();
+    }
+    catch (e) {
+        console.error('If you want to do "decodeBase64", polyfill "buffer" module.');
+        throw e;
+    }
+};
+exports.decodeBase64 = decodeBase64;

package/dist/utils/mime.js

@@ -4,11 +4,10 @@ exports.getMimeType = void 0;
 const getMimeType = (filename) => {
     const regexp = /\.([a-zA-Z0-9]+?)$/;
     const match = filename.match(regexp);
-    if (!match) {
+    if (!match)
         return;
-    }
     let mimeType = mimes[match[1]];
-    if (mimeType.startsWith('text') || mimeType === 'application/json') {
+    if ((mimeType && mimeType.startsWith('text')) || mimeType === 'application/json') {
         mimeType += '; charset=utf-8';
     }
     return mimeType;
@@ -43,6 +42,7 @@ const mimes = {
     js: 'text/javascript',
     json: 'application/json',
     jsonld: 'application/ld+json',
+    map: 'application/json',
     mid: 'audio/x-midi',
     midi: 'audio/x-midi',
     mjs: 'text/javascript',

package/package.json

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