4.0.0

.gitlab-ci.yml

@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
@@ -36,6 +39,7 @@ auditProductionDependencies:
     - npmci command npm audit --audit-level=high --only=prod --production
   tags:
     - docker
+  allow_failure: true
 
 auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci

.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

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
-      "type": "node",
+      "command": "npm test",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
+      "type": "node-terminal"
     }
   ]
 }

LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Lossless GmbH
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

cli.child.ts

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+import * as cliTool from './ts/index.js';
+cliTool.runCli();

cli.js

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

cli.ts.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('@gitzone/tsrun');
-const cliTool = require('./ts/index');
-cliTool.runCli();
+
+import * as tsrun from '@gitzone/tsrun';
+tsrun.runPath('./cli.child.js', import.meta.url);

package.json

@@ -1,16 +1,17 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.1.75",
+  "version": "4.0.0",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "bin": {
     "npmci": "cli.js"
   },
   "scripts": {
     "test": "tstest test/",
-    "build": "tsbuild && (npm run testVersion)",
+    "build": "tsbuild --allowimplicitany && (npm run testVersion)",
     "testVersion": "(cd test/assets/ && node ../../cli.js -v)"
   },
   "repository": {
@@ -24,34 +25,37 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.54",
-    "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^15.0.3",
+    "@gitzone/tsbuild": "^2.1.65",
+    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tstest": "^1.0.73",
+    "@pushrocks/tapbundle": "^5.0.4",
+    "@types/node": "^18.8.3",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^1.0.56",
-    "@pushrocks/lik": "^4.0.20",
+    "@apiglobal/typedrequest": "^2.0.10",
+    "@pushrocks/lik": "^6.0.0",
     "@pushrocks/npmextra": "^3.0.9",
-    "@pushrocks/projectinfo": "^4.0.5",
-    "@pushrocks/qenv": "^4.0.10",
+    "@pushrocks/projectinfo": "^5.0.1",
+    "@pushrocks/qenv": "^5.0.2",
     "@pushrocks/smartanalytics": "^2.0.15",
-    "@pushrocks/smartcli": "^3.0.14",
-    "@pushrocks/smartdelay": "^2.0.10",
-    "@pushrocks/smartfile": "^8.0.10",
-    "@pushrocks/smartlog": "^2.0.39",
+    "@pushrocks/smartcli": "^4.0.6",
+    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartfile": "^10.0.5",
+    "@pushrocks/smartgit": "^3.0.0",
+    "@pushrocks/smartlog": "^3.0.1",
     "@pushrocks/smartlog-destination-local": "^8.0.8",
     "@pushrocks/smartparam": "^1.1.6",
-    "@pushrocks/smartpromise": "^3.1.5",
-    "@pushrocks/smartrequest": "^1.1.51",
-    "@pushrocks/smartshell": "^2.0.26",
-    "@pushrocks/smartsocket": "^1.2.8",
+    "@pushrocks/smartpath": "^5.0.5",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartrequest": "^2.0.11",
+    "@pushrocks/smartshell": "^2.0.30",
+    "@pushrocks/smartsocket": "^2.0.7",
     "@pushrocks/smartssh": "^1.2.3",
-    "@pushrocks/smartstring": "^3.0.24",
-    "@servezone/servezone-interfaces": "^2.0.51",
+    "@pushrocks/smartstring": "^4.0.5",
+    "@servezone/interfaces": "^1.0.3",
+    "@tsclass/tsclass": "^4.0.21",
     "@types/through2": "^2.0.36",
     "through2": "^4.0.2"
   },

readme.md

@@ -100,7 +100,6 @@ 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). :)

test/test.cloudly.ts

