fix(core): update

2021-01-30 00:41:40 +00:00 · 2021-01-30 00:41:40 +00:00 · 060f635989
commit 060f635989
parent 769d7d6419
14 changed files with 10601 additions and 792 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,8 +15,6 @@ node_modules/

 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/

 # custom
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -4,13 +4,13 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
  paths:
    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'

 stages:
- security
- test
- release
- metadata
+  - security
+  - test
+  - release
+  - metadata

 # ====================
 # security stage
@ -19,45 +19,71 @@ mirror:
  stage: security
  script:
    - npmci git mirror
+  only:
+    - tags
  tags:
+    - lossless
    - docker
    - notpriv

-snyk:
+auditProductionDependencies:
+  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 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
-  - notpriv
+
+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 --only=dev
+  tags:
+    - docker
+  allow_failure: true

 # ====================
 # test stage
 # ====================

-testLTS:
+testStable:
  stage: test
  script:
    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
    - npmci npm install
    - npmci npm test
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
    - docker
-  - notpriv
+
+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:
+    - docker

 release:
  stage: release
  script:
-  - npmci node install lts
+    - npmci node install stable
    - npmci npm publish
  only:
    - tags
  tags:
+    - lossless
    - docker
    - notpriv

@ -67,11 +93,15 @@ release:
 codequality:
  stage: metadata
  allow_failure: true
+  only:
+    - tags
  script:
    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
    - npmci npm install
    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
  tags:
+    - lossless
    - docker
    - priv

@ -82,18 +112,20 @@ trigger:
  only:
    - tags
  tags:
+    - 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:
--- a/.vscode/settings.json
+++ b/.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", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}
--- a/npmextra.json
+++ b/npmextra.json
@ -1,5 +1,6 @@
 {
  "gitzone": {
+    "projectType": "npm",
    "module": {
      "githost": "gitlab.com",
      "gitscope": "pushrocks",
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -3,8 +3,8 @@
  "version": "1.0.20",
  "private": false,
  "description": "start scripts as long running daemons and manage them",
-  "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": {
@ -13,30 +13,35 @@
    "format": "(gitzone format)"
  },
  "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^10.11.7",
-    "tslint": "^5.11.0",
+    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tstest": "^1.0.52",
+    "@pushrocks/tapbundle": "^3.2.10",
+    "@types/node": "^14.14.22",
+    "tslint": "^6.1.3",
    "tslint-config-prettier": "^1.15.0"
  },
  "dependencies": {
-    "@pushrocks/lik": "^3.0.11",
-    "@pushrocks/smartfile": "^7.0.4",
+    "@pushrocks/lik": "^4.0.20",
+    "@pushrocks/smartfile": "^8.0.8",
    "@pushrocks/smartfm": "^2.0.4",
-    "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "@pushrocks/smartshell": "^2.0.25",
-    "@pushrocks/smartsystem": "^2.0.8"
+    "@pushrocks/smartlog": "^2.0.39",
+    "@pushrocks/smartlog-destination-local": "^8.0.8",
+    "@pushrocks/smartshell": "^2.0.26",
+    "@pushrocks/smartsystem": "^2.0.9"
  },
  "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"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
  ]
 }
--- a/readme.md
+++ b/readme.md
@ -8,19 +8,31 @@ start scripts as long running daemons and manage them
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartdaemon/)

 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smartdaemon/badges/master/build.svg)](https://gitlab.com/pushrocks/smartdaemon/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/smartdaemon/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartdaemon/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartdaemon.svg)](https://www.npmjs.com/package/@pushrocks/smartdaemon)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartdaemon/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartdaemon)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartdaemon/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartdaemon/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartdaemon)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartdaemon)](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/smartdaemon)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartdaemon)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartdaemon)](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)

 ## Usage

+
+## 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 | **&copy;** [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)
--- a/test/test.ts
+++ b/test/test.ts
@ -14,7 +14,7 @@ tap.test('should create a service', async () => {
    version: 'x.x.x',
    command: 'npm -v',
    description: 'displays the npm version',
-    workingDir: __dirname
+    workingDir: __dirname,
  });
 });

