mas-server 2.0.46 → 2.0.51

package/.temp/merge/validType.ts

@@ -0,0 +1,98 @@
+import { getType } from "../utils/masUtils";
+
+type BasicTypeDescriptor =
+  | StringConstructor
+  | NumberConstructor
+  | BooleanConstructor
+  | ObjectConstructor;
+type TypeDescriptor = BasicTypeDescriptor | Array<any>;
+
+interface TypeMapping {
+  [key: string]:
+    | TypeDescriptor
+    | TypeMapping
+    | Array<TypeDescriptor | TypeMapping>;
+}
+const vliadBase = (obj, typeMapping) => {
+  return getType(obj) == (typeMapping as any).name.toLowerCase();
+};
+const validTypeObj = (obj: any, typeMapping: TypeMapping | TypeDescriptor) => {
+  if (obj === null || obj === undefined) return false;
+  let typeT = getType(typeMapping);
+  if (typeT == "function") {
+    return vliadBase(obj, typeMapping);
+  } else if (typeT == "object") {
+    if (getType(obj) !== "object") return false;
+    for (let k in typeMapping) {
+      if (obj[k] === null || obj[k] === undefined) return false;
+      if (!validType(obj[k], typeMapping[k])) return false;
+    }
+  } else if (typeT == "array") {
+    if (getType(obj) != "array") return false;
+    if (obj.length === 0) return false;
+    const typeMappingArrObj = typeMapping[0];
+    if (!typeMappingArrObj) {
+      throw new Error(`非法的效验格式 ${typeMapping} ${typeMappingArrObj}`);
+    }
+    if (getType(obj) != "array") return false;
+    for (let v of obj) {
+      if (!validTypeObj(v, typeMappingArrObj)) return false;
+    }
+  }
+  return true;
+};
+const validTypeObjStrict = (
+  obj: any,
+  typeMapping: TypeMapping | TypeDescriptor
+) => {
+  if (obj === null || obj === undefined) return false;
+  let typeT = getType(typeMapping);
+  if (typeT == "function") {
+    return vliadBase(obj, typeMapping);
+  } else if (typeT == "object") {
+    if (getType(obj) !== "object") return false;
+    if (Object.keys(obj).length != Object.keys(typeT).length) return false;
+    for (let k in typeMapping) {
+      if (obj[k] === null || obj[k] === undefined) return false;
+      if (!validType(obj[k], typeMapping[k])) return false;
+    }
+  } else if (typeT == "array") {
+    if (getType(obj) != "array") return false;
+    if (obj.length === 0) return false;
+    const typeMappingArrObj = typeMapping[0];
+    if (!typeMappingArrObj) {
+      throw new Error(`非法的效验格式 ${typeMapping} ${typeMappingArrObj}`);
+    }
+    if (getType(obj) != "array") return false;
+    for (let v of obj) {
+      if (!validTypeObj(v, typeMappingArrObj)) return false;
+    }
+  }
+  return true;
+};
+export default function validType(
+  obj: any,
+  typeMapping: TypeMapping | TypeDescriptor,
+  strict: boolean = false
+): boolean {
+  return strict
+    ? validTypeObjStrict(obj, typeMapping)
+    : validTypeObj(obj, typeMapping);
+}
+// let res = validType(
+//   { name: "2", arr: [1] },
+//   { name: String, arr: [Number] },
+//   true
+// [
+//   { name: "s", age: "" },
+//   { names: "s", age: "" },
+// ],
+// { name: "11", age: 1, obj: { a: "1", b: 1 } },
+// String,
+// Boolean,
+// { name: String, age: Number, obj: { a: String, b: Number } }
+// [{ name: String }]
+// );
+// console.log(res);
+// console.log(getType(null)); //"null"
+// console.log(getType(undefined)); //"undefined"

package/beforebuild.js

@@ -0,0 +1,3 @@
+const fs = require("fs");
+const path = require("path");
+fs.copyFileSync(path.join(__dirname, "./src/utils/mas-encrypt.min.js"), path.join(__dirname, "./dist/utils/mas-encrypt.min.js"));