@@ -0,0 +1,23 @@
+process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = '0';
+import { tap, expect } from '@pushrocks/tapbundle';
+
+import * as cloudlyConnectorMod from '../ts/connector.cloudly/cloudlyconnector.js';
+
+tap.test('should be able to announce a container to cloudly', async () => {
+  const cloudlyConnector = new cloudlyConnectorMod.CloudlyConnector(null);
+  await cloudlyConnector.announceDockerContainer({
+    registryUrl: 'registry.losssless.com',
+    tag: 'testcontainer',
+    version: 'x.x.x',
+    labels: []
+  }, 'cloudly.lossless.one')
+});
+
+tap.test('should close the program despite socket timeout', async (toolsArg) => {
+  // TODO: remove when unreffed timeouts in webrequest have been solved.
+  toolsArg.delayFor(0).then(() => {
+    process.exit();
+  })
+})
+
+tap.start();

test/test.ts

@@ -1,7 +1,9 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 import * as path from 'path';
+import * as smartpath from '@pushrocks/smartpath';
 
 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';
@@ -14,10 +16,14 @@ process.env.NPMCI_LOGIN_DOCKER = 'docker.io|someuser|somepass';
 process.env.NPMCI_SSHKEY_1 = 'hostString|somePrivKey|##';
 
 process.cwd = () => {
-  return path.join(__dirname, 'assets/');
+  return path.join(smartpath.get.dirnameFromImportMetaUrl(import.meta.url), 'assets/');
 };
 
-import * as npmci from '../ts';
+let npmci: typeof import('../ts/index.js');
+
+tap.preTask('should import npmci', async () => {
+  npmci = await import('../ts/index.js');
+})
 
 // ======
 // Docker
@@ -37,8 +43,8 @@ tap.test('should return valid Dockerfiles', async () => {
     filePath: './Dockerfile_sometag1',
     read: true,
   });