--- a/ts/smartdaemon.classes.service.ts
+++ b/ts/smartdaemon.classes.service.ts
@ -14,7 +14,10 @@ export interface ISmartDaemonServiceConstructorOptions {
 * represents a service that is being spawned by SmartDaemon
 */
 export class SmartDaemonService implements ISmartDaemonServiceConstructorOptions {
-  public static async createFromOptions(smartdaemonRef: SmartDaemon, optionsArg: ISmartDaemonServiceConstructorOptions) {
+  public static async createFromOptions(
+    smartdaemonRef: SmartDaemon,
+    optionsArg: ISmartDaemonServiceConstructorOptions
+  ) {
    const service = new SmartDaemonService(smartdaemonRef);
    for (const key of Object.keys(optionsArg)) {
      service[key] = optionsArg[key];
@ -65,7 +68,6 @@ export class SmartDaemonService implements ISmartDaemonServiceConstructorOptions
    await this.smartdaemonRef.systemdManager.stopService(this);
  }

-
  // Save and Delete
  public async save() {
    await this.smartdaemonRef.systemdManager.saveService(this);
--- a/ts/smartdaemon.classes.smartdaemon.ts
+++ b/ts/smartdaemon.classes.smartdaemon.ts
@ -1,10 +1,11 @@
 import * as plugins from './smartdaemon.plugins';
 import { SmartDaemonTemplateManager } from './smartdaemon.classes.templatemanager';
-import { SmartDaemonService, ISmartDaemonServiceConstructorOptions } from './smartdaemon.classes.service';
+import {
+  SmartDaemonService,
+  ISmartDaemonServiceConstructorOptions,
+} from './smartdaemon.classes.service';
 import { SmartDaemonSystemdManager } from './smartdaemon.classes.systemdmanager';

-
-
 export class SmartDaemon {
  public templateManager: SmartDaemonTemplateManager;
  public systemdManager: SmartDaemonSystemdManager;
@ -20,10 +21,12 @@ export class SmartDaemon {
   * @param commandArg
   * @param workingDirectoryArg
   */
-  public async addService(optionsArg: ISmartDaemonServiceConstructorOptions): Promise<SmartDaemonService> {
+  public async addService(
+    optionsArg: ISmartDaemonServiceConstructorOptions
+  ): Promise<SmartDaemonService> {
    let serviceToAdd: SmartDaemonService;
    const existingServices = await this.systemdManager.getServices();
-    const existingService = existingServices.find(serviceArg => {
+    const existingService = existingServices.find((serviceArg) => {
      return serviceArg.name === optionsArg.name;
    });
    if (!existingService) {
--- a/ts/smartdaemon.classes.systemdmanager.ts
+++ b/ts/smartdaemon.classes.systemdmanager.ts
@ -1,21 +1,24 @@
 import * as plugins from './smartdaemon.plugins';
 import * as paths from './smartdaemon.paths';
 import { SmartDaemon } from './smartdaemon.classes.smartdaemon';
-import { ISmartDaemonServiceConstructorOptions, SmartDaemonService } from './smartdaemon.classes.service';
+import {
+  ISmartDaemonServiceConstructorOptions,
+  SmartDaemonService,
+} from './smartdaemon.classes.service';

 export class SmartDaemonSystemdManager {
  // STATIC
  private static smartDaemonNamespace = 'smartdaemon';

-  public static createServiceNameFromServiceName (serviceNameArg: string) {
+  public static createServiceNameFromServiceName(serviceNameArg: string) {
    return `${SmartDaemonSystemdManager.smartDaemonNamespace}_${serviceNameArg}`;
  }

-  public static createFileNameFromServiceName (serviceNameArg: string) {
+  public static createFileNameFromServiceName(serviceNameArg: string) {
    return `${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceNameArg)}.service`;
-  };
+  }

-  public static createFilePathFromServiceName (serviceNameArg: string) {
+  public static createFilePathFromServiceName(serviceNameArg: string) {
    return plugins.path.join(
      paths.systemdDir,
      SmartDaemonSystemdManager.createFileNameFromServiceName(serviceNameArg)
@ -32,7 +35,7 @@ export class SmartDaemonSystemdManager {
  constructor(smartdaemonRefArg: SmartDaemon) {
    this.smartdaemonRef = smartdaemonRefArg;
    this.smartshellInstance = new plugins.smartshell.Smartshell({
-      executor: 'bash'
+      executor: 'bash',
    });
    this.smartsystem = new plugins.smartsystem.Smartsystem();
  }
@ -60,7 +63,7 @@ export class SmartDaemonSystemdManager {
    const existingServices: SmartDaemonService[] = [];
    if (await this.checkElegibility()) {
      const smartfmInstance = new plugins.smartfm.Smartfm({
-        fmType: 'yaml'
+        fmType: 'yaml',
      });
      const availableServices = await plugins.smartfile.fs.fileTreeToObject(
        paths.systemdDir,
@ -80,14 +83,18 @@ export class SmartDaemonSystemdManager {
  public async startService(serviceArg: SmartDaemonService) {
    if (await this.checkElegibility()) {
      await this.execute(
-        `systemctl start ${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceArg.name)}`
+        `systemctl start ${SmartDaemonSystemdManager.createServiceNameFromServiceName(
+          serviceArg.name
+        )}`
      );
    }
  }
  public async stopService(serviceArg: SmartDaemonService) {
    if (await this.checkElegibility()) {
      await this.execute(
-        `systemctl stop ${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceArg.name)}`
+        `systemctl stop ${SmartDaemonSystemdManager.createServiceNameFromServiceName(
+          serviceArg.name
+        )}`
      );
    }
  }
@ -116,23 +123,25 @@ export class SmartDaemonSystemdManager {
        await this.execute(`systemctl daemon-reload`);
      }
      await this.execute(
-        `systemctl enable ${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceArg.name)}`
+        `systemctl enable ${SmartDaemonSystemdManager.createServiceNameFromServiceName(
+          serviceArg.name
+        )}`
      );
    }
  }
  public async disableService(serviceArg: SmartDaemonService) {
    if (await this.checkElegibility()) {
      await this.execute(
-        `systemctl disable ${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceArg.name)}`
+        `systemctl disable ${SmartDaemonSystemdManager.createServiceNameFromServiceName(
+          serviceArg.name
+        )}`
      );
    }
  }

  public async reload() {
    if (await this.checkElegibility()) {
-      await this.execute(
-        `systemctl daemon-reload`
-      );
+      await this.execute(`systemctl daemon-reload`);
    }
  }
 }
--- a/ts/smartdaemon.classes.templatemanager.ts
+++ b/ts/smartdaemon.classes.templatemanager.ts
@ -37,5 +37,5 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 `;
-  }
+  };
 }
--- a/ts/smartdaemon.plugins.ts
+++ b/ts/smartdaemon.plugins.ts
@ -1,10 +1,7 @@
 // node native scope
 import * as path from 'path';

-
-export {
-  path
-};
+export { path };

 // @pushrocks scope
 import * as lik from '@pushrocks/lik';
@ -15,14 +12,6 @@ import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local
 import * as smartshell from '@pushrocks/smartshell';
 import * as smartsystem from '@pushrocks/smartsystem';

-export {
-  lik,
-  smartfile,
-  smartfm,
-  smartlog,
-  smartlogDestinationLocal,
-  smartshell,
-  smartsystem
-};
+export { lik, smartfile, smartfm, smartlog, smartlogDestinationLocal, smartshell, smartsystem };

 // third party
--- a/ts/smartdamon.logging.ts
+++ b/ts/smartdamon.logging.ts
@ -7,9 +7,9 @@ export const logger = new plugins.smartlog.Smartlog({
    containerName: 'Some Containername',
    environment: 'local',
    runtime: 'node',
-    zone: 'gitzone'
+    zone: 'gitzone',
  },
-  minimumLogLevel: 'silly'
+  minimumLogLevel: 'silly',
 });

 logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());