hono 0.2.3 → 0.2.4

package/README.md

@@ -358,6 +358,11 @@ export default {
     return app.fetch(request, env, event)
   },
 }
+
+/*
+or just do this:
+export default app
+*/
 ```
 
 ## Cloudflare Workers with Hono

package/dist/context.js

@@ -24,9 +24,22 @@ class Context {
     newResponse(data, init = {}) {
         init.status = init.status || this._status;
         init.statusText = init.statusText || this._statusText;
-        const Encoder = new TextEncoder();
-        const length = data ? data.bytelength || Encoder.encode(data).byteLength : 0;
-        init.headers = Object.assign(Object.assign(Object.assign({}, this._headers), init.headers), { 'Content-Length': String(length) });
+        init.headers = Object.assign(Object.assign({}, this._headers), init.headers);
+        // Content-Length
+        let length = 0;
+        if (data) {
+            if (data instanceof ArrayBuffer) {
+                length = data.byteLength;
+            }
+            else if (typeof data == 'string') {
+                const Encoder = new TextEncoder();
+                length = Encoder.encode(data).byteLength || 0;
+            }
+            else {
+                length = data.bytelength;
+            }
+        }
+        init.headers = Object.assign(Object.assign({}, init.headers), { 'Content-Length': length.toString() });
         return new Response(data, init);
     }
     body(data, status = this._status, headers = this._headers) {

package/dist/hono.js

@@ -48,6 +48,7 @@ class Hono {
         return this.addRoute('patch', arg, ...args);
     }
     /*
+    We may implement these HTTP methods:
     trace
     copy
     lock

package/dist/middleware/mustache/mustache.js

@@ -16,19 +16,20 @@ const mustache = () => {
             throw new Error('If you want to use Mustache Middleware, install mustache module.');
         }
         c.render = async (filename, view = {}, options) => {
-            const content = await (0, cloudflare_1.getContentFromKVAsset)(`${filename}${EXTENSION}`);
-            if (!content) {
+            const buffer = await (0, cloudflare_1.getContentFromKVAsset)(`${filename}${EXTENSION}`);
+            if (!buffer) {
                 throw new Error(`Template "${filename}${EXTENSION}" is not found or blank.`);
             }
+            const content = bufferToString(buffer);
             const partialArgs = {};
             if (options) {
                 const partials = options;
                 for (const key of Object.keys(partials)) {
-                    const partialContent = await (0, cloudflare_1.getContentFromKVAsset)(`${partials[key]}${EXTENSION}`);
-                    if (!partialContent) {
+                    const partialBuffer = await (0, cloudflare_1.getContentFromKVAsset)(`${partials[key]}${EXTENSION}`);
+                    if (!partialBuffer) {
                         throw new Error(`Partial Template "${partials[key]}${EXTENSION}" is not found or blank.`);
                     }
-                    partialArgs[key] = partialContent;
+                    partialArgs[key] = bufferToString(partialBuffer);
                 }
             }
             const output = Mustache.render(content, view, partialArgs);
@@ -38,3 +39,10 @@ const mustache = () => {
     };
 };
 exports.mustache = mustache;
+const bufferToString = (buffer) => {
+    if (buffer instanceof ArrayBuffer) {
+        const enc = new TextDecoder('utf-8');
+        return enc.decode(buffer);
+    }
+    return buffer;
+};

package/dist/middleware/serve-static/serve-static.d.ts

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

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

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serveStatic = void 0;
+const cloudflare_1 = require("../../utils/cloudflare");
+const mime_1 = require("../../utils/mime");
+const DEFAULT_DOCUMENT = 'index.html';
+// This middleware is available only on Cloudflare Workers.
+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 content = await (0, cloudflare_1.getContentFromKVAsset)(path);
+        if (content) {
+            const mimeType = (0, mime_1.getMimeType)(path);
+            if (mimeType) {
+                c.header('Content-Type', mimeType);
+            }
+            c.res = c.body(content);
+        }
+        else {
+            // console.debug(`Static file: ${path} is not found`)
+        }
+    };
+};
+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/middleware.d.ts

@@ -22,4 +22,7 @@ export declare class Middleware {
     }) => (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

@@ -9,6 +9,7 @@ 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;
@@ -20,3 +21,4 @@ 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/cloudflare.d.ts

@@ -1 +1 @@
-export declare const getContentFromKVAsset: (path: string) => Promise<string>;
+export declare const getContentFromKVAsset: (path: string) => Promise<ArrayBuffer>;

package/dist/utils/cloudflare.js

@@ -14,8 +14,7 @@ const getContentFromKVAsset = async (path) => {
     if (!key) {
         return;
     }
-    let content;
-    content = await ASSET_NAMESPACE.get(key, { type: 'text' });
+    let content = await ASSET_NAMESPACE.get(key, { type: 'arrayBuffer' });
     if (content) {
         content = content;
     }

package/dist/utils/mime.d.ts

@@ -0,0 +1 @@
+export declare const getMimeType: (filename: string) => string;

package/dist/utils/mime.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMimeType = void 0;
+const getMimeType = (filename) => {
+    const regexp = /\.([a-zA-Z0-9]+?)$/;
+    const match = filename.match(regexp);
+    if (!match) {
+        return;
+    }
+    let mimeType = mimes[match[1]];
+    if (mimeType.startsWith('text') || mimeType === 'application/json') {
+        mimeType += '; charset=utf-8';
+    }
+    return mimeType;
+};
+exports.getMimeType = getMimeType;
+const mimes = {
+    aac: 'audio/aac',
+    abw: 'application/x-abiword',
+    arc: 'application/x-freearc',
+    avi: 'video/x-msvideo',
+    azw: 'application/vnd.amazon.ebook',
+    bin: 'application/octet-stream',
+    bmp: 'image/bmp',
+    bz: 'application/x-bzip',
+    bz2: 'application/x-bzip2',
+    csh: 'application/x-csh',
+    css: 'text/css',
+    csv: 'text/csv',
+    doc: 'application/msword',
+    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    eot: 'application/vnd.ms-fontobject',
+    epub: 'application/epub+zip',
+    gz: 'application/gzip',
+    gif: 'image/gif',
+    htm: 'text/html',
+    html: 'text/html',
+    ico: 'image/vnd.microsoft.icon',
+    ics: 'text/calendar',
+    jar: 'application/java-archive',
+    jpeg: 'image/jpeg',
+    jpg: 'image/jpeg',
+    js: 'text/javascript',
+    json: 'application/json',
+    jsonld: 'application/ld+json',
+    mid: 'audio/x-midi',
+    midi: 'audio/x-midi',
+    mjs: 'text/javascript',
+    mp3: 'audio/mpeg',
+    mpeg: 'video/mpeg',
+    mpkg: 'application/vnd.apple.installer+xml',
+    odp: 'application/vnd.oasis.opendocument.presentation',
+    ods: 'application/vnd.oasis.opendocument.spreadsheet',
+    odt: 'application/vnd.oasis.opendocument.text',
+    oga: 'audio/ogg',
+    ogv: 'video/ogg',
+    ogx: 'application/ogg',
+    opus: 'audio/opus',
+    otf: 'font/otf',
+    png: 'image/png',
+    pdf: 'application/pdf',
+    php: 'application/php',
+    ppt: 'application/vnd.ms-powerpoint',
+    pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+    rar: 'application/vnd.rar',
+    rtf: 'application/rtf',
+    sh: 'application/x-sh',
+    svg: 'image/svg+xml',
+    swf: 'application/x-shockwave-flash',
+    tar: 'application/x-tar',
+    tif: 'image/tiff',
+    tiff: 'image/tiff',
+    ts: 'video/mp2t',
+    ttf: 'font/ttf',
+    txt: 'text/plain',
+    vsd: 'application/vnd.visio',
+    wav: 'audio/wav',
+    weba: 'audio/webm',
+    webm: 'video/webm',
+    webp: 'image/webp',
+    woff: 'font/woff',
+    woff2: 'font/woff2',
+    xhtml: 'application/xhtml+xml',
+    xls: 'application/vnd.ms-excel',
+    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    xml: 'application/xml',
+    xul: 'application/vnd.mozilla.xul+xml',
+    zip: 'application/zip',
+    '3gp': 'video/3gpp',
+    '3g2': 'video/3gpp2',
+    '7z': 'application/x-7z-compressed',
+};

package/package.json

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