@aomex/cron 3.1.1 → 3.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,25 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [3.2.1](https://github.com/aomex/aomex/compare/v3.2.0...v3.2.1) (2024-09-17)
7
+
8
+
9
+ ### Performance Improvements
10
+
11
+ * **cron:** 美化终端列表 ([5b18187](https://github.com/aomex/aomex/commit/5b18187b1c8f94fa290c52ad74c0a15d791ea4dc))
12
+
13
+
14
+
15
+
16
+
17
+ # [3.2.0](https://github.com/aomex/aomex/compare/v3.1.1...v3.2.0) (2024-09-17)
18
+
19
+ **Note:** Version bump only for package @aomex/cron
20
+
21
+
22
+
23
+
24
+
6
25
  ## [3.1.1](https://github.com/aomex/aomex/compare/v3.1.0...v3.1.1) (2024-09-13)
7
26
 
8
27
  **Note:** Version bump only for package @aomex/cron
package/dist/index.d.ts CHANGED
@@ -14,7 +14,6 @@ declare module '@aomex/core' {
14
14
  not_started: I18nMessage<{
15
15
  port: number;
16
16
  }>;
17
- use_stop: I18nMessage;
18
17
  };
19
18
  }
20
19
  }
@@ -93,13 +92,12 @@ type ScheduleOptions = (ScheduleTimeObject | ScheduleTimeString) & {
93
92
  concurrent?: number;
94
93
  };
95
94
  type ServerWriteData = {
96
- list: string[];
97
- } | {
98
- done: string;
95
+ runningPIDs: string[];
99
96
  } | {
100
97
  runners: {
101
98
  pid: string;
102
- argv: string[];
99
+ command: string;
100
+ schedule: string;
103
101
  }[];
104
102
  };
105
103
 
package/dist/index.js CHANGED
@@ -5,8 +5,7 @@ i18n.register("zh_CN", "cron", {
5
5
  start: "\u542F\u52A8\u5B9A\u65F6\u4EFB\u52A1",
6
6
  stop: "\u9000\u51FA\u5B9A\u65F6\u4EFB\u52A1",
7
7
  stats: "\u67E5\u770B\u5B9A\u65F6\u4EFB\u52A1\u6267\u884C\u72B6\u6001",
8
- not_started: "\u5B9A\u65F6\u4EFB\u52A1\u672A\u542F\u52A8\uFF0C\u7AEF\u53E3\uFF1A{{port}}",
9
- use_stop: '\u6267\u884C\u4E2D\u7684\u4EFB\u52A1\u4E5F\u4F1A\u88AB\u5F3A\u5236\u4E2D\u65AD\uFF0C\u56E0\u6B64\u63A8\u8350\u4F7F\u7528\u6307\u4EE4 "aomex cron:stop" \u7ED3\u675F\u5B9A\u65F6\u4EFB\u52A1'
8
+ not_started: "\u5B9A\u65F6\u4EFB\u52A1\u672A\u542F\u52A8\uFF0C\u7AEF\u53E3\uFF1A{{port}}"
10
9
  });
11
10
 
12
11
  // src/i18n/locales/en-us.ts
@@ -16,8 +15,7 @@ i18n2.register("en_US", "cron", {
16
15
  start: "Start cron jobs",
17
16
  stop: "Stop cron jobs",
18
17
  stats: "Show cron jobs stats",
19
- not_started: "cron not started with port: {{port}}",
20
- use_stop: 'Recommend using command "aomex cron:stop" to stop cron in favor of waiting executing jobs'
18
+ not_started: "cron not started with port: {{port}}"
21
19
  });
22
20
 
23
21
  // src/middleware/cron.middleware.ts
@@ -275,7 +273,6 @@ var DEFAULT_PORT = 9786;
275
273
  var CONNECT_REFUSED = "ECONNREFUSED";
276
274
 
277
275
  // src/middleware/start.middleware.ts
278
- import { styleText } from "node:util";
279
276
  var commandName = "cron:start";
280
277
  var start = (opts) => {
281
278
  return middleware.console({
@@ -295,23 +292,33 @@ var start = (opts) => {
295
292
  if (!job.runningLevel) {
296
293
  clearInterval(timer);
297
294
  resolve(void 0);
298
- callback(job, --remain);
295
+ callback(--remain);
299
296
  }
300
297
  }, 300);
301
298
  });
302
299
  })
303
300
  );
304
301
  };
