3.1.81

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -4,7 +4,7 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
   - security
@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
@@ -19,20 +22,36 @@ 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
+  allow_failure: true
+
+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
@@ -48,28 +67,27 @@ testStable:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
-  - priv
 
 testBuild:
   stage: test
   script:
     - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm install
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
-  - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm publish
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -79,11 +97,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
 
@@ -94,20 +116,20 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   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:

.snyk

@@ -1,4 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.1
-ignore: {}
-patch: {}

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "npm test",
+      "name": "Run npm test",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

.vscode/settings.json

@@ -1,3 +1,26 @@
 {
-  "workbench.colorCustomizations": {}
+  "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"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
 }

cli.js

@@ -1,3 +1,4 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('./dist/index');
+const cliTool = require('./dist_ts/index');
+cliTool.runCli();

cli.ts.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
 require('@gitzone/tsrun');
-require('./ts/index');
+const cliTool = require('./ts/index');
+cliTool.runCli();

npmextra.json

@@ -9,6 +9,7 @@
     "command": "npmci test stable"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "shipzone",

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.1.62",
+  "version": "3.1.81",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "bin": {
     "npmci": "cli.js"
   },
@@ -24,48 +24,52 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.6",
-    "@gitzone/tstest": "^1.0.27",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.9",
-    "tslint": "^5.20.0",
+    "@gitzone/tsbuild": "^2.1.28",
+    "@gitzone/tsrun": "^1.2.18",
+    "@gitzone/tstest": "^1.0.59",
+    "@pushrocks/tapbundle": "^3.2.14",
+    "@types/node": "^16.11.6",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^1.0.24",
-    "@pushrocks/lik": "^3.0.11",
-    "@pushrocks/npmextra": "^3.0.7",
-    "@pushrocks/projectinfo": "^4.0.2",
-    "@pushrocks/qenv": "^4.0.6",
+    "@apiglobal/typedrequest": "^1.0.58",
+    "@pushrocks/lik": "^5.0.0",
+    "@pushrocks/npmextra": "^3.0.9",
+    "@pushrocks/projectinfo": "^4.0.5",
+    "@pushrocks/qenv": "^4.0.10",
     "@pushrocks/smartanalytics": "^2.0.15",
-    "@pushrocks/smartcli": "^3.0.7",
-    "@pushrocks/smartdelay": "^2.0.3",
-    "@pushrocks/smartfile": "^7.0.6",
-    "@pushrocks/smartgit": "^1.0.13",
-    "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartlog-destination-local": "^8.0.2",
-    "@pushrocks/smartparam": "^1.0.4",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartrequest": "^1.1.36",
-    "@pushrocks/smartshell": "^2.0.25",
-    "@pushrocks/smartsocket": "^1.1.49",
+    "@pushrocks/smartcli": "^3.0.14",
+    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartfile": "^8.0.10",
+    "@pushrocks/smartgit": "^2.0.1",
+    "@pushrocks/smartlog": "^2.0.44",
+    "@pushrocks/smartlog-destination-local": "^8.0.8",
+    "@pushrocks/smartparam": "^1.1.6",
+    "@pushrocks/smartpromise": "^3.1.6",
+    "@pushrocks/smartrequest": "^1.1.52",
+    "@pushrocks/smartshell": "^2.0.28",
+    "@pushrocks/smartsocket": "^1.2.8",
     "@pushrocks/smartssh": "^1.2.3",
