@fastcar/core 0.2.45 → 0.2.47

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@fastcar/core",
-	"version": "0.2.45",
+	"version": "0.2.47",
 	"homepage": "https://github.com/williamDazhangyu/fast-car",
 	"main": "target/index.js",
 	"author": "william_zhong",

package/src/FastCarApplication.ts

@@ -3,7 +3,7 @@ import * as fs from "fs";
 import * as process from "process";
 import * as Events from "events";
 import * as path from "path";
-import ClassLoader from "./utils/classLoader";
+import ClassLoader from "./utils/ClassLoader";
 import FileUtil from "./utils/FileUtil";
 import MixTool from "./utils/Mix";
 import TypeUtil from "./utils/TypeUtil";

package/src/utils/IPUtils.ts

@@ -0,0 +1,35 @@
+const getIPNum = function (address: string) {
+	let ip = address.split(".");
+	let total = 0;
+	ip.forEach((item, index) => {
+		total += parseInt(item) * Math.pow(256, 3 - index);
+	});
+
+	return total;
+};
+
+const InnerIPList = [
+	["10.0.0.0", "10.255.255.255"],
+	["172.16.0.0", "172.31.255.255"],
+	["192.168.0.0", "192.168.255.255"],
+	["127.0.0.0", "127.255.255.255"],
+].map((item) => {
+	return [getIPNum(item[0]), getIPNum(item[1])];
+});
+
+export default class IPUtils {
+	static isInnerIP = (ip: string): boolean => {
+		if (["0.0.0.0", "localhost"].includes(ip)) {
+			return true;
+		}
+
+		let n = ip.split(".");
+		if (n.length != 4) {
+			return false;
+		}
+		let ipn = getIPNum(ip);
+		return InnerIPList.some((item) => {
+			return ipn >= item[0] && ipn <= item[1];
+		});
+	};
+}

package/src/utils/TypeUtil.ts

@@ -53,4 +53,12 @@ export default class TypeUtil {
 		let fname = name.toLowerCase();
 		return BasicTypes.includes(fname);
 	}
+
+	static isMap(value: any) {
+		return value instanceof Map;
+	}
+
+	static isSet(value: any) {
+		return value instanceof Set;
+	}
 }

package/src/utils/ValidationUtil.ts

