4.0.6

.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 @git.zone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

npmextra.json

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

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@pushrocks/smarttime",
+  "name": "@push.rocks/smarttime",
   "private": false,
-  "version": "4.0.0",
+  "version": "4.0.6",
   "description": "handle time in smart ways",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -13,19 +13,19 @@
     "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.29",
-    "@gitzone/tsbundle": "^2.0.7",
-    "@gitzone/tsrun": "^1.2.18",
-    "@gitzone/tstest": "^1.0.60",
-    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.11.9"
+    "@git.zone/tsbuild": "^2.1.66",
+    "@git.zone/tsbundle": "^2.0.8",
+    "@git.zone/tsrun": "^1.2.44",
+    "@git.zone/tstest": "^1.0.77",
+    "@push.rocks/tapbundle": "^5.0.15",
+    "@types/node": "^20.8.7"
   },
   "dependencies": {
-    "@pushrocks/lik": "^6.0.0",
-    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartpromise": "^3.1.6",
-    "croner": "^5.3.4",
-    "dayjs": "^1.10.7",
+    "@push.rocks/lik": "^6.0.5",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartpromise": "^4.0.3",
+    "croner": "^7.0.3",
+    "dayjs": "^1.11.10",
     "is-nan": "^1.3.2",
     "pretty-ms": "^8.0.0"
   },

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

test/test.cronmanager.node.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 
 import * as smarttime from '../ts/index.js';
 

test/test.extendeddate.ts

@@ -1,4 +1,4 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 
 import * as smarttime from '../ts/index.js';
 

test/test.timer.both.ts

@@ -1,5 +1,5 @@
 // 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.js';
 

ts/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@pushrocks/smarttime',
-  version: '4.0.0',
+  name: '@push.rocks/smarttime',
+  version: '4.0.6',
   description: 'handle time in smart ways'
 }

ts/smarttime.classes.cronmanager.ts

@@ -1,5 +1,5 @@
 import * as plugins from './smarttime.plugins.js';
-import { CronJob } from './smarttime.classes.cronjob.js';
+import { CronJob, type TJobFunction } from './smarttime.classes.cronjob.js';
 import { getMilliSecondsAsHumanReadableString } from './smarttime.units.js';
 
 export class CronManager {
@@ -10,7 +10,7 @@ export class CronManager {
 
   constructor() {}
 
-  public addCronjob(cronIdentifierArg: string, cronFunctionArg: () => Promise<void>) {
+  public addCronjob(cronIdentifierArg: string, cronFunctionArg: TJobFunction) {
     const newCronJob = new CronJob(this, cronIdentifierArg, cronFunctionArg);
     this.cronjobs.add(newCronJob);
     if (this.status === 'started') {
@@ -34,40 +34,41 @@ export class CronManager {
       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');
-          }
-
-          await this.executionTimeout.promise;
-        } while (this.status === 'started');
-      };
-      runCronCycle();
+      this.runCronCycle();
     }
   }
 
+  private async runCronCycle() {
+    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');
+      }
+
+      await this.executionTimeout.promise;
+    } while (this.status === 'started');
+  };
+
   /**
    * stops all cronjobs
    */

ts/smarttime.classes.timer.ts

@@ -36,7 +36,7 @@ export class Timer {
   /**
    * the current timeout the needs to be canceled when this Timer is stopped
    */
-  private currentTimeout: NodeJS.Timer;
+  private currentTimeout: NodeJS.Timeout;
 
   // a deferred triggeted when Timer has completed
   private completedDeferred = plugins.smartpromise.defer<void>();

ts/smarttime.plugins.ts

@@ -1,7 +1,7 @@
 // @pushrocks scope
-import * as lik from '@pushrocks/lik';
-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 { lik, smartdelay, smartpromise };
 

ts/smarttime.units.ts

@@ -19,6 +19,9 @@ export let units = {
   minutes: (timesArg = 1) => {
     return timesArg * 60000;
   },
+  seconds: (timesArg = 1) => {
+    return timesArg * 1000;
+  },
 };
 
 export interface IUnitCombinationArg {
@@ -28,6 +31,7 @@ export interface IUnitCombinationArg {
   days?: number;
   hours?: number;
   minutes?: number;
+  seconds?: number;
 }
 
 export let getMilliSecondsFromUnits = (combinationArg: IUnitCombinationArg) => {
@@ -53,6 +57,9 @@ export let getMilliSecondsFromUnits = (combinationArg: IUnitCombinationArg) => {
   if (combinationArg.minutes) {
     addMilliSeconds(units.minutes(combinationArg.minutes));
   }
+  if (combinationArg.seconds) {
+    addMilliSeconds(units.seconds(combinationArg.seconds));
+  }
 
   return timeInMilliseconds;
 };

tsconfig.json

@@ -3,8 +3,12 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "nodenext",
-    "esModuleInterop": true
-  }
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }