npm - mas-server - Versions diffs - 1.0.2 → 2.0.0 - Mend

mas-server 1.0.2 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (153) hide show

package/.temp/a.ts +4 -0
package/.temp/as.ts +1 -0
package/.temp/b.ts +3 -0
package/{src/index.js → .temp/i.js} +3 -3
package/.temp/logs/.keep +0 -0
package/.temp/test.ts +2 -0
package/.temp/validType copy.ts +149 -0
package/.temp/validType.ts +96 -0
package/.temp/validTypeOptimize.ts +98 -0
package/.vscode/settings.json +0 -109
package/dist/index.js +136 -0
package/dist/masmysql/checkSqlkey.js +67 -0
package/dist/masmysql/createSqlForm.js +44 -0
package/dist/masmysql/esaysql.js +53 -0
package/dist/masmysql/index.js +111 -0
package/dist/masmysql/masSql.js +741 -0
package/dist/masmysql/state.js +5 -0
package/dist/masmysql/type.js +2 -0
package/dist/masmysql/utils.js +12 -0
package/dist/state.js +4 -0
package/dist/typings/index.js +2 -0
package/dist/utils/apiDoc.js +18 -0
package/dist/utils/getLog.js +18 -0
package/dist/utils/getRouteByApiSrc.js +54 -0
package/dist/utils/masUtils.js +12 -0
package/dist/utils/meaToken.js +57 -0
package/dist/utils/quickSend.js +32 -0
package/dist/utils/readApi.js +50 -0
package/dist/utils/validRouteData.js +37 -0
package/dist/utils/validToken.js +24 -0
package/dist/utils/validType.js +101 -0
package/package.json +34 -15
package/src/apiDoc/assets/empty-907982e4.js +1 -0
package/src/apiDoc/assets/index-b56e6bc6.js +1414 -0
package/src/apiDoc/assets/index-bb16d834.css +6 -0
package/src/{public/doc/img/jsoneditor-icons.256e3abc.svg → apiDoc/assets/jsoneditor-icons-45c98bf0.svg} +213 -357
package/src/apiDoc/favicon.ico +0 -0
package/src/apiDoc/index.html +15 -0
package/src/index.ts +132 -0
package/src/masmysql/checkSqlkey.ts +55 -0
package/src/masmysql/createSqlForm.ts +37 -0
package/src/masmysql/esaysql.ts +44 -0
package/src/masmysql/index.ts +68 -0
package/src/masmysql/masSql.ts +736 -0
package/src/masmysql/state.ts +5 -0
package/src/masmysql/type.ts +34 -0
package/src/masmysql/utils.ts +8 -0
package/src/state.ts +1 -0
package/src/typings/index.ts +114 -0
package/src/utils/apiDoc.ts +18 -0
package/src/utils/getLog.ts +20 -0
package/src/utils/getRouteByApiSrc.ts +55 -0
package/src/utils/mas-encrypt.min.js +1 -0
package/src/utils/masUtils.ts +8 -0
package/src/utils/meaToken.ts +56 -0
package/src/utils/quickSend.ts +19 -0
package/src/utils/readApi.ts +30 -0
package/src/utils/validRouteData.ts +46 -0
package/src/utils/validToken.ts +22 -0
package/src/utils/validType.ts +98 -0
package/test/apiTemplate/api.temp.ts +6 -0
package/test/apiTemplate/curd/del.ts +9 -0
package/test/apiTemplate/curd/get.ts +9 -0
package/test/apiTemplate/curd/set.ts +9 -0
package/test/config/api.config.ts +3 -0
package/test/config/api.key.ts +14 -0
package/test/config/config.ts +30 -0
package/test/config/createSqlFormData.ts +14 -0
package/test/logs/.keep +0 -0
package/test/main.ts +25 -0
package/test/scripts/beforeCreated.ts +67 -0
package/test/scripts/createApiFile.ts +27 -0
package/test/scripts/createApis.ts +109 -0
package/test/scripts/createSqlForm.ts +5 -0
package/test/scripts/getSqlFormType.ts +34 -0
package/test/scripts/run.ts +4 -0
package/test/scripts/updateRouter.ts +46 -0
package/test/src/api/curd/student/del.ts +9 -0
package/test/src/api/curd/student/get.ts +9 -0
package/test/src/api/curd/student/set.ts +9 -0
package/test/src/api/index.ts +4 -0
package/test/src/api/per.ts +6 -0
package/test/src/api/person/del.ts +4 -0
package/test/src/api/person/get.ts +4 -0
package/test/src/api/person/set.ts +4 -0
package/test/src/api/test.ts +7 -0
package/test/src/api/validtest/boolArr.ts +4 -0
package/test/src/debug.ts +56 -0
package/test/src/masState.ts +4 -0
package/test/src/sql/selectStudent.ts +7 -0
package/test/src/sqlform.json +1 -0
package/test/test.ts +13 -0
package/test/typings/.keep +0 -0
package/test/typings/studentSF.ts +6 -0
package/test/typings/test11SF.ts +1 -0
package/test/typings/test22SF.ts +1 -0
package/test/typings/testformSF.ts +1 -0
package/test//345/276/205/345/274/200/345/217/221.md +12 -0
package/tsconfig.json +23 -0
package/tsconfigschema.json +1263 -0
package/src/config/api.res.json +0 -1
package/src/config/api.tree.json +0 -1
package/src/config/apiModules/del.module +0 -6
package/src/config/apiModules/get.module +0 -6
package/src/config/apiModules/set.module +0 -6
package/src/config/config.schema.js +0 -41
package/src/public/doc/css/app.722f60c4.css +0 -1
package/src/public/doc/css/chunk-287b9965.80548a4b.css +0 -1
package/src/public/doc/css/chunk-vendors.a16c4353.css +0 -1
package/src/public/doc/favicon.ico +0 -0
package/src/public/doc/fonts/element-icons.535877f5.woff +0 -0
package/src/public/doc/fonts/element-icons.732389de.ttf +0 -0
package/src/public/doc/index.html +0 -1
package/src/public/doc/js/app.9ce10690.js +0 -2
package/src/public/doc/js/app.9ce10690.js.map +0 -1
package/src/public/doc/js/chunk-287b9965.77cfd27f.js +0 -32
package/src/public/doc/js/chunk-287b9965.77cfd27f.js.map +0 -1
package/src/public/doc/js/chunk-vendors.7c84e9a7.js +0 -35
package/src/public/doc/js/chunk-vendors.7c84e9a7.js.map +0 -1
package/src/public/index.html +0 -15
package/src/state.js +0 -6
package/src/utils/DataVerified.js +0 -35
package/src/utils/beforeCreate.js +0 -19
package/src/utils/createApi.js +0 -34
package/src/utils/createApiFile.js +0 -40
package/src/utils/createSqlForm.js +0 -7
package/src/utils/encrypt.js +0 -1
package/src/utils/getDir.js +0 -60
package/src/utils/logs.js +0 -16
package/src/utils/masDoc.js +0 -37
package/src/utils/masRoute.js +0 -29
package/src/utils/quickSend.js +0 -18
package/src/utils/token.js +0 -57
package/test/.utils/api.js +0 -4
package/test/.utils/apis.js +0 -5
package/test/.utils/beforeIndex.js +0 -4
package/test/.utils/createForm.js +0 -4
package/test/config/api.config.json +0 -7
package/test/config/api.config.k.json +0 -1
package/test/config/config.js +0 -22
package/test/config/sqlform.config.js +0 -23
package/test/index.js +0 -12
package/test/public/1.txt +0 -1
package/test/serverLogs/2022-10-29.log +0 -6
package/test/serverLogs/2022-10-30.log +0 -58
package/test/src/$form.js +0 -1
package/test/src/api/index.js +0 -3
package/test/src/api/test.js +0 -9
package/test/src/api/vip/del.js +0 -6
package/test/src/api/vip/get.js +0 -6
package/test/src/api/vip/set.js +0 -6
package/test/src/api/vip666.js +0 -4
package/test/src/debug.js +0 -2

