mm_statics 1.7.2 → 1.7.5

package/index.js

@@ -298,7 +298,7 @@ Static.prototype._sendFile = async function (ctx, path) {
     };
   }
 
-  await send(ctx, path, config);
+  return await send(ctx, path, config);
 };
 
 /**
@@ -608,29 +608,20 @@ Static.prototype._handleCache = async function (url, ctx) {
   return false;
 };
 
-/**
- * 将路由路径转换为物理路径
- * @param {string} path 文件路径
- * @returns {string} 根路径
- */
-Static.prototype.pathToRoot = function (path) {
-  return path.replace(this.config.path, "/");
-}
-
 /**
  * 处理文件编译逻辑
  * @param {string} path 文件路径
  * @returns {string|null} 编译后的内容
  */
 Static.prototype._handleFileCompile = async function (path) {
-  if (this.config.compile_md && path.extname() === '.md') {
+  let { src_path, compile_md, files, compile_vue, convert_amd } = this.config;
+  if (compile_md && path.extname() === '.md') {
     return await this._runMarkdown(path);
-  } else if (!path.startsWith(this.config.src_path)) return null;
+  } else if (!path.startsWith(src_path)) return null;
 
   let file_type = this._getType(path);
-  let { compile_vue, convert_amd } = this.config;
 
-  if (convert_amd && this.config.files.includes('.' + file_type)) {
+  if (convert_amd && files.includes('.' + file_type)) {
     return await this._runAmd(path, file_type);
   }
   else if (compile_vue && file_type === 'vue') {
@@ -661,38 +652,57 @@ Static.prototype._handleCompiledResp = async function (url, path, body, ctx) {
   }
 };
 
+/**
+ * 获取真实路径
+ * @param {string} path 文件路径
+ * @returns {string} 真实路径
+ */
+Static.prototype._getRealPath = function (path) {
+  return path.replace(this.config.path, "/");
+}
+
+/**
+ * 将路由路径转换为物理路径
+ * @param {string} path 文件路径
+ * @returns {string} 根路径
+ */
+Static.prototype._pathToRoot = function (path) {
+  return ("." + path).fullname(this.config.root);
+}
+
 /**
  * 主处理函数
  * @param {object} ctx Koa上下文对象
  * @param {Function} next Koa中间件函数
  */
 Static.prototype.main = async function (ctx, next) {
-  const url = ctx.url; // 使用完整URL（包含查询参数）
-  if (!url.startsWith(this.config.path)) {
+  let url = ctx.url; // 使用完整URL（包含查询参数）
+  if (!ctx.path.startsWith(this.config.path)) {
     await next();
-    return;
+    return '';
   }
+  let path = this._getRealPath(ctx.path);
+
   // 检查缓存
   if (await this._handleCache(url, ctx)) {
-    return;
+    return this._pathToRoot(path);
   }
 
-  const path = this.pathToRoot(ctx.path);
-
   // 处理文件编译
   let body = await this._handleFileCompile(path);
   if (body) {
     await this._handleCompiledResp(url, path, body, ctx);
-    return;
+    return this._pathToRoot(path);
   }
 
   // 直接发送文件
   try {
-    await this._sendFile(ctx, path);
+    return await this._sendFile(ctx, path);
   }
   catch {
     await next();
   }
+  return '';
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_statics",
-    "version": "1.7.2",
+    "version": "1.7.5",
     "description": "这是超级美眉statics函数模块，用于web服务端statics缓存",
     "main": "index.js",
     "scripts": {
@@ -37,20 +37,18 @@
         "static/"
     ],
     "dependencies": {
-        "@vue/compiler-sfc": "^3.5.27",
+        "@vue/compiler-sfc": "^3.5.33",
         "abstract-syntax-tree": "^2.22.0",
         "chokidar": "^5.0.0",
-        "koa": "^3.1.1",
-        "koa-send": "^5.0.1",
-        "marked": "^17.0.1",
+        "marked": "^18.0.2",
         "mm_cache": "^1.4.8",
         "mm_es6_to_amd": "^1.4.7",
-        "prettier": "^3.8.1"
+        "prettier": "^3.8.3"
     },
     "devDependencies": {
-        "eslint": "^9.39.2",
-        "eslint-plugin-jsdoc": "^62.5.0",
-        "mm_eslint": "^1.6.3",
+        "eslint": "^10.2.1",
+        "eslint-plugin-jsdoc": "^62.9.0",
+        "mm_eslint": "^1.7.1",
         "mocha": "^11.7.5",
         "supertest": "^7.2.2"
     }