hono 0.3.1 → 0.3.5

package/dist/context.js

@@ -52,7 +52,7 @@ class Context {
         if (typeof text !== 'string') {
             throw new TypeError('text method arg must be a string!');
         }
-        headers['Content-Type'] = 'text/plain';
+        headers['Content-Type'] || (headers['Content-Type'] = 'text/plain; charset=UTF-8');
         return this.body(text, status, headers);
     }
     json(object, status = this._status, headers = {}) {
@@ -60,14 +60,14 @@ class Context {
             throw new TypeError('json method arg must be a object!');
         }
         const body = JSON.stringify(object);
-        headers['Content-Type'] = 'application/json; charset=UTF-8';
+        headers['Content-Type'] || (headers['Content-Type'] = 'application/json; charset=UTF-8');
         return this.body(body, status, headers);
     }
     html(html, status = this._status, headers = {}) {
         if (typeof html !== 'string') {
             throw new TypeError('html method arg must be a string!');
         }
-        headers['Content-Type'] = 'text/html; charset=UTF-8';
+        headers['Content-Type'] || (headers['Content-Type'] = 'text/html; charset=UTF-8');
         return this.body(html, status, headers);
     }
     redirect(location, status = 302) {

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

@@ -18,21 +18,12 @@ 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) {
-    if (atob && btoa) {
-        return atob(str);
-    }
-    else {
-        const { Buffer } = require('buffer');
-        return Buffer.from(str, 'base64').toString();
-    }
-}
 const basicAuth = (options) => {
     if (!options.realm) {
         options.realm = 'Secure Area';

package/dist/middleware/mustache/mustache.d.ts

@@ -1,2 +1,6 @@
 import type { Context } from '../../context';
-export declare const mustache: () => (c: Context, next: Function) => Promise<void>;
+declare type Options = {
+    root: string;
+};
+export declare const mustache: (opt?: Options) => (c: Context, next: Function) => Promise<void>;
+export {};

package/dist/middleware/mustache/mustache.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mustache = void 0;
 const cloudflare_1 = require("../../utils/cloudflare");
 const EXTENSION = '.mustache';
-const mustache = () => {
+const DEFAULT_DOCUMENT = 'index.mustache';
+const mustache = (opt = { root: '' }) => {
+    const { root } = opt;
     return async (c, next) => {
         let Mustache;
         try {
@@ -13,18 +15,24 @@ const mustache = () => {
             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}`);
+            const path = (0, cloudflare_1.getKVFilePath)({ filename: `${filename}${EXTENSION}`, root: root, defaultDocument: DEFAULT_DOCUMENT });
+            const buffer = await (0, cloudflare_1.getContentFromKVAsset)(path);
             if (!buffer) {
-                throw new Error(`Template "${filename}${EXTENSION}" is not found or blank.`);
+                throw new Error(`Template "${path}" is not found or blank.`);
             }
             const content = bufferToString(buffer);
             const partialArgs = {};
             if (options) {
                 const partials = options;
                 for (const key of Object.keys(partials)) {
-                    const partialBuffer = await (0, cloudflare_1.getContentFromKVAsset)(`${partials[key]}${EXTENSION}`);
+                    const partialPath = (0, cloudflare_1.getKVFilePath)({
+                        filename: `${partials[key]}${EXTENSION}`,
+                        root: root,
+                        defaultDocument: DEFAULT_DOCUMENT,
+                    });
+                    const partialBuffer = await (0, cloudflare_1.getContentFromKVAsset)(partialPath);
                     if (!partialBuffer) {
-                        throw new Error(`Partial Template "${partials[key]}${EXTENSION}" is not found or blank.`);
+                        throw new Error(`Partial Template "${partialPath}" is not found or blank.`);
                     }
                     partialArgs[key] = bufferToString(partialBuffer);
                 }

package/dist/middleware/serve-static/serve-static.js

@@ -9,7 +9,7 @@ const serveStatic = (opt = { root: '' }) => {
     return async (c, next) => {
         await next();
         const url = new URL(c.req.url);
-        const path = getKVPath(url.pathname, opt.root);
+        const path = (0, cloudflare_1.getKVFilePath)({ filename: url.pathname, root: opt.root, defaultDocument: DEFAULT_DOCUMENT });
         const content = await (0, cloudflare_1.getContentFromKVAsset)(path);
         if (content) {
             const mimeType = (0, mime_1.getMimeType)(path);
@@ -24,21 +24,3 @@ const serveStatic = (opt = { root: '' }) => {
     };
 };
 exports.serveStatic = serveStatic;
-const getKVPath = (filename, root) => {
-    if (filename.endsWith('/')) {
-        // /top/ => /top/index.html
-        filename = filename.concat(DEFAULT_DOCUMENT);
-    }
-    else if (!(0, mime_1.getMimeType)(filename)) {
-        // /top => /top/index.html
-        filename = filename.concat('/' + DEFAULT_DOCUMENT);
-    }
-    // /foo.html => foo.html
-    filename = filename.replace(/^\//, '');
-    // assets/ => assets
-    root = root.replace(/\/$/, '');
-    // ./assets/foo.html => assets/foo.html
-    let path = root + '/' + filename;
-    path = path.replace(/^\.?\//, '');
-    return path;
-};

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,6 @@
 "use strict";
 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 +19,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 = 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/dist/utils/cloudflare.d.ts

@@ -1 +1,8 @@
 export declare const getContentFromKVAsset: (path: string) => Promise<ArrayBuffer>;
+declare type Options = {
+    filename: string;
+    root?: string;
+    defaultDocument?: string;
+};
+export declare const getKVFilePath: (opt: Options) => string;
+export {};

package/dist/utils/cloudflare.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContentFromKVAsset = void 0;
+exports.getKVFilePath = exports.getContentFromKVAsset = void 0;
 const getContentFromKVAsset = async (path) => {
     let ASSET_MANIFEST;
     if (typeof __STATIC_CONTENT_MANIFEST === 'string') {
@@ -21,3 +21,25 @@ const getContentFromKVAsset = async (path) => {
     return content;
 };
 exports.getContentFromKVAsset = getContentFromKVAsset;
+const getKVFilePath = (opt) => {
+    let filename = opt.filename;
+    let root = opt.root || '';
+    const defaultDocument = opt.defaultDocument || 'index.html';
+    if (filename.endsWith('/')) {
+        // /top/ => /top/index.html
+        filename = filename.concat(defaultDocument);
+    }
+    else if (!filename.match(/\.[a-zA-Z0-9]+$/)) {
+        // /top => /top/index.html
+        filename = filename.concat('/' + defaultDocument);
+    }
+    // /foo.html => foo.html
+    filename = filename.replace(/^\//, '');
+    // assets/ => assets
+    root = root.replace(/\/$/, '');
+    // ./assets/foo.html => assets/foo.html
+    let path = root ? root + '/' + filename : filename;
+    path = path.replace(/^\.?\//, '');
+    return path;
+};
+exports.getKVFilePath = getKVFilePath;

package/package.json

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