-    "@pushrocks/smartstring": "^3.0.10",
-    "@servezone/servezone-interfaces": "^2.0.51",
-    "@types/shelljs": "^0.8.5",
-    "@types/through2": "^2.0.34",
-    "through2": "^3.0.1"
+    "@pushrocks/smartstring": "^3.0.24",
+    "@servezone/interfaces": "^1.0.3",
+    "@tsclass/tsclass": "^3.0.36",
+    "@types/through2": "^2.0.36",
+    "through2": "^4.0.2"
   },
   "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "dist_ts_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,13 +8,20 @@ node and docker in gitlab ci on steroids
 * [docs (typedoc)](https://shipzone.gitlab.io/npmci/)
 
 ## Status for master
-[![build status](https://gitlab.com/shipzone/npmci/badges/master/build.svg)](https://gitlab.com/shipzone/npmci/commits/master)
-[![coverage report](https://gitlab.com/shipzone/npmci/badges/master/coverage.svg)](https://gitlab.com/shipzone/npmci/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@shipzone/npmci.svg)](https://www.npmjs.com/package/@shipzone/npmci)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@shipzone/npmci/badge.svg)](https://snyk.io/test/npm/@shipzone/npmci)
-[![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/shipzone/npmci/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/shipzone/npmci/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@shipzone/npmci)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/shipzone/npmci)](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/@shipzone/npmci)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@shipzone/npmci)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@shipzone/npmci)](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
 
@@ -93,6 +100,10 @@ For further information read the linked docs at the top of this README.
 
 Use TypeScript for best in class instellisense.
 
+## 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 | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.ts

@@ -2,6 +2,7 @@ import { tap, expect } from '@pushrocks/tapbundle';
 import * as path from 'path';
 
 process.env.NPMTS_TEST = 'true';
+process.env.NPMCI_URL_CLOUDLY = 'localhost'
 
 // set up environment
 process.env.CI_REPOSITORY_URL = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git';
@@ -31,11 +32,11 @@ tap.test('should return valid Dockerfiles', async () => {
   const npmciInstance = new npmci.Npmci();
   dockerfile1 = new npmci.Dockerfile(npmciInstance.dockerManager, {
     filePath: './Dockerfile',
-    read: true
+    read: true,
   });
   dockerfile2 = new npmci.Dockerfile(npmciInstance.dockerManager, {
     filePath: './Dockerfile_sometag1',
-    read: true
+    read: true,
   });
   expect(dockerfile1.version).to.equal('latest');
   return expect(dockerfile2.version).to.equal('sometag1');
@@ -62,28 +63,28 @@ tap.test('should sort an array of Dockerfiles', async () => {
 tap.test('should build all Dockerfiles', async () => {
   const npmciInstance = new npmci.Npmci();
   return npmciInstance.dockerManager.handleCli({
-    _: ['docker', 'build']
+    _: ['docker', 'build'],
   });
 });
 
 tap.test('should test all Dockerfiles', async () => {
   const npmciInstance = new npmci.Npmci();
   return npmciInstance.dockerManager.handleCli({
-    _: ['docker', 'test']
+    _: ['docker', 'test'],
   });
 });
 
 tap.test('should test dockerfiles', async () => {
   const npmciInstance = new npmci.Npmci();
   return npmciInstance.dockerManager.handleCli({
-    _: ['docker', 'test']
+    _: ['docker', 'test'],
   });
 });
 
 tap.test('should login docker daemon', async () => {
   const npmciInstance = new npmci.Npmci();
   return npmciInstance.dockerManager.handleCli({
-    _: ['docker', 'login']
+    _: ['docker', 'login'],
   });
 });
 
@@ -93,7 +94,7 @@ tap.test('should login docker daemon', async () => {
 tap.test('should prepare SSH keys', async () => {
   const npmciModSsh = await import('../ts/mod_ssh');
   return await npmciModSsh.handleCli({
-    _: ['ssh', 'prepare']
+    _: ['ssh', 'prepare'],
   });
 });
 
@@ -103,13 +104,13 @@ tap.test('should prepare SSH keys', async () => {
 tap.test('should install a certain version of node', async () => {
   const npmciInstance = new npmci.Npmci();
   await npmciInstance.nodejsManager.handleCli({
-    _: ['node', 'install', 'stable']
+    _: ['node', 'install', 'stable'],
   });
   await npmciInstance.nodejsManager.handleCli({
-    _: ['node', 'install', 'lts']
+    _: ['node', 'install', 'lts'],
   });
   await npmciInstance.nodejsManager.handleCli({
-    _: ['node', 'install', 'legacy']
+    _: ['node', 'install', 'legacy'],
   });
 });
 

ts/connector.cloudly/cloudlyconnector.ts

@@ -13,7 +13,9 @@ export class CloudlyConnector {
     this.npmciRef = npmciRefArg;
   }
 
-  public async announceDockerContainer(optionsArg: plugins.servezoneInterfaces.version.IVersionData) {
+  public async announceDockerContainer(
+    optionsArg: plugins.tsclass.container.IContainer
+  ) {
     const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly;
     if (!cloudlyUrl) {
       logger.log(
@@ -23,10 +25,14 @@ export class CloudlyConnector {
       return;
     }
 
-    const typedrequest = new plugins.typedrequest.TypedRequest<
-      plugins.servezoneInterfaces.request.version.IRequest_Any_Cloudly_VersionManager_Update
-    >(`https://${cloudlyUrl}/versionmanager`, 'update');
+    const typedrequest =
+      new plugins.typedrequest.TypedRequest<plugins.servezoneInterfaces.requests.IRequest_InformAboutNewContainerImage>(
+        `https://${cloudlyUrl}/typedrequest`,
+        'servezonestandard_InformAboutNewContainerVersion'
+      );
 
-    const response = await typedrequest.fire(optionsArg);
+    const response = await typedrequest.fire({
+      containerImageInfo: optionsArg
+    });
   }
 }

ts/index.ts

@@ -5,6 +5,6 @@ export const npmciInstance = new Npmci();
 
 export { Dockerfile, Npmci };
 
-if (process.env.CLI_CALL) {
+export const runCli = async () => {
   npmciInstance.start();
-}
+};

ts/manager.docker/index.ts

@@ -21,7 +21,7 @@ export class NpmciDockerManager {
    * handle cli input
    * @param argvArg
    */
-  public handleCli = async argvArg => {
+  public handleCli = async (argvArg: any) => {
     if (argvArg._.length >= 2) {
       const action: string = argvArg._[1];
       switch (action) {
@@ -85,7 +85,7 @@ export class NpmciDockerManager {
       new DockerRegistry({
         registryUrl: 'registry.gitlab.com',
         username: 'gitlab-ci-token',
-        password: process.env.CI_BUILD_TOKEN
+        password: process.env.CI_BUILD_TOKEN,
       })
     );
 
@@ -93,7 +93,7 @@ export class NpmciDockerManager {
     await plugins.smartparam.forEachMinimatch(
       process.env,
       'NPMCI_LOGIN_DOCKER*',
-      async envString => {
+      async (envString: string) => {
         this.npmciRegistryStorage.addRegistry(DockerRegistry.fromEnvString(envString));
       }
     );
@@ -104,7 +104,7 @@ export class NpmciDockerManager {
    * pushes an image towards a registry
    * @param argvArg
    */
-  public push = async argvArg => {
+  public push = async (argvArg: any) => {
     await this.prepare();
     let dockerRegistryUrls: string[] = [];
 
@@ -134,7 +134,9 @@ export class NpmciDockerManager {
       const dockerfileArray = await Dockerfile.readDockerfiles(this)
         .then(Dockerfile.sortDockerfiles)
         .then(Dockerfile.mapDockerfiles);
-      const dockerRegistryToPushTo = this.npmciRegistryStorage.getRegistryByUrl(dockerRegistryUrl);
+      const dockerRegistryToPushTo = await this.npmciRegistryStorage.getRegistryByUrl(
+        dockerRegistryUrl
+      );
       if (!dockerRegistryToPushTo) {
         logger.log(
           'error',
@@ -151,14 +153,14 @@ export class NpmciDockerManager {
   /**
    * pulls an image
    */
-  public pull = async argvArg => {
+  public pull = async (argvArg: any) => {
     await this.prepare();
     const registryUrlArg = argvArg._[2];
     let suffix = null;
     if (argvArg._.length >= 4) {
       suffix = argvArg._[3];
     }
-    const localDockerRegistry = this.npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
+    const localDockerRegistry = await this.npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
     const dockerfileArray = await Dockerfile.readDockerfiles(this)
       .then(Dockerfile.sortDockerfiles)
       .then(Dockerfile.mapDockerfiles);

ts/manager.docker/mod.classes.dockerfile.ts

@@ -31,7 +31,7 @@ export class Dockerfile {
     for (const dockerfilePath of fileTree) {
       const myDockerfile = new Dockerfile(npmciDockerManagerRefArg, {
         filePath: dockerfilePath,
-        read: true
+        read: true,
       });
       readDockerfilesArray.push(myDockerfile);
     }
@@ -51,7 +51,7 @@ export class Dockerfile {
     const cleanTagsOriginal = Dockerfile.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
     let sorterFunctionCounter: number = 0;
     const sorterFunction = () => {
-      sortableArrayArg.forEach(dockerfileArg => {
+      sortableArrayArg.forEach((dockerfileArg) => {
         const cleanTags = Dockerfile.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
         if (
           cleanTags.indexOf(dockerfileArg.baseImage) === -1 &&
@@ -83,7 +83,7 @@ export class Dockerfile {
    * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
    */
   public static async mapDockerfiles(sortedDockerfileArray: Dockerfile[]): Promise<Dockerfile[]> {
-    sortedDockerfileArray.forEach(dockerfileArg => {
+    sortedDockerfileArray.forEach((dockerfileArg) => {
       if (dockerfileArg.localBaseImageDependent) {
         sortedDockerfileArray.forEach((dockfile2: Dockerfile) => {
           if (dockfile2.cleanTag === dockerfileArg.baseImage) {
@@ -152,9 +152,8 @@ export class Dockerfile {
     suffixArg?: string
   ): string {
     // determine wether the repo should be mapped accordingly to the registry
-    const mappedRepo = npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerRegistryRepoMap[
-      registryArg
-    ];
+    const mappedRepo =
+      npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerRegistryRepoMap[registryArg];
     const repo = (() => {
       if (mappedRepo) {
         return mappedRepo;
@@ -198,7 +197,7 @@ export class Dockerfile {
     trackingArrayArg: Dockerfile[]
   ): string[] {
     const cleanTagsArray: string[] = [];
-    dockerfileArrayArg.forEach(dockerfileArg => {
+    dockerfileArrayArg.forEach((dockerfileArg) => {
       if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
         cleanTagsArray.push(dockerfileArg.cleanTag);
       }
@@ -269,14 +268,16 @@ export class Dockerfile {
     );
     await bash(`docker tag ${this.buildTag} ${this.pushTag}`);
     await bash(`docker push ${this.pushTag}`);
-    const imageDigest = (await bash(
-      `docker inspect --format="{{index .RepoDigests 0}}" ${this.pushTag}`
-    )).split('@')[1];
+    const imageDigest = (
+      await bash(`docker inspect --format="{{index .RepoDigests 0}}" ${this.pushTag}`)
+    ).split('@')[1];
     console.log(`The image ${this.pushTag} has digest ${imageDigest}`);
     await this.npmciDockerManagerRef.npmciRef.cloudlyConnector.announceDockerContainer({
-      dockerImageUrl: this.pushTag,
-      dockerImageVersion: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo
-        .npm.version
+      registryUrl: this.pushTag,
+      tag: this.buildTag,
+      labels: [],
+      version:
+        this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version,
     });
   }
 

ts/manager.docker/mod.classes.dockerregistry.ts

@@ -32,7 +32,7 @@ export class DockerRegistry {
     return new DockerRegistry({
       registryUrl: registryUrl,
       username: username,
-      password: password
+      password: password,
     });
   }
 

ts/manager.docker/mod.classes.registrystorage.ts

@@ -1,11 +1,11 @@
 import { logger } from '../npmci.logging';
 import * as plugins from './mod.plugins';
-import { Objectmap } from '@pushrocks/lik';
+import { ObjectMap } from '@pushrocks/lik';
 
 import { DockerRegistry } from './mod.classes.dockerregistry';
 
 export class RegistryStorage {
-  objectMap = new Objectmap<DockerRegistry>();
+  objectMap = new ObjectMap<DockerRegistry>();
   constructor() {
     // Nothing here
   }
@@ -15,13 +15,13 @@ export class RegistryStorage {
   }
 
   getRegistryByUrl(registryUrlArg: string) {
-    return this.objectMap.find(registryArg => {
+    return this.objectMap.findSync((registryArg) => {
       return registryArg.registryUrl === registryUrlArg;
     });
   }
 
   async loginAll() {
-    await this.objectMap.forEach(async registryArg => {
+    await this.objectMap.forEach(async (registryArg) => {
       await registryArg.login();
     });
     logger.log('success', 'logged in successfully into all available DockerRegistries!');

ts/manager.git/index.ts

@@ -1,6 +1,6 @@
 import { logger } from '../npmci.logging';
 import * as plugins from './mod.plugins';
-import { bash } from '../npmci.bash';
+import { bash, bashNoError } from '../npmci.bash';
 import { Npmci } from '../npmci.classes.npmci';
 
 export class NpmciGitManager {
@@ -14,7 +14,7 @@ export class NpmciGitManager {
    * handle cli input
    * @param argvArg
    */
-  public handleCli = async argvArg => {
+  public handleCli = async (argvArg: any) => {
     if (argvArg._.length >= 2) {
       const action: string = argvArg._[1];
       switch (action) {
@@ -47,16 +47,22 @@ export class NpmciGitManager {
       logger.log('info', 'found github token.');
       logger.log('info', 'attempting the mirror the repository to GitHub');
 
-      // plugins.smartgit.GitRepo;
+      // remove old mirrors
+      await bashNoError('git remote rm mirror');
 
+      await bash(`git fetch`);
       // add the mirror
-      await bash(
+      await bashNoError(
         `git remote add mirror https://${githubToken}@github.com/${githubUser}/${githubRepo}.git`
       );
-      await bash(`git push mirror --all`);
+      await bashNoError(`git push mirror --all`);
+      await bashNoError(`git checkout origin/master`);
+      await bashNoError(`git push mirror master`);
       logger.log('ok', 'pushed all branches to mirror!');
-      await bash(`git push mirror --tags`);
+      await bashNoError(`git push mirror --tags`);
       logger.log('ok', 'pushed all tags to mirror!');
+      // remove old mirrors
+      await bashNoError('git remote rm mirror');
     } else {
       logger.log('error', `cannot find NPMCI_GIT_GITHUBTOKEN env var!`);
       process.exit(1);

ts/manager.git/mod.plugins.ts

@@ -1,5 +1 @@
 export * from '../npmci.plugins';
-
-import * as smartgit from '@pushrocks/smartgit';
-
-export { smartgit };

ts/manager.nodejs/index.ts

@@ -16,7 +16,7 @@ export class NpmciNodeJsManager {
    * handle cli input
    * @param argvArg
    */
-  public async handleCli(argvArg) {
+  public async handleCli(argvArg: any) {
     if (argvArg._.length >= 3) {
       const action: string = argvArg._[1];
       switch (action) {
@@ -40,15 +40,15 @@ export class NpmciNodeJsManager {
    * Install a specific version of node
    * @param versionArg
    */
-  public async install(versionArg) {
+  public async install(versionArg: any) {
     logger.log('info', `now installing node version ${versionArg}`);
     let version: string;
     if (versionArg === 'stable') {
-      version = '12';
+      version = '16';
     } else if (versionArg === 'lts') {
-      version = '10';
+      version = '14';
     } else if (versionArg === 'legacy') {
-      version = '8';
+      version = '12';
     } else {
       version = versionArg;
     }
@@ -62,7 +62,6 @@ export class NpmciNodeJsManager {
     await bash('npm install -g npm');
     await bash('node -v');
     await bash('npm -v');
-    await bash(`npm config set cache ${paths.NpmciCacheDir}  --global `);
 
     // lets look for further config
     const config = await this.npmciRef.npmciConfig.getConfig();

ts/manager.npm/index.ts

@@ -1,4 +1,5 @@
 import * as plugins from './mod.plugins';
+import * as paths from '../npmci.paths';
 
 import { logger } from '../npmci.logging';
 import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
@@ -7,7 +8,7 @@ import { Npmci } from '../npmci.classes.npmci';
 export class NpmciNpmManager {
   public npmciRef: Npmci;
 
-  constructor(npmciRefArg) {
+  constructor(npmciRefArg: Npmci) {
     this.npmciRef = npmciRefArg;
   }
 
@@ -15,13 +16,16 @@ export class NpmciNpmManager {
    * handle cli input
    * @param argvArg
    */
-  public async handleCli(argvArg) {
+  public async handleCli(argvArg: any) {
     if (argvArg._.length >= 2) {
       const action: string = argvArg._[1];
       switch (action) {
         case 'install':
           await this.install();
           break;
+        case 'build':
+          await this.build();
+          break;
         case 'prepare':
           await this.prepare();
           break;
@@ -50,13 +54,21 @@ export class NpmciNpmManager {
   public async prepare() {
     const config = this.npmciRef.npmciConfig.getConfig();
     let npmrcFileString: string = '';
-    await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => {
+    await plugins.smartparam.forEachMinimatch(
+      process.env,
+      'NPMCI_TOKEN_NPM*',
+      (npmEnvArg: string) => {
         const npmRegistryUrl = npmEnvArg.split('|')[0];
-      const npmToken = npmEnvArg.split('|')[1];
-      npmrcFileString += `//${npmRegistryUrl}/:_authToken="${plugins.smartstring.base64.decode(
-        npmToken
-      )}"\n`;
-    });
+        let npmToken = npmEnvArg.split('|')[1];
+        if (npmEnvArg.split('|')[2] && npmEnvArg.split('|')[2] === 'plain') {
+          logger.log('ok', 'npm token not base64 encoded.');
+        } else {
+          logger.log('ok', 'npm token base64 encoded.');
+          npmToken = plugins.smartstring.base64.decode(npmToken);
+        }
+        npmrcFileString += `//${npmRegistryUrl}/:_authToken="${npmToken}"\n`;
+      }
+    );
     logger.log('info', `setting default npm registry to ${config.npmRegistryUrl}`);
     npmrcFileString += `registry=https://${config.npmRegistryUrl}\n`;
 
@@ -70,6 +82,10 @@ export class NpmciNpmManager {
 
     // lets save it to disk
     plugins.smartfile.memory.toFsSync(npmrcFileString, '/root/.npmrc');
+
+    // lets set the cache directory
+    await bash(`npm config set cache ${paths.NpmciCacheDir}  --global `);
+
     return;
   }
 
@@ -83,9 +99,13 @@ export class NpmciNpmManager {
       let publishVerdaccioAsWell = false;
       const config = this.npmciRef.npmciConfig.getConfig();
       const availableRegistries: string[] = [];
-      await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => {
+      await plugins.smartparam.forEachMinimatch(
+        process.env,
+        'NPMCI_TOKEN_NPM*',
+        (npmEnvArg: string) => {
           availableRegistries.push(npmEnvArg.split('|')[0]);
-      });
+        }
+      );
 
       // -> configure package access level
       if (config.npmAccessLevel) {
@@ -108,7 +128,7 @@ export class NpmciNpmManager {
 
       // publishEverywhere
       if (publishVerdaccioAsWell) {
-        const verdaccioRegistry = availableRegistries.find(registryString =>
+        const verdaccioRegistry = availableRegistries.find((registryString) =>
           registryString.startsWith('verdaccio')
         );
         if (verdaccioRegistry) {

ts/mod_ssh/index.ts

@@ -2,7 +2,7 @@ import { logger } from '../npmci.logging';
 import * as plugins from './mod.plugins';
 let sshInstance: plugins.smartssh.SshInstance;
 
-export let handleCli = async argvArg => {
+export let handleCli = async (argvArg: any) => {
   if (argvArg._.length >= 2) {
     const action: string = argvArg._[1];
     switch (action) {

ts/mod_trigger/index.ts

@@ -2,14 +2,15 @@ import * as plugins from './mod.plugins';
 import { bash } from '../npmci.bash';
 import { logger } from '../npmci.logging';
 
-const triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/;
+const triggerValueRegex =
+  /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/;
 
 export let trigger = async () => {
   logger.log('info', 'now running triggers');
   await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
 };
 
-const evaluateTrigger = async triggerEnvVarArg => {
+const evaluateTrigger = async (triggerEnvVarArg) => {
   const triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg);
   const regexDomain = triggerRegexResultArray[1];
   const regexProjectId = triggerRegexResultArray[2];
@@ -30,13 +31,13 @@ const evaluateTrigger = async triggerEnvVarArg => {
       {
         name: 'token',
         payload: regexProjectTriggerToken,
-        type: 'string'
+        type: 'string',
       },
       {
         name: 'ref',
         payload: regexRefName,
-        type: 'string'
-      }
+        type: 'string',
+      },
     ]
   );
 };

ts/npmci.bash.ts

@@ -13,7 +13,7 @@ export let nvmAvailable = smartpromise.defer<boolean>();
  */
 const npmciSmartshell = new plugins.smartshell.Smartshell({
   executor: 'bash',
-  sourceFilePaths: []
+  sourceFilePaths: [],
 });
 
 /**
@@ -84,7 +84,7 @@ export let bash = async (commandArg: string, retryArg: number = 2): Promise<stri
     logger.log('info', 'ShellExec would be: ' + commandArg);
     execResult = {
       exitCode: 0,
-      stdout: 'testOutput'
+      stdout: 'testOutput',
     };
   }
   return execResult.stdout;

ts/npmci.classes.npmci.ts

@@ -32,7 +32,7 @@ export class Npmci {
     this.analytics = new plugins.smartanalytics.Analytics({
       apiEndPoint: 'https://pubapi.lossless.one/analytics',
       projectId: 'gitzone',
-      appName: 'npmci'
+      appName: 'npmci',
     });
     this.cloudlyConnector = new CloudlyConnector(this);
     this.npmciEnv = new NpmciEnv(this);

ts/npmci.classes.npmcicli.ts

@@ -14,11 +14,11 @@ export class NpmciCli {
 
     // clean
     this.smartcli.addCommand('clean').subscribe(
-      async argv => {
+      async (argv) => {
         const modClean = await import('./mod_clean/index');
         await modClean.clean();
       },
-      err => {
+      (err) => {
         console.log(err);
         process.exit(1);
       }
@@ -26,11 +26,11 @@ export class NpmciCli {
 
     // command
     this.smartcli.addCommand('command').subscribe(
-      async argv => {
+      async (argv) => {
         const modCommand = await import('./mod_command/index');
         await modCommand.command();
       },
-      err => {
+      (err) => {
         console.log(err);
         process.exit(1);
       }
@@ -38,10 +38,10 @@ export class NpmciCli {
 
     // command
     this.smartcli.addCommand('git').subscribe(
-      async argvArg => {
+      async (argvArg) => {
         await this.npmciRef.gitManager.handleCli(argvArg);
       },
-      err => {
+      (err) => {
         console.log(err);
         process.exit(1);
       }
@@ -49,10 +49,10 @@ export class NpmciCli {
 
     // build
     this.smartcli.addCommand('docker').subscribe(
-      async argvArg => {
+      async (argvArg) => {
         await this.npmciRef.dockerManager.handleCli(argvArg);
       },
-      err => {
+      (err) => {
         console.log(err);
         process.exit(1);
       }
@@ -60,10 +60,10 @@ export class NpmciCli {
 
     // node
     this.smartcli.addCommand('node').subscribe(
-      async argvArg => {
+      async (argvArg) => {
         await this.npmciRef.nodejsManager.handleCli(argvArg);
       },
-      err => {
+      (err) => {
         console.log(err);
         process.exit(1);
       }
@@ -71,21 +71,21 @@ export class NpmciCli {
 
     // npm
     this.smartcli.addCommand('npm').subscribe(
-      async argvArg => {
+      async (argvArg) => {
         await this.npmciRef.npmManager.handleCli(argvArg);
       },
-      err => {
+      (err) => {
         console.log(err);
       }
     );
 
     // trigger
     this.smartcli.addCommand('ssh').subscribe(
-      async argvArg => {
+      async (argvArg) => {
         const modSsh = await import('./mod_ssh/index');
         await modSsh.handleCli(argvArg);
       },
-      err => {
+      (err) => {
         console.log(err);
         process.exit(1);
       }
@@ -93,11 +93,11 @@ export class NpmciCli {
 
     // trigger
     this.smartcli.addCommand('trigger').subscribe(
-      async argv => {
+      async (argv) => {
         const modTrigger = await import('./mod_trigger/index');
         await modTrigger.trigger();
       },
-      err => {
+      (err) => {
         console.log(err);
         process.exit(1);
       }

ts/npmci.classes.npmciconfig.ts

@@ -47,8 +47,7 @@ export class NpmciConfig {
     this.npmciQenv = new plugins.qenv.Qenv(
       paths.NpmciProjectDir,
       paths.NpmciProjectNogitDir,
-      false,
-      logger
+      false
     );
 
     this.configObject = {
@@ -59,7 +58,7 @@ export class NpmciConfig {
       npmAccessLevel: 'private',
       npmRegistryUrl: 'registry.npmjs.org',
       dockerBuildargEnvMap: {},
-      urlCloudly: this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY')
+      urlCloudly: this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY'),
     };
   }
 

ts/npmci.logging.ts

@@ -7,8 +7,8 @@ export const logger = new plugins.smartlog.Smartlog({
     containerName: 'Some ContainerName',
     environment: 'test',
     runtime: 'node',
-    zone: 'Some Zone'
-  }
+    zone: 'Some Zone',
+  },
 });
 
 logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());

ts/npmci.plugins.ts

@@ -9,7 +9,7 @@ import * as typedrequest from '@apiglobal/typedrequest';
 export { typedrequest };
 
 // @servezone
-import * as servezoneInterfaces from '@servezone/servezone-interfaces';
+import * as servezoneInterfaces from '@servezone/interfaces';
 
 export { servezoneInterfaces };
 
@@ -21,6 +21,7 @@ import * as smartanalytics from '@pushrocks/smartanalytics';
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartcli from '@pushrocks/smartcli';
+import * as smartgit from '@pushrocks/smartgit';
 import * as smartlog from '@pushrocks/smartlog';
 import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
 import * as smartparam from '@pushrocks/smartparam';
@@ -47,9 +48,17 @@ export {
   smartshell,
   smartsocket,
   smartssh,
-  smartstring
+  smartstring,
 };
 
+// @tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export {
+  tsclass
+}
+
+// third party
 import * as through2 from 'through2';
 
 export { through2 };