@jayfong/x-server 2.12.14 → 2.12.16

package/lib/cli/build_util.js

@@ -8,7 +8,6 @@ import { dedent, uniq } from 'vtils';
 export class BuildUtil {
   static async build(options) {
     var _options$minify, _options$inlineEnvs;
-
     const mainFile = path.join(options.cwd, 'src/main.ts');
     const pkgFile = path.join(options.cwd, 'package.json');
     const pkgContent = await fs.readJson(pkgFile);
@@ -20,8 +19,9 @@ export class BuildUtil {
     const distNoInstallFile = path.join(distDir, 'no_install.lock');
     const distBundleFile = path.join(tempDir, `app.${pkgContent.version}.tgz`);
     await fs.ensureDir(distDir);
-    await fs.ensureDir(tempDir); // 处理 external
+    await fs.ensureDir(tempDir);
 
+    // 处理 external
     const external = uniq(options.external || []);
     const externalWithVersions = (await Promise.all(external.map(async item => {
       try {
@@ -39,17 +39,17 @@ export class BuildUtil {
           version: ''
         };
       }
-    }))).filter(item => !!item.version); // fix: hexoid 构建问题
+    }))).filter(item => !!item.version);
 
+    // fix: hexoid 构建问题
     try {
       const hexoidPackageJsonFile = require.resolve('hexoid/package.json');
-
       const pkg = await fs.readJson(hexoidPackageJsonFile);
       delete pkg.module;
       await fs.writeJson(hexoidPackageJsonFile, pkg);
-    } catch {} // 构建
-
+    } catch {}
 
+    // 构建
     await fs.emptyDir(distDir);
     await esbuild.build({
       entryPoints: [mainFile],
@@ -75,7 +75,6 @@ export class BuildUtil {
       },
       plugins: [{
         name: 'extract-assets',
-
         setup(build) {
           build.onLoad({
             filter: /\/svg-captcha\/lib\/option-manager\.js$/
@@ -114,30 +113,29 @@ export class BuildUtil {
             };
           });
         }
-
       }]
-    }); // 兼容 prisma
+    });
 
+    // 兼容 prisma
     const prismaSchemaFile = path.join(options.cwd, 'src/db/schema.prisma');
-
     if (await fs.pathExists(prismaSchemaFile)) {
       // 复制 schema.prisma
       const distPrismaSchemaFile = path.join(distDir, path.basename(prismaSchemaFile));
-      await fs.copyFile(prismaSchemaFile, distPrismaSchemaFile); // 复制查询引擎
+      await fs.copyFile(prismaSchemaFile, distPrismaSchemaFile);
 
+      // 复制查询引擎
       const libqueryEngineFiles = await globby('libquery_engine-*', {
         cwd: path.join(options.cwd, 'node_modules/.prisma/client'),
         ignore: ['libquery_engine-{darwin,windows}*'],
         onlyFiles: true,
         absolute: true
       });
-
       for (const libqueryEngineFile of libqueryEngineFiles) {
         await fs.copyFile(libqueryEngineFile, path.join(distDir, path.basename(libqueryEngineFile)));
       }
-    } // 写入 pkg
-
+    }
 
+    // 写入 pkg
     const deps = externalWithVersions.reduce((res, item) => {
       res[item.name] = item.version;
       return res;
@@ -147,8 +145,9 @@ export class BuildUtil {
       version: pkgContent.version,
       dependencies: deps
     };
-    await fs.writeJSON(distPkgFile, distPkgContent); // 写入 pm2 配置
+    await fs.writeJSON(distPkgFile, distPkgContent);
 
+    // 写入 pm2 配置
     await fs.writeFile(distPm2File, dedent`
         module.exports = {
           apps: [
@@ -160,7 +159,6 @@ export class BuildUtil {
           ],
         }
       `);
-
     if (externalWithVersions.length) {
       if (options.noInstall) {
         await fs.writeFile(distNoInstallFile, '');
@@ -177,10 +175,9 @@ export class BuildUtil {
           }
         });
       }
-    } // 打包为 tgz
-
+    }
 
