@x-9lab/xlab 1.0.8 → 1.0.11

package/@types/middleware/request-filter.d.ts

@@ -1,4 +1,42 @@
+/// <reference types="node" />
 import type Koa from "koa";
+import url from "url";
+/**资源类型 */
+interface ISrcType {
+    /**是否是 js 文件 */
+    js: boolean;
+    /**是否是 html 文件 */
+    html: boolean;
+    /**是否是图片文件 */
+    img: boolean;
+    /**是否是 css 文件 */
+    css: boolean;
+    /**是否是文件夹 */
+    dir: boolean;
+    /**是否是静态文件 */
+    static: boolean;
+    /**是否是模板文件 */
+    tpl: boolean;
+    /**是否是字体文件 */
+    font: boolean;
+}
+declare module "koa" {
+    /**系统默认 state */
+    interface DefaultState {
+        /**资源类型 */
+        srcType: ISrcType;
+        /**请求域名 */
+        originHost: string | string[];
+        /**请求版本 */
+        ver: Record<string, string>;
+        /**
+        经过解析后的请求 url
+
+        @see `https://nodejs.org/dist/latest-v16.x/docs/api/url.html`
+         */
+        parsedUrl: url.Url;
+    }
+}
 declare function filter(ctx: Koa.Context, next: Koa.Next): Promise<void>;
 export default function (): typeof filter;
 export {};

package/dist/dot-file.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "processDotFile", {
     enumerable: true,
     get: ()=>processDotFile
 });
+const _utils = require("@x-drive/utils");
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
 const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
-const _utils = require("@x-drive/utils");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj

package/dist/middleware/cors.js

@@ -15,7 +15,7 @@ const _utils = require("@x-drive/utils");
     "localhost": true,
     "127.0.0.1": true
 };
-/**根域获取正则 */ const ROOT_NAME_REGEXP = /[\w-]*\.(?:com|cc|cn|asia|biz|coop|edu|gov|int|info|jobs|mobi|name|net|org|pro|tel|trave)(\.[a-z]{2})?/im;
+/**根域获取正则 */ const ROOT_NAME_REGEXP = /[\w-]*\.(?:com|lo|cc|cn|asia|biz|coop|edu|gov|int|info|jobs|mobi|name|net|org|pro|tel|trave)(\.[a-z]{2})?/im;
 /**获取域名根域 */ function getRootName(host) {
     const match = host.match(ROOT_NAME_REGEXP);
     if (match && (0, _utils.isString)(match[0])) {
@@ -56,6 +56,10 @@ function _default(config) {
             ctx.set("Access-Control-Allow-Origin", origin);
             ctx.set("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
             ctx.set("Access-Control-Allow-Credentials", "true");
+            const acrHeaders = ctx.headers["access-control-request-headers"];
+            if (acrHeaders) {
+                ctx.set("Access-Control-Allow-Headers", acrHeaders);
+            }
             ctx.set("X-Cors", isLocal ? "local" : config.type || "custom");
         } else {
             ctx.set("X-Cors", "disabled");

package/dist/middleware/request-filter.js

@@ -98,6 +98,7 @@ async function filter(ctx, next) {
     var parsedUrl = _url.default.parse(ctx.url);
     var pathname = parsedUrl.pathname;
     ctx.state.parsedUrl = parsedUrl;
+    ctx.state.originHost = ctx.headers["x-forwarded-host"] || ctx.headers.host;
     var srcType = {
         "js": false,
         "html": false,
@@ -114,14 +115,12 @@ async function filter(ctx, next) {
         // 提取页面必要的信息
         // 由于 dir 也可能直接返回 HTML 页面
         // 所以这里也需要经过 HTML 的过滤器处理
-        ctx.state.originHost = ctx.headers["x-forwarded-host"] || ctx.headers.host;
         ctx.state.ver = (0, _htmlFilter.filter)(ctx.url);
     } else if (isStatic(pathname)) {
         srcType.static = true;
         if (isHtml(pathname)) {
             srcType.html = true;
             // 提取页面必要的信息
-            ctx.state.originHost = ctx.headers["x-forwarded-host"] || ctx.headers.host;
             ctx.state.ver = (0, _htmlFilter.filter)(ctx.url);
         } else if (isJS(pathname)) {
             srcType.js = true;

package/package.json

@@ -1,8 +1,8 @@
 {
     "name": "@x-9lab/xlab",
-    "version": "1.0.8",
+    "version": "1.0.11",
     "description": "9lab 服务端模块",
-    "versionDesc": "支持根目录下的点配置文件",
+    "versionDesc": "originHost 现在所有请求都会带上",
     "scripts": {
         "dev": "swc src -D ./src/bin --config-file .swcrc -d dist -w",
         "compile": "swc src -D ./src/bin --config-file .swcrc -d dist",