@x-9lab/xlab 1.2.1 → 1.4.0

package/@types/global.d.ts

@@ -168,6 +168,8 @@ declare global {
             indexPageCacheTime?: number;
             /**静态资源缓存时间 */
             staticResourceCacheTime?: number;
+            /**是否允许静态资源跨域访问 */
+            staticCros?: boolean;
         }
         /**业务错误数据对象 */
         interface ICodeItem {

package/README.md

@@ -178,6 +178,7 @@ X-9lab 通用服务端
 |debug|`boolean`|false|是否开启 debug 模式|
 |staticMaxage|`number`|1800000|静态文件缓存时间|
 |staticHtmlFileMaxage|`number`|0|静态 html 文件缓存时间|
+|staticCros|`boolean`|false|是否允许静态资源跨域访问|
 |enableComboCache|`boolean`|true|是否开启 Combo 缓存|
 |enableCron|`boolean`|false|是否开启定时任务|
 |middleware|`Array<string | (string | Record<string, any>)[]>`|[]|开启的中间件列表。因不方便合并替换，v1.1.0 开始建议使用 `middlewares` 来配置 |

package/dist/components/request/index.js

@@ -19,6 +19,7 @@ const _utils = require("@x-drive/utils");
 const _nodeFetchWarper = require("@x-drive/node-fetch-warper");
 const _resolveUri = /*#__PURE__*/ _interopRequireDefault(require("./resolve-uri"));
 const _common = require("../common");
+const _util = require("util");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -120,7 +121,7 @@ const DEF_CONFIG = {
         }
         return null;
     } catch (e) {
-        reqLog.error(e);
+        reqLog.error((0, _util.inspect)(e));
         if (retry && retry > 0) {
             if ((0, _utils.isNumber)(config.retryDelay) && config.retryDelay > 0) {
                 await (0, _common.sleep)(config.retryDelay, reqLog);

package/dist/router.js

@@ -16,6 +16,7 @@ function _interopRequireDefault(obj) {
         default: obj
     };
 }
+/**API 服务目录 */ const API_BUSINESS_DIR = "business";
 /**生成 api */ function buildApi(api) {
     if (!api.startsWith("/")) {
         api = `/${api}`;
@@ -36,15 +37,18 @@ function _interopRequireDefault(obj) {
             if (stats.isDirectory() && item.startsWith("$")) {
                 // 接口级别中间件
                 let middlewaresFiles = _fs.default.readdirSync(tmpPath);
+                let mws = [];
                 middlewaresFiles.forEach(function(name) {
                     let tmpMwPath = _path.default.join(tmpPath, name);
                     let fileStat = _fs.default.statSync(tmpMwPath);
                     if (!fileStat.isDirectory() && !item.startsWith(".") && !item.endsWith(".d.ts")) {
-                        middlewares.push(tmpMwPath);
+                        mws.push(tmpMwPath);
                     }
                 });
                 // 简单做下排序
-                middlewares.sort();
+                mws.sort();
+                const partPath = dir.split(API_BUSINESS_DIR)[1] || _path.default.posix.sep;
+                middlewares[partPath] = mws;
             }
             if (stats.isDirectory() && !item.startsWith("@") && !item.startsWith("$")) {
                 walk(tmpPath, middlewares, callback);
@@ -60,11 +64,12 @@ function _interopRequireDefault(obj) {
         var mod = require(_path.default.resolve(modPath));
         if (mod) {
             mod = (0, _common.getRealDefaultMod)(mod);
-            let api_path = modPath.split("business");
+            let api_path = modPath.split(API_BUSINESS_DIR);
             let api;
+            let apiPart;
             let modName;
             // 根据路径生成 url 规则
-            api = api_path[1].replace(".js", "").split("/");
+            api = api_path[1].replace(".js", "").split(_path.default.posix.sep);
             // 文件名是 index
             const lastIsIndex = api[api.length - 1] === "index";
             // 文件名是 index 的则会被从 api 上先强行去掉
@@ -77,9 +82,11 @@ function _interopRequireDefault(obj) {
                 if (!lastIsIndex) {
                     api.pop();
                 }
+                apiPart = api;
                 api = buildApi(api.join("/"));
                 mod.unshift(api);
             } else {
+                apiPart = api;
                 // 不是数组则把文件当作正常的 api 地址
                 api = buildApi(api.join("/"));
             }
@@ -87,6 +94,10 @@ function _interopRequireDefault(obj) {
             if ((0, _utils.isObject)(mod) && ((0, _utils.isFunction)(mod.handler) || (0, _utils.isAsyncFunction)(mod.handler))) {
                 modName = mod.method || "get";
                 api = mod.api || api;
+                apiPart = api.split("/");
+                if (apiPart[0] !== "") {
+                    apiPart.unshift("");
+                }
                 // 保证一定是以 api 开头的
                 if (!IS_API_REGEXP.test(api)) {
                     api = buildApi(api);
@@ -104,6 +115,15 @@ function _interopRequireDefault(obj) {
                     ];
                 }
             }
+            var dirMws = [];
+            var prevPart = "";
+            for(let i = 2; i < apiPart.length; i++){
+                const part = `${prevPart}${_path.default.posix.sep}${apiPart[i]}`;
+                if (middlewares[part]) {
+                    dirMws = dirMws.concat(middlewares[part]);
+                }
+                prevPart = part;
+            }
             // 直接返回函数则直接绑定
             if ((0, _utils.isFunction)(mod) || (0, _utils.isAsyncFunction)(mod)) {
                 mod = [
@@ -117,8 +137,8 @@ function _interopRequireDefault(obj) {
                     modName = "get";
                 }
             }
-            if (middlewares && middlewares.length) {
-                let mws = middlewares.map((name)=>(0, _common.getRealDefaultMod)(require(name)));
+            if (dirMws && dirMws.length) {
+                let mws = dirMws.map((name)=>(0, _common.getRealDefaultMod)(require(name)));
                 mod.splice.apply(mod, [
                     1,
                     0,
@@ -131,12 +151,12 @@ function _interopRequireDefault(obj) {
         }
     };
     // 业务基本目录
-    var _p = _path.default.resolve(__dirname, "business");
-    walk(_p, [], processBusiness);
+    var _p = _path.default.resolve(__dirname, API_BUSINESS_DIR);
+    walk(_p, {}, processBusiness);
     // 支持自定义 api
-    _p = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "business");
+    _p = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, API_BUSINESS_DIR);
     if (process.cwd() !== __dirname && (0, _common.checkFileStat)(_p)) {
-        walk(_p, [], processBusiness);
+        walk(_p, {}, processBusiness);
     }
     processBusiness = null;
     console.log("");

package/dist/server.js

@@ -104,13 +104,20 @@ app.use(koaRouter.routes());
 var staticServeOpts = {};
 if (_config.default.isProd) {
     staticServeOpts.maxage = _config.default.staticMaxage;
-    const staticHtmlFileMaxage = _config.default.staticHtmlFileMaxage;
-    staticServeOpts.setHeaders = function(res, path) {
-        if (staticHtmlFileMaxage && path.endsWith(".html")) {
-            res.setHeader("Cache-Control", `max-age=${staticHtmlFileMaxage}`);
-        }
-    };
 }
+staticServeOpts.setHeaders = function(res, path) {
+    if (_config.default.isProd && _config.default.staticHtmlFileMaxage && path.endsWith(".html")) {
+        res.setHeader("Cache-Control", `max-age=${_config.default.staticHtmlFileMaxage}`);
+    }
+    if (_config.default.staticCros) {
+        const { origin  } = res.req.headers;
+        if (origin) {
+            res.setHeader("X-Cros-Static", origin);
+            res.setHeader("Access-Control-Allow-Origin", origin);
+            res.setHeader("Access-Control-Allow-Methods", "GET, OPTIONS");
+        }
+    }
+};
 app.use((0, _koaStatic.default)(_path.default.resolve(process.cwd(), _config.default.root), staticServeOpts));
 // 异常状态处理中间件
 app.use(_badRequest.default);

package/package.json

@@ -1,8 +1,8 @@
 {
     "name": "@x-9lab/xlab",
-    "version": "1.2.1",
+    "version": "1.4.0",
     "description": "9lab 服务端模块",
-    "versionDesc": "业务 api 文件夹支持接口级别通用中间件定义",
+    "versionDesc": "静态文件服务支持跨域",
     "scripts": {
         "dev": "swc src -D ./src/bin --config-file .swcrc -d dist -w",
         "compile": "swc src -D ./src/bin --config-file .swcrc -d dist",