3.0.16

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -1,16 +1,16 @@
 # gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,60 +18,66 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
-snyk:
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # test stage
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+    - lossless
+    - docker
+    - priv
+
+testBuild:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -81,31 +87,35 @@ codequality:
   allow_failure: true
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -113,5 +123,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -4,6 +4,7 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,38 +1,42 @@
 {
   "name": "@pushrocks/smarttime",
   "private": false,
-  "version": "3.0.11",
+  "version": "3.0.16",
   "description": "handle time in smart ways",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest ./test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild && tsbundle npm --production)"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsbundle": "^1.0.69",
     "@gitzone/tsrun": "^1.2.6",
     "@gitzone/tstest": "^1.0.24",
     "@pushrocks/tapbundle": "^3.0.9",
-    "@types/node": "^12.0.8",
-    "tslint": "^5.17.0",
+    "@types/node": "^14.0.5",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
+    "@pushrocks/smartdelay": "^2.0.6",
     "@pushrocks/smartpromise": "^3.0.2",
     "@types/cron": "^1.7.1",
     "@types/luxon": "^1.15.1",
-    "cron": "^1.7.1",
+    "cron-parser": "^2.14.0",
     "luxon": "^1.16.0"
   },
   "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"

readme.md

@@ -8,7 +8,7 @@ handle time in smart ways
 * [docs (typedoc)](https://pushrocks.gitlab.io/smarttime/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smarttime/badges/master/build.svg)](https://gitlab.com/pushrocks/smarttime/commits/master)
+[![pipeline status](https://gitlab.com/pushrocks/smarttime/badges/master/pipeline.svg)](https://gitlab.com/pushrocks/smarttime/commits/master)
 [![coverage report](https://gitlab.com/pushrocks/smarttime/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smarttime/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smarttime.svg)](https://www.npmjs.com/package/@pushrocks/smarttime)
 [![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smarttime/badge.svg)](https://snyk.io/test/npm/@pushrocks/smarttime)
@@ -23,6 +23,7 @@ Use TypeScript for best in class instellisense.
 Smarttime offers smart ways to deal with time.
 
 ### class CronManager
+
 This class provides scheduling of functions with a cron syntax
 
 ```typescript
@@ -30,11 +31,12 @@ import { CronManager } from '@pushrocks/smarrtime';
 const cronManagerInstance = new CronManager();
 cronManagerInstance.addConrjob('* * * * * *', async () => {
   console.log('hello'); // will log 'hello' to console once every second;
-})
+});
 cronManagerInstance.start();
 ```
 
 ### class ExtendedDate
+
 This class offers static functions to create zone specific JavaScript dates from European formated time strings.
 
 ```TypeScript
@@ -42,9 +44,14 @@ import { ExtendedDate } from '@pushrocks/smarttime'
 const myDate: Date = ExtendedDate.fromEuropeanDate('8.6.2018')
 ```
 
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

ts/index.ts

@@ -1,10 +1,6 @@
-import * as plugins from './smarttime.plugins';
-
 export * from './smarttime.classes.cronmanager';
 export * from './smarttime.classes.extendeddate';
 export * from './smarttime.classes.hrtmeasurement';
 export * from './smarttime.classes.timer';
 export * from './smarttime.classes.timestamp';
 export * from './smarttime.units';
-
-export { luxon } from './smarttime.plugins';

ts/smarttime.classes.cronjob.ts

@@ -0,0 +1,51 @@
+import * as plugins from './smarttime.plugins';
+import { CronManager } from './smarttime.classes.cronmanager';
+
+export type TJobFunction = (() => void) | (() => Promise<any>);
+
+export class CronJob {
+  public status: 'started' | 'stopped' | 'initial' = 'initial';
+  public cronExpression: string;
+  public jobFunction: TJobFunction;
+
+  private cronInterval = plugins.cronParser.parseExpression('* * * * * *');
+  private nextExecutionUnix: number = 0;
+
+  constructor(cronManager: CronManager, cronExpressionArg: string, jobFunction: TJobFunction) {
+    this.cronExpression = cronExpressionArg;
+    this.jobFunction = jobFunction;
+  }
+
+  /**
+   * checks wether the cronjob needs to be executed
+   */
+  public checkExecution() {
+    if (this.nextExecutionUnix === 0) {
+      this.nextExecutionUnix = this.cronInterval
+        .next()
+        .toDate()
+        .getTime();
+      return;
+    }
+    if (Date.now() > this.nextExecutionUnix) {
+      this.jobFunction();
+      this.nextExecutionUnix = this.cronInterval
+        .next()
+        .toDate()
+        .getTime();
+    }
+  }
+
+  public start() {
+    this.cronInterval = this.getCronInterval();
+    this.status = 'started';
+  }
+
+  public stop() {
+    this.status = 'stopped';
+  }
+
+  private getCronInterval() {
+    return plugins.cronParser.parseExpression(this.cronExpression);
+  }
+}

ts/smarttime.classes.cronmanager.ts

@@ -1,16 +1,28 @@
 import * as plugins from './smarttime.plugins';
+import { CronJob } from './smarttime.classes.cronjob';
+import { Timer } from './smarttime.classes.timer';
+import { Interval } from './smarttime.classes.interval';
 
 export class CronManager {
+  public cronInterval = new Interval(1000);
+
   public status: 'started' | 'stopped' = 'stopped';
+  public cronjobs: CronJob[] = [];
 
-  public cronjobs: plugins.cron.CronJob[] = [];
+  constructor() {
+    this.cronInterval.addIntervalJob(() => {
+      for (const cronJob of this.cronjobs) {
+        cronJob.checkExecution();
+      }
+    });
+  }
 
-  public addCronjob(cronIdentifierArg: string, cronFunctionArg: plugins.cron.CronCommand) {
-    const newCronJob = new plugins.cron.CronJob(cronIdentifierArg, cronFunctionArg);
+  public addCronjob(cronIdentifierArg: string, cronFunctionArg: () => any) {
+    const newCronJob = new CronJob(this, cronIdentifierArg, cronFunctionArg);
+    this.cronjobs.push(newCronJob);
     if (this.status === 'started') {
       newCronJob.start();
     }
-    this.cronjobs.push(newCronJob);
   }
 
   /**
@@ -21,6 +33,7 @@ export class CronManager {
     for (const cron of this.cronjobs) {
       cron.start();
     }
+    this.cronInterval.start();
   }
 
   /**
@@ -31,5 +44,6 @@ export class CronManager {
     for (const cron of this.cronjobs) {
       cron.stop();
     }
+    this.cronInterval.stop();
   }
 }

ts/smarttime.classes.extendeddate.ts

@@ -20,6 +20,10 @@ export class ExtendedDate extends Date {
     return new ExtendedDate(milliSeconds);
   }
 
+  public static fromDate(dateArg: Date) {
+    return new ExtendedDate(dateArg.getTime());
+  }
+
   public static fromEuropeanDate(europeanDate: string) {
     const dateArray = /(.*)\.(.*)\.(.*)/.exec(europeanDate);
     const luxonDate = plugins.luxon.DateTime.utc(
@@ -68,6 +72,8 @@ export class ExtendedDate extends Date {
   }
 
   // INSTANCE
+  public timezone: TAvailableZone;
+
   constructor(unixMilli: number) {
     super(unixMilli);
   }
@@ -109,10 +115,10 @@ export class ExtendedDate extends Date {
       year: this.getFullYear(),
       yearString: `${this.getFullYear()}`,
       month: this.getMonth() + 1,
-      monthString: ("0" + (this.getMonth() + 1)).slice(-2),
+      monthString: ('0' + (this.getMonth() + 1)).slice(-2),
       monthName: monthsArray[this.getMonth()],
       day: this.getDate(),
-      dayString: ("0" + this.getDate()).slice(-2),
+      dayString: ('0' + this.getDate()).slice(-2),
       dayOfTheWeek: this.getDay(),
       dayOfTheWeekName: daysArray[this.getDay()]
     };

ts/smarttime.classes.hrtmeasurement.ts

@@ -1,5 +1,3 @@
-import * as process from 'process';
-
 /**
  * easy high resolution time measurement
  */

ts/smarttime.classes.interval.ts

@@ -0,0 +1,40 @@
+import * as plugins from './smarttime.plugins';
+
+export class Interval {
+  public status: 'started' | 'stopped' | 'initial' = 'initial';
+  private statusAuthorization: any = null;
+
+  public intervalMilliseconds: number;
+  public intervalJobs: Array<() => any> = [];
+  constructor(intervalMillisencondsArg: number) {
+    this.intervalMilliseconds = intervalMillisencondsArg;
+  }
+
+  public start() {
+    this.status = 'started';
+    const statusAuth = new Date();
+    this.statusAuthorization = statusAuth;
+    const runInterval = async () => {
+      while (this.status === 'started' && this.statusAuthorization === statusAuth) {
+        await plugins.smartdelay.delayFor(this.intervalMilliseconds);
+        this.executeIntervalJobs();
+      }
+    };
+    runInterval();
+  }
+
+  public stop() {
+    this.status = 'stopped';
+    this.statusAuthorization = null;
+  }
+
+  public addIntervalJob(funcArg: () => any) {
+    this.intervalJobs.push(funcArg);
+  }
+
+  private executeIntervalJobs() {
+    for (const funcArg of this.intervalJobs) {
+      funcArg();
+    }
+  }
+}

ts/smarttime.plugins.ts

@@ -1,10 +1,11 @@
 // @pushrocks scope
+import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartpromise from '@pushrocks/smartpromise';
 
-export { smartpromise };
+export { smartdelay, smartpromise };
 
 // third parties
+import cronParser from 'cron-parser';
 import * as luxon from 'luxon';
-import * as cron from 'cron';
 
-export { luxon, cron };
+export { cronParser, luxon };