package/dist/index.js

@@ -1,45 +1,19 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validType = exports.createToken = exports.validToken = exports.massql = exports.getsqlFormDataType = exports.getsqlFormData = exports.createSqlForm = exports.checkSqlKey = exports.sqlQuery = exports.sqlInit = exports.sqlEnd = exports.sqlState = exports.moment = exports.getRouteByApiSrc = exports.readApi = exports.getApp = void 0;
+exports.validType = exports.createToken = exports.validToken = exports.massql = exports.getsqlFormDataType = exports.getsqlFormData = exports.createSqlForm = exports.checkSqlKey = exports.sqlQuery = exports.sqlInit = exports.sqlEnd = exports.sqlState = exports.moment = exports.readApi = exports.getApp = void 0;
 require("module-alias/register");
 const express_1 = __importDefault(require("express"));
 const cors_1 = __importDefault(require("cors"));
 const path_1 = __importDefault(require("path"));
-const fs = __importStar(require("fs"));
 const state_1 = require("./state");
 const getLog_1 = __importDefault(require("./utils/getLog"));
 const quickSend_1 = __importDefault(require("./utils/quickSend"));
 const readApi_1 = __importDefault(require("./utils/readApi"));
 exports.readApi = readApi_1.default;
 const validRouteData_1 = __importDefault(require("./utils/validRouteData"));
-const getRouteByApiSrc_1 = __importDefault(require("./utils/getRouteByApiSrc"));
-exports.getRouteByApiSrc = getRouteByApiSrc_1.default;
 const validToken_1 = __importDefault(require("./utils/validToken"));
 const ansi_colors_1 = __importDefault(require("ansi-colors"));
 const moment_1 = __importDefault(require("moment"));
