@fastcar/core 0.2.39 → 0.2.41

package/index.d.ts

@@ -149,6 +149,11 @@ export class FastCarApplication extends Events {
 	 */
 	getComponentDetailsList(): ComponentDesc[];
 
+	/**
+	 * @version 1.0 判断组件是否存在
+	 */
+	hasComponentByName(name: string | symbol): boolean;
+
 	/**
 	 * @version 1.0 开启日志系统
 	 */

package/package.json

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

package/src/FastCarApplication.ts

@@ -1,4 +1,5 @@
 import "reflect-metadata";
+import * as fs from "fs";
 import * as process from "process";
 import * as Events from "events";
 import * as path from "path";
@@ -12,7 +13,6 @@ import { ApplicationConfig } from "./config/ApplicationConfig";
 import { ComponentKind } from "./constant/ComponentKind";
 import { CommonConstant } from "./constant/CommonConstant";
 import { LifeCycleModule } from "./constant/LifeCycleModule";
-import * as fs from "fs";
 import { AppStatusEnum } from "./constant/AppStatusEnum";
 import ValidationUtil from "./utils/ValidationUtil";
 import Component from "./annotation/stereotype/Component";
@@ -25,7 +25,7 @@ import { ProcessType } from "./type/ProcessType";
 import { FileHotterDesc } from "./type/FileHotterDesc";
 import { LifeCycleType } from "./annotation/lifeCycle/AddLifeCycleItem";
 import { WinstonLoggerType } from "./type/WinstonLoggerType";
-import { Log } from "./annotation";
+import Log from "./annotation/stereotype/Log";
 
 @Component
 class FastCarApplication extends Events {
@@ -473,7 +473,7 @@ class FastCarApplication extends Events {
 	/***
 	 * @version 1.0 判断是否拥有组件名称
 	 */
-	hasComponentByName(name: string | symbol): any {
+	hasComponentByName(name: string | symbol): boolean {
 		return this.componentMap.has(name);
 	}
 

package/src/annotation/bind/AliasInjection.ts

@@ -1,5 +1,5 @@
 import { CommonConstant } from "../../constant/CommonConstant";
-import FastCarApplication from "../../FastCarApplication";
+import ApplicationInterface from "../../interface/ApplicationInterface";
 
 /***
  * @version 1.0 根据别名注入依赖
@@ -9,7 +9,7 @@ export default function AliasInjection(alias: string) {
 	return function (target: any, propertyKey: string) {
 		Reflect.defineProperty(target, propertyKey, {
 			get: () => {
-				let app: FastCarApplication = Reflect.get(global, CommonConstant.FastcarApp);
+				let app: ApplicationInterface = Reflect.get(global, CommonConstant.FastcarApp);
 
 				if (!app.hasComponentByName(alias)) {
 					//找不到依赖组件异常

package/src/annotation/data/Transactional.ts

@@ -1,6 +1,6 @@
 import "reflect-metadata";
 import { CommonConstant } from "../../constant/CommonConstant";
-import FastCarApplication from "../../FastCarApplication";
+import ApplicationInterface from "../../interface/ApplicationInterface";
 import DataSourceManager from "../../interface/DataSourceManager";
 import Logger from "../../interface/Logger";
 import { DesignMeta } from "../../type/DesignMeta";
@@ -11,7 +11,7 @@ import SqlError from "../../type/SqlError";
  * */
 export default function Transactional(driver: string = "MysqlDataSourceManager") {
 	return function (target: any, methodName: string, descriptor: PropertyDescriptor) {
-		const orignFunction = descriptor.value;
+		const orignFunction: Function = descriptor.value;
 
 		//在初始化时就应该检测是否注入了sessionID
 		const paramsIndex = Reflect.getOwnMetadata(DesignMeta.sqlSession, target, methodName);
@@ -22,7 +22,7 @@ export default function Transactional(driver: string = "MysqlDataSourceManager")
 		descriptor.value = async function (...args: any[]) {
 			//创建会话id
 
-			let app: FastCarApplication = Reflect.get(global, CommonConstant.FastcarApp);
+			let app: ApplicationInterface = Reflect.get(global, CommonConstant.FastcarApp);
 
 			let sysLogger: Logger = app.getSysLogger() || console;
 			let dsm: DataSourceManager = app.getComponentByName(driver);

package/src/annotation/stereotype/Log.ts

@@ -1,5 +1,5 @@
 import { CommonConstant } from "../../constant/CommonConstant";
-import FastCarApplication from "../../FastCarApplication";
+import ApplicationInterface from "../../interface/ApplicationInterface";
 import Logger from "../../interface/Logger";
 
 //日志实例
@@ -9,7 +9,7 @@ export default function Log(category?: string) {
 
 		Reflect.defineProperty(target, propertyKey, {
 			get: (): Logger => {
-				let app: FastCarApplication = Reflect.get(global, CommonConstant.FastcarApp);
+				let app: ApplicationInterface = Reflect.get(global, CommonConstant.FastcarApp);
 				let appid = app.getSetting(CommonConstant.APPId) || ""; //进行差异化区分
 				return app ? app.getLogger(appid ? `[${appid}] ${m}` : m) : console;
 			},

package/src/interface/ApplicationInterface.ts

@@ -0,0 +1,206 @@
+import { ApplicationConfig } from "../config/ApplicationConfig";
+import { ComponentKind } from "../constant/ComponentKind";
+import { LifeCycleModule } from "../constant/LifeCycleModule";
+import { ComponentDesc } from "../type/ComponentDesc";
+import { ProcessType } from "../type/ProcessType";
+import Logger from "./Logger";
+
+export default interface ApplicationInterface {
+	/***
+	 * @version 1.0 根据原型加载注入的方法
+	 *
+	 */
+	getInjectionUniqueKey(target: Object): string;
+
+	/**
+	 * @version 1.0 自身作为一个组件注入进去
+	 */
+	loadSelf(): void;
+
+	/***
+	 * @version 1.0 热更新组件
+	 */
+	addHot(): void;
+
+	/**
+	 * @version 1.0 获取资源路径
+	 */
+	getResourcePath(): string;
+
+	/***
+	 * @version 1.0 获取项目的基本路径
+	 *
+	 */
+	getBasePath(): string;
+
+	/**
+	 * @version 1.0 加载系统配置 加载顺序为 default json < yaml < env
+	 *
+	 */
+	loadSysConfig(): void;
+
+	setSetting(key: string | symbol, value: any): void;
+
+	/**
+	 * @version 1.0 获取自定义设置 设置优先级 配置自定义>系统配置>初始化
+	 * @param key
+	 */
+	getSetting(key: string | symbol): any;
+
+	/**
+	 * @version 1.0 获取应用配置
+	 * @return
+	 */
+	getapplicationConfig(): ApplicationConfig;
+
+	/**
+	 * @version 1.0 扫描组件
+	 */
+	loadClass(): void;
+
+	/***
+	 * @version 1.0 装配单个模块
+	 * @deprecated 修改为主动查找时装配
+	 */
+	injectionModule(instance: any, instanceName: string | symbol): void;
+
+	/***
+	 * @version 1.0 根据名称获取组件的加载情况
+	 *
+	 */
+	getComponentDetailByName(name: string | symbol): ComponentDesc | undefined;
+
+	/***
+	 * @version 1.0 根据原型获取组件的加载信息
+	 *
+	 */
+	getComponentDetailByTarget(target: Object): ComponentDesc | undefined;
+
+	/**
+	 * @version 1.0 加载需要注入的类
+	 * @deprecated 修改为主动查找时装配
+	 */
+	loadInjectionModule(): void;
+
+	/**
+	 * @version 1.0 根据类型获取组件
+	 * @param name
+	 * @return
+	 */
+	getComponentByType(name: ComponentKind): any[];
+
+	/**
+	 * @version 1.0 获取全部的组件列表
+	 * @return
+	 */
+	getComponentList(): any[];
+
+	/**
+	 * @version 1.0 根据名称组件
+	 * @param name
+	 */
+	getComponentByName(name: string | symbol): any;
+
+	/***
+	 * @version 1.0 根据原型获取实例
+	 */
+	getComponentByTarget(target: Object): any;
+
+	/**
+	 * @version 1.0 获取组件详情列表
+	 *
+	 */
+	getComponentDetailsList(): ComponentDesc[];
+
+	/**
+	 * @version 1.0 判断组件是否存在
+	 */
+	hasComponentByName(name: string | symbol): boolean;
+
+	/**
+	 * @version 1.0 开启日志系统
+	 */
+	startLog(): void;
+
+	/**
+	 * @version 1.0 初始化应用
+	 */
+	init(): void;
+
+	/***
+	 * @version 1.0 退出事件监听
+	 *
+	 */
+	addExitEvent(): void;
+
+	/***
+	 * @version 1.0 异常事件进行监听 不至于程序异常直接退出
+	 */
+	addExecptionEvent(): void;
+
+	/**
+	 * @version 1.0 自动调用方法
+	 * @param name
+	 */
+	automaticRun(name: LifeCycleModule): void;
+
+	/**
+	 * @version 1.0 开启应用前执行的操作 加载配置,扫描组件，注入依赖组件
+	 */
+	beforeStartServer(): void;
+
+	/**
+	 * @version 1.0 启动服务
+	 */
+	startServer(): void;
+
+	/**
+	 * @version 1.0 停止服务前自动调用服务
+	 */
+	beforeStopServer(): void;
+
+	/**
+	 * @version 1.0 停止服务
+	 */
+	stopServer(): void;
+
+	/**
+	 * @version 1.0 获取app名称
+	 */
+	getApplicationName(): string;
+
+	/***
+	 * @version 1.0 获取系统日志
+	 *
+	 */
+	getSysLogger(): Logger;
+
+	/***
+	 * @version 0.2.11 根据名称获取logger
+	 *
+	 */
+	getLogger(category?: string): Logger;
+
+	/***
+	 * @version 1.0 获取文件内容
+	 */
+	getFileContent(fp: string): string;
+
+	/***
+	 * @version 1.0 是否支持热更
+	 *
+	 */
+	isHotter(): boolean;
+
+	/**
+	 * @version 1.0 指定热更新文件
+	 *
+	 */
+	specifyHotUpdate(fp: string): void;
+
+	/***
+	 * @version 1.0 获取进程的信息
+	 *
+	 */
+	getMemoryUsage(): ProcessType;
+}

package/target/FastCarApplication.js

@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var FastCarApplication_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
+const fs = require("fs");
 const process = require("process");
 const Events = require("events");
 const path = require("path");
@@ -22,14 +23,13 @@ const SysConfig_1 = require("./config/SysConfig");
 const FastCarMetaData_1 = require("./constant/FastCarMetaData");
 const CommonConstant_1 = require("./constant/CommonConstant");
 const LifeCycleModule_1 = require("./constant/LifeCycleModule");
-const fs = require("fs");
 const AppStatusEnum_1 = require("./constant/AppStatusEnum");
 const ValidationUtil_1 = require("./utils/ValidationUtil");
 const Component_1 = require("./annotation/stereotype/Component");
 const WinstonLogger_1 = require("./model/WinstonLogger");
 const winston = require("winston");
 const DateUtil_1 = require("./utils/DateUtil");
-const annotation_1 = require("./annotation");
+const Log_1 = require("./annotation/stereotype/Log");
 let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends Events {
     constructor() {
         super();
@@ -657,7 +657,7 @@ let FastCarApplication = FastCarApplication_1 = class FastCarApplication extends
     }
 };
 __decorate([
-    (0, annotation_1.Log)("sys"),
+    (0, Log_1.default)("sys"),
     __metadata("design:type", Object)
 ], FastCarApplication.prototype, "sysLogger", void 0);
 FastCarApplication = FastCarApplication_1 = __decorate([

package/target/interface/ApplicationInterface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -4,3 +4,6 @@
 {"timestamp":"2022-12-21 18:00:16.672","level":"INFO","label":"[fastcar-server] logger","message":"自定义的日志输出"}
 {"timestamp":"2022-12-21 18:00:16.673","level":"WARN","label":"[fastcar-server] logger","message":"自定义警告"}
 {"timestamp":"2022-12-21 18:00:16.674","level":"ERROR","label":"[fastcar-server] logger","message":"自定义报错"}
+{"timestamp":"2023-01-04 16:48:09.670","level":"INFO","label":"[fastcar-server] logger","message":"自定义的日志输出"}
+{"timestamp":"2023-01-04 16:48:09.671","level":"WARN","label":"[fastcar-server] logger","message":"自定义警告"}
+{"timestamp":"2023-01-04 16:48:09.672","level":"ERROR","label":"[fastcar-server] logger","message":"自定义报错"}

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

@@ -0,0 +1,8 @@
+{"timestamp":"2023-01-04 16:48:09.561","level":"INFO","label":"[fastcar-server] sys","message":"Start scanning component"}
+{"timestamp":"2023-01-04 16:48:09.655","level":"INFO","label":"[fastcar-server] sys","message":"Complete component scan"}
+{"timestamp":"2023-01-04 16:48:09.657","level":"INFO","label":"[fastcar-server] sys","message":"Call application initialization method"}
+{"timestamp":"2023-01-04 16:48:09.660","level":"INFO","label":"[fastcar-server] sys","message":"start server app is run"}
+{"timestamp":"2023-01-04 16:48:09.660","level":"INFO","label":"[fastcar-server] sys","message":"version 1.0.0"}
+{"timestamp":"2023-01-04 16:48:11.690","level":"INFO","label":"[fastcar-server] sys","message":"exit reason","splat":"[\"beforeExit exit\"]"}
+{"timestamp":"2023-01-04 16:48:11.691","level":"INFO","label":"[fastcar-server] sys","message":"Call the method before the application stops"}
+{"timestamp":"2023-01-04 16:48:16.703","level":"INFO","label":"[fastcar-server] sys","message":"application stop"}

package/test/example/logs/sys.log

@@ -1,2 +0,0 @@
-{"timestamp":"2022-12-21 18:00:16.682","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":"2022-12-21 18:00:16.690","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)"}