3.0.45

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pushrocks/smarttime",
   "private": false,
-  "version": "3.0.35",
+  "version": "3.0.45",
   "description": "handle time in smart ways",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -12,22 +12,23 @@
     "build": "(tsbuild --web && tsbundle npm)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsbundle": "^1.0.78",
-    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.44",
-    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^14.6.2",
+    "@gitzone/tsbuild": "^2.1.29",
+    "@gitzone/tsbundle": "^1.0.89",
+    "@gitzone/tsrun": "^1.2.18",
+    "@gitzone/tstest": "^1.0.60",
+    "@pushrocks/tapbundle": "^4.0.3",
+    "@types/node": "^17.0.14",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@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"
+    "@pushrocks/lik": "^5.0.4",
+    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartpromise": "^3.1.6",
+    "croner": "^4.0.86",
+    "dayjs": "^1.10.7",
+    "is-nan": "^1.3.2",
+    "pretty-ms": "^7.0.1"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -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();

test/test.both.ts

@@ -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

test/test.cronmanager.both.ts

@@ -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) => {
@@ -17,7 +17,7 @@ tap.test('should create a valid cronJon', async (tools) => {
   let counter2 = 0;
   let counter3 = 0;
   const cronJob = testCronManager.addCronjob('*/2 * * * * *', async () => {
-    if (counter === 10) {
+    if (counter === 5) {
       testCronManager.removeCronjob(cronJob);
       done.resolve();
     }
@@ -25,7 +25,7 @@ tap.test('should create a valid cronJon', async (tools) => {
     console.log(`${new Date().getSeconds()} hey ${counter} -> runs every 2 seconds`);
   });
   const cronJob2 = testCronManager.addCronjob('*/3 * * * * *', async () => {
-    if (counter2 === 10) {
+    if (counter2 === 5) {
       testCronManager.removeCronjob(cronJob2);
       done2.resolve();
     }
@@ -33,7 +33,7 @@ tap.test('should create a valid cronJon', async (tools) => {
     console.log(`${new Date().getSeconds()} hey ${counter2} -> runs every 3 seconds`);
   });
   const cronJob3 = testCronManager.addCronjob('*/4 * * * * *', async () => {
-    if (counter3 === 10) {
+    if (counter3 === 5) {
       done3.resolve();
     }
     counter3++;

test/test.cronmanager.browser.ts

@@ -1,27 +0,0 @@
-import { tap, expect } from '@pushrocks/tapbundle';
-
-import * as smarttime from '../ts/index';
-
-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);
-});
-
-tap.test('should create a valid cronJon', async (tools) => {
-  const done = tools.defer();
-  let counter = 0;
-  testCronManager.addCronjob('*/2 * * * * *', async () => {
-    if (counter === 10) {
-      done.resolve();
-    }
-    counter++;
-    console.log(`hey ${counter}`);
-  });
-  testCronManager.start();
-  await done.promise;
-  testCronManager.stop();
-});
-
-tap.start();

test/test.extendeddate.ts

@@ -2,6 +2,11 @@ import { expect, tap } from '@pushrocks/tapbundle';
 
 import * as smarttime from '../ts/index';
 
+tap.test('should create a valid JavaScript Date', async () => {
+  const extendedDate = new smarttime.ExtendedDate(Date.now());
+  console.log(extendedDate);
+});
+
 tap.test('should create a valid JavaScript Date from European TimeStamp', async () => {
   const extendedDate = smarttime.ExtendedDate.fromEuropeanDate('1.6.2018');
   console.log(extendedDate);
@@ -18,7 +23,12 @@ 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 () => {
+  const extendedDate = new smarttime.ExtendedDate(Date.now());
+  console.log(extendedDate.format('YYYY-MM-DD - hh:mm'));
+})
+
 tap.start();

test/test.timer.both.ts

@@ -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 () => {

ts/smarttime.classes.cronmanager.ts

@@ -1,5 +1,6 @@
 import * as plugins from './smarttime.plugins';
 import { CronJob } from './smarttime.classes.cronjob';
+import { getMilliSecondsAsHumanReadableString } from './smarttime.units';
 
 export class CronManager {
   public executionTimeout: plugins.smartdelay.Timeout<void>;
@@ -47,16 +48,19 @@ export class CronManager {
             }
           }
           if (nextRunningCronjob) {
-            this.executionTimeout = new plugins.smartdelay.Timeout(nextRunningCronjob.getTimeToNextExecution());
+            this.executionTimeout = new plugins.smartdelay.Timeout(
+              nextRunningCronjob.getTimeToNextExecution()
+            );
             console.log(
-              `Next CronJob scheduled in ${this.executionTimeout.getTimeLeft()} milliseconds`
+              `Next CronJob scheduled in ${getMilliSecondsAsHumanReadableString(
+                this.executionTimeout.getTimeLeft()
+              )}`
             );
           } else {
             this.executionTimeout = new plugins.smartdelay.Timeout(1000);
             console.log('no cronjobs specified! Checking again in 1 second');
           }
-          
-          
+
           await this.executionTimeout.promise;
         } while (this.status === 'started');
       };

ts/smarttime.classes.cronparser.ts

@@ -18,7 +18,7 @@ export class CronParser {
     }
     if (cronPart.includes('/')) {
       const every = parseInt(cronPart.split('/')[1], 10);
-      const findEvenMatch = (recursionStartArg: number) => {
+      const findEvenMatch = (recursionStartArg: number): number => {
         if (recursionStartArg % every === 0) {
           return recursionStartArg;
         } else {

ts/smarttime.classes.extendeddate.ts

@@ -1,4 +1,5 @@
 import * as plugins from './smarttime.plugins';
+import * as units from './smarttime.units';
 
 export type TAvailableZone = 'Europe/Berlin';
 
@@ -72,7 +73,7 @@ export class ExtendedDate extends Date {
   // INSTANCE
   public timezone: TAvailableZone;
 
-  constructor(unixMilli: number) {
+  constructor(unixMilli: number = Date.now()) {
     super(unixMilli);
   }
 
@@ -82,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
    */
@@ -121,4 +127,25 @@ export class ExtendedDate extends Date {
       dayOfTheWeekName: daysArray[this.getDay()],
     };
   }
+
+  public format (formatArg: string) {
+    return plugins.dayjs(this.getTime()).format(formatArg);
+  }
+
+  /**
+   * boolean checks
+   */
+  public isToday () {
+    return plugins.dayjs(this.getTime()).isToday();
+  }
+
+  public lessTimePassedToNow(unitArgs: units.IUnitCombinationArg): boolean {
+    const maxPassedUnixTime = units.getMilliSecondsFromUnits(unitArgs);
+    const actualPassedUnixTime = Date.now() - this.getTime();
+    return actualPassedUnixTime < maxPassedUnixTime;
+  }
+
+  public moreTimePassedToNow(unitArgs: units.IUnitCombinationArg) {
+    return !this.lessTimePassedToNow(unitArgs);
+  }
 }

ts/smarttime.classes.timestamp.ts

@@ -8,7 +8,7 @@ export class TimeStamp {
   /**
    * returns new TimeStamp from milliseconds
    */
-  public static fromMilliSeconds(milliSecondsArg) {
+  public static fromMilliSeconds(milliSecondsArg: number) {
     return new TimeStamp(milliSecondsArg);
   }
 
@@ -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
    */

ts/smarttime.plugins.ts

@@ -5,8 +5,12 @@ import * as smartpromise from '@pushrocks/smartpromise';
 
 export { lik, smartdelay, smartpromise };
 
-// third parties
-import croner from 'croner';
+// third parties;
+const croner: any = require('croner');
 import dayjs from 'dayjs';
+import isToday from 'dayjs/plugin/isToday';
+import prettyMs from 'pretty-ms';
 
-export { croner, dayjs };
+dayjs.extend(isToday);
+
+export { croner, dayjs, prettyMs };

ts/smarttime.units.ts

@@ -1,3 +1,5 @@
+import * as plugins from './smarttime.plugins';
+
 export let units = {
   years: (timesArg = 1): number => {
     return timesArg * 3.154e10;
@@ -30,7 +32,7 @@ export interface IUnitCombinationArg {
 
 export let getMilliSecondsFromUnits = (combinationArg: IUnitCombinationArg) => {
   let timeInMilliseconds = 0;
-  let addMilliSeconds = (milliSecondsArg) => {
+  let addMilliSeconds = (milliSecondsArg: number) => {
     timeInMilliseconds = timeInMilliseconds + milliSecondsArg;
   };
   if (combinationArg.years) {
@@ -54,3 +56,7 @@ export let getMilliSecondsFromUnits = (combinationArg: IUnitCombinationArg) => {
 
   return timeInMilliseconds;
 };
+
+export const getMilliSecondsAsHumanReadableString = (milliSecondsArg: number): string => {
+  return plugins.prettyMs(milliSecondsArg);
+}