@@ -63,16 +37,17 @@ Object.defineProperty(exports, "createToken", { enumerable: true, get: function
 Object.defineProperty(exports, "validToken", { enumerable: true, get: function () { return meaToken_1.validToken; } });
 const validType_1 = __importDefault(require("./utils/validType"));
 exports.validType = validType_1.default;
+const createRouter_1 = __importDefault(require("./utils/createRouter"));
+const getRouterInfo_1 = __importDefault(require("./utils/getRouterInfo"));
 // =================================================================
 function getApp(DIRNAME, beforeMounted) {
     // 路径和配置放入state
     state_1.state.DIRNAME = DIRNAME;
     const config = require(path_1.default.join(DIRNAME, "/config/config.ts")).default;
-    const Router = require(path_1.default.join(DIRNAME, "/config/api.config.ts")).default;
-    const apiCN = require(path_1.default.join(DIRNAME, "/config/api.key.ts")).default;
+    // 获取路由信息
+    (0, getRouterInfo_1.default)(path_1.default.join(state_1.state.DIRNAME, "src/api"), path_1.default.join(state_1.state.DIRNAME, "config/defaultApiConfig.ts"));
     state_1.state.config = config;
-    state_1.state.Router = Router;
-    state_1.state.apiCN = apiCN;
+    state_1.state.apiCN = [];
     // new express
     const app = (0, express_1.default)();
     // 是否允许跨域
@@ -83,7 +58,6 @@ function getApp(DIRNAME, beforeMounted) {
     // 初始化app
     app.use(express_1.default.urlencoded({ extended: true }));
     app.use(express_1.default.json());
-    // 自定义中间件来处理纯文本和JSON数据
     // 错误处理中间件
     app.use((err, req, res, next) => {
         if (err.type == "entity.parse.failed") {
@@ -109,21 +83,8 @@ function getApp(DIRNAME, beforeMounted) {
         app.use("/apidoc", express_1.default.static(path_1.default.join(__dirname, "/apiDoc")));
         (0, apiDoc_1.default)(app);
     }
-    // 遍历api路由
-    for (const item in Router) {
-        let isExist = fs.existsSync(path_1.default.join(DIRNAME, "src", item) + ".ts");
-        if (!isExist) {
-            console.info(ansi_colors_1.default.red(`${item} not found`));
-            continue;
-        }
-        const apiFunc = require(path_1.default.join(DIRNAME, "src", item)).default;
-        if (!apiFunc) {
-            console.info(ansi_colors_1.default.yellow(`${item} 没有导出函数，已跳过..`));
-        }
-        else {
-            apiFunc && app[Router[item].methods](item, apiFunc);
-        }
-    }
+    // 创建路由
+    (0, createRouter_1.default)(app);
     // 运行debug
     setTimeout(() => {
         try {

package/dist/utils/apiDoc.js

@@ -8,9 +8,24 @@ exports.default = (app) => {
         }
         return value;
     });
-    // console.log(state);
+    const newRouter = JSON.parse(router);
+    // 有的描述没有类型，尝试从validFormat里取
+    for (const key in newRouter) {
+        const item = newRouter[key];
+        if (item.validFormat && item.validFormatDes) {
+            for (const validFormatDesItem of item.validFormatDes) {
+                if (!validFormatDesItem.type &&
+                    item.validFormat[validFormatDesItem.name]) {
+                    validFormatDesItem.type = item.validFormat[validFormatDesItem.name];
+                }
+                else if (!validFormatDesItem.type) {
+                    validFormatDesItem.type = "String";
+                }
+            }
+        }
+    }
     app.post("/apidoc/router", (req, res) => {
-        res.return(JSON.parse(router));
+        res.return(newRouter);
     });
     app.post("/apidoc/cn", (req, res) => {
         res.return(state_1.state.apiCN);

package/dist/utils/createRouter.js

@@ -0,0 +1,51 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const state_1 = require("@/state");
+const path_1 = __importDefault(require("path"));
+const fs = __importStar(require("fs"));
+const ansi_colors_1 = __importDefault(require("ansi-colors"));
+function createRouter(app) {
+    const { Router, DIRNAME } = state_1.state;
+    // 遍历api路由
+    for (const item in Router) {
+        let isExist = fs.existsSync(path_1.default.join(DIRNAME, "src", item) + ".ts");
+        if (!isExist) {
+            console.info(ansi_colors_1.default.red(`${item} not found`));
+            continue;
+        }
+        const apiFunc = require(path_1.default.join(DIRNAME, "src", item)).default;
+        if (!apiFunc) {
+            console.info(ansi_colors_1.default.yellow(`${item} 没有导出函数，已跳过..`));
+        }
+        else {
+            apiFunc && app[Router[item].methods](item, apiFunc);
+        }
+    }
+}
+exports.default = createRouter;

package/dist/utils/getRouterInfo.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const state_1 = require("@/state");
+const readApi_1 = __importDefault(require("./readApi"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const ansi_colors_1 = __importDefault(require("ansi-colors"));
+function getRouterInfo(apiDir, defaullConfigDir) {
+    const apiConfig = {};
+    const { DIRNAME } = state_1.state;
+    const routerDir = (0, readApi_1.default)(apiDir, "api");
+    const defaullConfig = require(defaullConfigDir).default;
+    // 遍历api路由
+    for (const item of routerDir) {
+        let isExist = fs_1.default.existsSync(path_1.default.join(DIRNAME, "src", item) + ".ts");
+        if (!isExist) {
+            console.info(ansi_colors_1.default.red(`${item} not found`));
+            continue;
+        }
+        const apiItemConfig = require(path_1.default.join(DIRNAME, "src", item)).config;
+        apiConfig[item] = apiItemConfig || defaullConfig;
+        // if (!apiFunc) {
+        //   console.info(c.yellow(`${item} 没有导出函数，已跳过..`));
+        // } else {
+        //   apiFunc && app[Router[item].methods](item, apiFunc);
+        // }
+    }
+    state_1.state.Router = apiConfig;
+    return apiConfig;
+}
+exports.default = getRouterInfo;