package/src/apiDoc/favicon.ico ADDED Viewed

Binary file

package/src/apiDoc/index.html ADDED Viewed

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="./favicon.ico">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Vite App</title>
+    <script type="module" crossorigin src="./assets/index-b56e6bc6.js"></script>
+    <link rel="stylesheet" href="./assets/index-bb16d834.css">
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

package/src/index.ts ADDED Viewed

@@ -0,0 +1,132 @@
+import "module-alias/register";
+import express from "express";
+import type { Express } from "express";
+import cors from "cors";
+import path from "path";
+import * as fs from "fs";
+import { state } from "@/state";
+import getLog from "@/utils/getLog";
+import quickSend from "@/utils/quickSend";
+import readApi from "@/utils/readApi";
+import validRouteData from "@/utils/validRouteData";
+import getRouteByApiSrc from "@/utils/getRouteByApiSrc";
+import validTokenUse from "@/utils/validToken";
+import type { masReq, masRes, apiConfigType, configType } from "@/typings";
+import c from "ansi-colors";
+import moment from "moment";
+import "moment/locale/zh-cn";
+moment.locale("zh-cn");
+// 数据库
+import {
+  sqlEnd,
+  sqlInit,
+  sqlQuery,
+  checkSqlKey,
+  createSqlForm,
+  massql,
+  state as sqlState,
+  getsqlFormDataType,
+  getsqlFormData,
+} from "masmysql";
+import type { createSqlFormType, sqlForm } from "masmysql";
+import apiDoc from "./utils/apiDoc";
+import { createToken, validToken } from "./utils/meaToken";
+// =================================================================
+export function getApp(
+  DIRNAME: string,
+  beforeMounted?: (app: Express) => void
+) {
+  // 路径和配置放入state
+  state.DIRNAME = DIRNAME;
+  const config = require(path.join(DIRNAME, "/config/config.ts")).default;
+  const Router = require(path.join(DIRNAME, "/config/api.config.ts")).default;
+  const apiCN = require(path.join(DIRNAME, "/config/api.key.ts")).default;
+  state.config = config;
+  state.Router = Router;
+  state.apiCN = apiCN;
+  // new express
+  const app = express();
+  // 是否允许跨域
+  config.cors && app.use(cors());
+  if (beforeMounted) {
+    beforeMounted(app);
+  }
+  // 初始化app
+  app.use(express.urlencoded({ extended: true }));
+  app.use(express.json());
+  // 自定义中间件来处理纯文本和JSON数据
+  // 错误处理中间件
+  app.use((err, req, res, next) => {
+    if (err.type == "entity.parse.failed") {
+      req.body._str = err.body;
+    }
+    next();
+  });
+  //快速return
+  app.use(quickSend);
+  // 日志
+  if (config.logs.open) {
+    app.use(require("express-ip")().getIpInfoMiddleware);
+    app.use(getLog);
+  }
+  // 权限管理
+  if (config.token.open) {
+    app.use(validTokenUse);
+  }
+  // 数据效验
+  app.use(validRouteData);
+  if (config.apidoc) {
+    app.use("/apidoc", express.static(path.join(__dirname, "/apiDoc")));
+    apiDoc(app);
+  }
+  // 遍历api路由
+  for (const item in Router) {
+    let isExist = fs.existsSync(path.join(DIRNAME, "src", item) + ".ts");
+    if (!isExist) {
+      console.info(c.red(`${item} not found`));
+      continue;
+    }
+    const apiFunc = require(path.join(DIRNAME, "src", item)).default;
+    if (!apiFunc) {
+      console.info(c.yellow(`${item} 没有导出函数，已跳过..`));
+    } else {
+      apiFunc && app[Router[item].methods](item, apiFunc);
+    }
+  }
+  // 运行debug
+  setTimeout(() => {
+    try {
+      require(path.join(DIRNAME + "/src/debug"));
+    } catch (error) {
+      console.info(c.red("debug.js报错！！！"));
+      console.info(error);
+    }
+  }, config.debugTime || 1000);
+  return app;
+}
+export {
+  readApi,
+  getRouteByApiSrc,
+  moment,
+  sqlState,
+  sqlEnd,
+  sqlInit,
+  sqlQuery,
+  checkSqlKey,
+  createSqlForm,
+  getsqlFormData,
+  getsqlFormDataType,
+  massql,
+  validToken,
+  createToken,
+};
+export type {
+  masReq,
+  masRes,
+  apiConfigType,
+  configType,
+  createSqlFormType,
+  sqlForm,
+};

