fix(core): update
This commit is contained in:
parent
dd783b455f
commit
fa8fd9fa35
@ -25,7 +25,6 @@
|
||||
"@pushrocks/lik": "^4.0.17",
|
||||
"@pushrocks/smartdelay": "^2.0.10",
|
||||
"@pushrocks/smartpromise": "^3.0.2",
|
||||
"croner": "^1.1.23",
|
||||
"dayjs": "^1.8.35",
|
||||
"is-nan": "^1.3.0"
|
||||
},
|
||||
|
@ -1,10 +1,12 @@
|
||||
import * as plugins from './smarttime.plugins';
|
||||
import { CronManager } from './smarttime.classes.cronmanager';
|
||||
|
||||
import { CronParser } from './smarttime.classes.cronparser';
|
||||
|
||||
export type TJobFunction = (() => void) | (() => Promise<any>);
|
||||
|
||||
export class CronJob {
|
||||
public croner;
|
||||
public cronParser: CronParser;
|
||||
public status: 'started' | 'stopped' | 'initial' = 'initial';
|
||||
public cronExpression: string;
|
||||
public jobFunction: TJobFunction;
|
||||
@ -13,7 +15,7 @@ export class CronJob {
|
||||
constructor(cronManager: CronManager, cronExpressionArg: string, jobFunction: TJobFunction) {
|
||||
this.cronExpression = cronExpressionArg;
|
||||
this.jobFunction = jobFunction;
|
||||
// this.croner = plugins.croner(this.cronExpression);
|
||||
this.cronParser = new CronParser(cronExpressionArg);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -41,7 +43,7 @@ export class CronJob {
|
||||
* gets the time to next execution
|
||||
*/
|
||||
public getTimeToNextExecution() {
|
||||
return 600000;
|
||||
return this.cronParser.getMsToNextTimeMatch();
|
||||
}
|
||||
|
||||
public start() {
|
||||
|
71
ts/smarttime.classes.cronparser.ts
Normal file
71
ts/smarttime.classes.cronparser.ts
Normal file
@ -0,0 +1,71 @@
|
||||
import * as plugins from './smarttime.plugins';
|
||||
|
||||
export class CronParser {
|
||||
public cronExpression: string;
|
||||
public get cronArray() {
|
||||
return this.cronExpression.split(' ');
|
||||
}
|
||||
constructor(cronExpressionArg: string) {
|
||||
this.cronExpression = cronExpressionArg;
|
||||
if (this.cronArray.length < 6) {
|
||||
throw new Error('CronParser needs second level accuracy');
|
||||
}
|
||||
}
|
||||
|
||||
private getNextPartMatch(cronPart: string, startValue: number, moduloArg: number) {
|
||||
if (cronPart === '*') {
|
||||
return startValue;
|
||||
}
|
||||
if (cronPart.includes('/')) {
|
||||
const every = parseInt(cronPart.split('/')[1], 10);
|
||||
const findEvenMatch = (recursionStartArg: number) => {
|
||||
if (recursionStartArg % every === 0) {
|
||||
return recursionStartArg;
|
||||
} else {
|
||||
return findEvenMatch(recursionStartArg + 1);
|
||||
}
|
||||
};
|
||||
return findEvenMatch(startValue);
|
||||
}
|
||||
if (parseInt(cronPart, 10)) {
|
||||
const match = parseInt(cronPart, 10);
|
||||
return match;
|
||||
}
|
||||
}
|
||||
|
||||
public getMsToNextTimeMatch() {
|
||||
const cronArray = this.cronArray;
|
||||
const secondExpression = cronArray[0];
|
||||
const minuteExpression = cronArray[1];
|
||||
const hourExpression = cronArray[2];
|
||||
const dayExpression = cronArray[3];
|
||||
const monthExpression = cronArray[4];
|
||||
const yearExpression = cronArray[5];
|
||||
|
||||
const currentDate = new Date();
|
||||
const currentSecond = currentDate.getSeconds() + 1;
|
||||
const currentMinute = currentDate.getMinutes();
|
||||
const currentHour = currentDate.getHours();
|
||||
const currentDay = currentDate.getDate();
|
||||
const currentMonth = currentDate.getMonth();
|
||||
const currentYear = currentDate.getFullYear();
|
||||
|
||||
const targetSecond = this.getNextPartMatch(secondExpression, currentSecond, 59);
|
||||
const targetMinute = this.getNextPartMatch(minuteExpression, currentMinute, 59);
|
||||
const targetHour = this.getNextPartMatch(hourExpression, currentHour, 23);
|
||||
const targetDay = currentDay;
|
||||
const targetMonth = currentMonth;
|
||||
const targetYear = currentYear;
|
||||
|
||||
const targetDate = new Date(
|
||||
targetYear,
|
||||
targetMonth,
|
||||
targetDay,
|
||||
targetHour,
|
||||
targetMinute,
|
||||
targetSecond
|
||||
);
|
||||
const targetTime = targetDate.getTime();
|
||||
return targetTime - Date.now();
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user