@lakutata/core 1.0.28 → 1.0.32

package/build/plugins/Security.js

@@ -30,7 +30,7 @@ class Security extends Plugin_1.Plugin {
         letters: true,
         specials: false
     }) {
-        return string_random_1.default(length, {
+        return (0, string_random_1.default)(length, {
             numbers: options.numbers === undefined ? true : options.numbers,
             letters: options.letters === undefined ? true : options.letters,
             specials: options.specials === undefined ? false : options.specials
@@ -39,64 +39,64 @@ class Security extends Plugin_1.Plugin {
     MD5(data, key) {
         const stringData = typeof data === 'string' ? data : this.JSON.stringify(data);
         if (key) {
-            return crypto_js_1.HmacMD5(stringData, key).toString();
+            return (0, crypto_js_1.HmacMD5)(stringData, key).toString();
         }
         else {
-            return crypto_js_1.MD5(stringData).toString();
+            return (0, crypto_js_1.MD5)(stringData).toString();
         }
     }
     SHA1(data, key) {
         const stringData = typeof data === 'string' ? data : this.JSON.stringify(data);
         if (key) {
-            return crypto_js_1.HmacSHA1(stringData, key).toString();
+            return (0, crypto_js_1.HmacSHA1)(stringData, key).toString();
         }
         else {
-            return crypto_js_1.SHA1(stringData).toString();
+            return (0, crypto_js_1.SHA1)(stringData).toString();
         }
     }
     SHA3(data, key) {
         const stringData = typeof data === 'string' ? data : this.JSON.stringify(data);
         if (key) {
-            return crypto_js_1.HmacSHA3(stringData, key).toString();
+            return (0, crypto_js_1.HmacSHA3)(stringData, key).toString();
         }
         else {
-            return crypto_js_1.SHA3(stringData).toString();
+            return (0, crypto_js_1.SHA3)(stringData).toString();
         }
     }
     SHA224(data, key) {
         const stringData = typeof data === 'string' ? data : this.JSON.stringify(data);
         if (key) {
-            return crypto_js_1.HmacSHA224(stringData, key).toString();
+            return (0, crypto_js_1.HmacSHA224)(stringData, key).toString();
         }
         else {
-            return crypto_js_1.SHA224(stringData).toString();
+            return (0, crypto_js_1.SHA224)(stringData).toString();
         }
     }
     SHA256(data, key) {
         const stringData = typeof data === 'string' ? data : this.JSON.stringify(data);
         if (key) {
-            return crypto_js_1.HmacSHA256(stringData, key).toString();
+            return (0, crypto_js_1.HmacSHA256)(stringData, key).toString();
         }
         else {
-            return crypto_js_1.SHA256(stringData).toString();
+            return (0, crypto_js_1.SHA256)(stringData).toString();
         }
     }
     SHA384(data, key) {
         const stringData = typeof data === 'string' ? data : this.JSON.stringify(data);
         if (key) {
-            return crypto_js_1.HmacSHA384(stringData, key).toString();
+            return (0, crypto_js_1.HmacSHA384)(stringData, key).toString();
         }
         else {
-            return crypto_js_1.SHA384(stringData).toString();
+            return (0, crypto_js_1.SHA384)(stringData).toString();
         }
     }
     SHA512(data, key) {
         const stringData = typeof data === 'string' ? data : this.JSON.stringify(data);
         if (key) {
-            return crypto_js_1.HmacSHA512(stringData, key).toString();
+            return (0, crypto_js_1.HmacSHA512)(stringData, key).toString();
         }
         else {
-            return crypto_js_1.SHA512(stringData).toString();
+            return (0, crypto_js_1.SHA512)(stringData).toString();
         }
     }
     encryptByPassword(data, password) {
@@ -114,30 +114,30 @@ class Security extends Plugin_1.Plugin {
         return this.Crypto.decrypt(ciphertext, secretKey);
     }
     generatePasswordHashSync(password) {
-        const salt = bcryptjs_1.genSaltSync(this.saltRound);
-        return bcryptjs_1.hashSync(password, salt);
+        const salt = (0, bcryptjs_1.genSaltSync)(this.saltRound);
+        return (0, bcryptjs_1.hashSync)(password, salt);
     }
     async generatePasswordHash(password) {
-        const salt = await bcryptjs_1.genSalt(this.saltRound);
-        return await bcryptjs_1.hash(password, salt);
+        const salt = await (0, bcryptjs_1.genSalt)(this.saltRound);
+        return await (0, bcryptjs_1.hash)(password, salt);
     }
     validatePasswordSync(password, hash) {
-        return bcryptjs_1.compareSync(password, hash);
+        return (0, bcryptjs_1.compareSync)(password, hash);
     }
     async validatePassword(password, hash) {
-        return await bcryptjs_1.compare(password, hash);
+        return await (0, bcryptjs_1.compare)(password, hash);
     }
 }
 __decorate([
-    DependencyInjection_1.Inject('JSON'),
+    (0, DependencyInjection_1.Inject)('JSON'),
     __metadata("design:type", JSON_1.JSON)
 ], Security.prototype, "JSON", void 0);
 __decorate([
-    DependencyInjection_1.Inject('Crypto'),
+    (0, DependencyInjection_1.Inject)('Crypto'),
     __metadata("design:type", Crypto_1.Crypto)
 ], Security.prototype, "Crypto", void 0);
 __decorate([
-    DependencyInjection_1.Configurable(),
+    (0, DependencyInjection_1.Configurable)(),
     __metadata("design:type", Number)
 ], Security.prototype, "saltRound", void 0);
 exports.Security = Security;

package/build/plugins/Security.js.map

@@ -1 +1 @@
-{"version":3,"file":"Security.js","sourceRoot":"","sources":["../../src/plugins/Security.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Security.js","sourceRoot":"","sources":["../../src/plugins/Security.ts"],"names":[],"mappings":"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"}

package/build/plugins/Shell.d.ts

@@ -0,0 +1,39 @@
+import { Plugin } from '../base/Plugin';
+import { CatFunction, ChmodFunction, CopyFunction, DirsFunction, EchoFunction, ExecFunction, FindFunction, GrepFunction, HeadFunction, LinkFunction, ListFunction, MkdirFunction, MoveFunction, PopDirFunction, PushDirFunction, RemoveFunction, SedFunction, ShellString, SortFunction, TailFunction, TestOptions, TouchFunction, UniqFunction } from '../interfaces/ShellJsInterfaces';
+declare module '../Core' {
+    interface Application {
+        Shell: Shell;
+    }
+}
+export declare class Shell extends Plugin {
+    protected shelljs: any;
+    cd(dir?: string): ShellString;
+    pwd(): ShellString;
+    test(option: TestOptions, path: string): boolean;
+    which(command: string): ShellString;
+    exit(code?: number): never;
+    tempdir(): ShellString;
+    error(): ShellString;
+    set(options: string): void;
+    ls: ListFunction;
+    find: FindFunction;
+    cp: CopyFunction;
+    rm: RemoveFunction;
+    mv: MoveFunction;
+    mkdir: MkdirFunction;
+    cat: CatFunction;
+    sed: SedFunction;
+    grep: GrepFunction;
+    echo: EchoFunction;
+    pushd: PushDirFunction;
+    popd: PopDirFunction;
+    dirs: DirsFunction;
+    ln: LinkFunction;
+    exec: ExecFunction;
+    chmod: ChmodFunction;
+    touch: TouchFunction;
+    head: HeadFunction;
+    sort: SortFunction;
+    tail: TailFunction;
+    uniq: UniqFunction;
+}

package/build/plugins/Shell.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Shell = void 0;
+const Plugin_1 = require("../base/Plugin");
+const shelljs = require('../lib/minified/ShellJs');
+class Shell extends Plugin_1.Plugin {
+    constructor() {
+        super(...arguments);
+        this.shelljs = shelljs;
+        this.ls = this.shelljs.ls;
+        this.find = this.shelljs.find;
+        this.cp = this.shelljs.cp;
+        this.rm = this.shelljs.rm;
+        this.mv = this.shelljs.mv;
+        this.mkdir = this.shelljs.mkdir;
+        this.cat = this.shelljs.cat;
+        this.sed = this.shelljs.sed;
+        this.grep = this.shelljs.grep;
+        this.echo = this.shelljs.echo;
+        this.pushd = this.shelljs.pushd;
+        this.popd = this.shelljs.popd;
+        this.dirs = this.shelljs.dirs;
+        this.ln = this.shelljs.ln;
+        this.exec = this.shelljs.exec;
+        this.chmod = this.shelljs.chmod;
+        this.touch = this.shelljs.touch;
+        this.head = this.shelljs.head;
+        this.sort = this.shelljs.sort;
+        this.tail = this.shelljs.tail;
+        this.uniq = this.shelljs.uniq;
+    }
+    cd(dir) {
+        return this.shelljs.cd(dir);
+    }
+    pwd() {
+        return this.shelljs.pwd();
+    }
+    test(option, path) {
+        return this.shelljs.test(option, path);
+    }
+    which(command) {
+        return this.shelljs.which(command);
+    }
+    exit(code) {
+        return this.shelljs.exit(code);
+    }
+    tempdir() {
+        return this.shelljs.tempdir();
+    }
+    error() {
+        return this.shelljs.error();
+    }
+    set(options) {
+        return this.shelljs.set(options);
+    }
+}
+exports.Shell = Shell;
+//# sourceMappingURL=Shell.js.map

package/build/plugins/Shell.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Shell.js","sourceRoot":"","sources":["../../src/plugins/Shell.ts"],"names":[],"mappings":";;;AAAA,2CAAqC;AA2BrC,MAAM,OAAO,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAQlD,MAAa,KAAM,SAAQ,eAAM;IAAjC;;QACW,YAAO,GAAQ,OAAO,CAAA;QAwGzB,OAAE,GAAiB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAA;QAQlC,SAAI,GAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;QAgBtC,OAAE,GAAiB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAA;QAWlC,OAAE,GAAmB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAA;QAYpC,OAAE,GAAiB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAA;QAUlC,UAAK,GAAkB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAA;QAYzC,QAAG,GAAgB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAA;QAanC,QAAG,GAAgB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAA;QAcnC,SAAI,GAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;QAWtC,SAAI,GAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;QActC,UAAK,GAAoB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAA;QAgB3C,SAAI,GAAmB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;QAaxC,SAAI,GAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;QAYtC,OAAE,GAAiB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAA;QAWlC,SAAI,GAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;QAoBtC,UAAK,GAAkB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAA;QAMzC,UAAK,GAAkB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAA;QAKzC,SAAI,GAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;QAUtC,SAAI,GAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;QAKtC,SAAI,GAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;QAUtC,SAAI,GAAiB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAA;IAC9C,CAAC;IArUO,EAAE,CAAC,GAAY;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;IAMM,GAAG;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAA;IAC1B,CAAC;IAiBM,IAAI,CAAC,MAAmB,EAAE,IAAY;QAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACvC,CAAC;IAQM,KAAK,CAAC,OAAe;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACnC,CAAC;IASM,IAAI,CAAC,IAAa;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAU,CAAA;IACxC,CAAC;IAQM,OAAO;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;IAC9B,CAAC;IAOM,KAAK;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IAC5B,CAAC;IASM,GAAG,CAAC,OAAe;QACzB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC;CAqPD;AA/UD,sBA+UC"}

package/build/types/TPluginsConfig.d.ts

@@ -2,5 +2,6 @@ import { IConstructor } from '../interfaces/IConstructor';
 import { Plugin } from '../base/Plugin';
 export declare type TPluginsConfig<TPlugin extends Plugin = Plugin> = ({
     class: IConstructor<TPlugin>;
+    scope?: 'Transient' | 'Singleton';
     [propertyKey: string]: any;
 } | IConstructor<TPlugin>)[];

package/build/utils/Delay.js

@@ -4,7 +4,7 @@ exports.delay = void 0;
 const timers_1 = require("timers");
 async function delay(milliseconds) {
     return new Promise(resolve => {
-        timers_1.setTimeout(() => {
+        (0, timers_1.setTimeout)(() => {
             resolve();
         }, milliseconds);
     });

package/build/utils/Delay.js.map

@@ -1 +1 @@
-{"version":3,"file":"Delay.js","sourceRoot":"","sources":["../../src/utils/Delay.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AAO1B,KAAK,UAAU,KAAK,CAAC,YAAoB;IAC/C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC5B,mBAAU,CAAC,GAAG,EAAE;YACf,OAAO,EAAE,CAAA;QACV,CAAC,EAAE,YAAY,CAAC,CAAA;IACjB,CAAC,CAAC,CAAA;AACH,CAAC;AAND,sBAMC"}
+{"version":3,"file":"Delay.js","sourceRoot":"","sources":["../../src/utils/Delay.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AAO1B,KAAK,UAAU,KAAK,CAAC,YAAoB;IAC/C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC5B,IAAA,mBAAU,EAAC,GAAG,EAAE;YACf,OAAO,EAAE,CAAA;QACV,CAAC,EAAE,YAAY,CAAC,CAAA;IACjB,CAAC,CAAC,CAAA;AACH,CAAC;AAND,sBAMC"}

package/build/utils/Timeout.js

@@ -7,7 +7,7 @@ exports.timeout = void 0;
 const p_timeout_1 = __importDefault(require("p-timeout"));
 const TimeoutException_1 = require("../exceptions/TimeoutException");
 async function timeout(p, milliseconds, messageOrFallback) {
-    return p_timeout_1.default(p, milliseconds, async () => {
+    return (0, p_timeout_1.default)(p, milliseconds, async () => {
         if (messageOrFallback) {
             switch (typeof messageOrFallback) {
                 case 'function':

package/build/utils/Timeout.js.map

@@ -1 +1 @@
-{"version":3,"file":"Timeout.js","sourceRoot":"","sources":["../../src/utils/Timeout.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAEhC,qEAA+D;AASxD,KAAK,UAAU,OAAO,CAAI,CAAa,EAAE,YAAoB,EAAE,iBAA+D;IACpI,OAAO,mBAAQ,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,EAAE;QAC3C,IAAI,iBAAiB,EAAE;YACtB,QAAQ,OAAO,iBAAiB,EAAE;gBACjC,KAAK,UAAU;oBACd,OAAO,CAAC,MAAM,iBAAiB,EAAE,CAAQ,CAAA;gBAC1C,KAAK,QAAQ;oBACZ,MAAM,IAAI,mCAAgB,CAAC,iBAAiB,CAAC,CAAA;gBAC9C,KAAK,QAAQ;oBACZ,MAAM,iBAAiB,CAAA;aACxB;SACD;aAAM;YACN,MAAM,IAAI,mCAAgB,CAAC,2BAA2B,YAAY,eAAe,CAAC,CAAA;SAClF;IACF,CAAC,CAAC,CAAA;AACH,CAAC;AAfD,0BAeC"}
+{"version":3,"file":"Timeout.js","sourceRoot":"","sources":["../../src/utils/Timeout.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAEhC,qEAA+D;AASxD,KAAK,UAAU,OAAO,CAAI,CAAa,EAAE,YAAoB,EAAE,iBAA+D;IACpI,OAAO,IAAA,mBAAQ,EAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,EAAE;QAC3C,IAAI,iBAAiB,EAAE;YACtB,QAAQ,OAAO,iBAAiB,EAAE;gBACjC,KAAK,UAAU;oBACd,OAAO,CAAC,MAAM,iBAAiB,EAAE,CAAQ,CAAA;gBAC1C,KAAK,QAAQ;oBACZ,MAAM,IAAI,mCAAgB,CAAC,iBAAiB,CAAC,CAAA;gBAC9C,KAAK,QAAQ;oBACZ,MAAM,iBAAiB,CAAA;aACxB;SACD;aAAM;YACN,MAAM,IAAI,mCAAgB,CAAC,2BAA2B,YAAY,eAAe,CAAC,CAAA;SAClF;IACF,CAAC,CAAC,CAAA;AACH,CAAC;AAfD,0BAeC"}

package/build/utils/ValidDataUrl.d.ts

@@ -0,0 +1 @@
+export declare function validDataUrl(candidate: string): boolean;

package/build/utils/ValidDataUrl.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validDataUrl = void 0;
+function validDataUrl(candidate) {
+    return /^data:([a-z]+\/[a-z0-9-+.]+(;[a-z0-9-.!#$%*+.{}|~`]+=[a-z0-9-.!#$%*+.{}()|~`]+)*)?(;base64)?,([a-z0-9!$&',()*+;=\-._~:@\/?%\s<>]*?)$/i.test(candidate);
+}
+exports.validDataUrl = validDataUrl;
+//# sourceMappingURL=ValidDataUrl.js.map

package/build/utils/ValidDataUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ValidDataUrl.js","sourceRoot":"","sources":["../../src/utils/ValidDataUrl.ts"],"names":[],"mappings":";;;AAKA,SAAgB,YAAY,CAAC,SAAiB;IAC7C,OAAO,uIAAuI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;AAC/J,CAAC;AAFD,oCAEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lakutata/core",
-  "version": "1.0.28",
+  "version": "1.0.32",
   "description": "Lakutata Framework Core",
   "main": "./build/Core.js",
   "types": "./build/Core.d.ts",
@@ -53,26 +53,26 @@
   "author": "alex.ma",
   "license": "MIT",
   "dependencies": {
-    "@thiagodelgado111/yup-phone": "^0.0.2",
     "bcryptjs": "^2.4.3",
     "crypto-js": "^4.1.1",
-    "ergate": "^2.0.11",
+    "google-libphonenumber": "^3.2.25",
     "inversify": "^5.1.1",
     "is-ssh": "^1.3.3",
     "json-helpers": "^5.1.4",
     "json5": "^2.2.0",
     "lodash.mapvalues": "^4.6.0",
-    "memfs": "^3.3.0",
+    "memfs": "^3.4.0",
     "merge-deep": "^3.0.3",
     "moment": "^2.29.1",
+    "moment-timezone": "^0.5.34",
     "msgpack5": "^5.3.2",
     "needle": "^2.9.1",
     "node-rsa": "^1.1.1",
     "p-timeout": "^4.1.0",
     "pupa": "^2.1.1",
+    "random": "^3.0.6",
     "reflect-metadata": "^0.1.13",
     "string-random": "^0.1.3",
-    "valid-data-url": "^3.0.1",
     "winston": "^3.3.3",
     "winston-transport": "^4.4.0",
     "yup": "^0.32.11"
@@ -81,6 +81,7 @@
     "@types/bcryptjs": "^2.4.2",
     "@types/chai": "^4.2.14",
     "@types/crypto-js": "^4.0.2",
+    "@types/google-libphonenumber": "^7.4.23",
     "@types/is-ssh": "^1.3.0",
     "@types/lodash.mapvalues": "^4.6.6",
     "@types/merge-deep": "^3.0.0",

package/src/Application.ts

@@ -10,9 +10,10 @@ import {MessagePack} from './plugins/MessagePack'
 import {JSON} from './plugins/JSON'
 import {TWorkflowsConfig} from './types/TWorkflowsConfig'
 import {Logger} from './plugins/Logger'
-import {format} from 'winston'
 import {TProcessesConfig} from './types/TProcessesConfig'
 import {TThreadsConfig} from './types/TThreadsConfig'
+import momentTimezone from 'moment-timezone'
+import {Shell} from './plugins/Shell'
 
 export class Application extends Module {
 	/**
@@ -64,6 +65,9 @@ export class Application extends Module {
 		{
 			class: JSON
 		},
+		{
+			class: Shell
+		},
 		{
 			class: Formatter,
 			dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -76,16 +80,6 @@ export class Application extends Module {
 				appId: process.env.appId,
 				appName: process.env.appName
 			},
-			console: {
-				silent: false,
-				format: format.combine(
-					format.timestamp({format: 'YYYY-MM-DD HH:mm:ss'}),
-					format.colorize(),
-					format.printf(packet => {
-						return `${packet.timestamp} ${packet.level}: ${packet.message}`
-					})
-				)
-			},
 			transports: []
 		}
 	]
@@ -125,6 +119,18 @@ export class Application extends Module {
 	 */
 	protected readonly workflows: TWorkflowsConfig = []
 
+	/**
+	 * 程序时区
+	 * @type {string}
+	 * @protected
+	 */
+	protected tz: string = (() => {
+		if (!process.env.TZ) {
+			process.env.TZ = momentTimezone.tz.guess()
+		}
+		return process.env.TZ
+	})()
+
 	/**
 	 * 初始化
 	 * @returns {Promise<void>}
@@ -137,6 +143,22 @@ export class Application extends Module {
 		})
 	}
 
+	/**
+	 * 获取程序时区
+	 * @returns {string}
+	 */
+	public getTimezone() {
+		return this.tz
+	}
+
+	/**
+	 * 设置程序时区
+	 * @param {string} tz
+	 */
+	public setTimezone(tz: string) {
+		this.tz = tz
+	}
+
 	/**
 	 * 获取应用程序ID
 	 * @returns {string}

package/src/ApplicationManagement.ts

@@ -1,3 +1,5 @@
+import momentTimezone from 'moment-timezone'
+
 require('events').captureRejections = true
 import {IApplicationConfig} from './interfaces/IApplicationConfig'
 import {Application} from './Application'
@@ -19,10 +21,11 @@ export async function createApp(config: IApplicationConfig): Promise<Application
 		process.title = config.id
 		process.env.appId = config.id
 		process.env.appName = config.name
+		process.env.TZ = config.timezone ? config.timezone : momentTimezone.tz.guess()
 		await coreContainer.initialize()
 		return coreContainer.getModule(Application)
 	} catch (e) {
-		throw  new FatalException(e.message)
+		throw  new FatalException((e as Error).message)
 	}
 }
 

package/src/base/Container.ts

@@ -83,12 +83,25 @@ export class Container<TObject extends BaseObject = BaseObject, TPlugin extends
 	 * @param {IConstructor<TPlugin>} pluginConstructor
 	 * @param {string} identifier
 	 * @param {object} config
-	 * @param {"Transient" | "Singleton"} scope
 	 */
 	public bindPlugin(pluginConstructor: IConstructor<TPlugin>, identifier: string, config: object): void {
+		const scope = config['scope'] ? config['scope'] : 'Transient'
 		const pluginConfiguration = config ? config : {}
 		if (this.pluginIoC.isBound(identifier)) return
 		const binding = this.pluginIoC.bind(identifier).to(pluginConstructor)
+		switch (scope) {
+			case 'Transient': {
+				binding.inTransientScope()
+			}
+				break
+			case 'Singleton': {
+				binding.inSingletonScope()
+			}
+				break
+			default: {
+				binding.inTransientScope()
+			}
+		}
 		binding.onActivation((context, injectable) => {
 			const onActivationFunc = function (this: TPlugin) {
 				const pluginConfigurationKeys = Object.keys(pluginConfiguration)

package/src/base/ValidatorClass.ts

@@ -25,11 +25,11 @@ import {OptionalArraySchema} from 'yup/lib/array'
 import Reference, {ReferenceOptions} from 'yup/lib/Reference'
 import mapValues from 'lodash/mapValues'
 import {ValidationException} from '../exceptions/ValidationException'
-import phoneValidationMethod, {YUP_METHOD as PHONE_METHOD} from '@thiagodelgado111/yup-phone'
 import isSsh from 'is-ssh'
-import validDataUrl from 'valid-data-url'
 import {MixedSchema} from 'yup/lib/mixed'
 import {BaseObject} from './BaseObject'
+import gPhoneNumber from 'google-libphonenumber'
+import {validDataUrl} from '../utils/ValidDataUrl'
 
 declare module 'yup' {
 	interface StringSchema {
@@ -44,13 +44,15 @@ declare module 'yup' {
 		dataUrl(): StringSchema
 
 		url(option?: { acceptParams?: boolean; protocol?: string[] | string; blackHostnameList?: string[]; whiteHostnameList?: string[] }): StringSchema
+
+		phone(countryCode?: string, strict?: boolean): StringSchema
 	}
 
 	interface ObjectSchema<TShape extends ObjectShape, TContext extends AnyObject = AnyObject, TIn extends Maybe<TypeOfShape<TShape>> = TypeOfShape<TShape>, TOut extends Maybe<AssertsShape<TShape>> = AssertsShape<TShape> | Optionals<TIn>> extends BaseSchema<TIn, TContext, TOut> {
 		structure(valueSchema: AnySchema): OptionalObjectSchema<TShape, Record<string, any>, TypeOfShape<TShape>>
 	}
 }
-
+const PHONE_METHOD = 'phone'
 const IPV4_METHOD = 'ipv4'
 const IPV6_METHOD = 'ipv6'
 const IP_ALL_METHOD = 'ip'
@@ -515,7 +517,42 @@ export class ValidatorClass extends BaseObject {
 
 	constructor() {
 		super()
-		addMethod(string, PHONE_METHOD, phoneValidationMethod)
+		addMethod(string, PHONE_METHOD, function (this: StringSchema, countryCode?: string, strict: boolean = false) {
+			const phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance()
+			const CLDR_REGION_CODE_SIZE = 2
+			const isValidCountryCode = (countryCode: any): boolean => typeof countryCode === 'string' && countryCode.length === CLDR_REGION_CODE_SIZE
+			const errMsg = isValidCountryCode(countryCode)
+				? `\${path} must be a valid phone number for region ${countryCode}`
+				: '${path} must be a valid phone number.'
+
+			return this.test(<any>{
+				name: PHONE_METHOD,
+				message: errMsg,
+				test(value: string) {
+					if (this.schema._nullable && value === null) {
+						return this.resolve(true)
+					}
+					if (!isValidCountryCode(countryCode)) {
+						countryCode = 'US'
+						strict = false
+					}
+					let isValid
+					try {
+						const phoneNumber = phoneUtil.parseAndKeepRawInput(value, countryCode)
+						if (!phoneUtil.isPossibleNumber(phoneNumber)) {
+							return false
+						}
+						const regionCodeFromPhoneNumber = phoneUtil.getRegionCodeForNumber(phoneNumber)
+						isValid = strict
+							? phoneUtil.isValidNumberForRegion(phoneNumber, countryCode)
+							: phoneUtil.isValidNumberForRegion(phoneNumber, regionCodeFromPhoneNumber)
+					} catch (error) {
+						isValid = false
+					}
+					return this.resolve(isValid)
+				}
+			})
+		})
 		addMethod(string, IPV4_METHOD, function (this: StringSchema, message = 'Invalid IP address') {
 			return this.matches(/(^(\d{1,3}\.){3}(\d{1,3})$)/, {
 				message,
@@ -668,7 +705,7 @@ export class ValidatorClass extends BaseObject {
 		try {
 			return await schema.validate(data, {strict: true})
 		} catch (e) {
-			throw this.generateException(ValidationException,e.message)
+			throw this.generateException(ValidationException, (e as Error).message)
 		}
 	}
 
@@ -682,7 +719,7 @@ export class ValidatorClass extends BaseObject {
 		try {
 			return schema.validateSync(data, {strict: true})
 		} catch (e) {
-			throw this.generateException(ValidationException,e.message)
+			throw this.generateException(ValidationException, (e as Error).message)
 		}
 	}
 
@@ -705,4 +742,4 @@ export class ValidatorClass extends BaseObject {
 	public isValidSync<SchemaType extends AnySchema, DataType = any>(schema: SchemaType, data: DataType): boolean {
 		return schema.isValidSync(data, {strict: true})
 	}
-}
+}

package/src/base/abstracts/Exception.ts

@@ -57,4 +57,4 @@ export abstract class Exception extends Error {
 	protected templates(): string[] {
 		return []
 	}
-}
+}

package/src/base/abstracts/Module.ts

@@ -160,12 +160,13 @@ export abstract class Module extends BaseObject {
 	 * @protected
 	 */
 	protected bindPlugins(): void {
+		//todo 可能需要合并一下多个相同插件的配置
 		if (!this.plugins) return
 		const reversedPlugins = this.plugins.reverse()
 		const registeredPluginSet = new Set()
 		for (const pluginConstructorOrConfig of reversedPlugins) {
 			let pluginConstructor
-			let pluginConfig: object = {}
+			let pluginConfig: object & { scope?: 'Transient' | 'Singleton' } = {}
 			if (typeof pluginConstructorOrConfig === 'object') {
 				pluginConstructor = pluginConstructorOrConfig.class
 				for (const configKey of Object.keys(pluginConstructorOrConfig)) {

package/src/base/process/Process.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata'
-import {ProcessClass} from 'ergate'
+import {ProcessClass} from '../../lib/multipleRunner/lib/cores/ProcessClass'
 
 export class Process extends ProcessClass {
 	/**

package/src/base/process/ProcessManager.ts

@@ -1,8 +1,8 @@
 import {Process} from './Process'
-import {ProxyClass} from 'ergate'
 import {IProcessConstructor} from '../../interfaces/IProcessConstructor'
-import {Process as processCreate} from 'ergate'
 import {ProcessException} from '../../exceptions/ProcessException'
+import {ProxyClass} from '../../lib/multipleRunner/definitions/interfaces/ProxyClass'
+import {Process as processCreate} from '../../lib/multipleRunner/lib/Process'
 
 export class ProcessManager<TProcess extends Process = Process> {
 	protected readonly processMap: Map<IProcessConstructor<TProcess>, TProcess & ProxyClass> = new Map()

package/src/base/thread/Thread.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata'
-import {ThreadClass} from 'ergate'
+import {ThreadClass} from '../../lib/multipleRunner/lib/cores/ThreadClass'
 
 export class Thread extends ThreadClass {
 

package/src/base/thread/ThreadManager.ts

@@ -1,8 +1,8 @@
 import {Thread} from './Thread'
 import {IThreadConstructor} from '../../interfaces/IThreadConstructor'
-import {Thread as threadCreate} from 'ergate'
 import {ThreadException} from '../../exceptions/ThreadException'
-import {ProxyClass} from 'ergate'
+import {ProxyClass} from '../../lib/multipleRunner/definitions/interfaces/ProxyClass'
+import {Thread as threadCreate} from '../../lib/multipleRunner/lib/Thread'
 
 export class ThreadManager<TThread extends Thread = Thread> {
 	protected readonly threadMap: Map<IThreadConstructor<TThread>, TThread & ProxyClass> = new Map()