push.rocks/smarttime
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2020-09-03 20:06:02 +00:00
parent f129ce42b6
commit 8e43ce7e9b
3 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/test.cronmanager.ts
View File

@ -11,16 +11,38 @@ tap.test('should create a valid instance of cronmanager', async () => {
tap.test('should create a valid cronJon', async (tools) => {
const done = tools.defer();
const done2 = tools.defer();
const done3 = tools.defer();
let counter = 0;
testCronManager.addCronjob('*/2 * * * * *', () => {
let counter2 = 0;
let counter3 = 0;
const cronJob = testCronManager.addCronjob('*/2 * * * * *', async () => {
if (counter === 10) {
testCronManager.removeCronjob(cronJob);
done.resolve();
}
counter++;
console.log(`hey ${counter}`);
console.log(`${new Date().getSeconds()} hey ${counter} -> runs every 2 seconds`);
});
const cronJob2 = testCronManager.addCronjob('*/3 * * * * *', async () => {
if (counter2 === 10) {
testCronManager.removeCronjob(cronJob2);
done2.resolve();
}
counter2++;
console.log(`${new Date().getSeconds()} hey ${counter2} -> runs every 3 seconds`);
});
const cronJob3 = testCronManager.addCronjob('*/4 * * * * *', async () => {
if (counter3 === 10) {
done3.resolve();
}
counter3++;
console.log(`${new Date().getSeconds()} hey ${counter3} -> runs every 4 seconds`);
});
testCronManager.start();
await done.promise;
await done2.promise;
await done3.promise;
testCronManager.stop();
});

9
ts/smarttime.classes.cronjob.ts
View File

@ -21,11 +21,14 @@ export class CronJob {
*/
public checkExecution(): number {
if (this.nextExecutionUnix === 0) {
this.nextExecutionUnix = this.croner.msToNext();
this.nextExecutionUnix = Date.now() + this.croner.msToNext();
}
if (Date.now() > this.nextExecutionUnix) {
this.jobFunction();
this.nextExecutionUnix = this.croner.msToNext();
const maybePromise = this.jobFunction();
if (maybePromise instanceof Promise) {
maybePromise.catch(e => console.log(e));
}
this.nextExecutionUnix = Date.now() + this.croner.msToNext();
}
return this.nextExecutionUnix;
}

26
ts/smarttime.classes.cronmanager.ts
View File

@ -9,7 +9,7 @@ export class CronManager {
constructor() {}
public addCronjob(cronIdentifierArg: string, cronFunctionArg: () => any) {
public addCronjob(cronIdentifierArg: string, cronFunctionArg: () => Promise<void>) {
const newCronJob = new CronJob(this, cronIdentifierArg, cronFunctionArg);
this.cronjobs.add(newCronJob);
if (this.status === 'started') {
@ -33,17 +33,13 @@ export class CronManager {
for (const cronJob of this.cronjobs.getArray()) {
cronJob.start();
}
this.executionTimeout = new plugins.smartdelay.Timeout(0);
// recursion
const runCheckExecution = () => {
console.log(
`Next CronJob scheduled in ${this.executionTimeout.getTimeLeft()} milliseconds`
);
this.executionTimeout.promise.then(() => {
const runCronCycle = async () => {
this.executionTimeout = new plugins.smartdelay.Timeout(0);
do {
let timeToNextOverallExecution: number;
for (const cronJob of this.cronjobs.getArray()) {
const timeToNextJobExecution = cronJob.checkExecution();
const nextExecutionTime = cronJob.checkExecution();
const timeToNextJobExecution = nextExecutionTime - Date.now();
if (
timeToNextJobExecution < timeToNextOverallExecution ||
!timeToNextOverallExecution
@ -52,11 +48,13 @@ export class CronManager {
}
}
this.executionTimeout = new plugins.smartdelay.Timeout(timeToNextOverallExecution);
runCheckExecution();
});
console.log(
`Next CronJob scheduled in ${this.executionTimeout.getTimeLeft()} milliseconds`
);
await this.executionTimeout.promise;
} while (this.status === 'started');
};
runCheckExecution();
runCronCycle();
}
}