mas-server 3.0.2 → 3.0.4

package/.temp/merge/validType.ts

@@ -1,98 +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"
+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/.temp/merge/validTypeOptimize.ts

@@ -1,98 +1,98 @@
-type BasicTypeDescriptor =
-  | typeof String
-  | typeof Number
-  | typeof Boolean
-  | typeof Object;
-type TypeDescriptor = BasicTypeDescriptor | Array<TypeDescriptor>;
-
-interface TypeMapping {
-  [key: string]: TypeDescriptor | TypeMapping;
-}
-
-function getTypeName(descriptor: TypeDescriptor): string {
-  if (Array.isArray(descriptor)) {
-    return "array";
-  } else {
-    return descriptor.name.toLowerCase();
-  }
-}
-
-function validType(obj: any, typeMapping: TypeMapping): boolean {
-  for (const key in typeMapping) {
-    if (!(key in obj)) {
-      return false;
-    }
-
-    const targetType = typeMapping[key];
-    const objValue = obj[key];
-
-    if (Array.isArray(targetType)) {
-      if (!Array.isArray(objValue)) {
-        return false;
-      }
-
-      const arrayElementType = targetType[0];
-
-      for (const element of objValue) {
-        if (typeof arrayElementType === "object") {
-          if (
-            !validType(element, arrayElementType as unknown as TypeMapping) ||
-            Object.keys(element).length !==
-              Object.keys(arrayElementType as unknown as TypeMapping).length
-          ) {
-            return false;
-          }
-        } else {
-          if (
-            typeof element !== getTypeName(arrayElementType as TypeDescriptor)
-          ) {
-            return false;
-          }
-        }
-      }
-    } else if (typeof targetType === "object") {
-      if (
-        typeof objValue !== "object" ||
-        Array.isArray(objValue) ||
-        !validType(objValue, targetType as TypeMapping) ||
-        Object.keys(objValue).length !==
-          Object.keys(targetType as TypeMapping).length
-      ) {
-        return false;
-      }
-    } else {
-      if (typeof objValue !== getTypeName(targetType as TypeDescriptor)) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-// 检查基本类型
-console.log(
-  validType({ name: "Alice", age: 30 }, { name: String, age: Number })
-); // 输出 true
-console.log(
-  validType({ name: "Alice", age: 30 }, { name: String, age: String })
-); // 输出 false
-
-// 检查数组类型
-console.log(validType({ values: [1, 2, 3] }, { values: [Number] })); // 输出 true
-console.log(validType({ values: [1, "2", 3] }, { values: [Number] })); // 输出 false
-
-// 检查嵌套类型
-console.log(
-  validType(
-    { person: { name: "Alice", age: 30 } },
-    { person: { name: String, age: Number } }
-  )
-); // 输出 true
-console.log(
-  validType(
-    { person: { name: "Alice", age: 30 } },
-    { person: { name: String, age: String } }
-  )
-); // 输出
-
-export {};
+type BasicTypeDescriptor =
+  | typeof String
+  | typeof Number
+  | typeof Boolean
+  | typeof Object;
+type TypeDescriptor = BasicTypeDescriptor | Array<TypeDescriptor>;
+
+interface TypeMapping {
+  [key: string]: TypeDescriptor | TypeMapping;
+}
+
+function getTypeName(descriptor: TypeDescriptor): string {
+  if (Array.isArray(descriptor)) {
+    return "array";
+  } else {
+    return descriptor.name.toLowerCase();
+  }
+}
+
+function validType(obj: any, typeMapping: TypeMapping): boolean {
+  for (const key in typeMapping) {
+    if (!(key in obj)) {
+      return false;
+    }
+
+    const targetType = typeMapping[key];
+    const objValue = obj[key];
+
+    if (Array.isArray(targetType)) {
+      if (!Array.isArray(objValue)) {
+        return false;
+      }
+
+      const arrayElementType = targetType[0];
+
+      for (const element of objValue) {
+        if (typeof arrayElementType === "object") {
+          if (
+            !validType(element, arrayElementType as unknown as TypeMapping) ||
+            Object.keys(element).length !==
+              Object.keys(arrayElementType as unknown as TypeMapping).length
+          ) {
+            return false;
+          }
+        } else {
+          if (
+            typeof element !== getTypeName(arrayElementType as TypeDescriptor)
+          ) {
+            return false;
+          }
+        }
+      }
+    } else if (typeof targetType === "object") {
+      if (
+        typeof objValue !== "object" ||
+        Array.isArray(objValue) ||
+        !validType(objValue, targetType as TypeMapping) ||
+        Object.keys(objValue).length !==
+          Object.keys(targetType as TypeMapping).length
+      ) {
+        return false;
+      }
+    } else {
+      if (typeof objValue !== getTypeName(targetType as TypeDescriptor)) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+// 检查基本类型
+console.log(
+  validType({ name: "Alice", age: 30 }, { name: String, age: Number })
+); // 输出 true
+console.log(
+  validType({ name: "Alice", age: 30 }, { name: String, age: String })
+); // 输出 false
+
+// 检查数组类型
+console.log(validType({ values: [1, 2, 3] }, { values: [Number] })); // 输出 true
+console.log(validType({ values: [1, "2", 3] }, { values: [Number] })); // 输出 false
+
+// 检查嵌套类型
+console.log(
+  validType(
+    { person: { name: "Alice", age: 30 } },
+    { person: { name: String, age: Number } }
+  )
+); // 输出 true
+console.log(
+  validType(
+    { person: { name: "Alice", age: 30 } },
+    { person: { name: String, age: String } }
+  )
+); // 输出
+
+export {};

package/.vscode/settings.json

@@ -1,3 +1,3 @@
-{
-  "javascript.format.semicolons": "insert"
-}
+{
+  "javascript.format.semicolons": "insert"
+}

package/dist/utils/createRouter.js

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -46,7 +55,17 @@ function createRouter(app, apiDir) {
             console.info(ansi_colors_1.default.yellow(`${item} 没有导出函数，已跳过..`));
         }
         else {
-            apiFunc && app[Router[item].methods](item, apiFunc);
+            apiFunc &&
+                app[Router[item].methods](item, (req, res) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    try {
+                        yield apiFunc(req, res);
+                    }
+                    catch (error) {
+                        console.log(error, error.toString);
+                        res.return({ msg: "服务器错误", error: ((_a = error === null || error === void 0 ? void 0 : error.toString) === null || _a === void 0 ? void 0 : _a.call(error)) || null }, 0, 500);
+                    }
+                }));
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mas-server",
-  "version": "3.0.02",
+  "version": "3.0.04",
   "description": "一款基于express面向中小型项目的后端框架",
   "main": "dist/index.js",
   "typings": "src/index.ts",
@@ -14,7 +14,7 @@
     "init": "npx nodemon ./test/scripts/beforeCreated.ts -end",
     "gsft": "npx nodemon ./test/scripts/getSqlFormType.ts",
     "build": "node ./beforebuild.js && tsc --project ./tsconfig-build.json",
-    "sync": "npm run build && npm publish && cnpm sync mas-server && explorer \"https://npmmirror.com/package/mas-server\""
+    "sync": "npm run build && npm publish --registry=https://registry.npmjs.org && cnpm sync mas-server && explorer \"https://npmmirror.com/package/mas-server\""
   },
   "keywords": [],
   "author": "tingxi8087",

package/src/state.ts

@@ -1 +1 @@
-export const state: any = {};
+export const state: any = {};

package/src/utils/createRouter.ts

@@ -16,7 +16,19 @@ export default function createRouter(app, apiDir: string) {
     if (!apiFunc) {
       console.info(c.yellow(`${item} 没有导出函数，已跳过..`));
     } else {
-      apiFunc && app[Router[item].methods](item, apiFunc);
+      apiFunc &&
+        app[Router[item].methods](item, async (req, res) => {
+          try {
+            await apiFunc(req, res);
+          } catch (error) {
+            console.log(error, error.toString);
+            res.return(
+              { msg: "服务器错误", error: error?.toString?.() || null },
+              0,
+              500
+            );
+          }
+        });
     }
   }
 }

package/src/utils/quickSend.ts

@@ -1,19 +1,19 @@
-export default (req, res, next) => {
-  // req.fields && (req.body = req.fields);
-  let right = true;
-  res.return = async (data, status = 1, code = 200, msg = "") => {
-    if (!right) return;
-    right = false;
-    if (data === null || data === undefined) {
-      status = 0;
-    }
-    if (data instanceof Promise) data = await data;
-    // if (typeof data != "string") data = JSON.stringify(data);
-    res.status(code).send({
-      msg,
-      status: !!status ? 1 : 0,
-      data: data === null || data === undefined ? null : data,
-    });
-  };
-  next();
-};
+export default (req, res, next) => {
+  // req.fields && (req.body = req.fields);
+  let right = true;
+  res.return = async (data, status = 1, code = 200, msg = "") => {
+    if (!right) return;
+    right = false;
+    if (data === null || data === undefined) {
+      status = 0;
+    }
+    if (data instanceof Promise) data = await data;
+    // if (typeof data != "string") data = JSON.stringify(data);
+    res.status(code).send({
+      msg,
+      status: !!status ? 1 : 0,
+      data: data === null || data === undefined ? null : data,
+    });
+  };
+  next();
+};

package/src/utils/readApi.ts

@@ -1,28 +1,28 @@
-import * as fs from "fs";
-import * as path from "path";
-
-export default function readFilesRecursively(
-  folderPath: string,
-  routerPrefix: string = ""
-): string[] {
-  const files: string[] = [];
-  fs.readdirSync(folderPath).forEach((fileName) => {
-    const filePath = path.join(folderPath, fileName);
-    const stat = fs.statSync(filePath);
-    if (stat.isDirectory()) {
-      const directoryPrefix = routerPrefix
-        ? `${routerPrefix}/${fileName}`
-        : fileName;
-      const directoryFiles = readFilesRecursively(filePath, directoryPrefix);
-      files.push(...directoryFiles);
-    } else {
-      const filePrefix = routerPrefix
-        ? `${routerPrefix}/${fileName}`
-        : fileName;
-      const fileRoute = `/${filePrefix.replace(/\.[^/.]+$/, "")}`;
-      files.push(fileRoute);
-    }
-  });
-
-  return files;
-}
+import * as fs from "fs";
+import * as path from "path";
+
+export default function readFilesRecursively(
+  folderPath: string,
+  routerPrefix: string = ""
+): string[] {
+  const files: string[] = [];
+  fs.readdirSync(folderPath).forEach((fileName) => {
+    const filePath = path.join(folderPath, fileName);
+    const stat = fs.statSync(filePath);
+    if (stat.isDirectory()) {
+      const directoryPrefix = routerPrefix
+        ? `${routerPrefix}/${fileName}`
+        : fileName;
+      const directoryFiles = readFilesRecursively(filePath, directoryPrefix);
+      files.push(...directoryFiles);
+    } else {
+      const filePrefix = routerPrefix
+        ? `${routerPrefix}/${fileName}`
+        : fileName;
+      const fileRoute = `/${filePrefix.replace(/\.[^/.]+$/, "")}`;
+      files.push(fileRoute);
+    }
+  });
+
+  return files;
+}