@jayfong/x-server 1.26.5 → 1.26.8

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.26.8](https://github.com/jfWorks/x-server/compare/v1.26.7...v1.26.8) (2022-05-07)
+
+
+### Bug Fixes
+
+* init ([b8f8e44](https://github.com/jfWorks/x-server/commit/b8f8e44ed1cf282293938ab3678796a402832dc2))
+
+### [1.26.7](https://github.com/jfWorks/x-server/compare/v1.26.6...v1.26.7) (2022-05-07)
+
+
+### Bug Fixes
+
+* _ => index ([e3000d0](https://github.com/jfWorks/x-server/commit/e3000d09f20d983e3edc00d7a307b419f786e485))
+
+### [1.26.6](https://github.com/jfWorks/x-server/compare/v1.26.5...v1.26.6) (2022-05-07)
+
+
+### Bug Fixes
+
+* ServiceOptions ([bd86e66](https://github.com/jfWorks/x-server/commit/bd86e6618a5e115cbba26b56dfbeba2a427bfda7))
+
 ### [1.26.5](https://github.com/jfWorks/x-server/compare/v1.26.4...v1.26.5) (2022-05-06)
 
 

package/lib/_cjs/cli/cli.js

@@ -50,7 +50,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     });
   }
 
-  await _template_util.TemplateUtil.initHelperPackage(process.cwd());
+  await _template_util.TemplateUtil.init(process.cwd());
 
   const watcher = _chokidar.default.watch(['src', '.env'], {
     cwd: process.cwd()
@@ -70,7 +70,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
 
     (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
       cwd: process.cwd(),
-      patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', ...(argv.index || [])],
+      patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
       replaceFile: true,
       onSuccess: filePath => {
         console.log(`✔️ 索引文件已更新: ${filePath}`);
@@ -107,7 +107,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
     value: 'production',
     comment: ''
   });
-  await _template_util.TemplateUtil.initHelperPackage(process.cwd());
+  await _template_util.TemplateUtil.init(process.cwd());
   await (0, _vscodeGenerateIndexStandalone.generateManyIndex)({
     cwd: process.cwd(),
     patterns: ['src/.x/*.ts'],

package/lib/_cjs/cli/template_util.js

@@ -14,9 +14,17 @@ var _vtils = require("vtils");
 var _vscodeGenerateIndexStandalone = require("vscode-generate-index-standalone");
 
 class TemplateUtil {
+  /**
+   * 初始化。
+   */
+  static async init(cwd) {
+    await Promise.all([this.initHelperPackage(cwd), this.initTasks(cwd)]);
+  }
   /**
    * 初始化辅助包。
    */
+
+
   static async initHelperPackage(cwd) {
     const fromDir = _path.default.join(__dirname, 'templates');
 
@@ -31,6 +39,23 @@ class TemplateUtil {
       replaceFile: true
     });
   }
+  /**
+   * 初始化任务。
+   */
+
+
+  static async initTasks(cwd) {
+    const tasksDir = _path.default.join(cwd, 'tasks');
+
+    const tasksIndexFile = _path.default.join(tasksDir, 'index.ts');
+
+    if (!(await _fsExtra.default.pathExists(tasksIndexFile))) {
+      await _fsExtra.default.writeFile(tasksIndexFile, (0, _vtils.dedent)`
+          // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
+          // @endindex
+        `);
+    }
+  }
   /**
    * 初始化模型。
    */

package/lib/_cjs/cli/templates/handlers.ts

@@ -1,3 +1,3 @@
-// @index('../../src/handlers/**/*.ts', (f, _) => `export * as __${_.pascal(f.path.replace('/src/handlers/', ''))}__ from '${f.path}'`)
+// @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `export * as __${_.pascal(f.path.replace('/src/handlers/', ''))}__ from '${f.path}'`)
 
 // @endindex

package/lib/_cjs/cli/templates/hooks.ts

@@ -1,2 +1,2 @@
-// @index('../../src/hooks/**/*.ts', (f, _) => `import '${f.path}'`)
+// @index(['../../src/hooks/**/*.ts', '!**/_*'], (f, _) => `import '${f.path}'`)
 // @endindex

package/lib/_cjs/cli/templates/routes.ts

@@ -2,7 +2,7 @@ import * as handlers from './handlers'
 import { Handler, XServer } from '@jayfong/x-server'
 
 const basePathWithHandlers: Array<[string, Record<string, Handler>]> = [
-  // @index('../../src/handlers/**/*.ts', (f, _) => `['${('/'+_.snake(f.path.replace('/src/handlers/', '')).replace(/_/g, '/')+'/').replace(/\/{2,}/g, '/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
+  // @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `['${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
   // @endindex
 ]
 

package/lib/_cjs/cli/templates/tasks.ts

@@ -1,2 +1 @@
-// @index('../../src/tasks/**/*.ts', (f, _) => `import '${f.path}'`)
-// @endindex
+import '../../src/tasks/index'

package/lib/_cjs/services/sensitive_words.js

@@ -7,14 +7,21 @@ exports.SensitiveWordsService = void 0;
 
 var _mintFilter = _interopRequireDefault(require("mint-filter"));
 
+/**
+ * 敏感词服务。
+ */
 class SensitiveWordsService {
   constructor(options) {
     this.options = options;
     this.serviceName = 'sensitiveWords';
     this.mint = void 0;
   }
+  /**
+   * 处理文本，敏感词将被替换为 * 号。
+   */
 
-  async filter(text) {
+
+  async process(text) {
     if (!this.mint) {
       this.mint = new _mintFilter.default(this.options.words);
     }

package/lib/cli/cli.js

@@ -36,7 +36,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     });
   }
 
-  await TemplateUtil.initHelperPackage(process.cwd());
+  await TemplateUtil.init(process.cwd());
   const watcher = chokidar.watch(['src', '.env'], {
     cwd: process.cwd()
   });
@@ -52,7 +52,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     });
     generateManyIndex({
       cwd: process.cwd(),
-      patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', ...(argv.index || [])],
+      patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
       replaceFile: true,
       onSuccess: filePath => {
         console.log(`✔️ 索引文件已更新: ${filePath}`);
@@ -89,7 +89,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     value: 'production',
     comment: ''
   });
-  await TemplateUtil.initHelperPackage(process.cwd());
+  await TemplateUtil.init(process.cwd());
   await generateManyIndex({
     cwd: process.cwd(),
     patterns: ['src/.x/*.ts'],

package/lib/cli/template_util.d.ts

@@ -1,8 +1,16 @@
 export declare class TemplateUtil {
+    /**
+     * 初始化。
+     */
+    static init(cwd: string): Promise<void>;
     /**
      * 初始化辅助包。
      */
     static initHelperPackage(cwd: string): Promise<void>;
+    /**
+     * 初始化任务。
+     */
+    static initTasks(cwd: string): Promise<void>;
     /**
      * 初始化模型。
      */

package/lib/cli/template_util.js

@@ -3,9 +3,17 @@ import path from 'path';
 import { camelCase, dedent, snakeCase, upperFirst } from 'vtils';
 import { generateManyIndex } from 'vscode-generate-index-standalone';
 export class TemplateUtil {
+  /**
+   * 初始化。
+   */
+  static async init(cwd) {
+    await Promise.all([this.initHelperPackage(cwd), this.initTasks(cwd)]);
+  }
   /**
    * 初始化辅助包。
    */
+
+
   static async initHelperPackage(cwd) {
     const fromDir = path.join(__dirname, 'templates');
     const toDir = path.join(cwd, 'node_modules/.x');
@@ -18,6 +26,22 @@ export class TemplateUtil {
       replaceFile: true
     });
   }
+  /**
+   * 初始化任务。
+   */
+
+
+  static async initTasks(cwd) {
+    const tasksDir = path.join(cwd, 'tasks');
+    const tasksIndexFile = path.join(tasksDir, 'index.ts');
+
+    if (!(await fs.pathExists(tasksIndexFile))) {
+      await fs.writeFile(tasksIndexFile, dedent`
+          // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
+          // @endindex
+        `);
+    }
+  }
   /**
    * 初始化模型。
    */

package/lib/cli/templates/handlers.ts

@@ -1,3 +1,3 @@
-// @index('../../src/handlers/**/*.ts', (f, _) => `export * as __${_.pascal(f.path.replace('/src/handlers/', ''))}__ from '${f.path}'`)
+// @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `export * as __${_.pascal(f.path.replace('/src/handlers/', ''))}__ from '${f.path}'`)
 
 // @endindex

package/lib/cli/templates/hooks.ts

@@ -1,2 +1,2 @@
-// @index('../../src/hooks/**/*.ts', (f, _) => `import '${f.path}'`)
+// @index(['../../src/hooks/**/*.ts', '!**/_*'], (f, _) => `import '${f.path}'`)
 // @endindex

package/lib/cli/templates/routes.ts

@@ -2,7 +2,7 @@ import * as handlers from './handlers'
 import { Handler, XServer } from '@jayfong/x-server'
 
 const basePathWithHandlers: Array<[string, Record<string, Handler>]> = [
-  // @index('../../src/handlers/**/*.ts', (f, _) => `['${('/'+_.snake(f.path.replace('/src/handlers/', '')).replace(/_/g, '/')+'/').replace(/\/{2,}/g, '/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
+  // @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `['${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
   // @endindex
 ]
 

package/lib/cli/templates/tasks.ts

@@ -1,2 +1 @@
-// @index('../../src/tasks/**/*.ts', (f, _) => `import '${f.path}'`)
-// @endindex
+import '../../src/tasks/index'

package/lib/services/cache.d.ts

@@ -1,10 +1,9 @@
 import { AsyncOrSync, IsEmptyArray, NonEmptyArray } from 'vtils/types';
 import { BaseService } from './base';
 import { MsValue } from 'vtils/date';
-export declare type CacheTTL = MsValue;
-export interface CacheOptions {
+export interface CacheServiceOptions {
     /** 默认过期时间 */
-    ttl: CacheTTL;
+    ttl: MsValue;
 }
 declare type Data = {
     [K in string]: (...args: any[]) => any;
@@ -18,10 +17,10 @@ declare type KeyPathForNumberValue<T extends Data> = {
 }[keyof T];
 declare 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: CacheOptions;
+    options: CacheServiceOptions;
     serviceName: string;
     private prefix;
-    constructor(options: CacheOptions);
+    constructor(options: CacheServiceOptions);
     private toRedisKey;
     /**
      * 设置缓存内容。对象类内容尽量避免使用，以免造成问题。
@@ -31,14 +30,14 @@ export declare class CacheService<TData extends Data = Data, TKey extends Key<TD
      * @param ttl 缓存时间（单位：时）
      * @returns 返回设置的缓存内容
      */
-    set<K extends TKeyPath, V extends Value<TData, K>>(key: K, value: V, ttl?: CacheTTL | ((data: V, defaultTTL: CacheTTL) => CacheTTL)): Promise<V>;
+    set<K extends TKeyPath, V extends Value<TData, K>>(key: K, value: V, ttl?: MsValue | ((data: V, defaultTTL: MsValue) => MsValue)): Promise<V>;
     /**
      * 存储值然后返回其对应的键，该键 URL 友好。
      *
      * @param value 值
      * @param ttl 存活时间
      */
-    save<T>(value: T | ((key: string) => AsyncOrSync<T>), ttl?: CacheTTL): Promise<string>;
+    save<T>(value: T | ((key: string) => AsyncOrSync<T>), ttl?: MsValue): Promise<string>;
     /**
      * 获取缓存内容。
      *
@@ -61,7 +60,7 @@ export declare class CacheService<TData extends Data = Data, TKey extends Key<TD
      * @param ttl 缓存时间（单位：时）
      * @returns 返回获取到的内容
      */
-    remember<K extends TKeyPath, V extends Value<TData, K>>(key: K, action: () => V | Promise<V>, ttl?: CacheTTL | ((data: V, defaultTTL: CacheTTL) => CacheTTL)): Promise<V>;
+    remember<K extends TKeyPath, V extends Value<TData, K>>(key: K, action: () => V | Promise<V>, ttl?: MsValue | ((data: V, defaultTTL: MsValue) => MsValue)): Promise<V>;
     /**
      * 自增。
      *
@@ -107,7 +106,7 @@ export declare class CacheService<TData extends Data = Data, TKey extends Key<TD
     /**
      * 派生出一个指定类型的缓存服务。
      */
-    fork<TNextData extends Data>(options?: Partial<CacheOptions>): CacheService<TNextData, Key<TNextData>, KeyPath<TNextData>, KeyPathForNumberValue<TNextData>>;
+    fork<TNextData extends Data>(options?: Partial<CacheServiceOptions>): CacheService<TNextData, Key<TNextData>, KeyPath<TNextData>, KeyPathForNumberValue<TNextData>>;
 }
 declare module '../x' {
     interface X {

package/lib/services/captcha.d.ts

@@ -1,6 +1,6 @@
 import { BaseService } from './base';
 import type { MsValue } from 'vtils/date';
-export interface CaptchaOptions {
+export interface CaptchaServiceOptions {
     /**
      * 验证码长度
      */
@@ -10,32 +10,32 @@ export interface CaptchaOptions {
      */
     ttl: MsValue;
 }
-export interface CaptchaGenerateResult {
+export interface CaptchaServiceGenerateResult {
     token: string;
     code: string;
 }
-export interface CaptchaGenerateImageResult {
+export interface CaptchaServiceGenerateImageResult {
     token: string;
     code: string;
     svg: string;
 }
-export interface CaptchaGenerateDataUrlResult {
+export interface CaptchaServiceGenerateDataUrlResult {
     token: string;
     code: string;
     dataUrl: string;
 }
-export interface CaptchaVerifyOptions {
+export interface CaptchaServiceVerifyOptions {
     token: string;
     code: string;
 }
 export declare class CaptchaService implements BaseService {
     private options;
     serviceName: string;
-    constructor(options: CaptchaOptions);
-    generate(): Promise<CaptchaGenerateResult>;
-    generateImage(): Promise<CaptchaGenerateImageResult>;
-    generateDataUrl(): Promise<CaptchaGenerateDataUrlResult>;
-    verify(options: CaptchaVerifyOptions): Promise<boolean>;
+    constructor(options: CaptchaServiceOptions);
+    generate(): Promise<CaptchaServiceGenerateResult>;
+    generateImage(): Promise<CaptchaServiceGenerateImageResult>;
+    generateDataUrl(): Promise<CaptchaServiceGenerateDataUrlResult>;
+    verify(options: CaptchaServiceVerifyOptions): Promise<boolean>;
 }
 declare module '../x' {
     interface X {

package/lib/services/dispose.d.ts

@@ -1,11 +1,11 @@
 import { BaseService } from './base';
-export interface DisposeOptions {
+export interface DisposeServiceOptions {
     disposeOnExit?: boolean;
 }
 export declare class DisposeService implements BaseService {
     private options?;
     serviceName: string;
-    constructor(options?: DisposeOptions);
+    constructor(options?: DisposeServiceOptions);
     private disposes;
     add(fn: () => any): void;
     dispose(): Promise<any[]>;

package/lib/services/pay.d.ts

@@ -1,5 +1,5 @@
 import { BaseService } from './base';
-export interface PayOptions {
+export interface PayServiceOptions {
     /** 支付宝 */
     alipay?: {
         /** 应用 ID */
@@ -23,7 +23,7 @@ export interface PayOptions {
         secretKey: string;
     };
 }
-export interface PayPrepareAlipayOptions {
+export interface PayServicePrepareAlipayOptions {
     /** 商品名称 */
     goodsName: string;
     /** 交易单号 */
@@ -35,11 +35,11 @@ export interface PayPrepareAlipayOptions {
     /** 返回地址 */
     returnUrl?: string;
 }
-export interface PayPrepareAlipayResult {
+export interface PayServicePrepareAlipayResult {
     /** 支付地址，需跳转过去 */
     payUrl: string;
 }
-export interface PayPrepareWepayOptions {
+export interface PayServicePrepareWepayOptions {
     /** 商品名称 */
     goodsName: string;
     /** 交易单号 */
@@ -51,7 +51,7 @@ export interface PayPrepareWepayOptions {
     /** 对应公众号用户的 openid */
     openid: string;
 }
-export interface PayPrepareWepayResult {
+export interface PayServicePrepareWepayResult {
     /** 支付参数，可直接传给 JSSDK 调用 */
     payParams: {
         appId: string;
@@ -66,9 +66,9 @@ export declare class PayService implements BaseService {
     private options;
     serviceName: string;
     private alipaySdk;
-    constructor(options: PayOptions);
-    prepareAlipay(options: PayPrepareAlipayOptions): Promise<PayPrepareAlipayResult>;
-    prepareWepay(options: PayPrepareWepayOptions): Promise<PayPrepareWepayResult>;
+    constructor(options: PayServiceOptions);
+    prepareAlipay(options: PayServicePrepareAlipayOptions): Promise<PayServicePrepareAlipayResult>;
+    prepareWepay(options: PayServicePrepareWepayOptions): Promise<PayServicePrepareWepayResult>;
     verifyNotifyData(data: any): boolean;
     verifyNotifyDataOrFail(data: any, message?: string): void;
     private wepaySign;

package/lib/services/rate_limit.d.ts

@@ -1,13 +1,13 @@
 import { BaseService } from './base';
 import { MsValue } from 'vtils/date';
-export interface RateLimitLimitByCountOptions {
+export interface RateLimitServiceLimitByCountOptions {
     key: string;
     count: number;
     ttl: MsValue;
 }
 export declare class RateLimitService implements BaseService {
     serviceName: string;
-    limitByCount(options: RateLimitLimitByCountOptions): Promise<number>;
+    limitByCount(options: RateLimitServiceLimitByCountOptions): Promise<number>;
 }
 declare module '../x' {
     interface X {

package/lib/services/redis.d.ts

@@ -1,5 +1,7 @@
 import Redis from 'ioredis';
 import { BaseService } from './base';
+export interface RedisServiceOptions extends Redis.RedisOptions {
+}
 export declare class RedisService extends Redis implements BaseService {
     serviceName: string;
 }

package/lib/services/sensitive_words.d.ts

@@ -1,13 +1,20 @@
 import { BaseService } from './base';
-export interface SensitiveWordsOptions {
+export interface SensitiveWordsServiceOptions {
+    /** 敏感词列表 */
     words: string[];
 }
+/**
+ * 敏感词服务。
+ */
 export declare class SensitiveWordsService implements BaseService {
     private options;
     serviceName: string;
     private mint;
-    constructor(options: SensitiveWordsOptions);
-    filter(text: string): Promise<string>;
+    constructor(options: SensitiveWordsServiceOptions);
+    /**
+     * 处理文本，敏感词将被替换为 * 号。
+     */
+    process(text: string): Promise<string>;
 }
 declare module '../x' {
     interface X {

package/lib/services/sensitive_words.js

@@ -1,12 +1,20 @@
 import Mint from 'mint-filter';
+
+/**
+ * 敏感词服务。
+ */
 export class SensitiveWordsService {
   constructor(options) {
     this.options = options;
     this.serviceName = 'sensitiveWords';
     this.mint = void 0;
   }
+  /**
+   * 处理文本，敏感词将被替换为 * 号。
+   */
+
 
-  async filter(text) {
+  async process(text) {
     if (!this.mint) {
       this.mint = new Mint(this.options.words);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.26.5",
+  "version": "1.26.8",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",