4.0.6

.gitea/workflows/default_tags.yaml

@@ -119,6 +119,6 @@ jobs:
         run: |
           npmci node install stable
           npmci npm install
-          pnpm install -g @gitzone/tsdoc
+          pnpm install -g @git.zone/tsdoc
           npmci command tsdoc
         continue-on-error: true

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@push.rocks/smarttime",
   "private": false,
-  "version": "4.0.3",
+  "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.66",
+    "@git.zone/tsbuild": "^2.1.66",
-    "@gitzone/tsbundle": "^2.0.8",
+    "@git.zone/tsbundle": "^2.0.8",
-    "@gitzone/tsrun": "^1.2.44",
+    "@git.zone/tsrun": "^1.2.44",
-    "@gitzone/tstest": "^1.0.77",
+    "@git.zone/tstest": "^1.0.77",
-    "@push.rocks/tapbundle": "^5.0.12",
+    "@push.rocks/tapbundle": "^5.0.15",
-    "@types/node": "^20.4.2"
+    "@types/node": "^20.8.7"
   },
   "dependencies": {
-    "@push.rocks/lik": "^6.0.3",
+    "@push.rocks/lik": "^6.0.5",
     "@push.rocks/smartdelay": "^3.0.5",
     "@push.rocks/smartpromise": "^4.0.3",
-    "croner": "^5.3.4",
+    "croner": "^7.0.3",
-    "dayjs": "^1.11.9",
+    "dayjs": "^1.11.10",
     "is-nan": "^1.3.2",
     "pretty-ms": "^8.0.0"
   },

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smarttime',
-  version: '4.0.3',
+  version: '4.0.6',
   description: 'handle time in smart ways'
 }

ts/smarttime.classes.cronmanager.ts

@@ -34,40 +34,41 @@ export class CronManager {
       for (const cronJob of this.cronjobs.getArray()) {
         cronJob.start();
       }
-      const runCronCycle = async () => {
+      this.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');
-      };
-      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.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,9 +3,12 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "ES2022",
+    "module": "NodeNext",
-    "moduleResolution": "nodenext",
+    "moduleResolution": "NodeNext",
     "esModuleInterop": true,
-    "verbatimModuleSyntax": true,
+    "verbatimModuleSyntax": true
-  }
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }