@x-9lab/xlab 1.2.1-alpha.1 → 1.3.1

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/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-alpha.1",
+    "version": "1.3.1",
     "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",
@@ -34,7 +34,7 @@
         "http-proxy": "1.18.1",
         "koa-compress": "5.1.0",
         "@x-drive/utils": "1.1.23",
-        "@x-drive/node-fetch-warper": "1.0.0"
+        "@x-drive/node-fetch-warper": "1.0.1"
     },
     "devDependencies": {
         "co": "4.6.0",