package/src/masmysql/checkSqlkey.ts ADDED Viewed

@@ -0,0 +1,55 @@
+import state from "./state";
+import { sqlQuery } from "./esaysql";
+import c from "ansi-colors";
+/** 添加相关表名 */
+const replenishForm = async (formName: string, key: string) => {
+  // state.status = 0;
+  const replenishData = {
+    create_time: "`create_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP",
+    update_time:
+      "`update_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP",
+    is_delete: "`is_delete` INT DEFAULT 0",
+  };
+  console.info(c.yellow(`${formName}缺少字段${key}`));
+  await sqlQuery(`alter table ${formName} add ${replenishData[key]}`);
+  console.info(c.yellow("已为您自动添加"));
+};
+/** 获取相关表名，并检查每个表是否含有 is_delete,create_time,update_time，没有则添加 */
+export default async function checkSqlKey() {
+  let dbname = state.config.database;
+  // 获得数据库相关表名
+  let formName = (await sqlQuery(
+    `select table_name
+     from information_schema.tables
+     where table_schema='${dbname}'`
+  )) as any;
+  const sqlform = {};
+  formName = formName.map((item) => item["TABLE_NAME"]);
+  const listKeyArr = {};
+  // 获得相关表字段，并且没有
+  for (let item of formName) {
+    let listkey: any = await sqlQuery(
+      `SELECT DATA_TYPE,COLUMN_NAME FROM information_schema.COLUMNS
+       WHERE table_name = '${item}' AND
+       \`TABLE_SCHEMA\`='${dbname}'`
+    );
+    listKeyArr[item] = JSON.parse(JSON.stringify(listkey));
+    listkey = listkey.map((item) => item["COLUMN_NAME"]);
+    if (!listkey.includes("create_time")) {
+      await replenishForm(item, "create_time");
+      listkey.push("create_time");
+    }
+    if (!listkey.includes("update_time")) {
+      await replenishForm(item, "update_time");
+      listkey.push("update_time");
+    }
+    if (!listkey.includes("is_delete")) {
+      await replenishForm(item, "is_delete");
+      listkey.push("is_delete");
+    }
+    sqlform[item] = listkey;
+  }
+  state.listKey = JSON.parse(JSON.stringify(listKeyArr));
+  state.sqlForm = { ...sqlform };
+  return sqlform;
+}