+    // 打包为 tgz
     await compressing.tgz.compressDir(distDir, distBundleFile);
   }
-
 }

package/lib/cli/cli.js

@@ -6,6 +6,7 @@ import { ApiGenerator } from "./api_generator";
 import { BuildUtil } from "./build_util";
 import { castArray, debounce } from 'vtils';
 import { DeployUtil } from "./deploy_util";
+import { DevUtil } from "./dev_util";
 import { EnvUtil } from "./env_util";
 import { generateManyIndex } from 'vscode-generate-index-standalone';
 import { TemplateUtil } from "./template_util";
@@ -17,17 +18,19 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
 }).positional('npc', {
   describe: 'npc 地址及密钥，格式：地址@密钥',
   type: 'string'
+}).positional('tsx', {
+  describe: '使用 tsx 运行',
+  type: 'boolean'
 }), async argv => {
   process.env.NODE_ENV = 'development';
   let lastRun;
-
   const run = () => {
-    lastRun = execa('node', ['-r', require.resolve("./register"), 'src/main.ts'], {
+    lastRun = DevUtil.runFile({
+      file: 'src/main.ts',
       cwd: process.cwd(),
-      stdio: 'inherit'
+      runner: argv.tsx ? 'tsx' : 'esbuild-register'
     });
   };
-
   if (argv.npc) {
     const [server, vkey] = argv.npc.split('@');
     execa('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
@@ -35,10 +38,10 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
       stdio: 'inherit'
     });
   }
-
   await TemplateUtil.init(process.cwd());
   const watcher = chokidar.watch(['src', '.env', '.env.*'], {
-    cwd: process.cwd()
+    cwd: process.cwd(),
+    ignored: '**/*.test.*'
   });
   watcher.on('all', debounce(async () => {
     await EnvUtil.importFile({
@@ -58,7 +61,6 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
         console.log(`✔️ 索引文件已更新: ${filePath}`);
       }
     });
-
     if (lastRun) {
       console.log('==== 重启服务中 ====');
       lastRun.kill();
@@ -124,15 +126,14 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   await EnvUtil.importFile({
     cwd: process.cwd(),
     file: '.env'
-  }); // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
+  });
+  // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
   // https://github.com/motdotla/dotenv#override
-
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
   await execa('tnpx', ['prisma', ...argv._.slice(1), '--schema', 'src/db/schema.prisma'], {
     cwd: process.cwd(),
     stdio: 'inherit'
   });
-
   if (!argv.production) {
     await TemplateUtil.initModels(process.cwd());
   }
@@ -144,6 +145,9 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
   describe: '是否生产模式',
   type: 'boolean',
   default: false
+}).positional('tsx', {
+  describe: '使用 tsx 运行',
+  type: 'boolean'
 }), async argv => {
   process.env.NODE_ENV = argv.production ? 'production' : 'development';
   await EnvUtil.importFile({
@@ -151,16 +155,16 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     file: '.env'
   });
   process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
-
   if (!argv.script) {
     await execa('tnpx', ['select-run'], {
       cwd: process.cwd(),
       stdio: 'inherit'
     });
   } else {
-    await execa('node', ['-r', require.resolve("./register"), argv.script], {
+    await DevUtil.runFile({
+      file: argv.script,
       cwd: process.cwd(),
-      stdio: 'inherit'
+      runner: argv.tsx ? 'tsx' : 'esbuild-register'
     });
   }
 }).command('deploy [type]', '部署', _ => _.positional('type', {
@@ -172,7 +176,6 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
     cwd: process.cwd(),
     file: '.env.deploy'
   });
-
   if (argv.type === 'env') {
     const appEnv = await EnvUtil.parseFileAsMap({
       cwd: process.cwd(),

package/lib/cli/deploy_util.js

@@ -6,11 +6,9 @@ export class DeployUtil {
   static async deploy(options) {
     const pkgContent = await fs.readJson(path.join(options.cwd, 'package.json'));
     const appFile = path.join(options.cwd, `temp/app.${pkgContent.version}.tgz`);
-
     if (!(await fs.pathExists(appFile))) {
       throw new Error('请先构建');
     }
-
     const ssh = new NodeSSH();
     await ssh.connect({
       host: options.host,
@@ -44,7 +42,6 @@ export class DeployUtil {
     });
     ssh.dispose();
   }
-
   static async deployEnv(options) {
     const ssh = new NodeSSH();
     await ssh.connect({
@@ -68,5 +65,4 @@ export class DeployUtil {
     });
     ssh.dispose();
   }
-
 }

package/lib/cli/dev_util.d.ts

@@ -0,0 +1,8 @@
+import execa from 'execa';
+export declare class DevUtil {
+    static runFile(options: {
+        file: string;
+        cwd: string;
+        runner: 'esbuild-register' | 'tsx';
+    }): execa.ExecaChildProcess<string>;
+}

package/lib/cli/dev_util.js

@@ -0,0 +1,12 @@
+import execa from 'execa';
+export class DevUtil {
+  static runFile(options) {
+    return options.runner === 'tsx' ? execa('tsx', [options.file], {
+      cwd: options.cwd,
+      stdio: 'inherit'
+    }) : execa('node', ['-r', require.resolve("./esbuild_register"), options.file], {
+      cwd: options.cwd,
+      stdio: 'inherit'
+    });
+  }
+}

package/lib/cli/env_util.js

@@ -9,27 +9,21 @@ export class EnvUtil {
         const [devValue, prodValue] = value.split(/\s+\|\|\s+/);
         return devOrProd(() => EnvUtil.normalizeValue(devValue), () => EnvUtil.normalizeValue(prodValue));
       }
-
       return value === 'true' ? true : value === 'false' ? false : value.startsWith('[') && value.endsWith(']') || value.startsWith('{') && value.endsWith('}') ? JSON.parse(value) : isNumeric(value) ? Number(value) : value;
     } else if (value && typeof value === 'object') {
       if (value.dev != null && value.prod != null) {
         return devOrProd(() => value.dev, () => value.prod);
       }
-
       return value;
     }
-
     return value;
   }
-
   static parseContent(src, isYaml = false) {
     const envs = [];
-
     if (isYaml) {
       const envObj = yamlParse(src);
       Object.keys(envObj).forEach(key => {
         var _src$match;
-
         envs.push({
           key: key,
           value: this.normalizeValue(envObj[key]),
@@ -38,56 +32,54 @@ export class EnvUtil {
       });
     } else {
       // https://github.com/andreialecu/dotenv/blob/feat-multiline/lib/main.js
-      const multilineLineBreaks = true; // convert Buffers before splitting into lines and processing
+      const multilineLineBreaks = true;
 
+      // convert Buffers before splitting into lines and processing
       const lines = src.split(EnvUtil.NEWLINES_MATCH);
       let lastComment = '';
-
       for (let idx = 0; idx < lines.length; idx++) {
-        let line = lines[idx]; // matching "KEY' and 'VAL' in 'KEY=VAL'
-
-        const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL); // matched?
+        let line = lines[idx];
 
+        // matching "KEY' and 'VAL' in 'KEY=VAL'
+        const keyValueArr = line.match(EnvUtil.RE_INI_KEY_VAL);
+        // matched?
         if (keyValueArr != null) {
-          const key = keyValueArr[1]; // default undefined or missing values to empty string
-
+          const key = keyValueArr[1];
+          // default undefined or missing values to empty string
           let val = keyValueArr[2] || '';
           let end = val.length - 1;
           const isDoubleQuoted = val[0] === '"' && val[end] === '"';
           const isSingleQuoted = val[0] === "'" && val[end] === "'";
           const isMultilineDoubleQuoted = val[0] === '"' && (val.length === 1 || val[end] !== '"');
-          const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'"); // if parsing line breaks and the value starts with a quote
+          const isMultilineSingleQuoted = val[0] === "'" && (val.length === 1 || val[end] !== "'");
 
+          // if parsing line breaks and the value starts with a quote
           if (multilineLineBreaks && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
             const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
             val = val.substring(1);
-
             while (idx++ < lines.length - 1) {
               line = lines[idx];
               end = line.length - 1;
-
               if (line[end] === quoteChar) {
                 val += EnvUtil.NEWLINE + line.substring(0, end);
                 break;
               }
-
               val += EnvUtil.NEWLINE + line;
             }
-
-            val = dedent(val); // if single or double quoted, remove quotes
+            val = dedent(val);
+            // if single or double quoted, remove quotes
           } else if (isSingleQuoted || isDoubleQuoted) {
-            val = val.substring(1, end); // if double quoted, expand newlines
+            val = val.substring(1, end);
 
+            // if double quoted, expand newlines
             if (isDoubleQuoted) {
               val = val.replace(EnvUtil.RE_NEWLINES, EnvUtil.NEWLINE);
             }
-
             val = dedent(val);
           } else {
             // remove surrounding whitespace
             val = dedent(val).trim();
           }
-
           envs.push({
             key: key,
             value: EnvUtil.normalizeValue(val),
@@ -96,58 +88,47 @@ export class EnvUtil {
           lastComment = '';
         } else {
           const commentArr = line.match(EnvUtil.COMMENT_MATCH);
-
           if (commentArr) {
             lastComment = commentArr[1];
           }
         }
       }
     }
-
     return envs;
   }
-
   static async parseFile(options) {
     const envFile = path.join(options.cwd, options.file);
     const envYmlFile = path.join(options.cwd, `${options.file}.yml`);
     const envYamlFile = path.join(options.cwd, `${options.file}.yaml`);
     const file = (await fs.pathExists(envYmlFile)) ? envYmlFile : (await fs.pathExists(envYamlFile)) ? envYamlFile : (await fs.pathExists(envFile)) ? envFile : '';
-
     if (file) {
       const envContent = await fs.readFile(file, 'utf-8');
       const envs = EnvUtil.parseContent(envContent, /\.ya?ml$/i.test(file));
       return envs;
     }
-
     return [];
   }
-
   static async parseFileAsMap(options) {
     const envs = await EnvUtil.parseFile(options);
     const envsObj = {};
-
     for (const env of envs) {
       envsObj[env.key] = env.value;
     }
-
     return envsObj;
   }
-
   static async importFile(options) {
     const envs = await EnvUtil.parseFile(options);
     const envsObj = {};
-
     for (const env of envs) {
       envsObj[env.key] = env.value;
       process.env[env.key] = env.value;
     }
-
-    process.env.X_SERVER_ENVS = JSON.stringify({ // @ts-ignore
+    process.env.X_SERVER_ENVS = JSON.stringify({
+      // @ts-ignore
       ...JSON.parse(process.env.X_SERVER_ENVS || '{}'),
       ...envsObj
     });
   }
-
   static makeTypes(envs) {
     return dedent`
       declare namespace NodeJS {
@@ -168,14 +149,12 @@ export class EnvUtil {
       }
     `;
   }
-
   static async outputTypes(options) {
     const envs = await EnvUtil.parseFile(options);
     const outFile = path.join(options.cwd, options.outFile);
     const types = EnvUtil.makeTypes(envs);
     await fs.outputFile(outFile, types);
   }
-
 }
 EnvUtil.NEWLINE = '\n';
 EnvUtil.RE_INI_KEY_VAL = /^\s*([\w.-]+)\s*=\s*(.*)?\s*$/;

package/lib/cli/template_util.d.ts

@@ -15,4 +15,5 @@ export declare class TemplateUtil {
      * 初始化模型。
      */
     static initModels(cwd: string): Promise<void>;
+    static getPrismaClientTypeFile(): string;
 }

package/lib/cli/template_util.js

@@ -1,4 +1,5 @@
 import fs from 'fs-extra';
+import globby from 'globby';
 import path from 'path';
 import { camelCase, dedent, snakeCase, upperFirst } from 'vtils';
 import { generateManyIndex } from 'vscode-generate-index-standalone';
@@ -9,32 +10,39 @@ export class TemplateUtil {
   static async init(cwd) {
     await Promise.all([this.initHelperPackage(cwd), this.initTasks(cwd)]);
   }
+
   /**
    * 初始化辅助包。
    */
-
-
   static async initHelperPackage(cwd) {
+    const prismaClientFile = TemplateUtil.getPrismaClientTypeFile();
     const fromDir = path.join(__dirname, 'templates');
     const toDir = path.join(cwd, 'node_modules/.x');
-    await fs.copy(fromDir, toDir, {
-      overwrite: true
+    const fromFiles = await globby('*', {
+      cwd: fromDir,
+      onlyFiles: true,
+      absolute: true
     });
+    await fs.ensureDir(toDir);
+    await Promise.all(fromFiles.map(async fromFile => {
+      const toFile = fromFile.replace(fromDir, toDir);
+      let fromFileContent = await fs.readFile(fromFile, 'utf-8');
+      fromFileContent = fromFileContent.replaceAll('../.prisma/client/index.d.ts', path.relative(toDir, prismaClientFile)).replaceAll('../../src', path.relative(toDir, `${cwd}/src`));
+      await fs.writeFile(toFile, fromFileContent);
+    }));
     await generateManyIndex({
       cwd: cwd,
       patterns: ['node_modules/.x/*.ts'],
       replaceFile: true
     });
   }
+
   /**
    * 初始化任务。
    */
-
-
   static async initTasks(cwd) {
     const tasksDir = path.join(cwd, 'src/tasks');
     const tasksIndexFile = path.join(tasksDir, 'index.ts');
-
     if (!(await fs.pathExists(tasksIndexFile))) {
       await fs.outputFile(tasksIndexFile, dedent`
           // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
@@ -42,23 +50,21 @@ export class TemplateUtil {
         `);
     }
   }
+
   /**
    * 初始化模型。
    */
-
-
   static async initModels(cwd) {
     const modelsDir = path.join(cwd, 'src/models');
     const indexFile = path.join(modelsDir, 'index.ts');
     const indexFile2 = path.join(cwd, 'node_modules/.x/models.ts');
-    const prismaClientFile = path.join(cwd, 'node_modules/.prisma/client/index.d.ts');
+    const prismaClientFile = TemplateUtil.getPrismaClientTypeFile();
     const prismaClientFileContent = await fs.readFile(prismaClientFile, 'utf8');
     const modelNames = [...prismaClientFileContent.match(/(?<=const ModelName:).+?(?=\})/s)[0].matchAll(/(\S+?):/g)].map(match => camelCase(match[1]));
     await Promise.all(modelNames.map(async modelName => {
       const model_name = snakeCase(modelName);
       const ModelName = upperFirst(modelName);
       const modelFile = path.join(modelsDir, `${model_name}.ts`);
-
       if (!(await fs.pathExists(modelFile))) {
         await fs.outputFile(modelFile, dedent`
               import { ${ModelName}BaseModel } from '@jayfong/x-server'
@@ -69,19 +75,25 @@ export class TemplateUtil {
             `);
       }
     }));
-
     if (!(await fs.pathExists(indexFile))) {
       await fs.outputFile(indexFile, dedent`
           // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
           // @endindex
         `);
     }
-
     await generateManyIndex({
       cwd: cwd,
       patterns: [indexFile, indexFile2],
       replaceFile: true
     });
   }
-
+  static getPrismaClientTypeFile() {
+    // const prismaClientFile = path.join(
+    //   cwd,
+    //   'node_modules/.prisma/client/index.d.ts',
+    // )
+    // 用 require.resolve 以兼容 pnpm
+    const prismaClientFile = require.resolve('@prisma/client/package.json').replace('@prisma/client/package.json', '.prisma/client/index.d.ts');
+    return prismaClientFile;
+  }
 }

package/lib/core/define_bus.js

@@ -1,18 +1,18 @@
 import { EventEmitter } from 'node:events';
-
 class EventBus extends EventEmitter {
   onReturnOff(event, listener) {
     this.on(event, listener);
     return () => this.off(event, listener);
   }
-
 }
-
 export function defineBus() {
   const eventEmitter = new EventBus();
   return eventEmitter;
-} // strict-event-emitter-types
+}
+
+// strict-event-emitter-types
 // https://github.com/bterlson/strict-event-emitter-types/blob/9ed45fc68a69f0b7f85ce4e5fe11ff53cc6a009e/src/index.ts
+
 // the overridden signatures need to be assignment compatible, but
 // due to how tuple types work[0] it's not possible to be assignment
 // compatible anymore. This hack fixes it with a unique symbol that
@@ -20,4 +20,6 @@ export function defineBus() {
 //
 // Unfortunately, this has the result of giving a poor error message when
 // you mix up types.
-// 0: https://github.com/Microsoft/TypeScript/issues/26013)
+// 0: https://github.com/Microsoft/TypeScript/issues/26013)
+// TODO: Stash under a symbol key once TS compiler bug is fixed
+// EventEmitter method overrides

package/lib/core/define_handler.js

@@ -1,35 +1,36 @@
 import { Handler } from "./handler";
 export function defineHandler(options) {
-  const handler = new Handler({ ...options,
+  const handler = new Handler({
+    ...options,
     requestMethod: 'POST'
   });
   return handler;
 }
 defineHandler.POST = defineHandler;
-
 defineHandler.GET = options => {
-  const handler = new Handler({ ...options,
+  const handler = new Handler({
+    ...options,
     requestMethod: 'GET'
   });
   return handler;
 };
-
 defineHandler.FILE = options => {
-  const handler = new Handler({ ...options,
+  const handler = new Handler({
+    ...options,
     requestMethod: 'FILE'
   });
   return handler;
 };
-
 defineHandler.WS = options => {
-  const handler = new Handler({ ...options,
+  const handler = new Handler({
+    ...options,
     requestMethod: 'WS'
   });
   return handler;
 };
-
 defineHandler.XML = options => {
-  const handler = new Handler({ ...options,
+  const handler = new Handler({
+    ...options,
     requestMethod: 'XML'
   });
   return handler;

package/lib/core/define_task.js

@@ -4,7 +4,8 @@ import { ms } from 'vtils';
 import { x } from "../x";
 export function defineTask(options) {
   const queue = new Queue(options.name, {
-    redis: { ...x.redis.options,
+    redis: {
+      ...x.redis.options,
       // https://github.com/OptimalBits/bull/issues/2186
       maxRetriesPerRequest: null,
       enableReadyCheck: false
@@ -28,7 +29,6 @@ export function defineSliceTask(options) {
     handle: async data => {
       const res = data.count ? await x.redis.multi([['lrange', data.redisKey, `-${data.count}`, '-1'], ['ltrim', data.redisKey, '0', `-${data.count + 1}`]]).exec() : await x.redis.multi([['lrange', data.redisKey, '0', '-1'], ['del', data.redisKey]]).exec();
       const list = res[0][1].reverse().map(item => JSON.parse(item));
-
       if (list.length) {
         return options.handle(list, data.key);
       }
@@ -44,9 +44,10 @@ export function defineSliceTask(options) {
       assert(duration != null || threshold != null, '参数 threshold 和 duration 必须至少设置 1 个');
       const redisKey = !key ? redisKeyPrefix : `${redisKeyPrefix}_${key}`;
       const res = await x.redis.multi([['llen', redisKey], ['lpush', redisKey, JSON.stringify(data)]]).exec();
-      const count = parseInt(res[0][1], 10) + 1; // 仅时段
-      // 1分钟内的合并推送
+      const count = parseInt(res[0][1], 10) + 1;
 
+      // 仅时段
+      // 1分钟内的合并推送
       if (duration != null) {
         if (count === 1) {
           await task.add({
@@ -56,7 +57,8 @@ export function defineSliceTask(options) {
             delay: duration
           });
         }
-      } // 仅阈值
+      }
+      // 仅阈值
       // 满10条推送
       else if (threshold != null) {
         if (thresholdTimeout) {
@@ -70,7 +72,6 @@ export function defineSliceTask(options) {
             delay: thresholdTimeout
           });
         }
-
         if (count === threshold) {
           await task.add({
             key: key,