-  expect(dockerfile1.version).to.equal('latest');
-  return expect(dockerfile2.version).to.equal('sometag1');
+  expect(dockerfile1.version).toEqual('latest');
+  return expect(dockerfile2.version).toEqual('sometag1');
 });
 
 tap.test('should read a directory of Dockerfiles', async () => {
@@ -46,7 +52,7 @@ tap.test('should read a directory of Dockerfiles', async () => {
   return npmci.Dockerfile.readDockerfiles(npmciInstance.dockerManager).then(
     async (readDockerfilesArrayArg: npmci.Dockerfile[]) => {
       sortableArray = readDockerfilesArrayArg;
-      return expect(readDockerfilesArrayArg[1].version).to.equal('sometag1');
+      return expect(readDockerfilesArrayArg[1].version).toEqual('sometag1');
     }
   );
 });
@@ -91,7 +97,7 @@ tap.test('should login docker daemon', async () => {
 // SSH
 // ===
 tap.test('should prepare SSH keys', async () => {
-  const npmciModSsh = await import('../ts/mod_ssh');
+  const npmciModSsh = await import('../ts/mod_ssh/index.js');
   return await npmciModSsh.handleCli({
     _: ['ssh', 'prepare'],
   });

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@shipzone/npmci',
+  version: '4.0.0',
+  description: 'node and docker in gitlab ci on steroids'
+}

ts/connector.cloudly/cloudlyconnector.ts

@@ -1,7 +1,7 @@
-import * as plugins from '../npmci.plugins';
+import * as plugins from '../npmci.plugins.js';
 
-import { Npmci } from '../npmci.classes.npmci';
-import { logger } from '../npmci.logging';
+import { Npmci } from '../npmci.classes.npmci.js';
+import { logger } from '../npmci.logging.js';
 
 /**
  * connects to cloudly
@@ -14,9 +14,10 @@ export class CloudlyConnector {
   }
 
   public async announceDockerContainer(
-    optionsArg: plugins.servezoneInterfaces.version.IVersionData
+    optionsArg: plugins.tsclass.container.IContainer,
+    testCloudlyUrlArg?: string
   ) {
-    const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly;
+    const cloudlyUrl = testCloudlyUrlArg || this.npmciRef.npmciConfig.getConfig().urlCloudly;
     if (!cloudlyUrl) {
       logger.log(
         'warn',
@@ -25,11 +26,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

@@ -1,5 +1,5 @@
-import { Npmci } from './npmci.classes.npmci';
-import { Dockerfile } from './manager.docker/mod.classes.dockerfile';
+import { Npmci } from './npmci.classes.npmci.js';
+import { Dockerfile } from './manager.docker/mod.classes.dockerfile.js';
 
 export const npmciInstance = new Npmci();
 

ts/manager.docker/index.ts

@@ -1,13 +1,13 @@
-import { logger } from '../npmci.logging';
-import * as plugins from './mod.plugins';
-import * as paths from '../npmci.paths';
-import { bash } from '../npmci.bash';
+import { logger } from '../npmci.logging.js';
+import * as plugins from './mod.plugins.js';
+import * as paths from '../npmci.paths.js';
+import { bash } from '../npmci.bash.js';
 
 // classes
-import { Npmci } from '../npmci.classes.npmci';
-import { Dockerfile } from './mod.classes.dockerfile';
-import { DockerRegistry } from './mod.classes.dockerregistry';
-import { RegistryStorage } from './mod.classes.registrystorage';
+import { Npmci } from '../npmci.classes.npmci.js';
+import { Dockerfile } from './mod.classes.dockerfile.js';
+import { DockerRegistry } from './mod.classes.dockerregistry.js';
+import { RegistryStorage } from './mod.classes.registrystorage.js';
 
 export class NpmciDockerManager {
   public npmciRef: Npmci;
@@ -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) {
@@ -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

@@ -1,13 +1,13 @@
-import * as plugins from './mod.plugins';
-import * as paths from '../npmci.paths';
+import * as plugins from './mod.plugins.js';
+import * as paths from '../npmci.paths.js';
 
-import { logger } from '../npmci.logging';
-import { bash } from '../npmci.bash';
+import { logger } from '../npmci.logging.js';
+import { bash } from '../npmci.bash.js';
 
-import { DockerRegistry } from './mod.classes.dockerregistry';
-import * as helpers from './mod.helpers';
-import { NpmciDockerManager } from '.';
-import { Npmci } from '../npmci.classes.npmci';
+import { DockerRegistry } from './mod.classes.dockerregistry.js';
+import * as helpers from './mod.helpers.js';
+import { NpmciDockerManager } from './index.js';
+import { Npmci } from '../npmci.classes.npmci.js';
 
 /**
  * class Dockerfile represents a Dockerfile on disk in npmci
@@ -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;
@@ -274,9 +273,11 @@ export class Dockerfile {
     ).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

@@ -1,6 +1,6 @@
-import { logger } from '../npmci.logging';
-import * as plugins from './mod.plugins';
-import { bash } from '../npmci.bash';
+import { logger } from '../npmci.logging.js';
+import * as plugins from './mod.plugins.js';
+import { bash } from '../npmci.bash.js';
 
 export interface IDockerRegistryConstructorOptions {
   registryUrl: string;

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

@@ -1,8 +1,8 @@
-import { logger } from '../npmci.logging';
-import * as plugins from './mod.plugins';
+import { logger } from '../npmci.logging.js';
+import * as plugins from './mod.plugins.js';
 import { ObjectMap } from '@pushrocks/lik';
 
-import { DockerRegistry } from './mod.classes.dockerregistry';
+import { DockerRegistry } from './mod.classes.dockerregistry.js';
 
 export class RegistryStorage {
   objectMap = new ObjectMap<DockerRegistry>();
@@ -15,7 +15,7 @@ export class RegistryStorage {
   }
 
   getRegistryByUrl(registryUrlArg: string) {
-    return this.objectMap.find((registryArg) => {
+    return this.objectMap.findSync((registryArg) => {
       return registryArg.registryUrl === registryUrlArg;
     });
   }

ts/manager.docker/mod.helpers.ts

@@ -1,5 +1,5 @@
-import { logger } from '../npmci.logging';
-import * as plugins from './mod.plugins';
-import * as paths from '../npmci.paths';
+import { logger } from '../npmci.logging.js';
+import * as plugins from './mod.plugins.js';
+import * as paths from '../npmci.paths.js';
 
-import { Dockerfile } from './mod.classes.dockerfile';
+import { Dockerfile } from './mod.classes.dockerfile.js';

ts/manager.docker/mod.plugins.ts

@@ -1 +1 @@
-export * from '../npmci.plugins';
+export * from '../npmci.plugins.js';

ts/manager.git/index.ts

@@ -1,7 +1,7 @@
-import { logger } from '../npmci.logging';
-import * as plugins from './mod.plugins';
-import { bash, bashNoError } from '../npmci.bash';
-import { Npmci } from '../npmci.classes.npmci';
+import { logger } from '../npmci.logging.js';
+import * as plugins from './mod.plugins.js';
+import { bash, bashNoError } from '../npmci.bash.js';
+import { Npmci } from '../npmci.classes.npmci.js';
 
 export class NpmciGitManager {
   public npmciRef: Npmci;
@@ -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) {

ts/manager.git/mod.plugins.ts

@@ -1 +1 @@
-export * from '../npmci.plugins';
+export * from '../npmci.plugins.js';

ts/manager.nodejs/index.ts

@@ -1,9 +1,9 @@
-import * as plugins from '../npmci.plugins';
-import * as paths from '../npmci.paths';
+import * as plugins from '../npmci.plugins.js';
+import * as paths from '../npmci.paths.js';
 
-import { logger } from '../npmci.logging';
-import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
-import { Npmci } from '../npmci.classes.npmci';
+import { logger } from '../npmci.logging.js';
+import { bash, bashNoError, nvmAvailable } from '../npmci.bash.js';
+import { Npmci } from '../npmci.classes.npmci.js';
 
 export class NpmciNodeJsManager {
   public npmciRef: Npmci;
@@ -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;
     }

ts/manager.npm/index.ts

@@ -1,14 +1,14 @@
-import * as plugins from './mod.plugins';
-import * as paths from '../npmci.paths';
+import * as plugins from './mod.plugins.js';
+import * as paths from '../npmci.paths.js';
 
-import { logger } from '../npmci.logging';
-import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
-import { Npmci } from '../npmci.classes.npmci';
+import { logger } from '../npmci.logging.js';
+import { bash, bashNoError, nvmAvailable } from '../npmci.bash.js';
+import { Npmci } from '../npmci.classes.npmci.js';
 
 export class NpmciNpmManager {
   public npmciRef: Npmci;
 
-  constructor(npmciRefArg) {
+  constructor(npmciRefArg: Npmci) {
     this.npmciRef = npmciRefArg;
   }
 
@@ -16,7 +16,7 @@ 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) {
@@ -54,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) => {
-      const npmRegistryUrl = npmEnvArg.split('|')[0];
-      const npmToken = npmEnvArg.split('|')[1];
-      npmrcFileString += `//${npmRegistryUrl}/:_authToken="${plugins.smartstring.base64.decode(
-        npmToken
-      )}"\n`;
-    });
+    await plugins.smartparam.forEachMinimatch(
+      process.env,
+      'NPMCI_TOKEN_NPM*',
+      (npmEnvArg: string) => {
+        const npmRegistryUrl = npmEnvArg.split('|')[0];
+        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`;
 
@@ -91,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) => {
-        availableRegistries.push(npmEnvArg.split('|')[0]);
-      });
+      await plugins.smartparam.forEachMinimatch(
+        process.env,
+        'NPMCI_TOKEN_NPM*',
+        (npmEnvArg: string) => {
+          availableRegistries.push(npmEnvArg.split('|')[0]);
+        }
+      );
 
       // -> configure package access level
       if (config.npmAccessLevel) {

ts/manager.npm/mod.plugins.ts

@@ -1 +1 @@
-export * from '../npmci.plugins';
+export * from '../npmci.plugins.js';

ts/mod_clean/index.ts

@@ -1,5 +1,5 @@
-import * as plugins from './mod.plugins';
-import * as paths from '../npmci.paths';
+import * as plugins from './mod.plugins.js';
+import * as paths from '../npmci.paths.js';
 
 /**
  * cleans npmci config files

ts/mod_clean/mod.plugins.ts

@@ -1 +1 @@
-export * from '../npmci.plugins';
+export * from '../npmci.plugins.js';

ts/mod_command/index.ts

@@ -1,5 +1,5 @@
-import * as plugins from './mod.plugins';
-import { bash } from '../npmci.bash';
+import * as plugins from './mod.plugins.js';
+import { bash } from '../npmci.bash.js';
 
 export let command = async () => {
   let wrappedCommand: string = '';

ts/mod_command/mod.plugins.ts

@@ -1 +1 @@
-export * from '../npmci.plugins';
+export * from '../npmci.plugins.js';

ts/mod_ssh/index.ts

@@ -1,8 +1,8 @@
-import { logger } from '../npmci.logging';
-import * as plugins from './mod.plugins';
+import { logger } from '../npmci.logging.js';
+import * as plugins from './mod.plugins.js';
 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_ssh/mod.plugins.ts

@@ -1 +1 @@
-export * from '../npmci.plugins';
+export * from '../npmci.plugins.js';

ts/mod_trigger/index.ts

@@ -1,8 +1,9 @@
-import * as plugins from './mod.plugins';
-import { bash } from '../npmci.bash';
-import { logger } from '../npmci.logging';
+import * as plugins from './mod.plugins.js';
+import { bash } from '../npmci.bash.js';
+import { logger } from '../npmci.logging.js';
 
-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');

ts/mod_trigger/mod.plugins.ts

@@ -1 +1 @@
-export * from '../npmci.plugins';
+export * from '../npmci.plugins.js';

ts/npmci.bash.ts

@@ -1,6 +1,6 @@
-import { logger } from './npmci.logging';
-import * as plugins from './npmci.plugins';
-import * as paths from './npmci.paths';
+import { logger } from './npmci.logging.js';
+import * as plugins from './npmci.plugins.js';
+import * as paths from './npmci.paths.js';
 
 import * as smartpromise from '@pushrocks/smartpromise';
 

ts/npmci.classes.npmci.ts

@@ -1,17 +1,17 @@
-import * as plugins from './npmci.plugins';
+import * as plugins from './npmci.plugins.js';
 
-import { CloudlyConnector } from './connector.cloudly/cloudlyconnector';
+import { CloudlyConnector } from './connector.cloudly/cloudlyconnector.js';
 
-import { NpmciInfo } from './npmci.classes.npmciinfo';
-import { NpmciCli } from './npmci.classes.npmcicli';
-import { NpmciConfig } from './npmci.classes.npmciconfig';
+import { NpmciInfo } from './npmci.classes.npmciinfo.js';
+import { NpmciCli } from './npmci.classes.npmcicli.js';
+import { NpmciConfig } from './npmci.classes.npmciconfig.js';
 
 // mods
-import { NpmciDockerManager } from './manager.docker';
-import { NpmciGitManager } from './manager.git';
-import { NpmciNodeJsManager } from './manager.nodejs';
-import { NpmciNpmManager } from './manager.npm';
-import { NpmciEnv } from './npmci.classes.npmcienv';
+import { NpmciDockerManager } from './manager.docker/index.js';
+import { NpmciGitManager } from './manager.git/index.js';
+import { NpmciNodeJsManager } from './manager.nodejs/index.js';
+import { NpmciNpmManager } from './manager.npm/index.js';
+import { NpmciEnv } from './npmci.classes.npmcienv.js';
 
 export class Npmci {
   public analytics: plugins.smartanalytics.Analytics;

ts/npmci.classes.npmcicli.ts

@@ -1,7 +1,7 @@
-import { logger } from './npmci.logging';
-import * as plugins from './npmci.plugins';
-import * as paths from './npmci.paths';
-import { Npmci } from './npmci.classes.npmci';
+import { logger } from './npmci.logging.js';
+import * as plugins from './npmci.plugins.js';
+import * as paths from './npmci.paths.js';
+import { Npmci } from './npmci.classes.npmci.js';
 
 export class NpmciCli {
   public npmciRef: Npmci;
@@ -15,7 +15,7 @@ export class NpmciCli {
     // clean
     this.smartcli.addCommand('clean').subscribe(
       async (argv) => {
-        const modClean = await import('./mod_clean/index');
+        const modClean = await import('./mod_clean/index.js');
         await modClean.clean();
       },
       (err) => {
@@ -27,7 +27,7 @@ export class NpmciCli {
     // command
     this.smartcli.addCommand('command').subscribe(
       async (argv) => {
-        const modCommand = await import('./mod_command/index');
+        const modCommand = await import('./mod_command/index.js');
         await modCommand.command();
       },
       (err) => {
@@ -82,7 +82,7 @@ export class NpmciCli {
     // trigger
     this.smartcli.addCommand('ssh').subscribe(
       async (argvArg) => {
-        const modSsh = await import('./mod_ssh/index');
+        const modSsh = await import('./mod_ssh/index.js');
         await modSsh.handleCli(argvArg);
       },
       (err) => {
@@ -94,7 +94,7 @@ export class NpmciCli {
     // trigger
     this.smartcli.addCommand('trigger').subscribe(
       async (argv) => {
-        const modTrigger = await import('./mod_trigger/index');
+        const modTrigger = await import('./mod_trigger/index.js');
         await modTrigger.trigger();
       },
       (err) => {

ts/npmci.classes.npmciconfig.ts

@@ -1,8 +1,8 @@
-import * as plugins from './npmci.plugins';
-import * as paths from './npmci.paths';
+import * as plugins from './npmci.plugins.js';
+import * as paths from './npmci.paths.js';
 
-import { logger } from './npmci.logging';
-import { Npmci } from './npmci.classes.npmci';
+import { logger } from './npmci.logging.js';
+import { Npmci } from './npmci.classes.npmci.js';
 
 /**
  * the main config interface for npmci

ts/npmci.classes.npmcienv.ts

@@ -1,5 +1,5 @@
-import * as plugins from './npmci.plugins';
-import { Npmci } from './npmci.classes.npmci';
+import * as plugins from './npmci.plugins.js';
+import { Npmci } from './npmci.classes.npmci.js';
 
 export class NpmciEnv {
   public npmciRef: Npmci;

ts/npmci.classes.npmciinfo.ts

@@ -1,7 +1,7 @@
-import * as plugins from './npmci.plugins';
-import * as paths from './npmci.paths';
-import { logger } from './npmci.logging';
-import { Npmci } from './npmci.classes.npmci';
+import * as plugins from './npmci.plugins.js';
+import * as paths from './npmci.paths.js';
+import { logger } from './npmci.logging.js';
+import { Npmci } from './npmci.classes.npmci.js';
 
 export class NpmciInfo {
   public npmciRef: Npmci;

ts/npmci.logging.ts

@@ -1,4 +1,4 @@
-import * as plugins from './npmci.plugins';
+import * as plugins from './npmci.plugins.js';
 
 export const logger = new plugins.smartlog.Smartlog({
   logContext: {

ts/npmci.paths.ts

@@ -1,9 +1,9 @@
-import * as plugins from './npmci.plugins';
+import * as plugins from './npmci.plugins.js';
 
 export const cwd = process.cwd();
 
 // package paths
-export const NpmciPackageRoot = plugins.path.join(__dirname, '../');
+export const NpmciPackageRoot = plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../');
 export const NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json');
 
 // project paths

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,9 +21,11 @@ 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';
+import * as smartpath from '@pushrocks/smartpath';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartrequest from '@pushrocks/smartrequest';
 import * as smartshell from '@pushrocks/smartshell';
@@ -38,10 +40,12 @@ export {
   smartanalytics,
   smartdelay,
   smartfile,
+  smartgit,
   smartcli,
   smartlog,
   smartlogDestinationLocal,
   smartparam,
+  smartpath,
   smartpromise,
   smartrequest,
   smartshell,
@@ -50,6 +54,14 @@ export {
   smartstring,
 };
 
+// @tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export {
+  tsclass
+}
+
+// third party
 import * as through2 from 'through2';
 
 export { through2 };

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}