@jayfong/x-server 2.2.15 → 2.3.0

package/lib/_cjs/cli/build_util.js

@@ -169,6 +169,7 @@ class BuildUtil {
             {
               name: ${JSON.stringify(pkgContent.name)},
               script: './main.js',
+              ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
             },
           ],
         }

package/lib/_cjs/cli/cli.js

@@ -190,6 +190,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     user: process.env.USER,
     key: process.env.KEY,
     dir: process.env.DIR,
-    cmd: process.env.CMD
+    cmd: process.env.CMD,
+    memory: process.env.MEMORY
   });
 }).parse();

package/lib/_cjs/cli/deploy_util.js

@@ -49,7 +49,7 @@ class DeployUtil {
         cd ${appDir}/dist
         [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
         ${options.cmd || ''}
-        pm2 startOrReload pm2.config.js
+        ${options.memory ? `PM2_MEMORY=${options.memory} ` : ''}pm2 startOrReload pm2.config.js
       `, {
       cwd: options.cwd,
       onStdout: buf => console.log(buf.toString()),

package/lib/_cjs/services/sensitive_words.js

@@ -7,6 +7,8 @@ exports.SensitiveWordsService = void 0;
 
 var _mintFilter = _interopRequireDefault(require("mint-filter"));
 
+var _vtils = require("vtils");
+
 /**
  * 敏感词服务。
  */
@@ -16,6 +18,20 @@ class SensitiveWordsService {
     this.serviceName = 'sensitiveWords';
     this.mint = void 0;
   }
+  /**
+   * 文本转换。
+   */
+
+
+  transform(text) {
+    return (// 移除空白字符
+      (0, _vtils.removeBlankChars)( // 移除非单词字符
+      (0, _vtils.removeNonWordChars)( // 全角转半角
+      (0, _vtils.toHalfWidthString)(text))) // 转小写
+      .toLowerCase() // 叠词归一
+      .replace(/(.)\1+/g, '$1')
+    );
+  }
   /**
    * 处理文本，敏感词将被替换为 * 号。
    */
@@ -26,7 +42,7 @@ class SensitiveWordsService {
       this.mint = new _mintFilter.default(this.options.words);
     }
 
-    const res = await this.mint.filter(text, {
+    const res = await this.mint.filter(this.transform(text), {
       every: true,
       replace: true,
       words: false
@@ -43,7 +59,7 @@ class SensitiveWordsService {
       this.mint = new _mintFilter.default(this.options.words);
     }
 
-    const res = await this.mint.filter(text, {
+    const res = await this.mint.filter(this.transform(text), {
       replace: false,
       every: !!every,
       words: true

package/lib/cli/api_generator.d.ts

@@ -10,7 +10,7 @@ interface ApiData {
     required: boolean;
     children: ApiData[];
 }
-declare type ApiHandles = Array<{
+type ApiHandles = Array<{
     category: string;
     name: string;
     path: string;

package/lib/cli/build_util.js

@@ -141,6 +141,7 @@ export class BuildUtil {
             {
               name: ${JSON.stringify(pkgContent.name)},
               script: './main.js',
+              ...(process.env.PM2_MEMORY ? { max_memory_restart: process.env.PM2_MEMORY } : {}),
             },
           ],
         }

package/lib/cli/cli.js

@@ -172,6 +172,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     user: process.env.USER,
     key: process.env.KEY,
     dir: process.env.DIR,
-    cmd: process.env.CMD
+    cmd: process.env.CMD,
+    memory: process.env.MEMORY
   });
 }).parse();

package/lib/cli/deploy_util.d.ts

@@ -4,6 +4,7 @@ export interface DeployOptions {
     user: string;
     key: string;
     dir: string;
+    memory?: string;
     cmd?: string;
 }
 export declare class DeployUtil {

package/lib/cli/deploy_util.js

@@ -37,7 +37,7 @@ export class DeployUtil {
         cd ${appDir}/dist
         [ -f no_install.lock ] && yarn_disable_self_update_check=true tyn
         ${options.cmd || ''}
-        pm2 startOrReload pm2.config.js
+        ${options.memory ? `PM2_MEMORY=${options.memory} ` : ''}pm2 startOrReload pm2.config.js
       `, {
       cwd: options.cwd,
       onStdout: buf => console.log(buf.toString()),

package/lib/core/define_bus.d.ts

@@ -10,10 +10,10 @@ interface TypeRecord<T, U, V> {
     ' _eventsType'?: U;
     ' _emitType'?: V;
 }
-declare type InnerEEMethodReturnType<T, TValue, FValue> = T extends (...args: any[]) => any ? ReturnType<T> extends void | undefined ? FValue : TValue : FValue;
-declare type EEMethodReturnType<T, S extends string, TValue, FValue = void> = S extends keyof T ? InnerEEMethodReturnType<T[S], TValue, FValue> : FValue;
-declare type ListenerType<T> = [T] extends [(...args: infer U) => any] ? U : [T] extends [void] ? [] : [T];
-declare type OverriddenMethods<TEmitter, TEventRecord, TEmitRecord = TEventRecord> = {
+type InnerEEMethodReturnType<T, TValue, FValue> = T extends (...args: any[]) => any ? ReturnType<T> extends void | undefined ? FValue : TValue : FValue;
+type EEMethodReturnType<T, S extends string, TValue, FValue = void> = S extends keyof T ? InnerEEMethodReturnType<T[S], TValue, FValue> : FValue;
+type ListenerType<T> = [T] extends [(...args: infer U) => any] ? U : [T] extends [void] ? [] : [T];
+type OverriddenMethods<TEmitter, TEventRecord, TEmitRecord = TEventRecord> = {
     on<P extends keyof TEventRecord, T>(this: T, event: P, listener: (...args: ListenerType<TEventRecord[P]>) => void): EEMethodReturnType<TEmitter, 'on', T>;
     on(event: typeof assignmentCompatibilityHack, listener: (...args: any[]) => any): void;
     addListener<P extends keyof TEventRecord, T>(this: T, event: P, listener: (...args: ListenerType<TEventRecord[P]>) => void): EEMethodReturnType<TEmitter, 'addListener', T>;
@@ -33,6 +33,6 @@ declare type OverriddenMethods<TEmitter, TEventRecord, TEmitRecord = TEventRecor
     onReturnOff<P extends keyof TEventRecord, T>(this: T, event: P, listener: (...args: ListenerType<TEventRecord[P]>) => void): () => any;
     onReturnOff(event: typeof assignmentCompatibilityHack, listener: (...args: any[]) => any): () => any;
 };
-declare type OverriddenKeys = keyof OverriddenMethods<any, any, any>;
-declare type StrictEventEmitter<TEmitterType, TEventRecord, TEmitRecord = TEventRecord, UnneededMethods extends Exclude<OverriddenKeys, keyof TEmitterType> = Exclude<OverriddenKeys, keyof TEmitterType>, NeededMethods extends Exclude<OverriddenKeys, UnneededMethods> = Exclude<OverriddenKeys, UnneededMethods>> = TypeRecord<TEmitterType, TEventRecord, TEmitRecord> & Pick<TEmitterType, Exclude<keyof TEmitterType, OverriddenKeys>> & Pick<OverriddenMethods<TEmitterType, TEventRecord, TEmitRecord>, NeededMethods>;
+type OverriddenKeys = keyof OverriddenMethods<any, any, any>;
+type StrictEventEmitter<TEmitterType, TEventRecord, TEmitRecord = TEventRecord, UnneededMethods extends Exclude<OverriddenKeys, keyof TEmitterType> = Exclude<OverriddenKeys, keyof TEmitterType>, NeededMethods extends Exclude<OverriddenKeys, UnneededMethods> = Exclude<OverriddenKeys, UnneededMethods>> = TypeRecord<TEmitterType, TEventRecord, TEmitRecord> & Pick<TEmitterType, Exclude<keyof TEmitterType, OverriddenKeys>> & Pick<OverriddenMethods<TEmitterType, TEventRecord, TEmitRecord>, NeededMethods>;
 export {};

package/lib/core/types.d.ts

@@ -216,4 +216,4 @@ export declare namespace XCron {
     interface Cron extends CronJob {
     }
 }
-export declare type XFile = MultipartFile;
+export type XFile = MultipartFile;

package/lib/services/cache.d.ts

@@ -5,17 +5,17 @@ export interface CacheServiceOptions {
     /** 默认过期时间 */
     ttl: MsValue;
 }
-declare type Data = {
+type Data = {
     [K in string]: (...args: any[]) => any;
 };
-declare type Key<T extends Data> = keyof T;
-declare type KeyPath<T extends Data> = {
+type Key<T extends Data> = keyof T;
+type KeyPath<T extends Data> = {
     [K in keyof T]: T[K] extends (...args: infer X) => any ? IsEmptyArray<X> extends true ? K : [K, ...X] : never;
 }[keyof T];
-declare type KeyPathForNumberValue<T extends Data> = {
+type KeyPathForNumberValue<T extends Data> = {
     [K in keyof T]: T[K] extends (...args: infer X) => number ? IsEmptyArray<X> extends true ? K : [K, ...X] : never;
 }[keyof T];
-declare type Value<T extends Data, P extends KeyPath<T>> = ReturnType<T[P extends any[] ? P[0] : P]>;
+type Value<T extends Data, P extends KeyPath<T>> = ReturnType<T[P extends any[] ? P[0] : P]>;
 export declare class CacheService<TData extends Data = Data, TKey extends Key<TData> = any, TKeyPath extends KeyPath<TData> = any, TKeyPathForNumberValue extends KeyPathForNumberValue<TData> = any> implements BaseService {
     options: CacheServiceOptions;
     serviceName: string;

package/lib/services/log.d.ts

@@ -1,11 +1,11 @@
 import { BaseService } from './base';
-export declare type LogServiceLevel = 'error' | 'info' | 'success';
-export declare type LogServicePayload = {
+export type LogServiceLevel = 'error' | 'info' | 'success';
+export type LogServicePayload = {
     level: LogServiceLevel;
     title: string;
     desc?: Record<string, any>;
 };
-export declare type LogServicePayloadWithTime = LogServicePayload & {
+export type LogServicePayloadWithTime = LogServicePayload & {
     time: string;
 };
 export declare class LogService implements BaseService {

package/lib/services/sensitive_words.d.ts

@@ -11,6 +11,10 @@ export declare class SensitiveWordsService implements BaseService {
     serviceName: string;
     private mint;
     constructor(options: SensitiveWordsServiceOptions);
+    /**
+     * 文本转换。
+     */
+    private transform;
     /**
      * 处理文本，敏感词将被替换为 * 号。
      */

package/lib/services/sensitive_words.js

@@ -1,4 +1,5 @@
 import Mint from 'mint-filter';
+import { removeBlankChars, removeNonWordChars, toHalfWidthString } from 'vtils';
 
 /**
  * 敏感词服务。
@@ -9,6 +10,20 @@ export class SensitiveWordsService {
     this.serviceName = 'sensitiveWords';
     this.mint = void 0;
   }
+  /**
+   * 文本转换。
+   */
+
+
+  transform(text) {
+    return (// 移除空白字符
+      removeBlankChars( // 移除非单词字符
+      removeNonWordChars( // 全角转半角
+      toHalfWidthString(text))) // 转小写
+      .toLowerCase() // 叠词归一
+      .replace(/(.)\1+/g, '$1')
+    );
+  }
   /**
    * 处理文本，敏感词将被替换为 * 号。
    */
@@ -19,7 +34,7 @@ export class SensitiveWordsService {
       this.mint = new Mint(this.options.words);
     }
 
-    const res = await this.mint.filter(text, {
+    const res = await this.mint.filter(this.transform(text), {
       every: true,
       replace: true,
       words: false
@@ -36,7 +51,7 @@ export class SensitiveWordsService {
       this.mint = new Mint(this.options.words);
     }
 
-    const res = await this.mint.filter(text, {
+    const res = await this.mint.filter(this.transform(text), {
       replace: false,
       every: !!every,
       words: true

package/lib/types/index.d.ts

@@ -1,23 +1,23 @@
 import { OmitStrict, PartialBy, RequiredBy, RequiredDeep, Simplify } from 'vtils/types';
-export declare type MakeDtoRequired<TRawData extends Record<any, any>, TPickKey extends keyof TRawData = never, TPartialKey extends keyof Pick<RequiredDeep<TRawData>, [
+export type MakeDtoRequired<TRawData extends Record<any, any>, TPickKey extends keyof TRawData = never, TPartialKey extends keyof Pick<RequiredDeep<TRawData>, [
     TPickKey
 ] extends [never] ? keyof TRawData : TPickKey> = never> = Simplify<PartialBy<Pick<RequiredDeep<TRawData>, [
     TPickKey
 ] extends [never] ? keyof TRawData : TPickKey>, TPartialKey>>;
-export declare type MakeDtoPartial<TRawData extends Record<any, any>, TPickKey extends keyof TRawData = never, TRequiredKey extends keyof Pick<Partial<TRawData>, [
+export type MakeDtoPartial<TRawData extends Record<any, any>, TPickKey extends keyof TRawData = never, TRequiredKey extends keyof Pick<Partial<TRawData>, [
     TPickKey
 ] extends [never] ? keyof TRawData : TPickKey> = never> = Simplify<RequiredBy<Pick<Partial<TRawData>, [
     TPickKey
 ] extends [never] ? keyof TRawData : TPickKey>, TRequiredKey>>;
-export declare type MakeDtoExcludeRequired<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TPartialKey extends keyof Omit<RequiredDeep<TRawData>, [
+export type MakeDtoExcludeRequired<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TPartialKey extends keyof Omit<RequiredDeep<TRawData>, [
     TExcludeKey
 ] extends [never] ? never : TExcludeKey> = never> = Simplify<PartialBy<Omit<RequiredDeep<TRawData>, [
     TExcludeKey
 ] extends [never] ? never : TExcludeKey>, TPartialKey>>;
-export declare type MakeDtoExcludePartial<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TRequiredKey extends keyof Omit<Partial<TRawData>, [
+export type MakeDtoExcludePartial<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TRequiredKey extends keyof Omit<Partial<TRawData>, [
     TExcludeKey
 ] extends [never] ? never : TExcludeKey> = never> = Simplify<RequiredBy<Omit<Partial<TRawData>, [
     TExcludeKey
 ] extends [never] ? never : TExcludeKey>, TRequiredKey>>;
-export declare type MakeDtoExclude<T, K extends keyof T> = OmitStrict<T, K>;
-export declare type MakeDtoInclude<T, K extends keyof T> = Pick<T, K>;
+export type MakeDtoExclude<T, K extends keyof T> = OmitStrict<T, K>;
+export type MakeDtoInclude<T, K extends keyof T> = Pick<T, K>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.2.15",
+  "version": "2.3.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -88,9 +88,9 @@
     "jest": "^27.5.1",
     "lint-staged": "^10.5.4",
     "npm-check-updates": "^12.5.9",
-    "prettier": "^2.6.2",
+    "prettier": "^2.8.8",
     "standard-version": "^9.3.2",
-    "typescript": "^4.6.3",
+    "typescript": "^5.0.4",
     "typescript-snapshots-plugin": "^1.7.0"
   },
   "publishConfig": {