package/src/masmysql/createSqlForm.ts ADDED Viewed

@@ -0,0 +1,37 @@
+import { sqlQuery } from "./esaysql";
+import state from "./state";
+import { createSqlForm } from "./type";
+export default async (form: { [key: string]: createSqlForm }) => {
+  const formArr = Object.keys(state.sqlForm);
+  for (let k in form) {
+    let data = form[k];
+    if (formArr.includes(k.toLowerCase())) {
+      continue;
+    }
+    const sqldata = `CREATE TABLE ${k.toLowerCase()}
+    (
+      \`id\` INT AUTO_INCREMENT PRIMARY KEY COMMENT '唯一主键',
+      ${data
+        .map(
+          (item) =>
+            `\`${item.key}\` ${
+              item.type.toLowerCase() == "str"
+                ? `VARCHAR(${item.length || "100"})`
+                : item.type.toLowerCase() == "int"
+                ? "INT"
+                : item.type.toLowerCase() == "float"
+                ? "FLOAT"
+                : "VARCHAR(100)"
+            } ${item.notNull ? "NOT NULL" : ""} COMMENT '${item.des || ""}'`
+        )
+        .join(",")},
+      \`create_time\` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+      \`update_time\` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+      \`is_delete\` INT DEFAULT 0 COMMENT '是否被删除'
+    )`;
+    await sqlQuery(sqldata, 1);
+    console.log(`尝试创建${k}表完成`);
+  }
+  console.log("创建表完成");
+};

package/src/masmysql/esaysql.ts ADDED Viewed

