Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
d3dd03534a | |||
9b96779d19 | |||
20b181b2f3 | |||
d278722da2 | |||
e3daf08d67 | |||
0483b55a9e | |||
c3a772c155 | |||
a2ffdd436f | |||
da9c71eedb | |||
63405fc577 |
2827
package-lock.json
generated
2827
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
14
package.json
14
package.json
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@pushrocks/smarttime",
|
||||
"private": false,
|
||||
"version": "3.0.41",
|
||||
"version": "3.0.46",
|
||||
"description": "handle time in smart ways",
|
||||
"main": "dist_ts/index.js",
|
||||
"typings": "dist_ts/index.d.ts",
|
||||
@ -12,20 +12,20 @@
|
||||
"build": "(tsbuild --web && tsbundle npm)"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@gitzone/tsbuild": "^2.1.28",
|
||||
"@gitzone/tsbundle": "^1.0.88",
|
||||
"@gitzone/tsbuild": "^2.1.29",
|
||||
"@gitzone/tsbundle": "^1.0.89",
|
||||
"@gitzone/tsrun": "^1.2.18",
|
||||
"@gitzone/tstest": "^1.0.60",
|
||||
"@pushrocks/tapbundle": "^3.2.14",
|
||||
"@types/node": "^16.11.6",
|
||||
"@pushrocks/tapbundle": "^4.0.3",
|
||||
"@types/node": "^17.0.14",
|
||||
"tslint": "^6.1.3",
|
||||
"tslint-config-prettier": "^1.18.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@pushrocks/lik": "^5.0.0",
|
||||
"@pushrocks/lik": "^5.0.4",
|
||||
"@pushrocks/smartdelay": "^2.0.13",
|
||||
"@pushrocks/smartpromise": "^3.1.6",
|
||||
"croner": "^4.0.69",
|
||||
"croner": "^4.0.86",
|
||||
"dayjs": "^1.10.7",
|
||||
"is-nan": "^1.3.2",
|
||||
"pretty-ms": "^7.0.1"
|
||||
|
@ -36,7 +36,7 @@ This class provides scheduling of functions with a cron syntax
|
||||
```typescript
|
||||
import { CronManager } from '@pushrocks/smarrtime';
|
||||
const cronManagerInstance = new CronManager();
|
||||
cronManagerInstance.addConrjob('* * * * * *', async () => {
|
||||
cronManagerInstance.addCronjob('* * * * * *', async () => {
|
||||
console.log('hello'); // will log 'hello' to console once every second;
|
||||
});
|
||||
cronManagerInstance.start();
|
||||
|
@ -9,15 +9,15 @@ tap.test('should create valid testTimeStamp instance', async (tools) => {
|
||||
testTimeStamp = new smarttime.TimeStamp();
|
||||
await tools.delayFor(2);
|
||||
testTimeStamp2 = new smarttime.TimeStamp();
|
||||
expect(testTimeStamp).to.be.instanceof(smarttime.TimeStamp);
|
||||
expect(testTimeStamp).to.be.instanceof(smarttime.TimeStamp);
|
||||
expect(testTimeStamp).toBeInstanceOf(smarttime.TimeStamp);
|
||||
expect(testTimeStamp).toBeInstanceOf(smarttime.TimeStamp);
|
||||
});
|
||||
|
||||
tap.test('should have valid linuxtime', async () => {
|
||||
// tslint:disable-next-line:no-unused-expression
|
||||
expect(testTimeStamp.isOlderThan(testTimeStamp2)).to.be.true;
|
||||
expect(testTimeStamp.isOlderThan(testTimeStamp2)).toBeTrue();
|
||||
// tslint:disable-next-line:no-unused-expression
|
||||
expect(testTimeStamp.isYoungerThanOtherTimeStamp(testTimeStamp2)).to.be.false;
|
||||
expect(testTimeStamp.isYoungerThanOtherTimeStamp(testTimeStamp2)).toBeFalse();
|
||||
});
|
||||
|
||||
let testHrtMeasurement: smarttime.HrtMeasurement;
|
||||
@ -28,8 +28,8 @@ tap.test('should create valid HrtMeasurements', async (tools) => {
|
||||
testHrtMeasurement.start();
|
||||
await tools.delayFor(20);
|
||||
testHrtMeasurement.stop();
|
||||
expect(testHrtMeasurement.milliSeconds).to.be.greaterThan(19);
|
||||
expect(testHrtMeasurement.milliSeconds).to.be.lessThan(25);
|
||||
expect(testHrtMeasurement.milliSeconds).toBeGreaterThan(19);
|
||||
expect(testHrtMeasurement.milliSeconds).toBeLessThan(25);
|
||||
});
|
||||
|
||||
// check units
|
||||
|
@ -6,7 +6,7 @@ let testCronManager: smarttime.CronManager;
|
||||
|
||||
tap.test('should create a valid instance of cronmanager', async () => {
|
||||
testCronManager = new smarttime.CronManager();
|
||||
expect(testCronManager).to.be.instanceOf(smarttime.CronManager);
|
||||
expect(testCronManager).toBeInstanceOf(smarttime.CronManager);
|
||||
});
|
||||
|
||||
tap.test('should create a valid cronJon', async (tools) => {
|
||||
|
@ -23,7 +23,7 @@ tap.test('should create a date and time with European Format', async () => {
|
||||
|
||||
tap.test('should create a European date string', async () => {
|
||||
const extendedDate = smarttime.ExtendedDate.fromHyphedDate('2018-02-13');
|
||||
expect(extendedDate.exportToEuropeanDate()).to.equal('13.02.2018');
|
||||
expect(extendedDate.exportToEuropeanDate()).toEqual('13.02.2018');
|
||||
});
|
||||
|
||||
tap.test('should format a date', async () => {
|
||||
|
@ -7,7 +7,7 @@ let testTimer: Timer;
|
||||
|
||||
tap.test('should create a valid timer', async () => {
|
||||
testTimer = new Timer(1000);
|
||||
expect(testTimer).to.be.instanceof(Timer);
|
||||
expect(testTimer).toBeInstanceOf(Timer);
|
||||
});
|
||||
|
||||
tap.test('should start timer', async () => {
|
||||
|
8
ts/00_commitinfo_data.ts
Normal file
8
ts/00_commitinfo_data.ts
Normal file
@ -0,0 +1,8 @@
|
||||
/**
|
||||
* autocreated commitinfo by @pushrocks/commitinfo
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@pushrocks/smarttime',
|
||||
version: '3.0.46',
|
||||
description: 'handle time in smart ways'
|
||||
}
|
@ -3,10 +3,10 @@ import { CronManager } from './smarttime.classes.cronmanager';
|
||||
|
||||
import { CronParser } from './smarttime.classes.cronparser';
|
||||
|
||||
export type TJobFunction = (() => void) | (() => Promise<any>);
|
||||
export type TJobFunction = ((triggerTimeArg?: number) => void) | ((triggerTimeArg?: number) => Promise<any>);
|
||||
|
||||
export class CronJob {
|
||||
public cronParser: CronParser | typeof plugins.croner;
|
||||
public cronParser: typeof plugins.croner;
|
||||
public status: 'started' | 'stopped' | 'initial' = 'initial';
|
||||
public cronExpression: string;
|
||||
public jobFunction: TJobFunction;
|
||||
@ -26,7 +26,7 @@ export class CronJob {
|
||||
this.getNextExecutionTime();
|
||||
}
|
||||
if (Date.now() > this.nextExecutionUnix) {
|
||||
const maybePromise = this.jobFunction();
|
||||
const maybePromise = this.jobFunction(this.nextExecutionUnix);
|
||||
if (maybePromise instanceof Promise) {
|
||||
maybePromise.catch(e => console.log(e));
|
||||
}
|
||||
|
@ -83,6 +83,11 @@ export class ExtendedDate extends Date {
|
||||
return `${units.dayString}.${units.monthString}.${units.yearString}`;
|
||||
}
|
||||
|
||||
public exportToHyphedSortableDate() {
|
||||
const units = this.exportToUnits();
|
||||
return `${units.yearString}-${units.monthString}-${units.dayString}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* exports units
|
||||
*/
|
||||
|
@ -53,6 +53,19 @@ export class TimeStamp {
|
||||
this.epochtime = Math.floor(this.milliSeconds / 1000);
|
||||
}
|
||||
|
||||
/**
|
||||
* returns a boolean for wether the timestamp is older than another timestamp
|
||||
* @param TimeStampArg
|
||||
* @param tresholdTimeArg
|
||||
*/
|
||||
public isOlderThanOtherTimeStamp(TimeStampArg: TimeStamp, tresholdTimeArg: number = 0) {
|
||||
if (this.milliSeconds < TimeStampArg.milliSeconds - tresholdTimeArg) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Is the current instance older than the argument
|
||||
* @param TimeStampArg
|
||||
@ -66,7 +79,7 @@ export class TimeStamp {
|
||||
}
|
||||
|
||||
/**
|
||||
* returns a boolean for wether a timestamp is younger
|
||||
* returns a boolean for wether the timestamp is younger than another timestamp
|
||||
* @param TimeStampArg
|
||||
* @param tresholdTimeArg
|
||||
*/
|
||||
|
Reference in New Issue
Block a user