midway-public-file 1.1.1 → 1.2.1

package/dist/lib/static-file.d.ts

@@ -26,4 +26,4 @@ export interface StaticCacheOptions {
     usePrecompiledGzip?: boolean;
     [key: string]: unknown;
 }
-export default function staticCache(dir?: string | StaticCacheOptions, options?: StaticCacheOptions, files?: Map<string, CachedFile> | Record<string, CachedFile>): Promise<(ctx: any, next: () => Promise<any>) => Promise<any>>;
+export default function staticCache(dir?: string | StaticCacheOptions, options?: StaticCacheOptions, files?: Map<string, CachedFile> | Record<string, CachedFile>): (ctx: any, next: () => Promise<any>) => Promise<any>;

package/dist/lib/static-file.js

@@ -182,7 +182,7 @@ function safeDecodeURIComponent(text) {
         return text;
     }
 }
-function loadFile(name, dir, options, files) {
+function loadFile(name, dir, options, files, async) {
     const prefix = options.prefix ?? '/';
     const pathname = path.normalize(path.join(prefix, name));
     if (!files.get(pathname)) {
@@ -191,24 +191,44 @@ function loadFile(name, dir, options, files) {
     const obj = files.get(pathname);
     const filename = (obj.path = path.join(dir, name));
     const stats = (0, node_fs_1.statSync)(filename);
-    const buffer = (0, node_fs_1.readFileSync)(filename);
     obj.cacheControl = options.cacheControl;
-    obj.maxAge = (typeof obj.maxAge === 'number' ? obj.maxAge : options.maxAge) ?? 0;
+    obj.maxAge =
+        (typeof obj.maxAge === 'number' ? obj.maxAge : options.maxAge) ?? 0;
     obj.type = lookupMime(pathname);
     obj.mime = obj.type;
     obj.mtime = stats.mtime;
     obj.length = stats.size;
-    obj.md5 = crypto.createHash('md5').update(buffer).digest('base64');
-    debug(`file: ${JSON.stringify(obj, null, 2)}`);
-    if (options.buffer) {
-        obj.buffer = buffer;
+    if (async) {
+        return new Promise((resolve, reject) => {
+            (0, node_fs_1.readFile)(filename, (err, buffer) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    obj.md5 = crypto.createHash('md5').update(buffer).digest('base64');
+                    debug(`file: ${JSON.stringify(obj, null, 2)}`);
+                    if (options.buffer) {
+                        obj.buffer = buffer;
+                    }
+                    resolve(obj);
+                }
+            });
+        });
+    }
+    else {
+        const buffer = (0, node_fs_1.readFileSync)(filename);
+        obj.md5 = crypto.createHash('md5').update(buffer).digest('base64');
+        debug(`file: ${JSON.stringify(obj, null, 2)}`);
+        if (options.buffer) {
+            obj.buffer = buffer;
+        }
+        return obj;
     }
-    return obj;
 }
 // ---------------------------------------------------------------------------
 // Main middleware factory
 // ---------------------------------------------------------------------------
-async function staticCache(dir, options, files) {
+function staticCache(dir, options, files) {
     // Allow calling with a single options object
     if (typeof dir === 'object' && dir !== null) {
         files = options;
@@ -216,20 +236,19 @@ async function staticCache(dir, options, files) {
         dir = undefined;
     }
     options = { ...(options ?? {}) };
-    options.prefix = (options.prefix ?? '').replace(/\/*$/, '/');
+    options.prefix = (options.prefix ?? '').replace(/\/+$/, '/');
     const resolvedFiles = new FileManager(files ?? options.files);
     const resolvedDir = path.normalize(dir ?? options.dir ?? process.cwd());
     const enableGzip = !!options.gzip;
     const filePrefix = path.normalize(options.prefix.replace(/^\//, ''));
     // -- filter --
-    let fileFilter = () => true;
+    let fileFilter = typeof options.filter === 'function'
+        ? options.filter
+        : (file) => true;
     if (Array.isArray(options.filter)) {
         const allowed = options.filter;
         fileFilter = (file) => allowed.includes(file);
     }
-    else if (typeof options.filter === 'function') {
-        fileFilter = options.filter;
-    }
     // -- preload (Node.js >= 20: readdirSync with recursive: true) --
     if (options.preload !== false) {
         const entries = (0, node_fs_1.readdirSync)(resolvedDir, {
@@ -255,11 +274,13 @@ async function staticCache(dir, options, files) {
         // Decode + normalize
         let filename = path.normalize(safeDecodeURIComponent(ctx.path));
         // Alias
-        const fixPath = options.prefix ? ctx.path.replace(new RegExp(`^${options.prefix}`), '') : ctx.path;
-        if (options.alias?.[fixPath]) {
-            const filePath = options.alias[fixPath];
-            if (filePath && !filePath.endsWith("*")) {
-                filename = path.normalize(safeDecodeURIComponent(path.join(options.prefix, filePath)));
+        const aliasKey = options.prefix
+            ? ctx.path.replace(new RegExp(`^${options.prefix}`), '')
+            : ctx.path;
+        if (options.alias?.[aliasKey]) {
+            const aliasPath = options.alias[aliasKey];
+            if (aliasPath && !aliasPath.endsWith('*')) {
+                filename = path.normalize(safeDecodeURIComponent(path.join(options.prefix, aliasPath)));
             }
         }
         let file = resolvedFiles.get(filename);
@@ -291,7 +312,7 @@ async function staticCache(dir, options, files) {
             }
             if (!stats.isFile())
                 return await next();
-            file = loadFile(filename, resolvedDir, options, resolvedFiles);
+            file = await loadFile(filename, resolvedDir, options, resolvedFiles, true);
         }
         // -- Response handling --
         ctx.status = 200;
@@ -334,7 +355,10 @@ async function staticCache(dir, options, files) {
             }
             return;
         }
-        const shouldGzip = enableGzip && file.length > 1024 && acceptGzip && isCompressible(file.type);
+        const shouldGzip = enableGzip &&
+            file.length > 1024 &&
+            acceptGzip &&
+            isCompressible(file.type);
         // Buffered file – gzip in memory
         if (file.buffer) {
             if (shouldGzip) {
@@ -358,7 +382,7 @@ async function staticCache(dir, options, files) {
         // Compute MD5 hash on-the-fly
         if (!file.md5) {
             const hash = crypto.createHash('md5');
-            stream.on('data', (chunk) => hash.update(chunk));
+            stream.on('data', chunk => hash.update(chunk));
             stream.on('end', () => {
                 file.md5 = hash.digest('base64');
             });
@@ -371,4 +395,4 @@ async function staticCache(dir, options, files) {
         }
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"static-file.js","sourceRoot":"","sources":["../../src/lib/static-file.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"static-file.js","sourceRoot":"","sources":["../../src/lib/static-file.ts"],"names":[],"mappings":"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"}

package/dist/middleware/static.middleware.js

@@ -54,7 +54,7 @@ const ylru_1 = require("ylru");
 const error_1 = require("../error");
 const static_file_1 = __importDefault(require("../lib/static-file"));
 let StaticMiddleware = class StaticMiddleware {
-    async resolve(app) {
+    resolve(app) {
         const dirs = Object.values(this.staticFileConfig.dirs);
         if (this.staticFileConfig.dir) {
             dirs.push(this.staticFileConfig.dir);
@@ -79,20 +79,13 @@ let StaticMiddleware = class StaticMiddleware {
                 prefixs.push(newOptions.prefix);
             }
             // ensure directory exists
-            if (this.environmentService.isPkgEnvironment()) {
-                if (!fs.existsSync(newOptions.dir)) {
-                    throw new error_1.DirectoryNotFoundError(newOptions.dir);
-                }
-            }
-            else {
-                if (!(await core_1.FileUtils.exists(newOptions.dir))) {
-                    throw new error_1.DirectoryNotFoundError(newOptions.dir);
-                }
+            if (!fs.existsSync(newOptions.dir)) {
+                throw new error_1.DirectoryNotFoundError(newOptions.dir);
             }
             this.logger.info('[midway:static] starting static serve %s -> %s', newOptions.prefix, newOptions.dir);
-            middlewares.push(await (0, static_file_1.default)(newOptions));
+            middlewares.push((0, static_file_1.default)(newOptions));
         }
-        return await this.middlewareService.compose(middlewares, app, 'staticFile');
+        return this.middlewareService.compose(middlewares, app, 'staticFile');
     }
     static getName() {
         return 'staticFile';
@@ -118,4 +111,4 @@ __decorate([
 exports.StaticMiddleware = StaticMiddleware = __decorate([
     (0, core_1.Middleware)()
 ], StaticMiddleware);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdGljLm1pZGRsZXdhcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWlkZGxld2FyZS9zdGF0aWMubWlkZGxld2FyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx5Q0FVd0I7QUFDeEIsK0NBQWlDO0FBQ2pDLHVDQUF5QjtBQUN6QiwwREFBOEI7QUFDOUIsK0JBQTJCO0FBQzNCLG9DQUFrRDtBQUNsRCxxRUFBNkM7QUFHdEMsSUFBTSxnQkFBZ0IsR0FBdEIsTUFBTSxnQkFBZ0I7SUFhM0IsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFPO1FBQ25CLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZELElBQUksSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQzlCLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZDLENBQUM7UUFDRCxNQUFNLE9BQU8sR0FBWSxFQUFFLENBQUM7UUFFNUIsU0FBUyxlQUFlLENBQUMsR0FBTyxFQUFFLElBQWlCO1lBQ2pELGtEQUFrRDtZQUNsRCxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMxRCxJQUFJLE9BQU8sRUFBRSxDQUFDO2dCQUNaLE9BQU8sSUFBQSxtQkFBSyxFQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FBQztZQUMxQixDQUFDO1lBQ0QsT0FBTyxJQUFJLEVBQUUsQ0FBQztRQUNoQixDQUFDO1FBRUQsTUFBTSxXQUFXLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUV0QyxLQUFLLE1BQU0sTUFBTSxJQUFJLElBQUksRUFBRSxDQUFDO1lBQzFCLE1BQU0sQ0FBQyxFQUFFLENBQ1AsWUFBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxZQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUNoRCw4REFBOEQsQ0FDL0QsQ0FBQztZQUVGLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsQ0FBQztZQUVwRSxJQUFJLFVBQVUsQ0FBQyxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQzVDLFVBQVUsQ0FBQyxLQUFLLEdBQUcsSUFBSSxVQUFHLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ2xELENBQUM7WUFFRCxJQUFJLFVBQVUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztnQkFDdEIsT0FBTyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDbEMsQ0FBQztZQUVELDBCQUEwQjtZQUMxQixJQUFJLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFLENBQUM7Z0JBQy9DLElBQUksQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO29CQUNuQyxNQUFNLElBQUksOEJBQXNCLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNuRCxDQUFDO1lBQ0gsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLElBQUksQ0FBQyxDQUFDLE1BQU0sZ0JBQVMsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQztvQkFDOUMsTUFBTSxJQUFJLDhCQUFzQixDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztnQkFDbkQsQ0FBQztZQUNILENBQUM7WUFFRCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZCxnREFBZ0QsRUFDaEQsVUFBVSxDQUFDLE1BQU0sRUFDakIsVUFBVSxDQUFDLEdBQUcsQ0FDZixDQUFDO1lBRUYsV0FBVyxDQUFDLElBQUksQ0FBRSxNQUFNLElBQUEscUJBQVcsRUFBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1FBQ25ELENBQUM7UUFFRCxPQUFPLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsR0FBRyxFQUFFLFlBQVksQ0FBQyxDQUFDO0lBQzlFLENBQUM7SUFFRCxNQUFNLENBQUMsT0FBTztRQUNaLE9BQU8sWUFBWSxDQUFDO0lBQ3RCLENBQUM7Q0FDRixDQUFBO0FBekVZLDRDQUFnQjtBQUVuQjtJQURQLElBQUEsYUFBTSxFQUFDLFlBQVksQ0FBQzs7MERBQ1E7QUFHN0I7SUFEQyxJQUFBLGFBQU0sR0FBRTs4QkFDVSw4QkFBdUI7MkRBQVc7QUFHckQ7SUFEQyxJQUFBLGFBQU0sR0FBRTs4QkFDVywrQkFBd0I7NERBQUM7QUFHN0M7SUFEQyxJQUFBLGFBQU0sRUFBQyxZQUFZLENBQUM7O2dEQUNWOzJCQVhBLGdCQUFnQjtJQUQ1QixJQUFBLGlCQUFVLEdBQUU7R0FDQSxnQkFBZ0IsQ0F5RTVCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdGljLm1pZGRsZXdhcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWlkZGxld2FyZS9zdGF0aWMubWlkZGxld2FyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx5Q0FTd0I7QUFDeEIsK0NBQWlDO0FBQ2pDLHVDQUF5QjtBQUN6QiwwREFBOEI7QUFDOUIsK0JBQTJCO0FBQzNCLG9DQUFrRDtBQUNsRCxxRUFBNkM7QUFHdEMsSUFBTSxnQkFBZ0IsR0FBdEIsTUFBTSxnQkFBZ0I7SUFhM0IsT0FBTyxDQUFDLEdBQVE7UUFDZCxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2RCxJQUFJLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUM5QixJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN2QyxDQUFDO1FBQ0QsTUFBTSxPQUFPLEdBQWEsRUFBRSxDQUFDO1FBRTdCLFNBQVMsZUFBZSxDQUFDLEdBQVEsRUFBRSxJQUFrQjtZQUNuRCxrREFBa0Q7WUFDbEQsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDMUQsSUFBSSxPQUFPLEVBQUUsQ0FBQztnQkFDWixPQUFPLElBQUEsbUJBQUssRUFBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDMUIsQ0FBQztZQUNELE9BQU8sSUFBSSxFQUFFLENBQUM7UUFDaEIsQ0FBQztRQUVELE1BQU0sV0FBVyxHQUFHLENBQUMsZUFBZSxDQUFDLENBQUM7UUFFdEMsS0FBSyxNQUFNLE1BQU0sSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUMxQixNQUFNLENBQUMsRUFBRSxDQUNQLFlBQUssQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLElBQUksWUFBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsRUFDaEQsOERBQThELENBQy9ELENBQUM7WUFFRixNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDLENBQUM7WUFFcEUsSUFBSSxVQUFVLENBQUMsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO2dCQUM1QyxVQUFVLENBQUMsS0FBSyxHQUFHLElBQUksVUFBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUNsRCxDQUFDO1lBRUQsSUFBSSxVQUFVLENBQUMsTUFBTSxFQUFFLENBQUM7Z0JBQ3RCLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ2xDLENBQUM7WUFFRCwwQkFBMEI7WUFDMUIsSUFBSSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7Z0JBQ25DLE1BQU0sSUFBSSw4QkFBc0IsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDbkQsQ0FBQztZQUVELElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUNkLGdEQUFnRCxFQUNoRCxVQUFVLENBQUMsTUFBTSxFQUNqQixVQUFVLENBQUMsR0FBRyxDQUNmLENBQUM7WUFFRixXQUFXLENBQUMsSUFBSSxDQUFDLElBQUEscUJBQVcsRUFBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1FBQzVDLENBQUM7UUFFRCxPQUFPLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLEdBQUcsRUFBRSxZQUFZLENBQUMsQ0FBQztJQUN4RSxDQUFDO0lBRUQsTUFBTSxDQUFDLE9BQU87UUFDWixPQUFPLFlBQVksQ0FBQztJQUN0QixDQUFDO0NBQ0YsQ0FBQTtBQW5FWSw0Q0FBZ0I7QUFFbkI7SUFEUCxJQUFBLGFBQU0sRUFBQyxZQUFZLENBQUM7OzBEQUNTO0FBRzlCO0lBREMsSUFBQSxhQUFNLEdBQUU7OEJBQ1UsOEJBQXVCOzJEQUFXO0FBR3JEO0lBREMsSUFBQSxhQUFNLEdBQUU7OEJBQ1csK0JBQXdCOzREQUFDO0FBRzdDO0lBREMsSUFBQSxhQUFNLEVBQUMsWUFBWSxDQUFDOztnREFDVDsyQkFYRCxnQkFBZ0I7SUFENUIsSUFBQSxpQkFBVSxHQUFFO0dBQ0EsZ0JBQWdCLENBbUU1QiJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-public-file",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",