@@ -0,0 +1,44 @@
+const mysql = require("mysql");
+import state from "./state";
+import c from "ansi-colors";
+export function sqlInit(config: {
+  host: string;
+  user: string;
+  password: string;
+  database: string;
+}) {
+  state.config = config;
+  state.connection = mysql.createConnection(config);
+  return new Promise((resolve, reject) => {
+    state.connection.connect(function (err) {
+      if (err) {
+        console.error("error connecting: " + err.stack);
+        throw Error("连接数据库失败！");
+      } else {
+        resolve(true);
+      }
+    });
+  });
+}
+export function sqlEnd() {
+  state.connection.end();
+}
+export function sqlQuery(sqldata, details = 0) {
+  return new Promise((resolve, reject) => {
+    state.connection.query(sqldata, (error, sqlRes) => {
+      if (details) {
+        if (error) {
+          reject(error);
+          console.info(error);
+        } else resolve(sqlRes);
+      }
+      if (!sqlRes) {
+        console.info(error, sqlRes);
+        console.info(c.red("错误：数据库语句错误"));
+        resolve(undefined);
+      } else if (Number.isInteger(sqlRes.affectedRows))
+        resolve(sqlRes.affectedRows);
+      else resolve(JSON.parse(JSON.stringify(sqlRes)));
+    });
+  });
+}

package/src/masmysql/index.ts ADDED Viewed

@@ -0,0 +1,68 @@
+import checkSqlKey from "./checkSqlkey";
+import createSqlFormScript from "./createSqlForm";
+import { sqlEnd, sqlInit, sqlQuery } from "./esaysql";
+import massql from "./masSql";
+import state from "./state";
+import * as fs from "fs";
+import type { createSqlFormType, sqlForm, sqlState } from "./type";
+/** 创建表名 */
+async function createSqlForm(
+  config: sqlState["config"],
+  createForm: createSqlFormType
+) {
+  sqlInit(config);
+  await checkSqlKey();
+  await createSqlFormScript(createForm);
+  sqlEnd();
+}
+export function getsqlFormData(path?: string) {
+  if (!state.sqlForm) {
+    throw Error("请先初始化数据库!");
+  }
+  const sqlForm = JSON.parse(JSON.stringify(state.sqlForm));
+  for (let k in sqlForm) {
+    sqlForm[k].push(`@!${k}`);
+  }
+  if (path) {
+    if (!path.includes(".json")) {
+      throw Error("写入路径错误");
+    }
+    if (fs.existsSync(path)) {
+      const data = require(path);
+      if (JSON.stringify(data) != JSON.stringify(sqlForm)) {
+        fs.writeFileSync(path, `${JSON.stringify(sqlForm)}`);
+      }
+    } else {
+      fs.writeFileSync(path, `${JSON.stringify(sqlForm)}`);
+    }
+  }
+  return sqlForm;
+}
+export function getsqlFormDataType(): {
+  [key: string]: { typeData: any; typeObj: any };
+} {
+  if (!state.listKey) {
+    throw Error("请先初始化数据库!");
+  }
+  let tarr = { int: "number", float: "number" };
+  let btarr = { int: "Number", float: "Number" };
+  let nnn = { is_delete: "", update_time: "", create_time: "" };
+  let res = {};
+  for (let key in state.listKey) {
+    let typeObj = "{";
+    let typeData = "{";
+    for (let item of state.listKey[key]) {
+      if (nnn[item.COLUMN_NAME] === "") continue;
+      typeObj += `${item.COLUMN_NAME}?:${tarr[item.DATA_TYPE] || "string"};`;
+      if (item.COLUMN_NAME==="id") continue;
+      typeData += `${item.COLUMN_NAME}:${btarr[item.DATA_TYPE] || "String"},`;
+    }
+    typeData=typeData.slice(0,typeData.length-1) + "}";
+    typeObj += "}";
+    res[key] = { typeData, typeObj };
+  }
+  return res;
+}
+export { sqlEnd, sqlInit, state, sqlQuery, checkSqlKey, createSqlForm, massql };
+export type { createSqlFormType, sqlState, sqlForm };