Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
cfcfde2132 | |||
b5ab945501 |
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@pushrocks/smarttime",
|
||||
"version": "3.0.34",
|
||||
"version": "3.0.35",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@pushrocks/smarttime",
|
||||
"private": false,
|
||||
"version": "3.0.34",
|
||||
"version": "3.0.35",
|
||||
"description": "handle time in smart ways",
|
||||
"main": "dist_ts/index.js",
|
||||
"typings": "dist_ts/index.d.ts",
|
||||
@ -25,6 +25,7 @@
|
||||
"@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"
|
||||
},
|
||||
|
@ -6,7 +6,7 @@ import { CronParser } from './smarttime.classes.cronparser';
|
||||
export type TJobFunction = (() => void) | (() => Promise<any>);
|
||||
|
||||
export class CronJob {
|
||||
public cronParser: CronParser;
|
||||
public cronParser: CronParser | typeof plugins.croner;
|
||||
public status: 'started' | 'stopped' | 'initial' = 'initial';
|
||||
public cronExpression: string;
|
||||
public jobFunction: TJobFunction;
|
||||
@ -15,7 +15,7 @@ export class CronJob {
|
||||
constructor(cronManager: CronManager, cronExpressionArg: string, jobFunction: TJobFunction) {
|
||||
this.cronExpression = cronExpressionArg;
|
||||
this.jobFunction = jobFunction;
|
||||
this.cronParser = new CronParser(cronExpressionArg);
|
||||
this.cronParser = plugins.croner(cronExpressionArg);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -43,7 +43,7 @@ export class CronJob {
|
||||
* gets the time to next execution
|
||||
*/
|
||||
public getTimeToNextExecution() {
|
||||
return this.cronParser.getMsToNextTimeMatch();
|
||||
return this.cronParser.msToNext();
|
||||
}
|
||||
|
||||
public start() {
|
||||
|
@ -33,7 +33,7 @@ export class CronParser {
|
||||
}
|
||||
}
|
||||
|
||||
public getMsToNextTimeMatch() {
|
||||
public msToNext() {
|
||||
const cronArray = this.cronArray;
|
||||
const secondExpression = cronArray[0];
|
||||
const minuteExpression = cronArray[1];
|
||||
|
@ -6,6 +6,7 @@ import * as smartpromise from '@pushrocks/smartpromise';
|
||||
export { lik, smartdelay, smartpromise };
|
||||
|
||||
// third parties
|
||||
import croner from 'croner';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
export { dayjs };
|
||||
export { croner, dayjs };
|
||||
|
Reference in New Issue
Block a user