@@ -10,9 +10,10 @@ export default class ValidationUtil {
 			}
 
 			if (TypeUtil.isObject(param)) {
-				if (TypeUtil.isDate(param)) {
+				if (TypeUtil.isDate(param) || TypeUtil.isMap(param) || TypeUtil.isSet(param)) {
 					return true;
 				}
+
 				return Reflect.ownKeys(param).length > 0;
 			}
 

package/src/utils.ts

@@ -8,6 +8,7 @@ import FormatStr from "./utils/FormatStr";
 import MixTool from "./utils/Mix";
 import TypeUtil from "./utils/TypeUtil";
 import ValidationUtil from "./utils/ValidationUtil";
+import IPUtils from "./utils/IPUtils";
 
 //实用工具集合类
-export { DateUtil, DataFormat, CryptoUtil, FileUtil, TypeUtil, ValidationUtil, FormatStr, ClassUtils, ClassLoader, MixTool };
+export { DateUtil, DataFormat, CryptoUtil, FileUtil, TypeUtil, ValidationUtil, FormatStr, ClassUtils, ClassLoader, MixTool, IPUtils };

package/target/FastCarApplication.js

@@ -15,7 +15,7 @@ const fs = require("fs");
 const process = require("process");
 const Events = require("events");
 const path = require("path");
-const classLoader_1 = require("./utils/classLoader");
+const ClassLoader_1 = require("./utils/ClassLoader");
 const FileUtil_1 = require("./utils/FileUtil");
 const Mix_1 = require("./utils/Mix");
 const TypeUtil_1 = require("./utils/TypeUtil");
@@ -99,7 +99,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
         this.delayHotIds.forEach(({ fp, loadType }) => {
             switch (loadType) {
                 case 1: {
-                    let moduleClass = classLoader_1.default.loadModule(fp, true);
+                    let moduleClass = ClassLoader_1.default.loadModule(fp, true);
                     this.sysLogger.info("hot update---" + fp);
                     if (moduleClass != null) {
                         moduleClass.forEach((func) => {
@@ -245,7 +245,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
             if (f.startsWith(resp)) {
                 continue;
             }
-            let moduleClass = classLoader_1.default.loadModule(f);
+            let moduleClass = ClassLoader_1.default.loadModule(f);
             if (moduleClass != null) {
                 moduleClass.forEach((func, name) => {
                     if (this.componentMap.has(name)) {
@@ -337,7 +337,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
                 };
                 if (!fpObj) {
                     fpObj = [fpdesc];
-                    classLoader_1.default.watchServices(fp, this);
+                    ClassLoader_1.default.watchServices(fp, this);
                     this.watchFiles.set(fp, fpObj);
                 }
                 else {
@@ -549,7 +549,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
         this.loadSysConfig();
         //监听系统配置
         if (this.isHotterSysConfig()) {
-            classLoader_1.default.watchServices(this.getResourcePath(), this, "sysReload");
+            ClassLoader_1.default.watchServices(this.getResourcePath(), this, "sysReload");
         }
         //开启日志
         this.startLog();

package/target/utils/IPUtils.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const getIPNum = function (address) {
+    let ip = address.split(".");
+    let total = 0;
+    ip.forEach((item, index) => {
+        total += parseInt(item) * Math.pow(256, 3 - index);
+    });
+    return total;
+};
+const InnerIPList = [
+    ["10.0.0.0", "10.255.255.255"],
+    ["172.16.0.0", "172.31.255.255"],
+    ["192.168.0.0", "192.168.255.255"],
+    ["127.0.0.0", "127.255.255.255"],
+].map((item) => {
+    return [getIPNum(item[0]), getIPNum(item[1])];
+});
+class IPUtils {
+}
+exports.default = IPUtils;
+IPUtils.isInnerIP = (ip) => {
+    if (["0.0.0.0", "localhost"].includes(ip)) {
+        return true;
+    }
+    let n = ip.split(".");
+    if (n.length != 4) {
+        return false;
+    }
+    let ipn = getIPNum(ip);
+    return InnerIPList.some((item) => {
+        return ipn >= item[0] && ipn <= item[1];
+    });
+};

package/target/utils/TypeUtil.js

@@ -43,5 +43,11 @@ class TypeUtil {
         let fname = name.toLowerCase();
         return BasicTypes.includes(fname);
     }
+    static isMap(value) {
+        return value instanceof Map;
+    }
+    static isSet(value) {
+        return value instanceof Set;
+    }
 }
 exports.default = TypeUtil;

package/target/utils/ValidationUtil.js

@@ -10,7 +10,7 @@ class ValidationUtil {
                 return param.length > 0;
             }
             if (TypeUtil_1.default.isObject(param)) {
-                if (TypeUtil_1.default.isDate(param)) {
+                if (TypeUtil_1.default.isDate(param) || TypeUtil_1.default.isMap(param) || TypeUtil_1.default.isSet(param)) {
                     return true;
                 }
                 return Reflect.ownKeys(param).length > 0;

package/target/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MixTool = exports.ClassLoader = exports.ClassUtils = exports.FormatStr = exports.ValidationUtil = exports.TypeUtil = exports.FileUtil = exports.CryptoUtil = exports.DataFormat = exports.DateUtil = void 0;
+exports.IPUtils = exports.MixTool = exports.ClassLoader = exports.ClassUtils = exports.FormatStr = exports.ValidationUtil = exports.TypeUtil = exports.FileUtil = exports.CryptoUtil = exports.DataFormat = exports.DateUtil = void 0;
 const classLoader_1 = require("./utils/classLoader");
 exports.ClassLoader = classLoader_1.default;
 const ClassUtils_1 = require("./utils/ClassUtils");
@@ -21,3 +21,5 @@ const TypeUtil_1 = require("./utils/TypeUtil");
 exports.TypeUtil = TypeUtil_1.default;
 const ValidationUtil_1 = require("./utils/ValidationUtil");
 exports.ValidationUtil = ValidationUtil_1.default;
+const IPUtils_1 = require("./utils/IPUtils");
+exports.IPUtils = IPUtils_1.default;

package/test/example/logs/fastcar-server.logger.log

@@ -0,0 +1,3 @@
+{"timestamp":"2023-07-24 16:49:43.665","level":"INFO","label":"fastcar-server.logger","message":"自定义的日志输出"}
+{"timestamp":"2023-07-24 16:49:43.666","level":"WARN","label":"fastcar-server.logger","message":"自定义警告"}
+{"timestamp":"2023-07-24 16:49:43.667","level":"ERROR","label":"fastcar-server.logger","message":"自定义报错"}

package/test/example/logs/fastcar-server.sys.log

@@ -0,0 +1,8 @@
+{"timestamp":"2023-07-24 16:49:36.843","level":"INFO","label":"fastcar-server.sys","message":"Start scanning component"}
+{"timestamp":"2023-07-24 16:49:38.241","level":"INFO","label":"fastcar-server.sys","message":"Complete component scan"}
+{"timestamp":"2023-07-24 16:49:39.408","level":"INFO","label":"fastcar-server.sys","message":"Call application initialization method"}
+{"timestamp":"2023-07-24 16:49:39.912","level":"INFO","label":"fastcar-server.sys","message":"start server app is run"}
+{"timestamp":"2023-07-24 16:49:40.384","level":"INFO","label":"fastcar-server.sys","message":"version 1.0.0"}
+{"timestamp":"2023-07-24 16:49:45.679","level":"INFO","label":"fastcar-server.sys","message":"exit reason","splat":"[\"beforeExit exit\"]"}
+{"timestamp":"2023-07-24 16:49:45.680","level":"INFO","label":"fastcar-server.sys","message":"Call the method before the application stops"}
+{"timestamp":"2023-07-24 16:49:50.692","level":"INFO","label":"fastcar-server.sys","message":"application stop"}

package/test/example/logs/sys.log

@@ -1,2 +0,0 @@
-{"timestamp":"2023-05-17 15:11:40.448","level":"ERROR","label":"sys","message":"Unsatisfied dependency expressed through [notFound] ","stack":"Error: Unsatisfied dependency expressed through [notFound] \n    at NotFoundController.get (D:\\code\\fast-car\\fast-car\\fastcar-core\\src\\annotation\\bind\\AliasInjection.ts:16:27)\n    at NotFoundController.getNotFound (D:\\code\\fast-car\\fast-car\\fastcar-core\\test\\example\\simple\\controller\\NotFoundController.ts:14:15)\n    at Context.<anonymous> (D:\\code\\fast-car\\fast-car\\fastcar-core\\test\\example\\simple\\app.ts:89:13)\n    at callFn (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runnable.js:366:21)\n    at Test.Runnable.run (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runnable.js:354:5)\n    at Runner.runTest (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:678:10)\n    at D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:801:12\n    at next (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:593:14)\n    at D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:603:7\n    at next (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:486:14)\n    at Immediate._onImmediate (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:571:5)\n    at processImmediate (node:internal/timers:466:21)\n    at process.topLevelDomainCallback (node:domain:152:15)\n    at process.callbackTrampoline (node:internal/async_hooks:128:24)"}
-{"timestamp":"2023-05-17 15:11:40.456","level":"ERROR","label":"sys","message":"Unsatisfied dependency expressed through [autoNotFound] ","stack":"Error: Unsatisfied dependency expressed through [autoNotFound] \n    at NotFoundController.get (D:\\code\\fast-car\\fast-car\\fastcar-core\\src\\annotation\\bind\\CallDependency.ts:17:26)\n    at NotFoundController.getAutoNotFound (D:\\code\\fast-car\\fast-car\\fastcar-core\\test\\example\\simple\\controller\\NotFoundController.ts:18:15)\n    at Context.<anonymous> (D:\\code\\fast-car\\fast-car\\fastcar-core\\test\\example\\simple\\app.ts:95:13)\n    at callFn (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runnable.js:366:21)\n    at Test.Runnable.run (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runnable.js:354:5)\n    at Runner.runTest (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:678:10)\n    at D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:801:12\n    at next (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:593:14)\n    at D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:603:7\n    at next (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:486:14)\n    at Immediate._onImmediate (D:\\code\\fast-car\\fast-car\\node_modules\\mocha\\lib\\runner.js:571:5)\n    at processImmediate (node:internal/timers:466:21)\n    at process.topLevelDomainCallback (node:domain:152:15)\n    at process.callbackTrampoline (node:internal/async_hooks:128:24)"}

package/test/unit/valid-test.ts

@@ -3,6 +3,7 @@ import ValidForm from "../../src/annotation/valid/ValidForm";
 import NotNull from "../../src/annotation/valid/NotNull";
 import Size from "../../src/annotation/valid/Size";
 import { Rule } from "../../src/annotation/valid/Rule";
+import { ValidationUtil } from "../../src/utils";
 
 describe("表单校验测试", () => {
 	it("表单单个测试", () => {
@@ -62,4 +63,10 @@ describe("表单校验测试", () => {
 		let instance = new A();
 		instance.test("a", { c: "c", d: 13 }); //校验失败
 	});
+
+	it("测试map是否为空", () => {
+		let d = new Map();
+		d.set("hello", "world");
+		console.log(ValidationUtil.isNotNull(d) == true);
+	});
 });

package/utils.d.ts

@@ -94,6 +94,10 @@ export class TypeUtil {
 
 	//是否为基本类型
 	static isBasic(name: string): boolean;
+
+	static isMap(value: any): boolean;
+
+	static isSet(value: any): boolean;
 }
 
 export class ValidationUtil {
@@ -166,3 +170,7 @@ export class MixTool {
 	//多个对象赋值
 	static assign(target: any, source: any): void;
 }
+
+export class IPUtils {
+	static isInnerIP(ip: string): boolean;
+}

package/test/example/logs/[fastcar-server] logger.log

@@ -1,3 +0,0 @@
-{"timestamp":"2023-05-17 15:11:40.432","level":"INFO","label":"[fastcar-server] logger","message":"自定义的日志输出"}
-{"timestamp":"2023-05-17 15:11:40.433","level":"WARN","label":"[fastcar-server] logger","message":"自定义警告"}
-{"timestamp":"2023-05-17 15:11:40.434","level":"ERROR","label":"[fastcar-server] logger","message":"自定义报错"}

package/test/example/logs/[fastcar-server] sys.log

@@ -1,8 +0,0 @@
-{"timestamp":"2023-05-17 15:11:21.300","level":"INFO","label":"[fastcar-server] sys","message":"Start scanning component"}
-{"timestamp":"2023-05-17 15:11:40.421","level":"INFO","label":"[fastcar-server] sys","message":"Complete component scan"}
-{"timestamp":"2023-05-17 15:11:40.422","level":"INFO","label":"[fastcar-server] sys","message":"Call application initialization method"}
-{"timestamp":"2023-05-17 15:11:40.424","level":"INFO","label":"[fastcar-server] sys","message":"start server app is run"}
-{"timestamp":"2023-05-17 15:11:40.425","level":"INFO","label":"[fastcar-server] sys","message":"version 1.0.0"}
-{"timestamp":"2023-05-17 15:11:42.456","level":"INFO","label":"[fastcar-server] sys","message":"exit reason","splat":"[\"beforeExit exit\"]"}
-{"timestamp":"2023-05-17 15:11:42.457","level":"INFO","label":"[fastcar-server] sys","message":"Call the method before the application stops"}
-{"timestamp":"2023-05-17 15:11:47.460","level":"INFO","label":"[fastcar-server] sys","message":"application stop"}