4.0.3

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @gitzone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitlab-ci.yml

@@ -12,30 +12,38 @@ stages:
   - release
   - metadata
 
+before_script:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
+
 # ====================
 # security stage
 # ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-audit:
+# ====================
+# security stage
+# ====================
+auditProductionDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+     - npmci command npm config set registry https://registry.npmjs.org
+     - npmci command pnpm audit --audit-level=high --prod
   tags:
     - lossless
     - docker
-    - notpriv
+  allow_failure: true
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command pnpm audit --audit-level=high --dev
+  tags:
+    - lossless
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -44,28 +52,22 @@ audit:
 testStable:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,11 +87,12 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
     - lossless
     - docker
@@ -109,11 +112,9 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
+    - npmci node install stable
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
-      "type": "node",
+      "command": "npm test",
+      "name": "Run npm test",
       "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"
+      "type": "node-terminal"
     }
   ]
 }

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

npmextra.json

@@ -7,10 +7,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smarttime",
-      "shortDescription": "handle time in smart ways",
-      "npmPackagename": "@pushrocks/smarttime",
+      "description": "handle time in smart ways",
+      "npmPackagename": "@push.rocks/smarttime",
       "license": "MIT"
     }
   }

package.json

@@ -1,32 +1,33 @@
 {
-  "name": "@pushrocks/smarttime",
+  "name": "@push.rocks/smarttime",
   "private": false,
-  "version": "3.0.20",
+  "version": "4.0.3",
   "description": "handle time in smart ways",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
-    "test": "(tstest ./test/)",
-    "build": "(tsbuild --web && tsbundle npm)"
+    "test": "(tstest ./test)",
+    "build": "(tsbuild --web && tsbundle npm)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
-    "@gitzone/tsbundle": "^1.0.72",
-    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.41",
-    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^14.0.22",
-    "tslint": "^6.1.2",
-    "tslint-config-prettier": "^1.18.0"
+    "@gitzone/tsbuild": "^2.1.66",
+    "@gitzone/tsbundle": "^2.0.8",
+    "@gitzone/tsrun": "^1.2.44",
+    "@gitzone/tstest": "^1.0.77",
+    "@push.rocks/tapbundle": "^5.0.12",
+    "@types/node": "^20.4.2"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.10",
-    "@pushrocks/smartpromise": "^3.0.2",
-    "croner": "^1.1.23",
-    "dayjs": "^1.8.29",
-    "is-nan": "^1.3.0"
+    "@push.rocks/lik": "^6.0.3",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartpromise": "^4.0.3",
+    "croner": "^5.3.4",
+    "dayjs": "^1.11.9",
+    "is-nan": "^1.3.2",
+    "pretty-ms": "^8.0.0"
   },
   "files": [
     "ts/**/*",
@@ -42,5 +43,6 @@
   ],
   "browserslist": [
     "last 1 chrome versions"
-  ]
+  ],
+  "type": "module"
 }

readme.md