302
+ const collectRunners = () => {
303
+ return jobs.reduce(
304
+ (carry, job) => carry.concat(
305
+ job.getPIDs().map((pid) => ({
306
+ pid,
307
+ command: job.schedule.argv.join(" "),
308
+ schedule: job.schedule.time
309
+ }))
310
+ ),
311
+ []
312
+ );
313
+ };
305
314
  const sendStopMessages = async (socket) => {
306
315
  socket.write(
307
- JSON.stringify({
308
- list: schedules.map((item) => item.toCrontab())
309
- }) + "\n"
316
+ JSON.stringify({ runners: collectRunners() }) + "\n"
310
317
  );
311
- await stopJobs((job) => {
318
+ await stopJobs(() => {
312
319
  socket.write(
313
320
  JSON.stringify({
314
- done: job.schedule.toCrontab()
321
+ runningPIDs: jobs.flatMap((job) => job.getPIDs())
315
322
  }) + "\n"
316
323
  );
317
324
  });
@@ -319,17 +326,7 @@ var start = (opts) => {
319
326
  };
320
327
  const sendStatsMessage = (socket) => {
321
328
  socket.write(
322
- JSON.stringify({
323
- runners: jobs.reduce(
324
- (carry, job) => carry.concat(
325
- job.getPIDs().map((pid) => ({
326
- pid,
327
- argv: job.schedule.argv
328
- }))
329
- ),
330
- []
331
- )
332
- }) + "\n"
329
+ JSON.stringify({ runners: collectRunners() }) + "\n"
333
330
  );
334
331
  };
335
332
  const server = net.createServer(async (socket) => {
@@ -346,12 +343,11 @@ var start = (opts) => {
346
343
  });
347
344
  server.listen(opts.port || DEFAULT_PORT);
348
345
  process.once("SIGINT", async () => {
349
- console.warn(styleText("yellowBright", i18n3.t("cron.use_stop")));
350
346
  stopJobs(() => {
351
347
  });
352
348
  });
353
349
  await Promise.all(jobs.map((job) => job.start()));
354
- await stopJobs((_, remain) => {
350
+ await stopJobs((remain) => {
355
351
  if (!remain) server.close();
356
352
  });
357
353
  },
@@ -386,10 +382,12 @@ var eject = (opts) => {
386
382
  };
387
383
 
388
384
  // src/middleware/stop.middleware.ts
385
+ import { terminal } from "@aomex/console";
389
386
  import { i18n as i18n5, middleware as middleware3 } from "@aomex/core";
390
387
  import net2 from "node:net";
391
- import Spinnies from "spinnies";
392
- import { styleText as styleText2 } from "node:util";
388
+ import { bytes, sleep } from "@aomex/internal-tools";
389
+ import formatDuration from "format-duration";
390
+ import pidusage from "pidusage";
393
391
  var commandName3 = "cron:stop";
394
392
  var stop = (opts) => {
395
393
  return middleware3.console({
@@ -400,33 +398,106 @@ var stop = (opts) => {
400
398
  const client = net2.createConnection({ port: PORT }, () => {
401
399
  client.write(commandName3);
402
400
  });
403
- const spinner = new Spinnies();
401
+ const logSession = terminal.applySession();
402
+ let runners = [];
403
+ let timer;
404
+ (function loop() {
405
+ timer = setTimeout(async () => {
406
+ let stats2;
407
+ try {
408
+ const pids = runners.filter(({ status }) => status === "loading").map(({ pid }) => pid);
409
+ stats2 = pids.length ? await pidusage(pids) : {};
410
+ } catch {
411
+ stats2 = {};
412
+ }
413
+ runners = runners.map((runner) => {
414
+ if (runner.status === "success") return runner;
415
+ const stat = stats2[runner.pid];
416
+ if (!stat) return runner;
417
+ return {
418
+ ...runner,
419
+ cpu: stat.cpu,
420
+ memory: stat.memory,
421
+ elapsed: stat.elapsed
422
+ };
423
+ }).sort((a, b) => b.elapsed - a.elapsed);
424
+ if (runners.length) {
425
+ logSession.update(
426
+ terminal.generateTable(
427
+ [
428
+ ["", "PID", "COMMAND", "SCHEDULE", "CPU", "MEMORY", "TIME"],
429
+ ...runners.map(
430
+ ({ pid, command, schedule: schedule2, elapsed, cpu, memory, status }) => {
431
+ return [
432
+ `:${status}:`,
433
+ pid,
434
+ command.padEnd(24, " "),
435
+ schedule2,
436
+ `${cpu.toFixed(2)}%`,
437
+ bytes(memory),
438
+ formatDuration(elapsed, { leading: true })
439
+ ];
440
+ }
441
+ )
442
+ ],
443
+ {
444
+ columnDefault: { paddingRight: 4 },
445
+ columns: {
446
+ 0: { paddingLeft: 0, paddingRight: 0 },
447
+ 2: { paddingRight: 1, width: 24, wrapWord: true }
448
+ },
449
+ drawVerticalLine: () => false,
450
+ drawHorizontalLine: () => false
451
+ }
452
+ ).replace(/^\s+/, " ")
453
+ );
454
+ }
455
+ if (runners.every((item) => item.status === "success")) {
456
+ logSession.commit();
457
+ client.destroy();
458
+ } else {
459
+ loop();
460
+ }
461
+ }, 100);
462
+ })();
463
+ process.once("SIGINT", () => {
464
+ clearTimeout(timer);
465
+ client.destroy();
466
+ });
404
467
  await new Promise((resolve, reject) => {
405
468
  client.on("close", resolve);
406
469
  client.on("error", (err) => {
407
470
  if (err.code === CONNECT_REFUSED) {
408
- console.warn(styleText2("yellow", i18n5.t("cron.not_started", { port: PORT })));
471
+ terminal.printWarning(i18n5.t("cron.not_started", { port: PORT }));
409
472
  resolve(void 0);
410
473
  } else {
411
474
  reject(err);
412
475
  }
413
476
  });
414
- client.on("data", (data) => {
415
- data.toString().split("\n").filter(Boolean).forEach((stringifyData) => {
416
- const json = JSON.parse(stringifyData);
417
- if ("list" in json) {
418
- json.list.forEach((item) => {
419
- spinner.add(item, { text: item });
477
+ client.on("data", async (data) => {
478
+ for (const stringifyData of data.toString().split("\n").filter(Boolean)) {
479
+ const jsonData = JSON.parse(stringifyData);
480
+ if ("runners" in jsonData) {
481
+ runners = jsonData.runners.map((runner) => {
482
+ return {
483
+ ...runner,
484
+ cpu: 0,
485
+ memory: 0,
486
+ elapsed: 0,
487
+ status: "loading"
488
+ };
489
+ });
490
+ } else if ("runningPIDs" in jsonData) {
491
+ runners.forEach((item) => {
492
+ if (!jsonData.runningPIDs.includes(item.pid)) {
493
+ item.status = "success";
494
+ }
420
495
  });
421
- } else if ("done" in json) {
422
- spinner.succeed(json.done);
423
- if (!spinner.hasActiveSpinners()) {
424
- client.destroy();
425
- }
426
496
  }
427
- });
497
+ }
428
498
  });
429
499
  });
500
+ await sleep(300);
430
501
  },
431
502
  help: {
432
503
  onDocument(doc) {
@@ -437,12 +508,12 @@ var stop = (opts) => {
437
508
  };
438
509
 
439
510
  // src/middleware/stats.middleware.ts
511
+ import { terminal as terminal2 } from "@aomex/console";
440
512
  import { i18n as i18n6, middleware as middleware4 } from "@aomex/core";
441
513
  import net3 from "node:net";
442
- import Spinnies2 from "spinnies";
443
- import pidusage from "pidusage";
444
- import { bytes } from "@aomex/internal-tools";
445
- import { styleText as styleText3 } from "node:util";
514
+ import pidusage2 from "pidusage";
515
+ import { bytes as bytes2 } from "@aomex/internal-tools";
516
+ import formatDuration2 from "format-duration";
446
517
  var commandName4 = "cron:stats";
447
518
  var stats = (opts) => {
448
519
  return middleware4.console({
@@ -454,7 +525,7 @@ var stats = (opts) => {
454
525
  client.write(commandName4);
455
526
  const timer = setInterval(() => {
456
527
  client.write(commandName4);
457
- }, 800);
528
+ }, 600);
458
529
  client.on("error", () => {
459
530
  clearInterval(timer);
460
531
  });
@@ -462,14 +533,12 @@ var stats = (opts) => {
462
533
  clearInterval(timer);
463
534
  });
464
535
  });
465
- const spinner = new Spinnies2();
466
- spinner.add("default", { text: "Running jobs count: 0" });
467
- let lastPIDs = [];
536
+ const logSession = terminal2.applySession();
468
537
  await new Promise((resolve, reject) => {
469
538
  client.on("close", resolve);
470
539
  client.on("error", (err) => {
471
540
  if (err.code === CONNECT_REFUSED) {
472
- console.warn(styleText3("yellow", i18n6.t("cron.not_started", { port: PORT })));
541
+ terminal2.printWarning(i18n6.t("cron.not_started", { port: PORT }));
473
542
  resolve(void 0);
474
543
  } else {
475
544
  reject(err);
@@ -477,34 +546,46 @@ var stats = (opts) => {
477
546
  });
478
547
  client.on("data", async (data) => {
479
548
  for (const stringifyData of data.toString().split("\n").filter(Boolean)) {
480
- const json = JSON.parse(stringifyData);
481
- if (!("runners" in json)) return;
482
- spinner.update("default", {
483
- text: `Running jobs count: ${json.runners.length}`
484
- });
485
- const pids = json.runners.map((item) => item.pid);
486
- lastPIDs.forEach((pid) => {
487
- if (!pids.includes(pid)) {
488
- spinner.remove("pid-" + pid);
489
- }
490
- });
549
+ const jsonData = JSON.parse(stringifyData);
550
+ if (!("runners" in jsonData)) return;
491
551
  let stats2;
492
552
  try {
493
- stats2 = await pidusage([...pids]);
553
+ stats2 = await pidusage2(jsonData.runners.map((item) => item.pid));
494
554
  } catch {
495
555
  stats2 = {};
496
556
  }
497
- json.runners.forEach(({ pid, argv }) => {
498
- const stat = stats2[pid] || { cpu: 0, memory: 0, elapsed: 0 };
499
- const msg = argv.join(" ") + // 使用中文会导致文字显示不全
500
- ` (cpu: ${Math.round(stat.cpu * 1e3) / 1e3}%, memory: ${bytes(stat.memory)}, time: ${stat.elapsed / 1e3}s, pid: ${pid})`;
501
- if (lastPIDs.includes(pid)) {
502
- spinner.update("pid-" + pid, { text: msg, status: "non-spinnable" });
503
- } else {
504
- spinner.add("pid-" + pid, { text: msg, status: "non-spinnable" });
505
- }
506
- });
507
- lastPIDs = pids;
557
+ logSession.update(
558
+ terminal2.generateTable(
559
+ [
560
+ ["PID", "COMMAND", "SCHEDULE", "CPU", "MEMORY", "TIME"],
561
+ ...jsonData.runners.map((runner) => {
562
+ const stat = stats2[runner.pid] || { cpu: 0, memory: 0, elapsed: 0 };
563
+ return { ...runner, ...stat };
564
+ }).sort((a, b) => b.elapsed - a.elapsed).map(({ pid, command, schedule: schedule2, elapsed, cpu, memory }) => {
565
+ return [
566
+ pid,
567
+ command.padEnd(24, " "),
568
+ schedule2,
569
+ `${cpu.toFixed(2)}%`,
570
+ bytes2(memory),
571
+ formatDuration2(elapsed, { leading: true })
572
+ ];
573
+ })
574
+ ],
575
+ {
576
+ columnDefault: { paddingRight: 4 },
577
+ columns: {
578
+ 1: {
579
+ paddingRight: 1,
580
+ width: 24,
581
+ wrapWord: true
582
+ }
583
+ },
584
+ drawVerticalLine: () => false,
585
+ drawHorizontalLine: () => false
586
+ }
587
+ )
588
+ );
508
589
  }
509
590
  });
510
591
  });
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/i18n/locales/zh-cn.ts","../src/i18n/locales/en-us.ts","../src/middleware/cron.middleware.ts","../src/middleware/start.middleware.ts","../src/lib/collect-schedule.ts","../src/middleware/schedule.middleware.ts","../src/lib/schedule-parser.ts","../src/lib/job.ts","../src/lib/constant.ts","../src/middleware/eject.middleware.ts","../src/middleware/stop.middleware.ts","../src/middleware/stats.middleware.ts"],"sourcesContent":["import { i18n } from '@aomex/core';\n\ni18n.register('zh_CN', 'cron', {\n eject: '导出定时任务列表',\n start: '启动定时任务',\n stop: '退出定时任务',\n stats: '查看定时任务执行状态',\n not_started: '定时任务未启动,端口:{{port}}',\n use_stop: '执行中的任务也会被强制中断,因此推荐使用指令 \"aomex cron:stop\" 结束定时任务',\n});\n","import { i18n } from '@aomex/core';\n\ni18n.register('en_US', 'cron', {\n eject: 'Eject cron jobs list',\n start: 'Start cron jobs',\n stop: 'Stop cron jobs',\n stats: 'Show cron jobs stats',\n not_started: 'cron not started with port: {{port}}',\n use_stop:\n 'Recommend using command \"aomex cron:stop\" to stop cron in favor of waiting executing jobs',\n});\n","import { compose, middleware } from '@aomex/core';\nimport type { ConsoleMiddleware } from '@aomex/console';\nimport { start } from './start.middleware';\nimport { eject } from './eject.middleware';\nimport type { CronOptions } from '../lib/type';\nimport { stop } from './stop.middleware';\nimport { stats } from './stats.middleware';\n\nexport const cron = (options: string | CronOptions): ConsoleMiddleware => {\n const opts: CronOptions =\n typeof options === 'string' ? { commanders: options } : options;\n const middlewareList = [start(opts), eject(opts), stop(opts), stats(opts)];\n const fn = compose(middlewareList);\n\n return middleware.console({\n fn,\n help: {\n async onDocument(_, { children }) {\n await children(middlewareList);\n },\n async postDocument(_, { children }) {\n await children(middlewareList);\n },\n },\n });\n};\n","import { i18n, middleware } from '@aomex/core';\nimport { collectSchedules } from '../lib/collect-schedule';\nimport { Job } from '../lib/job';\nimport type { CronOptions, ServerWriteData } from '../lib/type';\nimport net, { Socket } from 'node:net';\nimport { DEFAULT_PORT } from '../lib/constant';\nimport { styleText } from 'node:util';\n\nconst commandName = 'cron:start';\n\nexport const start = (opts: CronOptions) => {\n return middleware.console({\n fn: async (ctx, next) => {\n if (ctx.input.command !== commandName) return next();\n\n ctx.commandMatched = true;\n const schedules = await collectSchedules(opts);\n\n if (!schedules.length) return;\n\n const jobs = schedules.map((schedule) => new Job(schedule));\n\n const stopJobs = async (callback: (job: Job, remain: number) => void) => {\n jobs.forEach((job) => job.stop());\n let remain = jobs.length;\n await Promise.all(\n jobs.map((job) => {\n return new Promise((resolve) => {\n const timer = setInterval(() => {\n if (!job.runningLevel) {\n clearInterval(timer);\n resolve(void 0);\n callback(job, --remain);\n }\n }, 300);\n });\n }),\n );\n };\n\n const sendStopMessages = async (socket: Socket) => {\n socket.write(\n JSON.stringify({\n list: schedules.map((item) => item.toCrontab()),\n } satisfies ServerWriteData) + '\\n',\n );\n await stopJobs((job) => {\n socket.write(\n JSON.stringify({\n done: job.schedule.toCrontab(),\n } satisfies ServerWriteData) + '\\n',\n );\n });\n socket.destroy();\n };\n\n const sendStatsMessage = (socket: Socket) => {\n socket.write(\n JSON.stringify({\n runners: jobs.reduce<{ pid: string; argv: string[] }[]>(\n (carry, job) =>\n carry.concat(\n job.getPIDs().map((pid) => ({\n pid,\n argv: job.schedule.argv,\n })),\n ),\n [],\n ),\n } satisfies ServerWriteData) + '\\n',\n );\n };\n\n const server = net.createServer(async (socket) => {\n socket.on('data', async (data) => {\n switch (data.toString()) {\n case 'cron:stop':\n await sendStopMessages(socket);\n break;\n case 'cron:stats':\n sendStatsMessage(socket);\n break;\n }\n });\n });\n server.listen(opts.port || DEFAULT_PORT);\n\n // CTRL + C\n // 子进程也会被立即杀死,但是job.start仍然在生产任务\n process.once('SIGINT', async () => {\n console.warn(styleText('yellowBright', i18n.t('cron.use_stop')));\n stopJobs(() => {});\n });\n\n await Promise.all(jobs.map((job) => job.start()));\n // 确保执行中的任务已经完成\n await stopJobs((_, remain) => {\n if (!remain) server.close();\n });\n },\n help: {\n onDocument(doc) {\n doc[commandName] = { summary: i18n.t('cron.start') };\n },\n },\n });\n};\n","import { Commander } from '@aomex/console';\nimport { pathToFiles, getFileValues } from '@aomex/internal-file-import';\nimport { ScheduleMiddleware } from '../middleware/schedule.middleware';\nimport { ScheduleParser } from './schedule-parser';\nimport type { CronOptions } from './type';\n\nexport const collectSchedules = async (opts: CronOptions) => {\n const files = await pathToFiles(opts.commanders);\n const commanders = await getFileValues<Commander>(\n files,\n (item) => !!item && item instanceof Commander,\n );\n const schedules: ScheduleParser[] = [];\n for (const commander of commanders) {\n for (const builder of commander['builders']) {\n for (const middleware of builder['middlewareList']) {\n if (middleware instanceof ScheduleMiddleware) {\n schedules.push(\n new ScheduleParser({\n ...opts,\n ...middleware['options'],\n command: builder.commands[0]!,\n }),\n );\n }\n }\n }\n }\n return schedules;\n};\n","import { ConsoleMiddleware } from '@aomex/console';\nimport type { ScheduleOptions } from '../lib/type';\n\nexport class ScheduleMiddleware extends ConsoleMiddleware<object> {\n constructor(protected readonly options: ScheduleOptions) {\n super(async (_, next) => next());\n }\n}\n\n/**\n * 创建一个定时任务\n *\n * 如果传递字符串,则为cron时间表达式(支持秒)。如:`1-10,20 * * * *`\n */\nexport const schedule = (options: ScheduleOptions | string): ScheduleMiddleware => {\n return new ScheduleMiddleware(\n typeof options === 'string' ? { time: options } : options,\n );\n};\n","import { scriptName } from '@aomex/console';\nimport { CacheMemoryAdapter, Caching } from '@aomex/cache';\nimport type { CronOptions, ScheduleOptions } from './type';\nimport cronParser from 'cron-parser';\n\nexport class ScheduleParser {\n protected _time?: string;\n protected _seconds?: number[];\n protected _argv?: string[];\n protected _cache?: Caching;\n\n constructor(\n protected readonly options: ScheduleOptions & CronOptions & { command: string },\n ) {}\n\n public get command(): string {\n return this.options.command;\n }\n\n public get concurrent(): number {\n return Math.max(1, this.options.concurrent || 1);\n }\n\n public get cache(): Caching {\n return (this._cache ??= this.options.cache || new Caching(new CacheMemoryAdapter()));\n }\n\n public get time(): string {\n return (this._time ??= (() => {\n const { options } = this;\n if ('time' in options) {\n const expression = options.time;\n try {\n const handle = cronParser.parseExpression(expression);\n const arr = expression.split(/\\s+/);\n return arr.length < 5 ? handle.stringify(false) : arr.join(' ');\n } catch {\n throw new Error(`时间表达式不合法:${expression}`);\n }\n }\n\n const arr = [\n options.minute ?? '*',\n options.hour ?? '*',\n options.dayOfMonth ?? '*',\n options.month ?? '*',\n options.dayOfWeek ?? '*',\n ];\n options.second && arr.unshift(options.second);\n return arr.join(' ');\n })());\n }\n\n public get argv(): string[] {\n return (this._argv ??= [this.options.command, ...(this.options.args || [])].map(\n String,\n ));\n }\n\n public toCrontab(): string {\n return [\n this.time,\n scriptName,\n ...this.argv.map((value) => (value.includes(' ') ? `\"${value}\"` : value)),\n ].join(' ');\n }\n\n toJSON() {\n return {\n command: this.command,\n time: this.time,\n argv: this.argv,\n concurrent: this.concurrent,\n };\n }\n}\n","import cronParser from 'cron-parser';\nimport type { ScheduleParser } from './schedule-parser';\nimport { spawn } from 'node:child_process';\nimport type { Caching } from '@aomex/cache';\n\nexport class Job {\n public runningLevel: number = 0;\n public readonly runningKey: string;\n public readonly cronExpression: cronParser.CronExpression;\n public readonly cache: Caching;\n public handle: { timer: NodeJS.Timeout; resolve: (data: void) => void } | null = null;\n public stopping = false;\n public readonly processData: {\n execArgv: string[];\n node: string;\n filePath: string;\n cwd: string;\n env: NodeJS.ProcessEnv;\n };\n protected childPIDs = new Set<string>();\n\n constructor(public readonly schedule: ScheduleParser) {\n this.runningKey = `cron-job|arg:${schedule.argv}|exp:${schedule.time}|con:${schedule.concurrent}`;\n this.cronExpression = cronParser.parseExpression(this.schedule.time);\n this.cache = schedule.cache;\n this.processData = {\n execArgv: [...process.execArgv],\n node: process.argv0,\n filePath: process.argv[1]!,\n cwd: process.cwd(),\n env: process.env,\n };\n }\n\n async start(): Promise<void> {\n if (!this.cronExpression.hasNext()) return;\n const nextTime = this.cronExpression.next().getTime();\n\n while (true) {\n /**\n * setTimeout的最大延时值是 `2^31-1`(约为24.85天) ,超过这个值会被立即执行。\n * 拆分延时值可让执行时机更精确。\n */\n const delta = Math.min(3600_000, nextTime - Date.now());\n await this.delay(delta);\n if (this.stopping) return;\n if (nextTime - Date.now() <= 0) {\n // 不要使用`await`语法,因为需要立即进入下一个循环\n this.consume(nextTime);\n break;\n }\n }\n\n return this.start();\n }\n\n delay(delta: number) {\n return new Promise((resolve) => {\n const timer = setTimeout(() => {\n this.handle = null;\n resolve(undefined);\n }, delta);\n this.handle = { timer, resolve };\n });\n }\n\n stop() {\n this.stopping = true;\n if (this.handle) {\n clearTimeout(this.handle.timer);\n this.handle.resolve();\n }\n }\n\n getPIDs() {\n return [...this.childPIDs];\n }\n\n async consume(time: number) {\n try {\n ++this.runningLevel;\n if (!(await this.win(time))) return;\n const pong = this.ping();\n try {\n await this.runChildProcess();\n } finally {\n await pong();\n }\n } finally {\n --this.runningLevel;\n }\n }\n\n async runChildProcess() {\n return new Promise((resolve) => {\n const childProcess = spawn(\n this.processData.node,\n [...this.processData.execArgv, this.processData.filePath, ...this.schedule.argv],\n {\n cwd: this.processData.cwd,\n env: this.processData.env,\n stdio: 'pipe',\n },\n );\n\n const pid = childProcess.pid?.toString();\n pid && this.childPIDs.add(pid);\n\n childProcess.stdout.pipe(process.stdout);\n childProcess.stderr.pipe(process.stderr);\n childProcess.on('close', () => {\n pid && this.childPIDs.delete(pid);\n resolve(undefined);\n });\n });\n }\n\n async win(time: number): Promise<boolean> {\n if (Infinity === this.schedule.concurrent) return true;\n\n // 同一时间点任务可能因为服务器各异导致触发时间不一致,造成重复执行,因此需要抹平时差。\n {\n const currentKey = `${this.runningKey}|now:${time}`;\n const count = await this.cache.increment(currentKey);\n await this.cache.expire(currentKey, 1800_000 /* 30分钟 */);\n if (count > this.schedule.concurrent) return false;\n }\n\n const count = await this.cache.increment(this.runningKey);\n if (count <= this.schedule.concurrent) {\n await this.cache.expire(this.runningKey, 8_000);\n return true;\n }\n\n await this.cache.decrement(this.runningKey);\n return false;\n }\n\n /**\n * 设置过期时间,防止进程崩溃或者被强制关闭后计数器数字累积\n */\n ping() {\n const timer = setInterval(() => {\n this.cache.expire(this.runningKey, 8_000);\n }, 3_000);\n\n return async () => {\n clearInterval(timer);\n await this.done();\n };\n }\n\n async done() {\n await this.cache.decrement(this.runningKey);\n }\n}\n","export const DEFAULT_PORT = 9786;\nexport const CONNECT_REFUSED = 'ECONNREFUSED';\n","import { i18n, middleware } from '@aomex/core';\nimport type { ConsoleMiddleware } from '@aomex/console';\nimport { collectSchedules } from '../lib/collect-schedule';\nimport type { CronOptions } from '../lib/type';\n\nconst commandName = 'cron:eject';\n\nexport const eject = (opts: CronOptions): ConsoleMiddleware => {\n return middleware.console({\n fn: async (ctx, next) => {\n if (ctx.input.command !== commandName) return next();\n\n ctx.commandMatched = true;\n const schedules = await collectSchedules(opts);\n const taskList = schedules.map((schedule) => schedule.toCrontab()).flat();\n console.log(taskList.join('\\n'));\n },\n help: {\n onDocument(doc) {\n doc[commandName] = {\n summary: i18n.t('cron.eject'),\n };\n },\n },\n });\n};\n","import type { ConsoleMiddleware } from '@aomex/console';\nimport { i18n, middleware } from '@aomex/core';\nimport type { CronOptions, ServerWriteData } from '../lib/type';\nimport net from 'node:net';\nimport Spinnies from 'spinnies';\nimport { CONNECT_REFUSED, DEFAULT_PORT } from '../lib/constant';\nimport { styleText } from 'node:util';\n\nconst commandName = 'cron:stop';\n\nexport const stop = (opts: CronOptions): ConsoleMiddleware => {\n return middleware.console({\n fn: async (ctx, next) => {\n if (ctx.input.command !== commandName) return next();\n ctx.commandMatched = true;\n\n const PORT = opts.port || DEFAULT_PORT;\n const client = net.createConnection({ port: PORT }, () => {\n client.write(commandName);\n });\n\n const spinner = new Spinnies();\n\n await new Promise((resolve, reject): void => {\n // 多次resolve不会报错\n client.on('close', resolve);\n client.on('error', (err) => {\n // @ts-expect-error\n if (err.code === CONNECT_REFUSED) {\n console.warn(styleText('yellow', i18n.t('cron.not_started', { port: PORT })));\n resolve(undefined);\n } else {\n reject(err);\n }\n });\n client.on('data', (data) => {\n // 数据可能会堆积下发,直接用JSON.parse容易出错\n data\n .toString()\n .split('\\n')\n .filter(Boolean)\n .forEach((stringifyData) => {\n const json = JSON.parse(stringifyData) as ServerWriteData;\n if ('list' in json) {\n json.list.forEach((item) => {\n spinner.add(item, { text: item });\n });\n } else if ('done' in json) {\n spinner.succeed(json.done);\n if (!spinner.hasActiveSpinners()) {\n client.destroy();\n }\n }\n });\n });\n });\n },\n help: {\n onDocument(doc) {\n doc[commandName] = { summary: i18n.t('cron.stop') };\n },\n },\n });\n};\n","import type { ConsoleMiddleware } from '@aomex/console';\nimport { i18n, middleware } from '@aomex/core';\nimport type { CronOptions, ServerWriteData } from '../lib/type';\nimport net from 'node:net';\nimport Spinnies from 'spinnies';\nimport pidusage from 'pidusage';\nimport { bytes } from '@aomex/internal-tools';\nimport { styleText } from 'node:util';\nimport { CONNECT_REFUSED, DEFAULT_PORT } from '../lib/constant';\n\nconst commandName = 'cron:stats';\n\nexport const stats = (opts: CronOptions): ConsoleMiddleware => {\n return middleware.console({\n fn: async (ctx, next) => {\n if (ctx.input.command !== commandName) return next();\n ctx.commandMatched = true;\n\n const PORT = opts.port || DEFAULT_PORT;\n const client = net.createConnection({ port: PORT }, () => {\n client.write(commandName);\n const timer = setInterval(() => {\n client.write(commandName);\n }, 800);\n client.on('error', () => {\n clearInterval(timer);\n });\n client.on('close', () => {\n clearInterval(timer);\n });\n });\n\n const spinner = new Spinnies();\n spinner.add('default', { text: 'Running jobs count: 0' });\n\n let lastPIDs: string[] = [];\n\n await new Promise((resolve, reject): void => {\n // 多次resolve不会报错\n client.on('close', resolve);\n client.on('error', (err) => {\n // @ts-expect-error\n if (err.code === CONNECT_REFUSED) {\n console.warn(styleText('yellow', i18n.t('cron.not_started', { port: PORT })));\n resolve(undefined);\n } else {\n reject(err);\n }\n });\n client.on('data', async (data) => {\n // 数据可能会堆积下发,直接用JSON.parse容易出错\n for (const stringifyData of data.toString().split('\\n').filter(Boolean)) {\n const json = JSON.parse(stringifyData) as ServerWriteData;\n if (!('runners' in json)) return;\n\n spinner.update('default', {\n text: `Running jobs count: ${json.runners.length}`,\n });\n\n const pids = json.runners.map((item) => item.pid);\n lastPIDs.forEach((pid) => {\n if (!pids.includes(pid)) {\n spinner.remove('pid-' + pid);\n }\n });\n let stats: Awaited<ReturnType<typeof pidusage>>;\n try {\n // 传入后会对原数组进行toNumber()处理,因此需要使用新数组\n stats = await pidusage([...pids]);\n } catch {\n stats = {};\n }\n\n json.runners.forEach(({ pid, argv }) => {\n const stat = stats[pid] || { cpu: 0, memory: 0, elapsed: 0 };\n const msg =\n argv.join(' ') +\n // 使用中文会导致文字显示不全\n ` (cpu: ${Math.round(stat.cpu * 1000) / 1000}%, memory: ${bytes(stat.memory)}, time: ${stat.elapsed / 1000}s, pid: ${pid})`;\n\n if (lastPIDs.includes(pid)) {\n spinner.update('pid-' + pid, { text: msg, status: 'non-spinnable' });\n } else {\n // 直接使用数字作为key会导致排序不正确\n spinner.add('pid-' + pid, { text: msg, status: 'non-spinnable' });\n }\n });\n\n lastPIDs = pids;\n }\n });\n });\n },\n help: {\n onDocument(doc) {\n doc[commandName] = { summary: i18n.t('cron.stats') };\n },\n },\n });\n};\n"],"mappings":"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","names":["i18n","middleware","i18n","arr","middleware","cronParser","schedule","count","schedule","i18n","i18n","middleware","commandName","middleware","schedule","i18n","i18n","middleware","net","styleText","commandName","middleware","net","i18n","i18n","middleware","net","Spinnies","styleText","commandName","middleware","net","Spinnies","styleText","i18n","stats","middleware"]}
1
+ {"version":3,"sources":["../src/i18n/locales/zh-cn.ts","../src/i18n/locales/en-us.ts","../src/middleware/cron.middleware.ts","../src/middleware/start.middleware.ts","../src/lib/collect-schedule.ts","../src/middleware/schedule.middleware.ts","../src/lib/schedule-parser.ts","../src/lib/job.ts","../src/lib/constant.ts","../src/middleware/eject.middleware.ts","../src/middleware/stop.middleware.ts","../src/middleware/stats.middleware.ts"],"sourcesContent":["import { i18n } from '@aomex/core';\n\ni18n.register('zh_CN', 'cron', {\n eject: '导出定时任务列表',\n start: '启动定时任务',\n stop: '退出定时任务',\n stats: '查看定时任务执行状态',\n not_started: '定时任务未启动,端口:{{port}}',\n});\n","import { i18n } from '@aomex/core';\n\ni18n.register('en_US', 'cron', {\n eject: 'Eject cron jobs list',\n start: 'Start cron jobs',\n stop: 'Stop cron jobs',\n stats: 'Show cron jobs stats',\n not_started: 'cron not started with port: {{port}}',\n});\n","import { compose, middleware } from '@aomex/core';\nimport type { ConsoleMiddleware } from '@aomex/console';\nimport { start } from './start.middleware';\nimport { eject } from './eject.middleware';\nimport type { CronOptions } from '../lib/type';\nimport { stop } from './stop.middleware';\nimport { stats } from './stats.middleware';\n\nexport const cron = (options: string | CronOptions): ConsoleMiddleware => {\n const opts: CronOptions =\n typeof options === 'string' ? { commanders: options } : options;\n const middlewareList = [start(opts), eject(opts), stop(opts), stats(opts)];\n const fn = compose(middlewareList);\n\n return middleware.console({\n fn,\n help: {\n async onDocument(_, { children }) {\n await children(middlewareList);\n },\n async postDocument(_, { children }) {\n await children(middlewareList);\n },\n },\n });\n};\n","import { i18n, middleware } from '@aomex/core';\nimport { collectSchedules } from '../lib/collect-schedule';\nimport { Job } from '../lib/job';\nimport type { CronOptions, ServerWriteData } from '../lib/type';\nimport net, { Socket } from 'node:net';\nimport { DEFAULT_PORT } from '../lib/constant';\n\nconst commandName = 'cron:start';\n\nexport const start = (opts: CronOptions) => {\n return middleware.console({\n fn: async (ctx, next) => {\n if (ctx.input.command !== commandName) return next();\n\n ctx.commandMatched = true;\n const schedules = await collectSchedules(opts);\n\n if (!schedules.length) return;\n\n const jobs = schedules.map((schedule) => new Job(schedule));\n\n const stopJobs = async (callback: (remain: number) => void) => {\n jobs.forEach((job) => job.stop());\n let remain = jobs.length;\n await Promise.all(\n jobs.map((job) => {\n return new Promise((resolve) => {\n const timer = setInterval(() => {\n if (!job.runningLevel) {\n clearInterval(timer);\n resolve(void 0);\n callback(--remain);\n }\n }, 300);\n });\n }),\n );\n };\n\n const collectRunners = () => {\n return jobs.reduce<{ pid: string; command: string; schedule: string }[]>(\n (carry, job) =>\n carry.concat(\n job.getPIDs().map((pid) => ({\n pid,\n command: job.schedule.argv.join(' '),\n schedule: job.schedule.time,\n })),\n ),\n [],\n );\n };\n\n const sendStopMessages = async (socket: Socket) => {\n socket.write(\n JSON.stringify({ runners: collectRunners() } satisfies ServerWriteData) + '\\n',\n );\n await stopJobs(() => {\n socket.write(\n JSON.stringify({\n runningPIDs: jobs.flatMap((job) => job.getPIDs()),\n } satisfies ServerWriteData) + '\\n',\n );\n });\n socket.destroy();\n };\n\n const sendStatsMessage = (socket: Socket) => {\n socket.write(\n JSON.stringify({ runners: collectRunners() } satisfies ServerWriteData) + '\\n',\n );\n };\n\n const server = net.createServer(async (socket) => {\n socket.on('data', async (data) => {\n switch (data.toString()) {\n case 'cron:stop':\n await sendStopMessages(socket);\n break;\n case 'cron:stats':\n sendStatsMessage(socket);\n break;\n }\n });\n });\n server.listen(opts.port || DEFAULT_PORT);\n\n // CTRL + C\n // 子进程也会被立即杀死,但是job.start仍然在生产任务\n process.once('SIGINT', async () => {\n stopJobs(() => {});\n });\n\n await Promise.all(jobs.map((job) => job.start()));\n // 确保执行中的任务已经完成\n await stopJobs((remain) => {\n if (!remain) server.close();\n });\n },\n help: {\n onDocument(doc) {\n doc[commandName] = { summary: i18n.t('cron.start') };\n },\n },\n });\n};\n","import { Commander } from '@aomex/console';\nimport { pathToFiles, getFileValues } from '@aomex/internal-file-import';\nimport { ScheduleMiddleware } from '../middleware/schedule.middleware';\nimport { ScheduleParser } from './schedule-parser';\nimport type { CronOptions } from './type';\n\nexport const collectSchedules = async (opts: CronOptions) => {\n const files = await pathToFiles(opts.commanders);\n const commanders = await getFileValues<Commander>(\n files,\n (item) => !!item && item instanceof Commander,\n );\n const schedules: ScheduleParser[] = [];\n for (const commander of commanders) {\n for (const builder of commander['builders']) {\n for (const middleware of builder['middlewareList']) {\n if (middleware instanceof ScheduleMiddleware) {\n schedules.push(\n new ScheduleParser({\n ...opts,\n ...middleware['options'],\n command: builder.commands[0]!,\n }),\n );\n }\n }\n }\n }\n return schedules;\n};\n","import { ConsoleMiddleware } from '@aomex/console';\nimport type { ScheduleOptions } from '../lib/type';\n\nexport class ScheduleMiddleware extends ConsoleMiddleware<object> {\n constructor(protected readonly options: ScheduleOptions) {\n super(async (_, next) => next());\n }\n}\n\n/**\n * 创建一个定时任务\n *\n * 如果传递字符串,则为cron时间表达式(支持秒)。如:`1-10,20 * * * *`\n */\nexport const schedule = (options: ScheduleOptions | string): ScheduleMiddleware => {\n return new ScheduleMiddleware(\n typeof options === 'string' ? { time: options } : options,\n );\n};\n","import { scriptName } from '@aomex/console';\nimport { CacheMemoryAdapter, Caching } from '@aomex/cache';\nimport type { CronOptions, ScheduleOptions } from './type';\nimport cronParser from 'cron-parser';\n\nexport class ScheduleParser {\n protected _time?: string;\n protected _seconds?: number[];\n protected _argv?: string[];\n protected _cache?: Caching;\n\n constructor(\n protected readonly options: ScheduleOptions & CronOptions & { command: string },\n ) {}\n\n public get command(): string {\n return this.options.command;\n }\n\n public get concurrent(): number {\n return Math.max(1, this.options.concurrent || 1);\n }\n\n public get cache(): Caching {\n return (this._cache ??= this.options.cache || new Caching(new CacheMemoryAdapter()));\n }\n\n public get time(): string {\n return (this._time ??= (() => {\n const { options } = this;\n if ('time' in options) {\n const expression = options.time;\n try {\n const handle = cronParser.parseExpression(expression);\n const arr = expression.split(/\\s+/);\n return arr.length < 5 ? handle.stringify(false) : arr.join(' ');\n } catch {\n throw new Error(`时间表达式不合法:${expression}`);\n }\n }\n\n const arr = [\n options.minute ?? '*',\n options.hour ?? '*',\n options.dayOfMonth ?? '*',\n options.month ?? '*',\n options.dayOfWeek ?? '*',\n ];\n options.second && arr.unshift(options.second);\n return arr.join(' ');\n })());\n }\n\n public get argv(): string[] {\n return (this._argv ??= [this.options.command, ...(this.options.args || [])].map(\n String,\n ));\n }\n\n public toCrontab(): string {\n return [\n this.time,\n scriptName,\n ...this.argv.map((value) => (value.includes(' ') ? `\"${value}\"` : value)),\n ].join(' ');\n }\n\n toJSON() {\n return {\n command: this.command,\n time: this.time,\n argv: this.argv,\n concurrent: this.concurrent,\n };\n }\n}\n","import cronParser from 'cron-parser';\nimport type { ScheduleParser } from './schedule-parser';\nimport { spawn } from 'node:child_process';\nimport type { Caching } from '@aomex/cache';\n\nexport class Job {\n public runningLevel: number = 0;\n public readonly runningKey: string;\n public readonly cronExpression: cronParser.CronExpression;\n public readonly cache: Caching;\n public handle: { timer: NodeJS.Timeout; resolve: (data: void) => void } | null = null;\n public stopping = false;\n public readonly processData: {\n execArgv: string[];\n node: string;\n filePath: string;\n cwd: string;\n env: NodeJS.ProcessEnv;\n };\n protected childPIDs = new Set<string>();\n\n constructor(public readonly schedule: ScheduleParser) {\n this.runningKey = `cron-job|arg:${schedule.argv}|exp:${schedule.time}|con:${schedule.concurrent}`;\n this.cronExpression = cronParser.parseExpression(this.schedule.time);\n this.cache = schedule.cache;\n this.processData = {\n execArgv: [...process.execArgv],\n node: process.argv0,\n filePath: process.argv[1]!,\n cwd: process.cwd(),\n env: process.env,\n };\n }\n\n async start(): Promise<void> {\n if (!this.cronExpression.hasNext()) return;\n const nextTime = this.cronExpression.next().getTime();\n\n while (true) {\n /**\n * setTimeout的最大延时值是 `2^31-1`(约为24.85天) ,超过这个值会被立即执行。\n * 拆分延时值可让执行时机更精确。\n */\n const delta = Math.min(3600_000, nextTime - Date.now());\n await this.delay(delta);\n if (this.stopping) return;\n if (nextTime - Date.now() <= 0) {\n // 不要使用`await`语法,因为需要立即进入下一个循环\n this.consume(nextTime);\n break;\n }\n }\n\n return this.start();\n }\n\n delay(delta: number) {\n return new Promise((resolve) => {\n const timer = setTimeout(() => {\n this.handle = null;\n resolve(undefined);\n }, delta);\n this.handle = { timer, resolve };\n });\n }\n\n stop() {\n this.stopping = true;\n if (this.handle) {\n clearTimeout(this.handle.timer);\n this.handle.resolve();\n }\n }\n\n getPIDs() {\n return [...this.childPIDs];\n }\n\n async consume(time: number) {\n try {\n ++this.runningLevel;\n if (!(await this.win(time))) return;\n const pong = this.ping();\n try {\n await this.runChildProcess();\n } finally {\n await pong();\n }\n } finally {\n --this.runningLevel;\n }\n }\n\n async runChildProcess() {\n return new Promise((resolve) => {\n const childProcess = spawn(\n this.processData.node,\n [...this.processData.execArgv, this.processData.filePath, ...this.schedule.argv],\n {\n cwd: this.processData.cwd,\n env: this.processData.env,\n stdio: 'pipe',\n },\n );\n\n const pid = childProcess.pid?.toString();\n pid && this.childPIDs.add(pid);\n\n childProcess.stdout.pipe(process.stdout);\n childProcess.stderr.pipe(process.stderr);\n childProcess.on('close', () => {\n pid && this.childPIDs.delete(pid);\n resolve(undefined);\n });\n });\n }\n\n async win(time: number): Promise<boolean> {\n if (Infinity === this.schedule.concurrent) return true;\n\n // 同一时间点任务可能因为服务器各异导致触发时间不一致,造成重复执行,因此需要抹平时差。\n {\n const currentKey = `${this.runningKey}|now:${time}`;\n const count = await this.cache.increment(currentKey);\n await this.cache.expire(currentKey, 1800_000 /* 30分钟 */);\n if (count > this.schedule.concurrent) return false;\n }\n\n const count = await this.cache.increment(this.runningKey);\n if (count <= this.schedule.concurrent) {\n await this.cache.expire(this.runningKey, 8_000);\n return true;\n }\n\n await this.cache.decrement(this.runningKey);\n return false;\n }\n\n /**\n * 设置过期时间,防止进程崩溃或者被强制关闭后计数器数字累积\n */\n ping() {\n const timer = setInterval(() => {\n this.cache.expire(this.runningKey, 8_000);\n }, 3_000);\n\n return async () => {\n clearInterval(timer);\n await this.done();\n };\n }\n\n async done() {\n await this.cache.decrement(this.runningKey);\n }\n}\n","export const DEFAULT_PORT = 9786;\nexport const CONNECT_REFUSED = 'ECONNREFUSED';\n","import { i18n, middleware } from '@aomex/core';\nimport type { ConsoleMiddleware } from '@aomex/console';\nimport { collectSchedules } from '../lib/collect-schedule';\nimport type { CronOptions } from '../lib/type';\n\nconst commandName = 'cron:eject';\n\nexport const eject = (opts: CronOptions): ConsoleMiddleware => {\n return middleware.console({\n fn: async (ctx, next) => {\n if (ctx.input.command !== commandName) return next();\n\n ctx.commandMatched = true;\n const schedules = await collectSchedules(opts);\n const taskList = schedules.map((schedule) => schedule.toCrontab()).flat();\n console.log(taskList.join('\\n'));\n },\n help: {\n onDocument(doc) {\n doc[commandName] = {\n summary: i18n.t('cron.eject'),\n };\n },\n },\n });\n};\n","import { terminal, type ConsoleMiddleware } from '@aomex/console';\nimport { i18n, middleware } from '@aomex/core';\nimport type { CronOptions, ServerWriteData } from '../lib/type';\nimport net from 'node:net';\nimport { CONNECT_REFUSED, DEFAULT_PORT } from '../lib/constant';\nimport { bytes, sleep } from '@aomex/internal-tools';\nimport formatDuration from 'format-duration';\nimport pidusage from 'pidusage';\n\nconst commandName = 'cron:stop';\n\nexport const stop = (opts: CronOptions): ConsoleMiddleware => {\n return middleware.console({\n fn: async (ctx, next) => {\n if (ctx.input.command !== commandName) return next();\n ctx.commandMatched = true;\n\n const PORT = opts.port || DEFAULT_PORT;\n const client = net.createConnection({ port: PORT }, () => {\n client.write(commandName);\n });\n\n const logSession = terminal.applySession();\n let runners: {\n cpu: number;\n memory: number;\n elapsed: number;\n pid: string;\n command: string;\n schedule: string;\n status: 'loading' | 'success';\n }[] = [];\n\n let timer: NodeJS.Timeout;\n (function loop() {\n timer = setTimeout(async () => {\n let stats: Awaited<ReturnType<typeof pidusage>>;\n try {\n const pids = runners\n .filter(({ status }) => status === 'loading')\n .map(({ pid }) => pid);\n stats = pids.length ? await pidusage(pids) : {};\n } catch {\n stats = {};\n }\n runners = runners\n .map((runner) => {\n if (runner.status === 'success') return runner;\n const stat = stats[runner.pid];\n if (!stat) return runner;\n return {\n ...runner,\n cpu: stat.cpu,\n memory: stat.memory,\n elapsed: stat.elapsed,\n };\n })\n .sort((a, b) => b.elapsed - a.elapsed);\n\n if (runners.length) {\n logSession.update(\n terminal\n .generateTable(\n [\n ['', 'PID', 'COMMAND', 'SCHEDULE', 'CPU', 'MEMORY', 'TIME'],\n ...runners.map(\n ({ pid, command, schedule, elapsed, cpu, memory, status }) => {\n return [\n `:${status}:`,\n pid,\n command.padEnd(24, ' '),\n schedule,\n `${cpu.toFixed(2)}%`,\n bytes(memory),\n formatDuration(elapsed, { leading: true }),\n ];\n },\n ),\n ],\n {\n columnDefault: { paddingRight: 4 },\n columns: {\n 0: { paddingLeft: 0, paddingRight: 0 },\n 2: { paddingRight: 1, width: 24, wrapWord: true },\n },\n drawVerticalLine: () => false,\n drawHorizontalLine: () => false,\n },\n )\n .replace(/^\\s+/, ' '),\n );\n }\n\n if (runners.every((item) => item.status === 'success')) {\n logSession.commit();\n client.destroy();\n } else {\n loop();\n }\n }, 100);\n })();\n\n process.once('SIGINT', () => {\n clearTimeout(timer);\n client.destroy();\n });\n\n await new Promise((resolve, reject): void => {\n // 多次resolve不会报错\n client.on('close', resolve);\n client.on('error', (err) => {\n // @ts-expect-error\n if (err.code === CONNECT_REFUSED) {\n terminal.printWarning(i18n.t('cron.not_started', { port: PORT }));\n resolve(undefined);\n } else {\n reject(err);\n }\n });\n client.on('data', async (data) => {\n // 数据可能会堆积下发,直接用JSON.parse容易出错\n for (const stringifyData of data.toString().split('\\n').filter(Boolean)) {\n const jsonData = JSON.parse(stringifyData) as ServerWriteData;\n if ('runners' in jsonData) {\n runners = jsonData.runners.map((runner) => {\n return {\n ...runner,\n cpu: 0,\n memory: 0,\n elapsed: 0,\n status: 'loading' as const,\n };\n });\n } else if ('runningPIDs' in jsonData) {\n runners.forEach((item) => {\n if (!jsonData.runningPIDs.includes(item.pid)) {\n item.status = 'success';\n }\n });\n }\n }\n });\n });\n\n // 让终端日志渲染完\n await sleep(300);\n },\n help: {\n onDocument(doc) {\n doc[commandName] = { summary: i18n.t('cron.stop') };\n },\n },\n });\n};\n","import { terminal, type ConsoleMiddleware } from '@aomex/console';\nimport { i18n, middleware } from '@aomex/core';\nimport type { CronOptions, ServerWriteData } from '../lib/type';\nimport net from 'node:net';\nimport pidusage from 'pidusage';\nimport { bytes } from '@aomex/internal-tools';\nimport { CONNECT_REFUSED, DEFAULT_PORT } from '../lib/constant';\nimport formatDuration from 'format-duration';\n\nconst commandName = 'cron:stats';\n\nexport const stats = (opts: CronOptions): ConsoleMiddleware => {\n return middleware.console({\n fn: async (ctx, next) => {\n if (ctx.input.command !== commandName) return next();\n ctx.commandMatched = true;\n\n const PORT = opts.port || DEFAULT_PORT;\n const client = net.createConnection({ port: PORT }, () => {\n client.write(commandName);\n const timer = setInterval(() => {\n client.write(commandName);\n }, 600);\n client.on('error', () => {\n clearInterval(timer);\n });\n client.on('close', () => {\n clearInterval(timer);\n });\n });\n\n const logSession = terminal.applySession();\n\n await new Promise((resolve, reject): void => {\n // 多次resolve不会报错\n client.on('close', resolve);\n client.on('error', (err) => {\n // @ts-expect-error\n if (err.code === CONNECT_REFUSED) {\n terminal.printWarning(i18n.t('cron.not_started', { port: PORT }));\n resolve(undefined);\n } else {\n reject(err);\n }\n });\n client.on('data', async (data) => {\n // 数据可能会堆积下发,直接用JSON.parse容易出错\n for (const stringifyData of data.toString().split('\\n').filter(Boolean)) {\n const jsonData = JSON.parse(stringifyData) as ServerWriteData;\n if (!('runners' in jsonData)) return;\n\n let stats: Awaited<ReturnType<typeof pidusage>>;\n try {\n stats = await pidusage(jsonData.runners.map((item) => item.pid));\n } catch {\n stats = {};\n }\n\n logSession.update(\n terminal.generateTable(\n [\n ['PID', 'COMMAND', 'SCHEDULE', 'CPU', 'MEMORY', 'TIME'],\n ...jsonData.runners\n .map((runner) => {\n const stat = stats[runner.pid] || { cpu: 0, memory: 0, elapsed: 0 };\n return { ...runner, ...stat };\n })\n .sort((a, b) => b.elapsed - a.elapsed)\n .map(({ pid, command, schedule, elapsed, cpu, memory }) => {\n return [\n pid,\n command.padEnd(24, ' '),\n schedule,\n `${cpu.toFixed(2)}%`,\n bytes(memory),\n formatDuration(elapsed, { leading: true }),\n ];\n }),\n ],\n {\n columnDefault: { paddingRight: 4 },\n columns: {\n 1: {\n paddingRight: 1,\n width: 24,\n wrapWord: true,\n },\n },\n drawVerticalLine: () => false,\n drawHorizontalLine: () => false,\n },\n ),\n );\n }\n });\n });\n },\n help: {\n onDocument(doc) {\n doc[commandName] = { summary: i18n.t('cron.stats') };\n },\n },\n });\n};\n"],"mappings":"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","names":["i18n","middleware","i18n","arr","middleware","cronParser","schedule","count","schedule","i18n","i18n","middleware","commandName","middleware","schedule","i18n","i18n","middleware","net","commandName","middleware","net","stats","schedule","i18n","terminal","i18n","middleware","net","pidusage","bytes","formatDuration","commandName","middleware","net","terminal","i18n","stats","pidusage","schedule","bytes","middleware"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aomex/cron",
3
- "version": "3.1.1",
3
+ "version": "3.2.1",
4
4
  "description": "定时任务",
5
5
  "type": "module",
6
6
  "types": "dist/index.d.ts",
@@ -29,22 +29,21 @@
29
29
  "node": "^20.13.0 || ^22"
30
30
  },
31
31
  "peerDependencies": {
32
- "@aomex/console": "^3.0.0",
32
+ "@aomex/console": "^3.2.0",
33
33
  "@aomex/core": "^3.0.0"
34
34
  },
35
35
  "dependencies": {
36
36
  "cron-parser": "^4.9.0",
37
+ "format-duration": "^3.0.2",
37
38
  "pidusage": "^3.0.2",
38
- "spinnies": "^0.5.1",
39
- "@aomex/internal-file-import": "^3.1.1",
40
- "@aomex/internal-tools": "^3.1.1",
41
- "@aomex/cache": "^3.1.1"
39
+ "@aomex/cache": "^3.2.1",
40
+ "@aomex/internal-tools": "^3.2.1",
41
+ "@aomex/internal-file-import": "^3.2.1"
42
42
  },
43
43
  "devDependencies": {
44
44
  "@types/pidusage": "^2.0.5",
45
- "@types/spinnies": "^0.5.3",
46
- "@aomex/core": "^3.1.1",
47
- "@aomex/console": "^3.1.1"
45
+ "@aomex/console": "^3.2.1",
46
+ "@aomex/core": "^3.2.1"
48
47
  },
49
48
  "scripts": {}
50
49
  }