@aomex/cron 0.0.13 → 0.0.15

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
@@ -1,5 +1,20 @@
1
1
  # @aomex/cron
2
2
 
3
+ ## 0.0.15
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies []:
8
+ - @aomex/core@0.0.15
9
+ - @aomex/commander@0.0.17
10
+ - @aomex/console@0.0.15
11
+
12
+ ## 0.0.14
13
+
14
+ ### Patch Changes
15
+
16
+ - [`1bddd3d`](https://github.com/aomex/aomex/commit/1bddd3dd9be1dbf446cb4ba3866de50fff8d6d50) Thanks [@geekact](https://github.com/geekact)! - feat(cron): update thread alive time from 6s to 15s
17
+
3
18
  ## 0.0.13
4
19
 
5
20
  ### Patch Changes
package/dist/index.js CHANGED
@@ -306,10 +306,11 @@ var JobInOrder = class extends Job {
306
306
  async consumeWithoutOverlapping() {
307
307
  if (this.amount === 0)
308
308
  return;
309
+ await this.keepAlive();
309
310
  if (await this.winQueue()) {
310
311
  let timer;
311
312
  try {
312
- timer = setInterval(() => this.ping(), 3 * 1e3);
313
+ timer = setInterval(() => this.keepAlive(), 5 * 1e3);
313
314
  --this.amount;
314
315
  await super.consume();
315
316
  } finally {
@@ -321,12 +322,11 @@ var JobInOrder = class extends Job {
321
322
  this.waiting();
322
323
  }
323
324
  }
324
- async ping() {
325
- await this.driver?.set(this.uniqueKey + "ping:" + this.jobID, 1, 6 * 1e3);
325
+ async keepAlive() {
326
+ await this.driver?.set(this.uniqueKey + "ping:" + this.jobID, 1, 15 * 1e3);
326
327
  }
327
328
  async winQueue() {
328
329
  if (this.driver) {
329
- await this.ping();
330
330
  const isWinner = await this.driver.add(
331
331
  this.uniqueKey,
332
332
  this.jobID,
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/middleware/cron.ts","../src/middleware/eject.ts","../src/lib/get-middleware-schedule.ts","../src/middleware/schedule.ts","../src/lib/schedule.ts","../src/middleware/eject-to-help.ts","../src/middleware/run.ts","../src/middleware/run-to-help.ts","../src/lib/job.ts","../src/lib/job-in-order.ts"],"sourcesContent":["import type { ConsoleChain } from '@aomex/console';\nimport { Cache, chain } from '@aomex/core';\nimport type { PathToFileOptions } from '@aomex/utility';\nimport { eject } from './eject';\nimport { run } from './run';\n\nexport interface CronOptions {\n paths: PathToFileOptions;\n /**\n * Running schedule with multiple threads and only one thread can win it.\n */\n driver?: Cache;\n /**\n * It set to false, the job will not start before previous job finished. Defaults `true`\n *\n * While running with multiple threads, provide `driver` to share to queue.\n */\n overlapping?: boolean;\n}\n\nexport const cron = (options: CronOptions): ConsoleChain => {\n return chain.console.mount(run(options)).mount(eject(options.paths));\n};\n","import { options } from '@aomex/console';\nimport { chain, Middleware, middleware, rule } from '@aomex/core';\nimport { chalk, type PathToFileOptions } from '@aomex/utility';\nimport { mkdir, writeFile } from 'node:fs/promises';\nimport path, { dirname } from 'node:path';\nimport { getMiddlewareSchedule } from '../lib/get-middleware-schedule';\nimport { ejectToHelp } from './eject-to-help';\n\nconst exportCron = 'cron:eject';\n\nexport const ejectRule = options(\n {\n output: rule.string().optional().docs({\n description: 'Export to specific file',\n }),\n },\n {\n output: ['o'],\n },\n);\n\nexport const eject = (paths: PathToFileOptions) =>\n chain.console\n .mount(ejectToHelp(exportCron))\n .mount(ejectRule)\n .mount(\n middleware.console<Middleware.Infer<typeof ejectRule>>(\n async (ctx, next) => {\n if (ctx.request.command !== exportCron) {\n Reflect.deleteProperty(ctx, 'options');\n return next();\n }\n\n ctx.response.commandMatched = true;\n\n const schedules = await getMiddlewareSchedule(paths);\n const crons = schedules\n .map((schedule) => schedule.toCrontab())\n .flat();\n\n const { output: outputToFile } = ctx.options;\n if (outputToFile) {\n const file = path.resolve(outputToFile);\n await mkdir(dirname(file), { recursive: true });\n await writeFile(file, crons.join('\\n'), {});\n console.log(`Crontab has been created: ${chalk.blue(file)}`);\n } else {\n console.log(crons.join('\\n'));\n }\n },\n ),\n );\n","import { Commander } from '@aomex/commander';\nimport { Chain } from '@aomex/core';\nimport {\n fileToModules,\n type PathToFileOptions,\n pathToFiles,\n} from '@aomex/utility';\nimport { ScheduleMiddleware } from '../middleware/schedule';\nimport type { Schedule } from './schedule';\n\nexport const getMiddlewareSchedule = async (paths: PathToFileOptions) => {\n const files = await pathToFiles(paths);\n const commanders = await fileToModules<Commander>(\n files,\n (item) => !!item && item instanceof Commander,\n );\n const schedules: Schedule[] = [];\n for (const commander of commanders) {\n for (const builder of Commander.getBuilders(commander)) {\n for (const middleware of Chain.flatten(builder.chain)) {\n if (middleware instanceof ScheduleMiddleware) {\n schedules.push(middleware.getSchedule(builder.commands[0]!));\n }\n }\n }\n }\n return schedules;\n};\n","import { ConsoleMiddleware } from '@aomex/console';\nimport { Schedule, type ScheduleOptions } from '../lib/schedule';\n\nexport class ScheduleMiddleware extends ConsoleMiddleware<object> {\n constructor(protected readonly options: ScheduleOptions) {\n super(async (_, next) => next());\n }\n\n getSchedule(command: string): Schedule {\n return new Schedule({ ...this.options, command });\n }\n}\n\nexport const schedule = (\n options: ScheduleOptions | string,\n): ScheduleMiddleware => {\n return new ScheduleMiddleware(\n typeof options === 'string' ? { time: options } : options,\n );\n};\n","import { scriptName } from '@aomex/console';\nimport { Cache } from '@aomex/core';\nimport parser from 'cron-parser';\nimport type { CronOptions } from '../middleware/cron';\n\ninterface ScheduleTimeObject {\n /**\n * 0-59\n */\n second?: string | number;\n /**\n * 0-59\n */\n minute?: string | number;\n /**\n * 0-23\n */\n hour?: string | number;\n /**\n * 1-31\n */\n dayOfMonth?: string | number;\n /**\n * 0-11\n */\n month?: string | number;\n /**\n * 0-6\n * - weekend: 0\n * - monday: 1\n */\n dayOfWeek?: string | number;\n}\n\ninterface ScheduleTimeString {\n /**\n Cron-like time, support seconds.\n ```\n ┌────────────── second (optional)\n │ ┌──────────── minute \n │ │ ┌────────── hour\n │ │ │ ┌──────── day of month\n │ │ │ │ ┌────── month\n │ │ │ │ │ ┌──── day of week\n │ │ │ │ │ │\n `* * * * * *`\n ```\n */\n time: string;\n}\n\ninterface ScheduleBaseOptions {\n /**\n * Examples: `['--hello', 'world', '-it', '--output', 'file.txt']`\n */\n args?: (string | number)[];\n /**\n * It set to false, the job will not start before previous job finished. If not set, `cron.overlapping` will be used.\n *\n * While running with multiple threads, provide `driver` to share to queue.\n * @see CronOptions.overlapping\n */\n overlapping?: CronOptions['overlapping'];\n /**\n * Running schedule with multiple threads and only one thread can win it. If not set, `cron.driver` will be used. If set to false, every threads are expected to win.\n *\n * @see CronOptions.driver\n */\n driver?: Cache | false;\n}\n\nexport type ScheduleOptions = (ScheduleTimeObject | ScheduleTimeString) &\n ScheduleBaseOptions;\n\nexport class Schedule {\n protected _time?: string;\n protected _seconds?: number[];\n protected _argv?: string[];\n\n constructor(\n protected readonly options: ScheduleOptions & { command: string },\n ) {}\n\n public get overlapping(): CronOptions['overlapping'] | undefined {\n return this.options.overlapping;\n }\n\n public get driver(): Cache | false | undefined {\n return this.options.driver;\n }\n\n public get time(): string {\n return (this._time ??= (() => {\n const { options } = this;\n if ('time' in options) {\n const timeList = options.time.split(/\\s+/);\n switch (timeList.length) {\n case 6:\n timeList.shift();\n return timeList.join(' ');\n case 5:\n return timeList.join(' ');\n default:\n throw new Error(`Invalid cron time: \"${options.time}\"`);\n }\n }\n\n return [\n options.minute ?? '*',\n options.hour ?? '*',\n options.dayOfMonth ?? '*',\n options.month ?? '*',\n options.dayOfWeek ?? '*',\n ].join(' ');\n })());\n }\n\n public get argv(): string[] {\n return (this._argv ??= [\n this.options.command,\n ...(this.options.args || []),\n ].map(String));\n }\n\n public get seconds(): number[] {\n return (this._seconds ??= (() => {\n const { options } = this;\n let second: string | undefined;\n\n if ('time' in options) {\n const timeList = options.time.split(/\\s+/);\n if (timeList.length === 6) {\n second = timeList[0]!;\n }\n } else {\n second = options.second?.toString();\n }\n\n if (!second) return [];\n const seconds: number[] = [];\n // second and minute are both 0-59\n const interval = parser.parseExpression(`${second} * * * *`);\n while (true) {\n const nextSecond = interval.next().getMinutes();\n if (seconds.includes(nextSecond)) break;\n seconds.push(nextSecond);\n }\n return seconds.sort((a, b) => a - b);\n })());\n }\n\n public toCrontab(): string[] {\n const script = [this.time];\n const crons: string[][] = [];\n\n for (const second of this.seconds) {\n crons.push(script.concat(`sleep ${second};`));\n }\n\n if (crons.length === 0) {\n crons.push(script);\n }\n\n return crons.map((time) => {\n const argv = this.argv.map((value) =>\n value.includes(' ') ? `\"${value}\"` : value,\n );\n return time.concat(['npx', scriptName, ...argv]).join(' ');\n });\n }\n\n toJSON() {\n return {\n time: this.time,\n seconds: this.seconds,\n argv: this.argv,\n overlapping: this.overlapping,\n };\n }\n}\n","import { HelpMiddleware, scriptName } from '@aomex/console';\nimport { middleware } from '@aomex/core';\nimport { chalk } from '@aomex/utility';\nimport { ejectRule } from './eject';\n\nexport const ejectToHelp = (commandName: string): HelpMiddleware =>\n middleware.help(async (ctx, next) => {\n return ctx.cli.config({\n all(yargs) {\n yargs.command(chalk.yellow(commandName), 'Create cron-compatibly list');\n },\n detail(yargs) {\n yargs.usage(`${scriptName} ${commandName} [options]`);\n ejectRule.toHelp(yargs);\n },\n next,\n detailCommand: commandName,\n });\n });\n","import { middleware, chain } from '@aomex/core';\nimport { runToHelp } from './run-to-help';\nimport type { CronOptions } from './cron';\nimport { Job } from '../lib/job';\nimport { getMiddlewareSchedule } from '../lib/get-middleware-schedule';\nimport { JobInOrder } from '../lib/job-in-order';\nimport { Schedule } from '../lib/schedule';\nimport { ConsoleApp } from '@aomex/console';\n\nconst runCron = 'cron:run';\n\nexport const run = (cron: CronOptions) =>\n chain.console.mount(runToHelp(runCron)).mount(\n middleware.console(async (ctx, next) => {\n if (ctx.request.command !== runCron) return next();\n ctx.response.commandMatched = true;\n const schedules = await getMiddlewareSchedule(cron.paths);\n schedules.forEach((schedule) => {\n createJob(ctx.app, schedule, cron).start();\n });\n }),\n );\n\nexport const createJob = (\n app: ConsoleApp,\n schedule: Schedule,\n cron: CronOptions,\n) => {\n const driver = (schedule.driver ?? cron.driver) || null;\n const overlapping = schedule.overlapping ?? cron.overlapping;\n return overlapping !== false\n ? new Job(app, schedule, driver)\n : new JobInOrder(app, schedule, driver);\n};\n","import { middleware } from '@aomex/core';\nimport { HelpMiddleware, scriptName } from '@aomex/console';\nimport { chalk } from '@aomex/utility';\n\nexport const runToHelp = (commandName: string): HelpMiddleware =>\n middleware.help(async (ctx, next) => {\n ctx.cli.config({\n all(yargs) {\n yargs.command(chalk.yellow(commandName), 'Star cron jobs');\n },\n detail(yargs) {\n yargs.usage(`${scriptName} ${commandName} [options]`);\n },\n detailCommand: commandName,\n next,\n });\n });\n","import type { ConsoleApp } from '@aomex/console';\nimport cronParser from 'cron-parser';\nimport { sleep } from '@aomex/utility';\nimport { Cache } from '@aomex/core';\nimport { Schedule } from './schedule';\n\nexport class Job {\n constructor(\n protected readonly app: ConsoleApp,\n protected readonly schedule: Schedule,\n protected readonly driver: Cache | null,\n ) {}\n\n async start(): Promise<void> {\n const handle = this.getCronHandle();\n\n while (true) {\n const nextTime = handle.next().getTime();\n const uniqueKey = `cron-job-win-argv:${this.schedule.argv};pattern:${this.schedule.time};time:${nextTime};`;\n await sleep(nextTime - Date.now());\n if (this.schedule.seconds.length) {\n this.emitBySeconds(uniqueKey);\n } else {\n this.winJob(uniqueKey).then((isWinner) => {\n isWinner && this.consume();\n });\n }\n if (!handle.hasNext()) break;\n }\n }\n\n emitBySeconds(key: string) {\n const nowSecond = new Date().getSeconds();\n for (const nextSecond of this.schedule.seconds) {\n const delay = nextSecond - nowSecond;\n if (delay >= 0) {\n sleep(delay * 1000).then(async () => {\n const isWinner = await this.winJob(key + `second:${nextSecond};`);\n isWinner && this.consume();\n });\n }\n }\n }\n\n async winJob(key: string): Promise<boolean> {\n if (this.driver) {\n return this.driver.add(key, 1, 100 * 1000);\n }\n return true;\n }\n\n getCronHandle() {\n const now = new Date();\n if (this.schedule.seconds.length) {\n now.setMinutes(now.getMinutes() - 1);\n }\n return cronParser.parseExpression(this.schedule.time, {\n currentDate: now,\n });\n }\n\n async consume() {\n await this.app.run(...this.schedule.argv).catch(() => {});\n }\n}\n","import { sleep } from '@aomex/utility';\nimport { hostname } from 'node:os';\nimport { Job } from './job';\n\nexport class JobInOrder extends Job {\n public amount: number = 0;\n protected waitingTimer: NodeJS.Timeout | null = null;\n protected executing: boolean = false;\n protected readonly jobID =\n hostname() + Date.now() + Math.random() + ':' + process.pid;\n protected readonly uniqueKey = `cron-job-queue-argv:${this.schedule.argv};pattern:${this.schedule.time};`;\n\n override async winJob(key: string): Promise<boolean> {\n if (this.driver && this.amount) {\n await sleep(this.amount * 3);\n }\n return super.winJob(key);\n }\n\n override async consume() {\n ++this.amount;\n await this.consumeWithoutOverlapping();\n }\n\n async consumeWithoutOverlapping() {\n if (this.amount === 0) return;\n if (await this.winQueue()) {\n let timer!: NodeJS.Timer;\n try {\n timer = setInterval(() => this.ping(), 3 * 1000);\n --this.amount;\n await super.consume();\n } finally {\n clearInterval(timer);\n await this.finished();\n this.waiting();\n }\n } else {\n this.waiting();\n }\n }\n\n async ping() {\n await this.driver?.set(this.uniqueKey + 'ping:' + this.jobID, 1, 6 * 1000);\n }\n\n async winQueue(): Promise<boolean> {\n if (this.driver) {\n await this.ping();\n const isWinner = await this.driver.add(\n this.uniqueKey,\n this.jobID,\n 3600 * 24 * 1000,\n );\n if (isWinner) return true;\n const jobID = await this.driver.get(this.uniqueKey);\n // Just expired\n if (jobID === null) return this.winQueue();\n // Thread is dead\n if (!(await this.driver.exists(this.uniqueKey + 'ping:' + jobID))) {\n await this.driver.delete(this.uniqueKey);\n return this.winQueue();\n }\n return false;\n } else if (!this.executing) {\n return (this.executing = true);\n } else {\n return false;\n }\n }\n\n async finished(): Promise<void> {\n if (this.driver) {\n await this.driver.delete(this.uniqueKey);\n } else {\n this.executing = false;\n }\n }\n\n waiting() {\n if (this.amount === 0) return;\n this.waitingTimer ??= setTimeout(() => {\n this.waitingTimer = null;\n this.consumeWithoutOverlapping();\n }, 500);\n }\n}\n"],"mappings":"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","names":["chain","middleware","chalk","options","options","middleware","scriptName","scriptName","middleware","schedule","chalk","middleware","chain","middleware","scriptName","chalk","schedule","sleep","sleep","cron","chain","middleware","schedule","options","chain"]}
1
+ {"version":3,"sources":["../src/middleware/cron.ts","../src/middleware/eject.ts","../src/lib/get-middleware-schedule.ts","../src/middleware/schedule.ts","../src/lib/schedule.ts","../src/middleware/eject-to-help.ts","../src/middleware/run.ts","../src/middleware/run-to-help.ts","../src/lib/job.ts","../src/lib/job-in-order.ts"],"sourcesContent":["import type { ConsoleChain } from '@aomex/console';\nimport { Cache, chain } from '@aomex/core';\nimport type { PathToFileOptions } from '@aomex/utility';\nimport { eject } from './eject';\nimport { run } from './run';\n\nexport interface CronOptions {\n paths: PathToFileOptions;\n /**\n * Running schedule with multiple threads and only one thread can win it.\n */\n driver?: Cache;\n /**\n * It set to false, the job will not start before previous job finished. Defaults `true`\n *\n * While running with multiple threads, provide `driver` to share to queue.\n */\n overlapping?: boolean;\n}\n\nexport const cron = (options: CronOptions): ConsoleChain => {\n return chain.console.mount(run(options)).mount(eject(options.paths));\n};\n","import { options } from '@aomex/console';\nimport { chain, Middleware, middleware, rule } from '@aomex/core';\nimport { chalk, type PathToFileOptions } from '@aomex/utility';\nimport { mkdir, writeFile } from 'node:fs/promises';\nimport path, { dirname } from 'node:path';\nimport { getMiddlewareSchedule } from '../lib/get-middleware-schedule';\nimport { ejectToHelp } from './eject-to-help';\n\nconst exportCron = 'cron:eject';\n\nexport const ejectRule = options(\n {\n output: rule.string().optional().docs({\n description: 'Export to specific file',\n }),\n },\n {\n output: ['o'],\n },\n);\n\nexport const eject = (paths: PathToFileOptions) =>\n chain.console\n .mount(ejectToHelp(exportCron))\n .mount(ejectRule)\n .mount(\n middleware.console<Middleware.Infer<typeof ejectRule>>(\n async (ctx, next) => {\n if (ctx.request.command !== exportCron) {\n Reflect.deleteProperty(ctx, 'options');\n return next();\n }\n\n ctx.response.commandMatched = true;\n\n const schedules = await getMiddlewareSchedule(paths);\n const crons = schedules\n .map((schedule) => schedule.toCrontab())\n .flat();\n\n const { output: outputToFile } = ctx.options;\n if (outputToFile) {\n const file = path.resolve(outputToFile);\n await mkdir(dirname(file), { recursive: true });\n await writeFile(file, crons.join('\\n'), {});\n console.log(`Crontab has been created: ${chalk.blue(file)}`);\n } else {\n console.log(crons.join('\\n'));\n }\n },\n ),\n );\n","import { Commander } from '@aomex/commander';\nimport { Chain } from '@aomex/core';\nimport {\n fileToModules,\n type PathToFileOptions,\n pathToFiles,\n} from '@aomex/utility';\nimport { ScheduleMiddleware } from '../middleware/schedule';\nimport type { Schedule } from './schedule';\n\nexport const getMiddlewareSchedule = async (paths: PathToFileOptions) => {\n const files = await pathToFiles(paths);\n const commanders = await fileToModules<Commander>(\n files,\n (item) => !!item && item instanceof Commander,\n );\n const schedules: Schedule[] = [];\n for (const commander of commanders) {\n for (const builder of Commander.getBuilders(commander)) {\n for (const middleware of Chain.flatten(builder.chain)) {\n if (middleware instanceof ScheduleMiddleware) {\n schedules.push(middleware.getSchedule(builder.commands[0]!));\n }\n }\n }\n }\n return schedules;\n};\n","import { ConsoleMiddleware } from '@aomex/console';\nimport { Schedule, type ScheduleOptions } from '../lib/schedule';\n\nexport class ScheduleMiddleware extends ConsoleMiddleware<object> {\n constructor(protected readonly options: ScheduleOptions) {\n super(async (_, next) => next());\n }\n\n getSchedule(command: string): Schedule {\n return new Schedule({ ...this.options, command });\n }\n}\n\nexport const schedule = (\n options: ScheduleOptions | string,\n): ScheduleMiddleware => {\n return new ScheduleMiddleware(\n typeof options === 'string' ? { time: options } : options,\n );\n};\n","import { scriptName } from '@aomex/console';\nimport { Cache } from '@aomex/core';\nimport parser from 'cron-parser';\nimport type { CronOptions } from '../middleware/cron';\n\ninterface ScheduleTimeObject {\n /**\n * 0-59\n */\n second?: string | number;\n /**\n * 0-59\n */\n minute?: string | number;\n /**\n * 0-23\n */\n hour?: string | number;\n /**\n * 1-31\n */\n dayOfMonth?: string | number;\n /**\n * 0-11\n */\n month?: string | number;\n /**\n * 0-6\n * - weekend: 0\n * - monday: 1\n */\n dayOfWeek?: string | number;\n}\n\ninterface ScheduleTimeString {\n /**\n Cron-like time, support seconds.\n ```\n ┌────────────── second (optional)\n │ ┌──────────── minute \n │ │ ┌────────── hour\n │ │ │ ┌──────── day of month\n │ │ │ │ ┌────── month\n │ │ │ │ │ ┌──── day of week\n │ │ │ │ │ │\n `* * * * * *`\n ```\n */\n time: string;\n}\n\ninterface ScheduleBaseOptions {\n /**\n * Examples: `['--hello', 'world', '-it', '--output', 'file.txt']`\n */\n args?: (string | number)[];\n /**\n * It set to false, the job will not start before previous job finished. If not set, `cron.overlapping` will be used.\n *\n * While running with multiple threads, provide `driver` to share to queue.\n * @see CronOptions.overlapping\n */\n overlapping?: CronOptions['overlapping'];\n /**\n * Running schedule with multiple threads and only one thread can win it. If not set, `cron.driver` will be used. If set to false, every threads are expected to win.\n *\n * @see CronOptions.driver\n */\n driver?: Cache | false;\n}\n\nexport type ScheduleOptions = (ScheduleTimeObject | ScheduleTimeString) &\n ScheduleBaseOptions;\n\nexport class Schedule {\n protected _time?: string;\n protected _seconds?: number[];\n protected _argv?: string[];\n\n constructor(\n protected readonly options: ScheduleOptions & { command: string },\n ) {}\n\n public get overlapping(): CronOptions['overlapping'] | undefined {\n return this.options.overlapping;\n }\n\n public get driver(): Cache | false | undefined {\n return this.options.driver;\n }\n\n public get time(): string {\n return (this._time ??= (() => {\n const { options } = this;\n if ('time' in options) {\n const timeList = options.time.split(/\\s+/);\n switch (timeList.length) {\n case 6:\n timeList.shift();\n return timeList.join(' ');\n case 5:\n return timeList.join(' ');\n default:\n throw new Error(`Invalid cron time: \"${options.time}\"`);\n }\n }\n\n return [\n options.minute ?? '*',\n options.hour ?? '*',\n options.dayOfMonth ?? '*',\n options.month ?? '*',\n options.dayOfWeek ?? '*',\n ].join(' ');\n })());\n }\n\n public get argv(): string[] {\n return (this._argv ??= [\n this.options.command,\n ...(this.options.args || []),\n ].map(String));\n }\n\n public get seconds(): number[] {\n return (this._seconds ??= (() => {\n const { options } = this;\n let second: string | undefined;\n\n if ('time' in options) {\n const timeList = options.time.split(/\\s+/);\n if (timeList.length === 6) {\n second = timeList[0]!;\n }\n } else {\n second = options.second?.toString();\n }\n\n if (!second) return [];\n const seconds: number[] = [];\n // second and minute are both 0-59\n const interval = parser.parseExpression(`${second} * * * *`);\n while (true) {\n const nextSecond = interval.next().getMinutes();\n if (seconds.includes(nextSecond)) break;\n seconds.push(nextSecond);\n }\n return seconds.sort((a, b) => a - b);\n })());\n }\n\n public toCrontab(): string[] {\n const script = [this.time];\n const crons: string[][] = [];\n\n for (const second of this.seconds) {\n crons.push(script.concat(`sleep ${second};`));\n }\n\n if (crons.length === 0) {\n crons.push(script);\n }\n\n return crons.map((time) => {\n const argv = this.argv.map((value) =>\n value.includes(' ') ? `\"${value}\"` : value,\n );\n return time.concat(['npx', scriptName, ...argv]).join(' ');\n });\n }\n\n toJSON() {\n return {\n time: this.time,\n seconds: this.seconds,\n argv: this.argv,\n overlapping: this.overlapping,\n };\n }\n}\n","import { HelpMiddleware, scriptName } from '@aomex/console';\nimport { middleware } from '@aomex/core';\nimport { chalk } from '@aomex/utility';\nimport { ejectRule } from './eject';\n\nexport const ejectToHelp = (commandName: string): HelpMiddleware =>\n middleware.help(async (ctx, next) => {\n return ctx.cli.config({\n all(yargs) {\n yargs.command(chalk.yellow(commandName), 'Create cron-compatibly list');\n },\n detail(yargs) {\n yargs.usage(`${scriptName} ${commandName} [options]`);\n ejectRule.toHelp(yargs);\n },\n next,\n detailCommand: commandName,\n });\n });\n","import { middleware, chain } from '@aomex/core';\nimport { runToHelp } from './run-to-help';\nimport type { CronOptions } from './cron';\nimport { Job } from '../lib/job';\nimport { getMiddlewareSchedule } from '../lib/get-middleware-schedule';\nimport { JobInOrder } from '../lib/job-in-order';\nimport { Schedule } from '../lib/schedule';\nimport { ConsoleApp } from '@aomex/console';\n\nconst runCron = 'cron:run';\n\nexport const run = (cron: CronOptions) =>\n chain.console.mount(runToHelp(runCron)).mount(\n middleware.console(async (ctx, next) => {\n if (ctx.request.command !== runCron) return next();\n ctx.response.commandMatched = true;\n const schedules = await getMiddlewareSchedule(cron.paths);\n schedules.forEach((schedule) => {\n createJob(ctx.app, schedule, cron).start();\n });\n }),\n );\n\nexport const createJob = (\n app: ConsoleApp,\n schedule: Schedule,\n cron: CronOptions,\n) => {\n const driver = (schedule.driver ?? cron.driver) || null;\n const overlapping = schedule.overlapping ?? cron.overlapping;\n return overlapping !== false\n ? new Job(app, schedule, driver)\n : new JobInOrder(app, schedule, driver);\n};\n","import { middleware } from '@aomex/core';\nimport { HelpMiddleware, scriptName } from '@aomex/console';\nimport { chalk } from '@aomex/utility';\n\nexport const runToHelp = (commandName: string): HelpMiddleware =>\n middleware.help(async (ctx, next) => {\n ctx.cli.config({\n all(yargs) {\n yargs.command(chalk.yellow(commandName), 'Star cron jobs');\n },\n detail(yargs) {\n yargs.usage(`${scriptName} ${commandName} [options]`);\n },\n detailCommand: commandName,\n next,\n });\n });\n","import type { ConsoleApp } from '@aomex/console';\nimport cronParser from 'cron-parser';\nimport { sleep } from '@aomex/utility';\nimport { Cache } from '@aomex/core';\nimport { Schedule } from './schedule';\n\nexport class Job {\n constructor(\n protected readonly app: ConsoleApp,\n protected readonly schedule: Schedule,\n protected readonly driver: Cache | null,\n ) {}\n\n async start(): Promise<void> {\n const handle = this.getCronHandle();\n\n while (true) {\n const nextTime = handle.next().getTime();\n const uniqueKey = `cron-job-win-argv:${this.schedule.argv};pattern:${this.schedule.time};time:${nextTime};`;\n await sleep(nextTime - Date.now());\n if (this.schedule.seconds.length) {\n this.emitBySeconds(uniqueKey);\n } else {\n this.winJob(uniqueKey).then((isWinner) => {\n isWinner && this.consume();\n });\n }\n if (!handle.hasNext()) break;\n }\n }\n\n emitBySeconds(key: string) {\n const nowSecond = new Date().getSeconds();\n for (const nextSecond of this.schedule.seconds) {\n const delay = nextSecond - nowSecond;\n if (delay >= 0) {\n sleep(delay * 1000).then(async () => {\n const isWinner = await this.winJob(key + `second:${nextSecond};`);\n isWinner && this.consume();\n });\n }\n }\n }\n\n async winJob(key: string): Promise<boolean> {\n if (this.driver) {\n return this.driver.add(key, 1, 100 * 1000);\n }\n return true;\n }\n\n getCronHandle() {\n const now = new Date();\n if (this.schedule.seconds.length) {\n now.setMinutes(now.getMinutes() - 1);\n }\n return cronParser.parseExpression(this.schedule.time, {\n currentDate: now,\n });\n }\n\n async consume() {\n await this.app.run(...this.schedule.argv).catch(() => {});\n }\n}\n","import { sleep } from '@aomex/utility';\nimport { hostname } from 'node:os';\nimport { Job } from './job';\n\nexport class JobInOrder extends Job {\n public amount: number = 0;\n protected waitingTimer: NodeJS.Timeout | null = null;\n protected executing: boolean = false;\n protected readonly jobID =\n hostname() + Date.now() + Math.random() + ':' + process.pid;\n protected readonly uniqueKey = `cron-job-queue-argv:${this.schedule.argv};pattern:${this.schedule.time};`;\n\n override async winJob(key: string): Promise<boolean> {\n if (this.driver && this.amount) {\n await sleep(this.amount * 3);\n }\n return super.winJob(key);\n }\n\n override async consume() {\n ++this.amount;\n await this.consumeWithoutOverlapping();\n }\n\n async consumeWithoutOverlapping() {\n if (this.amount === 0) return;\n await this.keepAlive();\n if (await this.winQueue()) {\n let timer!: NodeJS.Timer;\n try {\n timer = setInterval(() => this.keepAlive(), 5 * 1000);\n --this.amount;\n await super.consume();\n } finally {\n clearInterval(timer);\n await this.finished();\n this.waiting();\n }\n } else {\n this.waiting();\n }\n }\n\n async keepAlive() {\n await this.driver?.set(this.uniqueKey + 'ping:' + this.jobID, 1, 15 * 1000);\n }\n\n async winQueue(): Promise<boolean> {\n if (this.driver) {\n const isWinner = await this.driver.add(\n this.uniqueKey,\n this.jobID,\n 3600 * 24 * 1000,\n );\n if (isWinner) return true;\n const jobID = await this.driver.get(this.uniqueKey);\n // Just expired\n if (jobID === null) return this.winQueue();\n // Thread is dead\n if (!(await this.driver.exists(this.uniqueKey + 'ping:' + jobID))) {\n await this.driver.delete(this.uniqueKey);\n return this.winQueue();\n }\n return false;\n } else if (!this.executing) {\n return (this.executing = true);\n } else {\n return false;\n }\n }\n\n async finished(): Promise<void> {\n if (this.driver) {\n await this.driver.delete(this.uniqueKey);\n } else {\n this.executing = false;\n }\n }\n\n waiting() {\n if (this.amount === 0) return;\n this.waitingTimer ??= setTimeout(() => {\n this.waitingTimer = null;\n this.consumeWithoutOverlapping();\n }, 500);\n }\n}\n"],"mappings":"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","names":["chain","middleware","chalk","options","options","middleware","scriptName","scriptName","middleware","schedule","chalk","middleware","chain","middleware","scriptName","chalk","schedule","sleep","sleep","cron","chain","middleware","schedule","options","chain"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aomex/cron",
3
- "version": "0.0.13",
3
+ "version": "0.0.15",
4
4
  "description": "",
5
5
  "type": "module",
6
6
  "types": "dist/index.d.ts",
@@ -26,18 +26,18 @@
26
26
  "homepage": "https://aomex.js.org",
27
27
  "license": "MIT",
28
28
  "peerDependencies": {
29
- "@aomex/console": "^0.0.14",
30
- "@aomex/commander": "^0.0.16",
31
- "@aomex/core": "^0.0.14"
29
+ "@aomex/console": "^0.0.15",
30
+ "@aomex/commander": "^0.0.17",
31
+ "@aomex/core": "^0.0.15"
32
32
  },
33
33
  "dependencies": {
34
34
  "@aomex/utility": "^0.0.5",
35
35
  "cron-parser": "^4.8.1"
36
36
  },
37
37
  "devDependencies": {
38
- "@aomex/console": "^0.0.14",
39
- "@aomex/commander": "^0.0.16",
40
- "@aomex/core": "^0.0.14",
38
+ "@aomex/console": "^0.0.15",
39
+ "@aomex/commander": "^0.0.17",
40
+ "@aomex/core": "^0.0.15",
41
41
  "strip-ansi": "^7.0.1"
42
42
  },
43
43
  "scripts": {}