hono 0.2.4 → 0.3.3

package/README.md

@@ -35,7 +35,7 @@ Fastest is hono
 
 Below is a demonstration to create an application of Cloudflare Workers with Hono.
 
-![Demo](https://user-images.githubusercontent.com/10682/151102477-be0f950e-8d23-49c5-b6d8-d8ecb6b7484e.gif)
+![Demo](https://user-images.githubusercontent.com/10682/151973526-342644f9-71c5-4fee-81f4-64a7558bb192.gif)
 
 ## Install
 
@@ -138,19 +138,24 @@ app.get('/fetch-url', async (c) => {
 ### Builtin Middleware
 
 ```js
-import { Hono, Middleware } from 'hono'
+import { Hono } from 'hono'
+import { poweredBy } from 'hono/powered-by'
+import { logger } from 'hono/logger'
+import { basicAuth } from 'hono/basicAuth'
 
-...
+const app = new Hono()
 
-app.use('*', Middleware.poweredBy())
-app.use('*', Middleware.logger())
+app.use('*', poweredBy())
+app.use('*', logger())
 app.use(
   '/auth/*',
-  Middleware.basicAuth({
+  basicAuth({
     username: 'hono',
     password: 'acoolproject',
   })
 )
+
+...
 ```
 
 Available builtin middleware are listed on [src/middleware](https://github.com/yusukebe/hono/tree/master/src/middleware).

package/dist/compose.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compose = void 0;
 // Based on the code in the MIT licensed `koa-compose` package.
 const compose = (middleware) => {
+    const errors = [];
     return function (context, next) {
         let index = -1;
         return dispatch(0);
@@ -16,7 +17,10 @@ const compose = (middleware) => {
             if (!fn)
                 return Promise.resolve();
             try {
-                return Promise.resolve(fn(context, dispatch.bind(null, i + 1)));
+                return Promise.resolve(fn(context, dispatch.bind(null, i + 1))).catch((e) => {
+                    errors.push(e);
+                    throw errors[0]; // XXX
+                });
             }
             catch (err) {
                 return Promise.reject(err);

package/dist/hono.d.ts

@@ -8,6 +8,7 @@ declare global {
         param: (key: string) => string;
         query: (key: string) => string | null;
         header: (name: string) => string;
+        parsedBody: any;
     }
 }
 export declare type Handler = (c: Context, next?: Function) => Response | Promise<Response>;

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export { Hono } from './hono';
 export type { Handler, MiddlewareHandler } from './hono';
-export { Middleware } from './middleware';
 export { Context } from './context';
 export type { Env } from './context';

package/dist/index.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Context = exports.Middleware = exports.Hono = void 0;
+exports.Context = exports.Hono = void 0;
 var hono_1 = require("./hono");
 Object.defineProperty(exports, "Hono", { enumerable: true, get: function () { return hono_1.Hono; } });
-var middleware_1 = require("./middleware");
-Object.defineProperty(exports, "Middleware", { enumerable: true, get: function () { return middleware_1.Middleware; } });
 var context_1 = require("./context");
 Object.defineProperty(exports, "Context", { enumerable: true, get: function () { return context_1.Context; } });

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

@@ -18,23 +18,20 @@ const auth = (req) => {
     if (!match) {
         return undefined;
     }
-    const userPass = USER_PASS_REGEXP.exec(decodeBase64(match[1]));
+    const userPass = USER_PASS_REGEXP.exec((0, buffer_1.decodeBase64)(match[1]));
     if (!userPass) {
         return undefined;
     }
     return { username: userPass[1], password: userPass[2] };
 };
-function decodeBase64(str) {
-    return Buffer.from(str, 'base64').toString();
-}
 const basicAuth = (options) => {
     if (!options.realm) {
         options.realm = 'Secure Area';
     }
     return async (ctx, next) => {
         const user = auth(ctx.req);
-        const usernameEqual = user && await (0, buffer_1.timingSafeEqual)(options.username, user.username);
-        const passwordEqual = user && await (0, buffer_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/body-parse/body-parse.d.ts

@@ -1,7 +1,2 @@
 import type { Context } from '../../context';
-declare global {
-    interface Request {
-        parsedBody: any;
-    }
-}
 export declare const bodyParse: () => (ctx: Context, next: Function) => Promise<void>;

package/dist/middleware/mustache/mustache.js

@@ -4,16 +4,13 @@ exports.mustache = void 0;
 const cloudflare_1 = require("../../utils/cloudflare");
 const EXTENSION = '.mustache';
 const mustache = () => {
-    let Mustache;
-    try {
-        Mustache = require('mustache');
-    }
-    catch (_a) {
-        // Do nothing.
-    }
     return async (c, next) => {
-        if (!Mustache) {
-            throw new Error('If you want to use Mustache Middleware, install mustache module.');
+        let Mustache;
+        try {
+            Mustache = require('mustache');
+        }
+        catch (_a) {
+            throw new Error('If you want to use Mustache Middleware, install "mustache" package first.');
         }
         c.render = async (filename, view = {}, options) => {
             const buffer = await (0, cloudflare_1.getContentFromKVAsset)(`${filename}${EXTENSION}`);

package/dist/middleware.d.ts

@@ -1,28 +1,3 @@
 export declare class Middleware {
     static default: (c: import("./context").Context, next: Function) => Promise<void>;
-    static poweredBy: () => (c: import("./context").Context, next: Function) => Promise<void>;
-    static logger: (fn?: {
-        (...data: any[]): void;
-        (...data: any[]): void;
-        (message?: any, ...optionalParams: any[]): void;
-    }) => (c: import("./context").Context, next: Function) => Promise<void>;
-    static basicAuth: (options: {
-        username: string;
-        password: string;
-        realm?: string;
-    }) => (ctx: import("./context").Context, next: Function) => Promise<any>;
-    static bodyParse: () => (ctx: import("./context").Context, next: Function) => Promise<void>;
-    static cors: (options?: {
-        origin: string;
-        allowMethods?: string[];
-        allowHeaders?: string[];
-        maxAge?: number;
-        credentials?: boolean;
-        exposeHeaders?: string[];
-    }) => (c: import("./context").Context, next: Function) => Promise<void>;
-    static cookie: () => (c: import("./context").Context, next: Function) => Promise<void>;
-    static mustache: () => (c: import("./context").Context, next: Function) => Promise<void>;
-    static serveStatic: (opt?: {
-        root: string;
-    }) => (c: import("./context").Context, next: Function) => Promise<void>;
 }

package/dist/middleware.js

@@ -2,23 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Middleware = void 0;
 const default_1 = require("./middleware/default");
-const powered_by_1 = require("./middleware/powered-by/powered-by");
-const logger_1 = require("./middleware/logger/logger");
-const basic_auth_1 = require("./middleware/basic-auth/basic-auth");
-const body_parse_1 = require("./middleware/body-parse/body-parse");
-const cors_1 = require("./middleware/cors/cors");
-const cookie_1 = require("./middleware/cookie/cookie");
-const mustache_1 = require("./middleware/mustache/mustache");
-const serve_static_1 = require("./middleware/serve-static/serve-static");
 class Middleware {
 }
 exports.Middleware = Middleware;
 Middleware.default = default_1.defaultMiddleware;
-Middleware.poweredBy = powered_by_1.poweredBy;
-Middleware.logger = logger_1.logger;
-Middleware.basicAuth = basic_auth_1.basicAuth;
-Middleware.bodyParse = body_parse_1.bodyParse;
-Middleware.cors = cors_1.cors;
-Middleware.cookie = cookie_1.cookie;
-Middleware.mustache = mustache_1.mustache;
-Middleware.serveStatic = serve_static_1.serveStatic;

package/dist/utils/buffer.d.ts

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

package/dist/utils/buffer.js

@@ -1,6 +1,25 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timingSafeEqual = exports.equal = void 0;
+exports.timingSafeEqual = exports.sha256 = exports.decodeBase64 = exports.equal = void 0;
 const equal = (a, b) => {
     if (a === b) {
         return true;
@@ -19,13 +38,50 @@ 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 = await Promise.resolve().then(() => __importStar(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 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;
+    const sa = await (0, exports.sha256)(a);
+    const sb = await (0, exports.sha256)(b);
+    return sa === sb && a === b;
 };
 exports.timingSafeEqual = timingSafeEqual;

package/package.json

@@ -1,12 +1,51 @@
 {
   "name": "hono",
-  "version": "0.2.4",
+  "version": "0.3.3",
   "description": "[炎] Ultrafast web framework for Cloudflare Workers.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
+  "exports": {
+    ".": "./dist/index.js",
+    "./basic-auth": "./dist/middleware/basic-auth/basic-auth.js",
+    "./body-parse": "./dist/middleware/body-parse/body-parse.js",
+    "./cookie": "./dist/middleware/cookie/cookie.js",
+    "./cors": "./dist/middleware/cors/cors.js",
+    "./logger": "./dist/middleware/logger/logger.js",
+    "./mustache": "./dist/middleware/mustache/mustache.js",
+    "./powered-by": "./dist/middleware/powered-by/powered-by.js",
+    "./serve-static": "./dist/middleware/serve-static/serve-static.js"
+  },
+  "typesVersions": {
+    "*": {
+      "basic-auth": [
+        "./dist/middleware/basic-auth/basic-auth.d.ts"
+      ],
+      "body-parse": [
+        "./dist/middleware/body-parse/body-parse.d.ts"
+      ],
+      "cookie": [
+        "./dist/middleware/cookie/cookie.d.ts"
+      ],
+      "cors": [
+        "./dist/middleware/cors/cors.d.ts"
+      ],
+      "logger": [
+        "./dist/middleware/logger/logger.d.ts"
+      ],
+      "mustache": [
+        "./dist/middleware/mustache/mustache.d.ts"
+      ],
+      "powered-by": [
+        "./dist/middleware/powered-by/powered-by.d.ts"
+      ],
+      "serve-static": [
+        "./dist/middleware/serve-static/serve-static.d.ts"
+      ]
+    }
+  },
   "scripts": {
     "test": "jest",
     "lint": "eslint --ext js,ts src .eslintrc.js test",
@@ -55,7 +94,7 @@
     "mustache": "^4.2.0",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.1.2",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.5"
   },
   "engines": {
     "node": ">=11.0.0"