3.0.26

.gitlab-ci.yml

@@ -19,23 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
   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 audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pushrocks/smarttime",
   "private": false,
-  "version": "3.0.21",
+  "version": "3.0.26",
   "description": "handle time in smart ways",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -12,20 +12,21 @@
     "build": "(tsbuild --web && tsbundle npm)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsbundle": "^1.0.72",
+    "@gitzone/tsbundle": "^1.0.78",
     "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.41",
+    "@gitzone/tstest": "^1.0.44",
     "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^14.0.22",
+    "@types/node": "^14.6.2",
-    "tslint": "^6.1.2",
+    "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.29",
+    "dayjs": "^1.8.35",
     "is-nan": "^1.3.0"
   },
   "files": [

ts/index.ts

@@ -1,4 +1,5 @@
 export * from './smarttime.classes.cronmanager';
+export * from './smarttime.classes.cronjob';
 export * from './smarttime.classes.extendeddate';
 export * from './smarttime.classes.hrtmeasurement';
 export * from './smarttime.classes.interval';

ts/smarttime.classes.cronmanager.ts

@@ -5,13 +5,13 @@ 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) {
     const newCronJob = new CronJob(this, cronIdentifierArg, cronFunctionArg);
-    this.cronjobs.push(newCronJob);
+    this.cronjobs.add(newCronJob);
     if (this.status === 'started') {
       newCronJob.start();
     }
@@ -19,42 +19,58 @@ export class CronManager {
     return newCronJob;
   }
 
+  public removeCronjob(cronjobArg: CronJob) {
+    cronjobArg.stop();
+    this.cronjobs.remove(cronjobArg);
+  }
+
   /**
    * starts the cronjob
    */
   public start() {
-    this.status = 'started';
+    if (this.status !== 'started') {
-    for (const cronJob of this.cronjobs) {
+      this.status = 'started';
-      cronJob.start();
+      for (const cronJob of this.cronjobs.getArray()) {
-    }
+        cronJob.start();
-    this.executionTimeout = new plugins.smartdelay.Timeout(0);
+      }
+      this.executionTimeout = new plugins.smartdelay.Timeout(0);
 
-    // recursion
+      // recursion
-    const runCheckExecution = () => {
+      const runCheckExecution = () => {
-      console.log(`Next CronJob scheduled in ${this.executionTimeout.getTimeLeft()} milliseconds`);
+        console.log(
-      this.executionTimeout.promise.then(() => {
+          `Next CronJob scheduled in ${this.executionTimeout.getTimeLeft()} milliseconds`
-        let timeToNextOverallExecution: number;
+        );
-        for (const cronJob of this.cronjobs) {
+        this.executionTimeout.promise.then(() => {
-          const timeToNextJobExecution = cronJob.checkExecution();
+          let timeToNextOverallExecution: number;
-          if (timeToNextJobExecution < timeToNextOverallExecution || !timeToNextOverallExecution) {
+          for (const cronJob of this.cronjobs.getArray()) {
-            timeToNextOverallExecution = timeToNextJobExecution;
+            const timeToNextJobExecution = cronJob.checkExecution();
+            if (
+              timeToNextJobExecution < timeToNextOverallExecution ||
+              !timeToNextOverallExecution
+            ) {
+              timeToNextOverallExecution = timeToNextJobExecution;
+            }
           }
-        }
+          this.executionTimeout = new plugins.smartdelay.Timeout(timeToNextOverallExecution);
-        this.executionTimeout = new plugins.smartdelay.Timeout(timeToNextOverallExecution);
+          runCheckExecution();
-        runCheckExecution();
+        });
-      });
+      };
-    };
 
-    runCheckExecution();
+      runCheckExecution();
+    }
   }
 
   /**
    * stops all cronjobs
    */
   public stop() {
-    this.status = 'stopped';
+    if (this.status === 'started') {
-    this.executionTimeout.cancel();
+      this.status = 'stopped';
-    for (const cron of this.cronjobs) {
+      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.plugins.ts

@@ -1,8 +1,9 @@
 // @pushrocks scope
+import * as lik from '@pushrocks/lik';
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartpromise from '@pushrocks/smartpromise';
 
-export { smartdelay, smartpromise };
+export { lik, smartdelay, smartpromise };
 
 // third parties
 import croner from 'croner';