@@ -1,27 +1,26 @@
-# @pushrocks/smarttime
+# @push.rocks/smarttime
 handle time in smart ways
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smarttime)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/smarttime)
-* [github.com (source mirror)](https://github.com/pushrocks/smarttime)
-* [docs (typedoc)](https://pushrocks.gitlab.io/smarttime/)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smarttime)
+* [gitlab.com (source)](https://gitlab.com/push.rocks/smarttime)
+* [github.com (source mirror)](https://github.com/push.rocks/smarttime)
+* [docs (typedoc)](https://push.rocks.gitlab.io/smarttime/)
 
 ## Status for master
 
 Status Category | Status Badge
 -- | --
-GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smarttime/badges/master/pipeline.svg)](https://lossless.cloud)
-GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smarttime/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smarttime)](https://lossless.cloud)
-Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smarttime)](https://lossless.cloud)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/push.rocks/smarttime/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/smarttime/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smarttime)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/smarttime)](https://lossless.cloud)
 TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
 node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
 Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
-PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smarttime)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smarttime)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smarttime)](https://lossless.cloud)
-Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smarttime)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smarttime)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smarttime)](https://lossless.cloud)
 
 ## Usage
 
@@ -36,7 +35,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();
@@ -57,7 +56,6 @@ We are always happy for code contributions. If you are not the code contributing
 
 For further information read the linked docs at the top of this readme.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
 | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.both.ts

@@ -1,6 +1,6 @@
 // tslint:disable-next-line:no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
-import * as smarttime from '../ts/index';
+import { expect, tap } from '@push.rocks/tapbundle';
+import * as smarttime from '../ts/index.js';
 
 // Test TimeStamp class
 let testTimeStamp: smarttime.TimeStamp;
@@ -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

@@ -0,0 +1,60 @@
+import { tap, expect } from '@push.rocks/tapbundle';
+
+import * as smarttime from '../ts/index.js';
+
+let testCronManager: smarttime.CronManager;
+
+tap.test('should create a valid instance of cronmanager', async () => {
+  testCronManager = new smarttime.CronManager();
+  expect(testCronManager).toBeInstanceOf(smarttime.CronManager);
+});
+
+tap.test('should create a valid cronJon', async (tools) => {
+  const done = tools.defer();
+  const done2 = tools.defer();
+  const done3 = tools.defer();
+  let counter = 0;
+  let counter2 = 0;
+  let counter3 = 0;
+  const cronJob = testCronManager.addCronjob('*/2 * * * * *', async () => {
+    if (counter === 5) {
+      testCronManager.removeCronjob(cronJob);
+      done.resolve();
+    }
+    counter++;
+    console.log(`${new Date().getSeconds()} hey ${counter} -> runs every 2 seconds`);
+  });
+  const cronJob2 = testCronManager.addCronjob('*/3 * * * * *', async () => {
+    if (counter2 === 5) {
+      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 === 5) {
+      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();
+  testCronManager.removeCronjob(cronJob3);
+});
+
+tap.test('runs every full minute', async (tools) => {
+  const done = tools.defer();
+  const cronJob = testCronManager.addCronjob('0 * * * * *', async () => {
+    done.resolve();
+  });
+  testCronManager.start();
+  await done.promise;
+  testCronManager.stop();
+});
+
+tap.start();

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 * * * * *', () => {
-    if (counter === 10) {
-      done.resolve();
-    }
-    counter++;
-    console.log(`hey ${counter}`);
-  });
-  testCronManager.start();
-  await done.promise;
-  testCronManager.stop();
-});
-
-tap.start();

test/test.cronmanager.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 * * * * *', () => {
-    if (counter === 10) {
-      done.resolve();
-    }
-    counter++;
-    console.log(`hey ${counter}`);
-  });
-  testCronManager.start();
-  await done.promise;
-  testCronManager.stop();
-});
-
-tap.start();

test/test.extendeddate.ts

@@ -1,6 +1,11 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 
-import * as smarttime from '../ts/index';
+import * as smarttime from '../ts/index.js';
+
+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');
@@ -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

@@ -1,13 +1,13 @@
 // tslint:disable-next-line:no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 
-import { Timer } from '../ts/index';
+import { Timer } from '../ts/index.js';
 
 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/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smarttime',
+  version: '4.0.3',
+  description: 'handle time in smart ways'
+}

ts/index.ts

@@ -1,7 +1,8 @@
-export * from './smarttime.classes.cronmanager';
-export * from './smarttime.classes.extendeddate';
-export * from './smarttime.classes.hrtmeasurement';
-export * from './smarttime.classes.interval';
-export * from './smarttime.classes.timer';
-export * from './smarttime.classes.timestamp';
-export * from './smarttime.units';
+export * from './smarttime.classes.cronmanager.js';
+export * from './smarttime.classes.cronjob.js';
+export * from './smarttime.classes.extendeddate.js';
+export * from './smarttime.classes.hrtmeasurement.js';
+export * from './smarttime.classes.interval.js';
+export * from './smarttime.classes.timer.js';
+export * from './smarttime.classes.timestamp.js';
+export * from './smarttime.units.js';

ts/smarttime.classes.cronjob.ts

@@ -1,10 +1,14 @@
-import * as plugins from './smarttime.plugins';
-import { CronManager } from './smarttime.classes.cronmanager';
+import * as plugins from './smarttime.plugins.js';
+import { CronManager } from './smarttime.classes.cronmanager.js';
 
-export type TJobFunction = (() => void) | (() => Promise<any>);
+import { CronParser } from './smarttime.classes.cronparser.js';
+
+export type TJobFunction =
+  | ((triggerTimeArg?: number) => void)
+  | ((triggerTimeArg?: number) => Promise<any>);
 
 export class CronJob {
-  public croner;
+  public cronParser: plugins.croner;
   public status: 'started' | 'stopped' | 'initial' = 'initial';
   public cronExpression: string;
   public jobFunction: TJobFunction;
@@ -13,7 +17,7 @@ export class CronJob {
   constructor(cronManager: CronManager, cronExpressionArg: string, jobFunction: TJobFunction) {
     this.cronExpression = cronExpressionArg;
     this.jobFunction = jobFunction;
-    this.croner = plugins.croner(this.cronExpression);
+    this.cronParser = plugins.croner(cronExpressionArg);
   }
 
   /**
@@ -21,15 +25,29 @@ export class CronJob {
    */
   public checkExecution(): number {
     if (this.nextExecutionUnix === 0) {
-      this.nextExecutionUnix = this.croner.msToNext();
+      this.getNextExecutionTime();
     }
     if (Date.now() > this.nextExecutionUnix) {
-      this.jobFunction();
-      this.nextExecutionUnix = this.croner.msToNext();
+      const maybePromise = this.jobFunction(this.nextExecutionUnix);
+      if (maybePromise instanceof Promise) {
+        maybePromise.catch((e) => console.log(e));
+      }
+      this.nextExecutionUnix = this.getNextExecutionTime();
     }
     return this.nextExecutionUnix;
   }
 
+  public getNextExecutionTime() {
+    return (this.nextExecutionUnix = Date.now() + this.getTimeToNextExecution());
+  }
+
+  /**
+   * gets the time to next execution
+   */
+  public getTimeToNextExecution() {
+    return this.cronParser.msToNext();
+  }
+
   public start() {
     this.status = 'started';
   }

ts/smarttime.classes.cronmanager.ts

@@ -1,58 +1,84 @@
-import * as plugins from './smarttime.plugins';
-import { CronJob } from './smarttime.classes.cronjob';
+import * as plugins from './smarttime.plugins.js';
+import { CronJob, type TJobFunction } from './smarttime.classes.cronjob.js';
+import { getMilliSecondsAsHumanReadableString } from './smarttime.units.js';
 
 export class CronManager {
   public executionTimeout: plugins.smartdelay.Timeout<void>;
 
   public status: 'started' | 'stopped' = 'stopped';
-  public cronjobs: CronJob[] = [];
+  public cronjobs = new plugins.lik.ObjectMap<CronJob>();
 
   constructor() {}
 
-  public addCronjob(cronIdentifierArg: string, cronFunctionArg: () => any) {
+  public addCronjob(cronIdentifierArg: string, cronFunctionArg: TJobFunction) {
     const newCronJob = new CronJob(this, cronIdentifierArg, cronFunctionArg);
-    this.cronjobs.push(newCronJob);
+    this.cronjobs.add(newCronJob);
     if (this.status === 'started') {
       newCronJob.start();
     }
+
+    return newCronJob;
+  }
+
+  public removeCronjob(cronjobArg: CronJob) {
+    cronjobArg.stop();
+    this.cronjobs.remove(cronjobArg);
   }
 
   /**
    * starts the cronjob
    */
   public start() {
-    this.status = 'started';
-    for (const cronJob of this.cronjobs) {
-      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(() => {
-        let timeToNextOverallExecution: number;
-        for (const cronJob of this.cronjobs) {
-          const timeToNextJobExecution = cronJob.checkExecution();
-          if (timeToNextJobExecution < timeToNextOverallExecution || !timeToNextOverallExecution) {
-            timeToNextOverallExecution = timeToNextJobExecution;
+    if (this.status !== 'started') {
+      this.status = 'started';
+      for (const cronJob of this.cronjobs.getArray()) {
+        cronJob.start();
+      }
+      const runCronCycle = async () => {
+        this.executionTimeout = new plugins.smartdelay.Timeout(0);
+        do {
+          let nextRunningCronjob: CronJob;
+          for (const cronJob of this.cronjobs.getArray()) {
+            cronJob.checkExecution();
+            if (
+              !nextRunningCronjob ||
+              cronJob.getTimeToNextExecution() < nextRunningCronjob.getTimeToNextExecution()
+            ) {
+              nextRunningCronjob = cronJob;
+            }
+          }
+          if (nextRunningCronjob) {
+            this.executionTimeout = new plugins.smartdelay.Timeout(
+              nextRunningCronjob.getTimeToNextExecution()
+            );
+            console.log(
+              `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');
           }
-        }
-        this.executionTimeout = new plugins.smartdelay.Timeout(timeToNextOverallExecution);
-        runCheckExecution();
-      });
-    };
 
-    runCheckExecution();
+          await this.executionTimeout.promise;
+        } while (this.status === 'started');
+      };
+      runCronCycle();
+    }
   }
 
   /**
    * stops all cronjobs
    */
   public stop() {
-    this.status = 'stopped';
-    this.executionTimeout.cancel();
-    for (const cron of this.cronjobs) {
+    if (this.status === 'started') {
+      this.status = 'stopped';
+      this.executionTimeout.cancel();
+    } else {
+      console.log(`You tried to stop a CronManager that was not actually started.`);
+    }
+    for (const cron of this.cronjobs.getArray()) {
       cron.stop();
     }
   }

ts/smarttime.classes.cronparser.ts

@@ -0,0 +1,88 @@
+import * as plugins from './smarttime.plugins.js';
+
+export class CronParser {
+  public cronExpression: string;
+  public get cronArray() {
+    return this.cronExpression.split(' ');
+  }
+  constructor(cronExpressionArg: string) {
+    this.cronExpression = cronExpressionArg;
+    if (this.cronArray.length < 6) {
+      throw new Error('CronParser needs second level accuracy');
+    }
+  }
+
+  private getNextPartMatch(cronPart: string, startValue: number, moduloArg: number) {
+    if (cronPart === '*') {
+      return startValue;
+    }
+    if (cronPart.includes('/')) {
+      const every = parseInt(cronPart.split('/')[1], 10);
+      const findEvenMatch = (recursionStartArg: number): number => {
+        if (recursionStartArg % every === 0) {
+          return recursionStartArg;
+        } else {
+          return findEvenMatch(recursionStartArg + 1);
+        }
+      };
+      return findEvenMatch(startValue);
+    }
+    if (parseInt(cronPart, 10) || cronPart === '0') {
+      const match = parseInt(cronPart, 10);
+      return match;
+    }
+  }
+
+  public msToNext() {
+    const cronArray = this.cronArray;
+    const secondExpression = cronArray[0];
+    const minuteExpression = cronArray[1];
+    const hourExpression = cronArray[2];
+    const dayExpression = cronArray[3];
+    const monthExpression = cronArray[4];
+    const yearExpression = cronArray[5];
+
+    let currentDate = new Date();
+    let currentSecond = currentDate.getSeconds() + 1;
+    let currentMinute = currentDate.getMinutes();
+    let currentHour = currentDate.getHours();
+    let currentDay = currentDate.getDate();
+    let currentMonth = currentDate.getMonth();
+    let currentYear = currentDate.getFullYear();
+
+    const targetSecond = this.getNextPartMatch(secondExpression, currentSecond, 59);
+    if (targetSecond < currentSecond) {
+      currentMinute = (currentMinute + 1) % 59;
+    }
+    const targetMinute = this.getNextPartMatch(minuteExpression, currentMinute, 59);
+    if (targetMinute < currentMinute) {
+      currentHour = (currentHour + 1) % 23;
+    }
+    const targetHour = this.getNextPartMatch(hourExpression, currentHour, 23);
+    if (targetHour < currentHour) {
+      currentDay = (currentDay + 1) % 30;
+    }
+
+    const targetDay = currentDay;
+    if (targetDay < currentDay) {
+      currentMonth = (currentMonth + 1) % 11;
+    }
+
+    const targetMonth = currentMonth;
+    if (targetMonth < currentMonth) {
+      currentYear = currentYear + 1;
+    }
+    const targetYear = currentYear;
+
+    const targetDate = new Date(
+      targetYear,
+      targetMonth,
+      targetDay,
+      targetHour,
+      targetMinute,
+      targetSecond
+    );
+    const targetTime = targetDate.getTime();
+    return targetTime - Date.now();
+  }
+}

ts/smarttime.classes.extendeddate.ts

@@ -1,4 +1,5 @@
-import * as plugins from './smarttime.plugins';
+import * as plugins from './smarttime.plugins.js';
+import * as units from './smarttime.units.js';
 
 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.interval.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smarttime.plugins';
+import * as plugins from './smarttime.plugins.js';
 
 export class Interval {
   public status: 'started' | 'stopped' | 'initial' = 'initial';

ts/smarttime.classes.timer.ts

@@ -1,6 +1,6 @@
-import * as plugins from './smarttime.plugins';
+import * as plugins from './smarttime.plugins.js';
 
-import { TimeStamp } from './smarttime.classes.timestamp';
+import { TimeStamp } from './smarttime.classes.timestamp.js';
 
 export type TimerState = 'initiated' | 'started' | 'paused' | 'completed';
 

ts/smarttime.classes.timestamp.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smarttime.plugins';
+import * as plugins from './smarttime.plugins.js';
 
 /**
  * TimeStamp
@@ -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

@@ -1,11 +1,16 @@
 // @pushrocks scope
-import * as smartdelay from '@pushrocks/smartdelay';
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as lik from '@push.rocks/lik';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartpromise from '@push.rocks/smartpromise';
 
-export { smartdelay, smartpromise };
+export { lik, smartdelay, smartpromise };
 
-// third parties
+// third parties;
 import croner from 'croner';
 import dayjs from 'dayjs';
+import isToday from 'dayjs/plugin/isToday.js';
+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.js';
+
 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);
+};

tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}