@lakutata/core 1.0.29 → 1.0.33

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.29",
+  "version": "1.0.33",
   "description": "Lakutata Framework Core",
   "main": "./build/Core.js",
   "types": "./build/Core.d.ts",
@@ -53,9 +53,9 @@
   "author": "alex.ma",
   "license": "MIT",
   "dependencies": {
-    "@thiagodelgado111/yup-phone": "^0.0.2",
     "bcryptjs": "^2.4.3",
     "crypto-js": "^4.1.1",
+    "google-libphonenumber": "^3.2.25",
     "inversify": "^5.1.1",
     "is-ssh": "^1.3.3",
     "json-helpers": "^5.1.4",
@@ -73,7 +73,6 @@
     "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"
@@ -82,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,10 +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 {
 	/**
@@ -65,6 +65,9 @@ export class Application extends Module {
 		{
 			class: JSON
 		},
+		{
+			class: Shell
+		},
 		{
 			class: Formatter,
 			dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -77,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: []
 		}
 	]
@@ -163,6 +156,7 @@ export class Application extends Module {
 	 * @param {string} tz
 	 */
 	public setTimezone(tz: string) {
+		process.env.TZ = tz
 		this.tz = tz
 	}
 

package/src/ApplicationManagement.ts

@@ -25,7 +25,7 @@ export async function createApp(config: IApplicationConfig): Promise<Application
 		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/decorators/MethodValidation.ts

@@ -26,7 +26,7 @@ export const Return = (returnSchema: AnySchema, options: { strict?: boolean, str
 							const methodResult = returnSchema.validateSync(originalAsyncMethodResult, options)
 							resolve(methodResult)
 						} catch (e) {
-							reject(new InvalidMethodReturnException(e.message))
+							reject(new InvalidMethodReturnException((e as Error).message))
 						}
 					}).catch(reject)
 				})
@@ -35,9 +35,9 @@ export const Return = (returnSchema: AnySchema, options: { strict?: boolean, str
 					return returnSchema.validateSync(originalMethodResult, options)
 				} catch (e) {
 					if (target['generateException']) {
-						throw target['generateException'](InvalidMethodReturnException, e.message)
+						throw target['generateException'](InvalidMethodReturnException, (e as Error).message)
 					} else {
-						throw new InvalidMethodReturnException(e.message)
+						throw new InvalidMethodReturnException((e as Error).message)
 					}
 				}
 			}
@@ -68,13 +68,13 @@ export const Accept = (argumentSchemas: AnySchema | AnySchema[], options: { stri
 				}
 			} catch (e) {
 				if (target['generateException']) {
-					throw target['generateException'](InvalidMethodAcceptException, e.message)
+					throw target['generateException'](InvalidMethodAcceptException, (e as Error).message)
 				} else {
-					throw new InvalidMethodAcceptException(e.message)
+					throw new InvalidMethodAcceptException((e as Error).message)
 				}
 			}
 			return originalMethod.apply(this, args)
 		}
 		return descriptor
 	}
-}
+}