@wooksjs/http-static 0.4.10 → 0.4.12

package/dist/index.cjs

@@ -4,38 +4,6 @@ var eventHttp = require('@wooksjs/event-http');
 var fs = require('fs');
 var path = require('path');
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
 const extensions = {
     '123': 'application/vnd.lotus-1-2-3',
     ez: 'application/andrew-inset',
@@ -1230,134 +1198,118 @@ function normalizePath(filePath, baseDir) {
 }
 
 const { stat, readdir } = fs.promises;
-function serveFile(filePath, options = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!options.allowDotDot && (/\/\.\.\//.test(filePath) || /^\.\.\//.test(filePath))) {
-            throw new Error('Parent Traversal ("/../") is not allowed.');
+async function serveFile(filePath, options = {}) {
+    if (!options.allowDotDot && (/\/\.\.\//.test(filePath) || /^\.\.\//.test(filePath))) {
+        throw new Error('Parent Traversal ("/../") is not allowed.');
+    }
+    const { restoreCtx } = eventHttp.useHttpContext();
+    const { status } = eventHttp.useResponse();
+    const { setHeader, removeHeader } = eventHttp.useSetHeaders();
+    const headers = eventHttp.useHeaders();
+    const { method, url } = eventHttp.useRequest();
+    const { setCacheControl, setExpires, setPragmaNoCache } = eventHttp.useSetCacheControl();
+    const normalizedPath = normalizePath(filePath, options.baseDir);
+    let fileStats;
+    try {
+        fileStats = await stat(normalizedPath);
+    }
+    catch (e) {
+        if (options.defaultExt) {
+            const ext = path.extname(filePath);
+            if (!ext) {
+                restoreCtx();
+                return serveFile(filePath + '.' + options.defaultExt);
+            }
         }
-        const { restoreCtx } = eventHttp.useHttpContext();
-        const { status } = eventHttp.useResponse();
-        const { setHeader, removeHeader } = eventHttp.useSetHeaders();
-        const headers = eventHttp.useHeaders();
-        const { method, url } = eventHttp.useRequest();
-        const { setCacheControl, setExpires, setPragmaNoCache } = eventHttp.useSetCacheControl();
-        const normalizedPath = normalizePath(filePath, options.baseDir);
-        let fileStats;
-        try {
-            fileStats = yield stat(normalizedPath);
+        throw new eventHttp.HttpError(404);
+    }
+    status(200);
+    const etag = `"${[
+        fileStats.ino,
+        fileStats.size,
+        fileStats.mtime.toISOString(),
+    ].join('-')}"`;
+    const lastModified = new Date(fileStats.mtime);
+    if (isNotModified(etag, lastModified, headers['if-none-match'] || '', headers['if-modified-since'] || '')) {
+        status(304);
+        return '';
+    }
+    setHeader('etag', etag);
+    setHeader('last-modified', lastModified.toUTCString());
+    if (options.cacheControl !== undefined) {
+        setCacheControl(options.cacheControl);
+    }
+    if (options.expires) {
+        setExpires(options.expires);
+    }
+    if (options.pragmaNoCache) {
+        setPragmaNoCache(options.pragmaNoCache);
+    }
+    if (fileStats.isDirectory()) {
+        if (options.listDirectory) {
+            restoreCtx();
+            return listDirectory(normalizedPath);
         }
-        catch (e) {
-            if (options.defaultExt) {
-                const ext = path.extname(filePath);
-                if (!ext) {
-                    restoreCtx();
-                    return serveFile(filePath + '.' + options.defaultExt);
-                }
+        else if (options.index) {
+            if (filePath[filePath.length - 1] !== '/' &&
+                url &&
+                url[url.length - 1] !== '/') {
+                return new eventHttp.BaseHttpResponse()
+                    .setStatus(302)
+                    .setHeader('location', url + '/');
             }
-            throw new eventHttp.HttpError(404);
-        }
-        status(200);
-        // if-none-match & if-modified-since processing start
-        // rfc7232
-        const etag = `"${[
-            fileStats.ino,
-            fileStats.size,
-            fileStats.mtime.toISOString(),
-        ].join('-')}"`;
-        const lastModified = new Date(fileStats.mtime);
-        if (isNotModified(etag, lastModified, headers['if-none-match'] || '', headers['if-modified-since'] || '')) {
-            status(304);
-            return '';
+            restoreCtx();
+            return serveFile(path.join(filePath, options.index), {
+                ...options,
+                index: '',
+            });
         }
-        // if-none-match & if-modified-since processing end
-        setHeader('etag', etag);
-        setHeader('last-modified', lastModified.toUTCString());
-        if (options.cacheControl !== undefined) {
-            setCacheControl(options.cacheControl);
+        removeHeader('etag');
+        removeHeader('last-modified');
+        throw new eventHttp.HttpError(404);
+    }
+    let range = headers.range;
+    let start, end;
+    let size = fileStats.size;
+    if (range) {
+        const rangeParts = range
+            .trim()
+            .replace(/bytes=/, '')
+            .split('-');
+        const [s, e] = rangeParts;
+        start = parseInt(s);
+        end = e ? parseInt(e) : size - 1;
+        end = Math.min(size - 1, end);
+        if (start > end || isNaN(start) || isNaN(end)) {
+            throw new eventHttp.HttpError(416);
         }
-        if (options.expires) {
-            setExpires(options.expires);
+        size = end - start + 1;
+        const ifRange = headers['if-range'] || '';
+        const ifRangeTag = ifRange[0] === '"' ? ifRange : '';
+        const ifRangeDate = ifRangeTag ? '' : ifRange;
+        if (ifRange &&
+            !isNotModified(etag, lastModified, ifRangeTag, ifRangeDate)) {
+            status(200);
+            size = fileStats.size;
+            range = '';
         }
-        if (options.pragmaNoCache) {
-            setPragmaNoCache(options.pragmaNoCache);
+        else {
+            setHeader('content-range', `bytes ${start}-${end}/${fileStats.size}`);
+            status(206);
         }
-        if (fileStats.isDirectory()) {
-            if (options.listDirectory) {
-                restoreCtx();
-                return listDirectory(normalizedPath);
-            }
-            else if (options.index) {
-                if (filePath[filePath.length - 1] !== '/' &&
-                    url &&
-                    url[url.length - 1] !== '/') {
-                    return new eventHttp.BaseHttpResponse()
-                        .setStatus(302)
-                        .setHeader('location', url + '/');
-                }
-                restoreCtx();
-                return serveFile(path.join(filePath, options.index), Object.assign(Object.assign({}, options), { index: '' }));
-            }
-            removeHeader('etag');
-            removeHeader('last-modified');
-            throw new eventHttp.HttpError(404);
-        }
-        // range header processing start
-        let range = headers.range;
-        let start, end;
-        let size = fileStats.size;
-        if (range) {
-            const rangeParts = range
-                .trim()
-                .replace(/bytes=/, '')
-                .split('-');
-            const [s, e] = rangeParts;
-            start = parseInt(s);
-            end = e ? parseInt(e) : size - 1;
-            end = Math.min(size - 1, end);
-            if (start > end || isNaN(start) || isNaN(end)) {
-                throw new eventHttp.HttpError(416);
-            }
-            size = end - start + 1;
-            // if-range processing start
-            // rfc7233#section-3.2\
-            const ifRange = headers['if-range'] || '';
-            const ifRangeTag = ifRange[0] === '"' ? ifRange : '';
-            const ifRangeDate = ifRangeTag ? '' : ifRange;
-            if (ifRange &&
-                !isNotModified(etag, lastModified, ifRangeTag, ifRangeDate)) {
-                // If the validator does not match, the server MUST ignore
-                // the Range header field.
-                status(200);
-                size = fileStats.size;
-                range = '';
-            }
-            else {
-                // If the validator given in the If-Range header field matches the
-                // current validator for the selected representation of the target
-                // resource, then the server SHOULD process the Range header field as
-                // requested.
-                setHeader('content-range', `bytes ${start}-${end}/${fileStats.size}`);
-                status(206);
-            }
-            // if-range processing end
-        }
-        // range header processing end
-        setHeader('accept-ranges', 'bytes');
-        setHeader('content-type', getMimeType(normalizedPath) || 'application/octet-stream');
-        setHeader('content-length', size);
-        if (options.headers) {
-            for (const header of Object.keys(options.headers)) {
-                setHeader(header, options.headers[header]);
-            }
+    }
+    setHeader('accept-ranges', 'bytes');
+    setHeader('content-type', getMimeType(normalizedPath) || 'application/octet-stream');
+    setHeader('content-length', size);
+    if (options.headers) {
+        for (const header of Object.keys(options.headers)) {
+            setHeader(header, options.headers[header]);
         }
-        return method === 'HEAD'
-            ? ''
-            : fs.createReadStream(normalizedPath, !!range ? { start, end } : undefined);
-    });
+    }
+    return method === 'HEAD'
+        ? ''
+        : fs.createReadStream(normalizedPath, !!range ? { start, end } : undefined);
 }
-// function toWeak(etag: string): string {
-//     return `W/${etag}`
-// }
 function isNotModified(etag, lastModified, clientEtag, clientLM) {
     if (clientEtag) {
         const parts = clientEtag.split(',').map((v) => v.trim());
@@ -1366,71 +1318,60 @@ function isNotModified(etag, lastModified, clientEtag, clientLM) {
                 return true;
             }
         }
-        // A recipient MUST ignore If-Modified-Since if the request contains an
-        // If-None-Match header field; the condition in If-None-Match is
-        // considered to be a more accurate replacement for the condition in
-        // If-Modified-Since, and the two are only combined for the sake of
-        // interoperating with older intermediaries that might not implement
-        // If-None-Match.
         return false;
     }
     const date = new Date(clientLM);
-    // A recipient MUST ignore the If-Modified-Since header field if the
-    // received field-value is not a valid HTTP-date, or if the request
-    // method is neither GET nor HEAD.
     if (date.toString() !== 'Invalid Date' &&
         date.getTime() > lastModified.getTime()) {
         return true;
     }
     return false;
 }
-function listDirectory(dirPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { setContentType } = eventHttp.useSetHeaders();
-        const { url } = eventHttp.useRequest();
-        const list = yield readdir(dirPath);
-        const promises = [];
-        let detailedList = [];
-        for (const item of list) {
-            promises.push({ name: item, promise: stat(path.join(dirPath, item)) });
-        }
-        for (const item of promises) {
-            const data = yield item.promise;
-            detailedList.push({
-                name: item.name,
-                size: data.size,
-                mtime: data.mtime,
-                dir: data.isDirectory(),
-            });
-        }
-        detailedList = detailedList.sort((a, b) => a.dir === b.dir ? (a.name > b.name ? 1 : -1) : a.dir > b.dir ? -1 : 1);
-        detailedList.unshift({ name: '..', dir: true });
-        setContentType('text/html');
-        const styles = '<style type="text/css">\nhtml { font-family: monospace }\n' +
-            'span { padding: 0px 2px }\n' +
-            '.text { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }\n' +
-            '.icon { width: 20px; display: inline-block; text-align: center; }\n' +
-            '.name { width: 250px; display: inline-block; }\n' +
-            '.size { width: 80px; display: inline-block; color: grey; text-align: right; }\n' +
-            '.date { width: 200px; display: inline-block; color: grey; text-align: right; }\n' +
-            '\n</style>';
-        return ('<html><head><title>Dir</title> ' +
-            styles +
-            ' </head><body><ul>' +
-            detailedList
-                .map((d) => `<li> <span class="icon">${d.dir ? '&#128193;' : '&#128462;'}</span>` +
-                `<a href="${path.join(url || '', d.name)}"><span class="name text">${d.name}</span></a>` +
-                `<span class="size text">${(d.size &&
-                    (d.size > 10000
-                        ? Math.round(d.size / 1024 / 1024).toString() +
-                            'Mb'
-                        : Math.round(d.size / 1024).toString() +
-                            'Kb')) ||
-                    ''}</span>` +
-                `<span class="date text">${(d.mtime && d.mtime.toISOString()) || ''}</li>`)
-                .join('\n') +
-            '</ul></body></html>');
-    });
+async function listDirectory(dirPath) {
+    const { setContentType } = eventHttp.useSetHeaders();
+    const { url } = eventHttp.useRequest();
+    const list = await readdir(dirPath);
+    const promises = [];
+    let detailedList = [];
+    for (const item of list) {
+        promises.push({ name: item, promise: stat(path.join(dirPath, item)) });
+    }
+    for (const item of promises) {
+        const data = await item.promise;
+        detailedList.push({
+            name: item.name,
+            size: data.size,
+            mtime: data.mtime,
+            dir: data.isDirectory(),
+        });
+    }
+    detailedList = detailedList.sort((a, b) => a.dir === b.dir ? (a.name > b.name ? 1 : -1) : a.dir > b.dir ? -1 : 1);
+    detailedList.unshift({ name: '..', dir: true });
+    setContentType('text/html');
+    const styles = '<style type="text/css">\nhtml { font-family: monospace }\n' +
+        'span { padding: 0px 2px }\n' +
+        '.text { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }\n' +
+        '.icon { width: 20px; display: inline-block; text-align: center; }\n' +
+        '.name { width: 250px; display: inline-block; }\n' +
+        '.size { width: 80px; display: inline-block; color: grey; text-align: right; }\n' +
+        '.date { width: 200px; display: inline-block; color: grey; text-align: right; }\n' +
+        '\n</style>';
+    return ('<html><head><title>Dir</title> ' +
+        styles +
+        ' </head><body><ul>' +
+        detailedList
+            .map((d) => `<li> <span class="icon">${d.dir ? '&#128193;' : '&#128462;'}</span>` +
+            `<a href="${path.join(url || '', d.name)}"><span class="name text">${d.name}</span></a>` +
+            `<span class="size text">${(d.size &&
+                (d.size > 10000
+                    ? Math.round(d.size / 1024 / 1024).toString() +
+                        'Mb'
+                    : Math.round(d.size / 1024).toString() +
+                        'Kb')) ||
+                ''}</span>` +
+            `<span class="date text">${(d.mtime && d.mtime.toISOString()) || ''}</li>`)
+            .join('\n') +
+        '</ul></body></html>');
 }
 
 exports.serveFile = serveFile;

package/dist/index.d.ts

@@ -1,20 +1,17 @@
-/// <reference types="node" />
-
-import { Readable } from 'stream';
-import { TCacheControl } from '@wooksjs/event-http';
-
-export declare function serveFile(filePath: string, options?: TServeFileOptions): Promise<Readable | string | string[] | unknown>;
-
-declare interface TServeFileOptions {
-    headers?: Record<string, string>;
-    cacheControl?: TCacheControl;
-    expires?: Date | string | number;
-    pragmaNoCache?: boolean;
-    baseDir?: string;
-    defaultExt?: string;
-    listDirectory?: boolean;
-    index?: string;
-    allowDotDot?: boolean;
-}
-
-export { }
+import { TCacheControl } from '@wooksjs/event-http';
+import { Readable } from 'stream';
+
+interface TServeFileOptions {
+    headers?: Record<string, string>;
+    cacheControl?: TCacheControl;
+    expires?: Date | string | number;
+    pragmaNoCache?: boolean;
+    baseDir?: string;
+    defaultExt?: string;
+    listDirectory?: boolean;
+    index?: string;
+    allowDotDot?: boolean;
+}
+declare function serveFile(filePath: string, options?: TServeFileOptions): Promise<Readable | string | string[] | unknown>;
+
+export { serveFile };

package/dist/index.mjs

@@ -2,38 +2,6 @@ import { useHttpContext, useResponse, useSetHeaders, useHeaders, useRequest, use
 import { createReadStream, promises } from 'fs';
 import path from 'path';
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
 const extensions = {
     '123': 'application/vnd.lotus-1-2-3',
     ez: 'application/andrew-inset',
@@ -1228,134 +1196,118 @@ function normalizePath(filePath, baseDir) {
 }
 
 const { stat, readdir } = promises;
-function serveFile(filePath, options = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!options.allowDotDot && (/\/\.\.\//.test(filePath) || /^\.\.\//.test(filePath))) {
-            throw new Error('Parent Traversal ("/../") is not allowed.');
+async function serveFile(filePath, options = {}) {
+    if (!options.allowDotDot && (/\/\.\.\//.test(filePath) || /^\.\.\//.test(filePath))) {
+        throw new Error('Parent Traversal ("/../") is not allowed.');
+    }
+    const { restoreCtx } = useHttpContext();
+    const { status } = useResponse();
+    const { setHeader, removeHeader } = useSetHeaders();
+    const headers = useHeaders();
+    const { method, url } = useRequest();
+    const { setCacheControl, setExpires, setPragmaNoCache } = useSetCacheControl();
+    const normalizedPath = normalizePath(filePath, options.baseDir);
+    let fileStats;
+    try {
+        fileStats = await stat(normalizedPath);
+    }
+    catch (e) {
+        if (options.defaultExt) {
+            const ext = path.extname(filePath);
+            if (!ext) {
+                restoreCtx();
+                return serveFile(filePath + '.' + options.defaultExt);
+            }
         }
-        const { restoreCtx } = useHttpContext();
-        const { status } = useResponse();
-        const { setHeader, removeHeader } = useSetHeaders();
-        const headers = useHeaders();
-        const { method, url } = useRequest();
-        const { setCacheControl, setExpires, setPragmaNoCache } = useSetCacheControl();
-        const normalizedPath = normalizePath(filePath, options.baseDir);
-        let fileStats;
-        try {
-            fileStats = yield stat(normalizedPath);
+        throw new HttpError(404);
+    }
+    status(200);
+    const etag = `"${[
+        fileStats.ino,
+        fileStats.size,
+        fileStats.mtime.toISOString(),
+    ].join('-')}"`;
+    const lastModified = new Date(fileStats.mtime);
+    if (isNotModified(etag, lastModified, headers['if-none-match'] || '', headers['if-modified-since'] || '')) {
+        status(304);
+        return '';
+    }
+    setHeader('etag', etag);
+    setHeader('last-modified', lastModified.toUTCString());
+    if (options.cacheControl !== undefined) {
+        setCacheControl(options.cacheControl);
+    }
+    if (options.expires) {
+        setExpires(options.expires);
+    }
+    if (options.pragmaNoCache) {
+        setPragmaNoCache(options.pragmaNoCache);
+    }
+    if (fileStats.isDirectory()) {
+        if (options.listDirectory) {
+            restoreCtx();
+            return listDirectory(normalizedPath);
         }
-        catch (e) {
-            if (options.defaultExt) {
-                const ext = path.extname(filePath);
-                if (!ext) {
-                    restoreCtx();
-                    return serveFile(filePath + '.' + options.defaultExt);
-                }
+        else if (options.index) {
+            if (filePath[filePath.length - 1] !== '/' &&
+                url &&
+                url[url.length - 1] !== '/') {
+                return new BaseHttpResponse()
+                    .setStatus(302)
+                    .setHeader('location', url + '/');
             }
-            throw new HttpError(404);
-        }
-        status(200);
-        // if-none-match & if-modified-since processing start
-        // rfc7232
-        const etag = `"${[
-            fileStats.ino,
-            fileStats.size,
-            fileStats.mtime.toISOString(),
-        ].join('-')}"`;
-        const lastModified = new Date(fileStats.mtime);
-        if (isNotModified(etag, lastModified, headers['if-none-match'] || '', headers['if-modified-since'] || '')) {
-            status(304);
-            return '';
+            restoreCtx();
+            return serveFile(path.join(filePath, options.index), {
+                ...options,
+                index: '',
+            });
         }
-        // if-none-match & if-modified-since processing end
-        setHeader('etag', etag);
-        setHeader('last-modified', lastModified.toUTCString());
-        if (options.cacheControl !== undefined) {
-            setCacheControl(options.cacheControl);
+        removeHeader('etag');
+        removeHeader('last-modified');
+        throw new HttpError(404);
+    }
+    let range = headers.range;
+    let start, end;
+    let size = fileStats.size;
+    if (range) {
+        const rangeParts = range
+            .trim()
+            .replace(/bytes=/, '')
+            .split('-');
+        const [s, e] = rangeParts;
+        start = parseInt(s);
+        end = e ? parseInt(e) : size - 1;
+        end = Math.min(size - 1, end);
+        if (start > end || isNaN(start) || isNaN(end)) {
+            throw new HttpError(416);
         }
-        if (options.expires) {
-            setExpires(options.expires);
+        size = end - start + 1;
+        const ifRange = headers['if-range'] || '';
+        const ifRangeTag = ifRange[0] === '"' ? ifRange : '';
+        const ifRangeDate = ifRangeTag ? '' : ifRange;
+        if (ifRange &&
+            !isNotModified(etag, lastModified, ifRangeTag, ifRangeDate)) {
+            status(200);
+            size = fileStats.size;
+            range = '';
         }
-        if (options.pragmaNoCache) {
-            setPragmaNoCache(options.pragmaNoCache);
+        else {
+            setHeader('content-range', `bytes ${start}-${end}/${fileStats.size}`);
+            status(206);
         }
-        if (fileStats.isDirectory()) {
-            if (options.listDirectory) {
-                restoreCtx();
-                return listDirectory(normalizedPath);
-            }
-            else if (options.index) {
-                if (filePath[filePath.length - 1] !== '/' &&
-                    url &&
-                    url[url.length - 1] !== '/') {
-                    return new BaseHttpResponse()
-                        .setStatus(302)
-                        .setHeader('location', url + '/');
-                }
-                restoreCtx();
-                return serveFile(path.join(filePath, options.index), Object.assign(Object.assign({}, options), { index: '' }));
-            }
-            removeHeader('etag');
-            removeHeader('last-modified');
-            throw new HttpError(404);
-        }
-        // range header processing start
-        let range = headers.range;
-        let start, end;
-        let size = fileStats.size;
-        if (range) {
-            const rangeParts = range
-                .trim()
-                .replace(/bytes=/, '')
-                .split('-');
-            const [s, e] = rangeParts;
-            start = parseInt(s);
-            end = e ? parseInt(e) : size - 1;
-            end = Math.min(size - 1, end);
-            if (start > end || isNaN(start) || isNaN(end)) {
-                throw new HttpError(416);
-            }
-            size = end - start + 1;
-            // if-range processing start
-            // rfc7233#section-3.2\
-            const ifRange = headers['if-range'] || '';
-            const ifRangeTag = ifRange[0] === '"' ? ifRange : '';
-            const ifRangeDate = ifRangeTag ? '' : ifRange;
-            if (ifRange &&
-                !isNotModified(etag, lastModified, ifRangeTag, ifRangeDate)) {
-                // If the validator does not match, the server MUST ignore
-                // the Range header field.
-                status(200);
-                size = fileStats.size;
-                range = '';
-            }
-            else {
-                // If the validator given in the If-Range header field matches the
-                // current validator for the selected representation of the target
-                // resource, then the server SHOULD process the Range header field as
-                // requested.
-                setHeader('content-range', `bytes ${start}-${end}/${fileStats.size}`);
-                status(206);
-            }
-            // if-range processing end
-        }
-        // range header processing end
-        setHeader('accept-ranges', 'bytes');
-        setHeader('content-type', getMimeType(normalizedPath) || 'application/octet-stream');
-        setHeader('content-length', size);
-        if (options.headers) {
-            for (const header of Object.keys(options.headers)) {
-                setHeader(header, options.headers[header]);
-            }
+    }
+    setHeader('accept-ranges', 'bytes');
+    setHeader('content-type', getMimeType(normalizedPath) || 'application/octet-stream');
+    setHeader('content-length', size);
+    if (options.headers) {
+        for (const header of Object.keys(options.headers)) {
+            setHeader(header, options.headers[header]);
         }
-        return method === 'HEAD'
-            ? ''
-            : createReadStream(normalizedPath, !!range ? { start, end } : undefined);
-    });
+    }
+    return method === 'HEAD'
+        ? ''
+        : createReadStream(normalizedPath, !!range ? { start, end } : undefined);
 }
-// function toWeak(etag: string): string {
-//     return `W/${etag}`
-// }
 function isNotModified(etag, lastModified, clientEtag, clientLM) {
     if (clientEtag) {
         const parts = clientEtag.split(',').map((v) => v.trim());
@@ -1364,71 +1316,60 @@ function isNotModified(etag, lastModified, clientEtag, clientLM) {
                 return true;
             }
         }
-        // A recipient MUST ignore If-Modified-Since if the request contains an
-        // If-None-Match header field; the condition in If-None-Match is
-        // considered to be a more accurate replacement for the condition in
-        // If-Modified-Since, and the two are only combined for the sake of
-        // interoperating with older intermediaries that might not implement
-        // If-None-Match.
         return false;
     }
     const date = new Date(clientLM);
-    // A recipient MUST ignore the If-Modified-Since header field if the
-    // received field-value is not a valid HTTP-date, or if the request
-    // method is neither GET nor HEAD.
     if (date.toString() !== 'Invalid Date' &&
         date.getTime() > lastModified.getTime()) {
         return true;
     }
     return false;
 }
-function listDirectory(dirPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { setContentType } = useSetHeaders();
-        const { url } = useRequest();
-        const list = yield readdir(dirPath);
-        const promises = [];
-        let detailedList = [];
-        for (const item of list) {
-            promises.push({ name: item, promise: stat(path.join(dirPath, item)) });
-        }
-        for (const item of promises) {
-            const data = yield item.promise;
-            detailedList.push({
-                name: item.name,
-                size: data.size,
-                mtime: data.mtime,
-                dir: data.isDirectory(),
-            });
-        }
-        detailedList = detailedList.sort((a, b) => a.dir === b.dir ? (a.name > b.name ? 1 : -1) : a.dir > b.dir ? -1 : 1);
-        detailedList.unshift({ name: '..', dir: true });
-        setContentType('text/html');
-        const styles = '<style type="text/css">\nhtml { font-family: monospace }\n' +
-            'span { padding: 0px 2px }\n' +
-            '.text { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }\n' +
-            '.icon { width: 20px; display: inline-block; text-align: center; }\n' +
-            '.name { width: 250px; display: inline-block; }\n' +
-            '.size { width: 80px; display: inline-block; color: grey; text-align: right; }\n' +
-            '.date { width: 200px; display: inline-block; color: grey; text-align: right; }\n' +
-            '\n</style>';
-        return ('<html><head><title>Dir</title> ' +
-            styles +
-            ' </head><body><ul>' +
-            detailedList
-                .map((d) => `<li> <span class="icon">${d.dir ? '&#128193;' : '&#128462;'}</span>` +
-                `<a href="${path.join(url || '', d.name)}"><span class="name text">${d.name}</span></a>` +
-                `<span class="size text">${(d.size &&
-                    (d.size > 10000
-                        ? Math.round(d.size / 1024 / 1024).toString() +
-                            'Mb'
-                        : Math.round(d.size / 1024).toString() +
-                            'Kb')) ||
-                    ''}</span>` +
-                `<span class="date text">${(d.mtime && d.mtime.toISOString()) || ''}</li>`)
-                .join('\n') +
-            '</ul></body></html>');
-    });
+async function listDirectory(dirPath) {
+    const { setContentType } = useSetHeaders();
+    const { url } = useRequest();
+    const list = await readdir(dirPath);
+    const promises = [];
+    let detailedList = [];
+    for (const item of list) {
+        promises.push({ name: item, promise: stat(path.join(dirPath, item)) });
+    }
+    for (const item of promises) {
+        const data = await item.promise;
+        detailedList.push({
+            name: item.name,
+            size: data.size,
+            mtime: data.mtime,
+            dir: data.isDirectory(),
+        });
+    }
+    detailedList = detailedList.sort((a, b) => a.dir === b.dir ? (a.name > b.name ? 1 : -1) : a.dir > b.dir ? -1 : 1);
+    detailedList.unshift({ name: '..', dir: true });
+    setContentType('text/html');
+    const styles = '<style type="text/css">\nhtml { font-family: monospace }\n' +
+        'span { padding: 0px 2px }\n' +
+        '.text { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }\n' +
+        '.icon { width: 20px; display: inline-block; text-align: center; }\n' +
+        '.name { width: 250px; display: inline-block; }\n' +
+        '.size { width: 80px; display: inline-block; color: grey; text-align: right; }\n' +
+        '.date { width: 200px; display: inline-block; color: grey; text-align: right; }\n' +
+        '\n</style>';
+    return ('<html><head><title>Dir</title> ' +
+        styles +
+        ' </head><body><ul>' +
+        detailedList
+            .map((d) => `<li> <span class="icon">${d.dir ? '&#128193;' : '&#128462;'}</span>` +
+            `<a href="${path.join(url || '', d.name)}"><span class="name text">${d.name}</span></a>` +
+            `<span class="size text">${(d.size &&
+                (d.size > 10000
+                    ? Math.round(d.size / 1024 / 1024).toString() +
+                        'Mb'
+                    : Math.round(d.size / 1024).toString() +
+                        'Kb')) ||
+                ''}</span>` +
+            `<span class="date text">${(d.mtime && d.mtime.toISOString()) || ''}</li>`)
+            .join('\n') +
+        '</ul></body></html>');
 }
 
 export { serveFile };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/http-static",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "@wooksjs/http-static",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -8,6 +8,14 @@
   "files": [
     "dist"
   ],
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/wooksjs/wooksjs.git",
@@ -31,7 +39,7 @@
     "url": "https://github.com/wooksjs/wooksjs/issues"
   },
   "peerDependencies": {
-    "@wooksjs/event-http": "0.4.10"
+    "@wooksjs/event-http": "0.4.12"
   },
   "homepage": "https://github.com/wooksjs/wooksjs/tree/main/packages/http-static#readme"
 }