4.1.28

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install pnpm and npmci
+      run: |
+        pnpm install -g pnpm
+        pnpm install -g @shipzone/npmci
+
+    - name: Run npm prepare
+      run: npmci npm prepare
+
+    - name: Audit production dependencies
+      run: |
+        npmci command npm config set registry https://registry.npmjs.org
+        npmci command pnpm audit --audit-level=high --prod
+      continue-on-error: true
+
+    - name: Audit development dependencies
+      run: |
+        npmci command npm config set registry https://registry.npmjs.org
+        npmci command pnpm audit --audit-level=high --dev
+      continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Test stable
+      run: |
+        npmci node install stable
+        npmci npm install
+        npmci npm test
+
+    - name: Test build
+      run: |
+        npmci node install stable
+        npmci npm install
+        npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,108 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_LOGIN_DOCKER_GITEA: ${{secrets.NPMCI_DOCKER_REGISTRYURL_DEFAULT}}|${{ gitea.repository_owner }}|${{ secrets.GITEA_TOKEN }}
+
+jobs:
+
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install pnpm and npmci
+      run: |
+        pnpm install -g pnpm
+        pnpm install -g @shipzone/npmci
+
+    - name: Run npm prepare
+      run: npmci npm prepare
+
+    - name: Audit production dependencies
+      run: |
+        npmci command npm config set registry https://registry.npmjs.org
+        npmci command pnpm audit --audit-level=high --prod
+      continue-on-error: true
+
+    - name: Audit development dependencies
+      run: |
+        npmci command npm config set registry https://registry.npmjs.org
+        npmci command pnpm audit --audit-level=high --dev
+      continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Test stable
+      run: |
+        npmci node install stable
+        npmci npm install
+        npmci npm test
+
+    - name: Test build
+      run: |
+        npmci node install stable
+        npmci npm install
+        npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Release
+      run: |
+        npmci node install stable
+        npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Code quality
+      run: |
+        npmci command npm install -g typescript
+        npmci npm prepare
+        npmci npm install
+
+    - name: Trigger
+      run: npmci trigger
+
+    - name: Build docs and upload artifacts
+      run: |
+        npmci node install stable
+        npmci npm install
+        pnpm install -g @gitzone/tsdoc
+        npmci command tsdoc
+      continue-on-error: true

.gitlab-ci.yml

@@ -1,137 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-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 --only=dev
-  tags:
-    - docker
-  allow_failure: true
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-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 stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-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
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  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:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

.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",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${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"
     }
   ]
 }

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');
+import * as tsrun from '@gitzone/tsrun';
-cliTool.runCli();
+tsrun.runPath('./cli.child.js', import.meta.url);

npmextra.json

@@ -12,10 +12,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "shipzone",
+      "gitscope": "ship.zone",
       "gitrepo": "npmci",
-      "shortDescription": "node and docker in gitlab ci on steroids",
+      "description": "node and docker in gitlab ci on steroids",
-      "npmPackagename": "@shipzone/npmci",
+      "npmPackagename": "@ship.zone/npmci",
       "license": "MIT"
     }
   }

package.json

@@ -1,17 +1,19 @@
 {
-  "name": "@shipzone/npmci",
+  "name": "@ship.zone/npmci",
-  "version": "3.1.77",
+  "version": "4.1.28",
   "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)"
+    "testVersion": "(cd test/assets/ && node ../../cli.js -v)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -24,35 +26,37 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.28",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsrun": "^1.2.18",
+    "@gitzone/tsrun": "^1.2.44",
-    "@gitzone/tstest": "^1.0.59",
+    "@gitzone/tstest": "^1.0.77",
-    "@pushrocks/tapbundle": "^3.2.14",
+    "@push.rocks/tapbundle": "^5.0.15",
-    "@types/node": "^16.11.1",
+    "@types/node": "^20.5.4"
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^1.0.58",
+    "@api.global/typedrequest": "^3.0.1",
-    "@pushrocks/lik": "^5.0.0",
+    "@push.rocks/lik": "^6.0.5",
-    "@pushrocks/npmextra": "^3.0.9",
+    "@push.rocks/npmextra": "^4.0.0",
-    "@pushrocks/projectinfo": "^4.0.5",
+    "@push.rocks/projectinfo": "^5.0.2",
-    "@pushrocks/qenv": "^4.0.10",
+    "@push.rocks/qenv": "^6.0.2",
-    "@pushrocks/smartanalytics": "^2.0.15",
+    "@push.rocks/smartanalytics": "^2.0.15",
-    "@pushrocks/smartcli": "^3.0.14",
+    "@push.rocks/smartcli": "^4.0.8",
-    "@pushrocks/smartdelay": "^2.0.13",
+    "@push.rocks/smartdelay": "^3.0.5",
-    "@pushrocks/smartfile": "^8.0.10",
+    "@push.rocks/smartenv": "^5.0.5",
-    "@pushrocks/smartlog": "^2.0.44",
+    "@push.rocks/smartfile": "^10.0.30",
-    "@pushrocks/smartlog-destination-local": "^8.0.8",
+    "@push.rocks/smartgit": "^3.0.1",
-    "@pushrocks/smartparam": "^1.1.6",
+    "@push.rocks/smartlog": "^3.0.3",
-    "@pushrocks/smartpromise": "^3.1.6",
+    "@push.rocks/smartlog-destination-local": "^9.0.0",
-    "@pushrocks/smartrequest": "^1.1.52",
+    "@push.rocks/smartobject": "^1.0.12",
-    "@pushrocks/smartshell": "^2.0.28",
+    "@push.rocks/smartpath": "^5.0.11",
-    "@pushrocks/smartsocket": "^1.2.8",
+    "@push.rocks/smartpromise": "^4.0.2",
-    "@pushrocks/smartssh": "^1.2.3",
+    "@push.rocks/smartrequest": "^2.0.18",
-    "@pushrocks/smartstring": "^3.0.24",
+    "@push.rocks/smartshell": "^3.0.3",
-    "@servezone/servezone-interfaces": "^2.0.51",
+    "@push.rocks/smartsocket": "^2.0.22",
-    "@types/through2": "^2.0.36",
+    "@push.rocks/smartssh": "^2.0.1",
+    "@push.rocks/smartstring": "^4.0.8",
+    "@servezone/interfaces": "^1.0.3",
+    "@tsclass/tsclass": "^4.0.42",
+    "@types/through2": "^2.0.38",
     "through2": "^4.0.2"
   },
   "files": [

readme.md

@@ -21,7 +21,6 @@ Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](htt
 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
 
@@ -100,14 +99,12 @@ 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)
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
 | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.cloudly.ts

@@ -0,0 +1,26 @@
+process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';
+import { tap, expect } from '@push.rocks/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 { tap, expect } from '@push.rocks/tapbundle';
 import * as path from 'path';
+import * as smartpath from '@push.rocks/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,16 @@ 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');
+
+type TNpmciTypes = typeof import('../ts/index.js');
+
+tap.preTask('should import npmci', async () => {
+  npmci = await import('../ts/index.js');
+});
 
 // ======
 // Docker
@@ -29,6 +37,8 @@ let sortableArray: npmci.Dockerfile[];
 
 tap.test('should return valid Dockerfiles', async () => {
   const npmciInstance = new npmci.Npmci();
+  await npmciInstance.start();
+  await npmciInstance.start();
   dockerfile1 = new npmci.Dockerfile(npmciInstance.dockerManager, {
     filePath: './Dockerfile',
     read: true,
@@ -37,16 +47,17 @@ tap.test('should return valid Dockerfiles', async () => {
     filePath: './Dockerfile_sometag1',
     read: true,
   });
-  expect(dockerfile1.version).to.equal('latest');
+  expect(dockerfile1.version).toEqual('latest');
-  return expect(dockerfile2.version).to.equal('sometag1');
+  return expect(dockerfile2.version).toEqual('sometag1');
 });
 
 tap.test('should read a directory of Dockerfiles', async () => {
   const npmciInstance = new npmci.Npmci();
+  await npmciInstance.start();
   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');
     }
   );
 });
@@ -61,6 +72,7 @@ tap.test('should sort an array of Dockerfiles', async () => {
 
 tap.test('should build all Dockerfiles', async () => {
   const npmciInstance = new npmci.Npmci();
+  await npmciInstance.start();
   return npmciInstance.dockerManager.handleCli({
     _: ['docker', 'build'],
   });
@@ -68,6 +80,7 @@ tap.test('should build all Dockerfiles', async () => {
 
 tap.test('should test all Dockerfiles', async () => {
   const npmciInstance = new npmci.Npmci();
+  await npmciInstance.start();
   return npmciInstance.dockerManager.handleCli({
     _: ['docker', 'test'],
   });
@@ -75,6 +88,7 @@ tap.test('should test all Dockerfiles', async () => {
 
 tap.test('should test dockerfiles', async () => {
   const npmciInstance = new npmci.Npmci();
+  await npmciInstance.start();
   return npmciInstance.dockerManager.handleCli({
     _: ['docker', 'test'],
   });
@@ -82,6 +96,7 @@ tap.test('should test dockerfiles', async () => {
 
 tap.test('should login docker daemon', async () => {
   const npmciInstance = new npmci.Npmci();
+  await npmciInstance.start();
   return npmciInstance.dockerManager.handleCli({
     _: ['docker', 'login'],
   });
@@ -91,7 +106,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'],
   });
@@ -102,6 +117,7 @@ tap.test('should prepare SSH keys', async () => {
 // ====
 tap.test('should install a certain version of node', async () => {
   const npmciInstance = new npmci.Npmci();
+  await npmciInstance.start();
   await npmciInstance.nodejsManager.handleCli({
     _: ['node', 'install', 'stable'],
   });

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@ship.zone/npmci',
+  version: '4.1.28',
+  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 { Npmci } from '../npmci.classes.npmci.js';
-import { logger } from '../npmci.logging';
+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>(
+    const typedrequest =
-      `https://${cloudlyUrl}/versionmanager`,
+      new plugins.typedrequest.TypedRequest<plugins.servezoneInterfaces.requests.IRequest_InformAboutNewContainerImage>(
-      'update'
+        `https://${cloudlyUrl}/typedrequest`,
-    );
+        'servezonestandard_InformAboutNewContainerVersion'
+      );
 
-    const response = await typedrequest.fire(optionsArg);
+    const response = await typedrequest.fire({
+      containerImageInfo: optionsArg,
+    });
   }
 }

ts/index.ts

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

ts/manager.cloudron/index.ts

@@ -0,0 +1,67 @@
+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';
+import { Npmci } from '../npmci.classes.npmci.js';
+
+export class NpmciCloudronManager {
+  public npmciRef: Npmci;
+
+  constructor(npmciArg: Npmci) {
+    this.npmciRef = npmciArg;
+  }
+
+  /**
+   * handle cli input
+   * @param argvArg
+   */
+  public handleCli = async (argvArg: any) => {
+    if (argvArg._.length >= 2) {
+      const action: string = argvArg._[1];
+      switch (action) {
+        case 'deploy':
+          await this.deploy();
+          break;
+        default:
+          logger.log('error', `>>npmci cloudron ...<< action >>${action}<< not supported`);
+      }
+    } else {
+      logger.log(
+        'info',
+        `>>npmci cloudron ...<< cli arguments invalid... Please read the documentation.`
+      );
+    }
+  };
+
+  /**
+   * Replaces the version string in CloudronManifest file
+   * @param versionArg
+   */
+  public deploy = async () => {
+    logger.log('info', 'now deploying to cloudron...');
+    logger.log('info', 'installing cloudron cli...');
+    await bash(`pnpm install -g cloudron`);
+    logger.log('ok', 'cloudron cli installed');
+
+    // lets set the version in the CloudronManifest file
+    await this.prepareCloudronManifest(this.npmciRef.npmciConfig.getConfig().projectInfo.npm.version);
+    logger.log('ok', 'CloudronManifest prepared');
+
+    // lets figure out the docker image tag
+    const dockerImageTag = await this.npmciRef.npmciConfig.kvStorage.readKey('latestPushedDockerTag');
+    const appName = this.npmciRef.npmciConfig.getConfig().cloudronAppName;
+    
+    const cloudronEnvVar = process.env.NPMCI_LOGIN_CLOUDRON;
+    const cloudronServer = cloudronEnvVar.split('|')[0];
+    const cloudronToken = cloudronEnvVar.split('|')[1];
+    await bash(`cloudron update --server ${cloudronServer} --token ${cloudronToken} --image ${dockerImageTag} --app ${appName}`);
+  };
+
+  private prepareCloudronManifest = async (versionArg: string) => {
+    const manifestPath = plugins.path.join(paths.cwd, 'CloudronManifest.json');
+    let manifestFile = plugins.smartfile.fs.toStringSync(manifestPath);
+    manifestFile = manifestFile.replace(/##version##/g, versionArg);
+    plugins.smartfile.memory.toFsSync(manifestFile, manifestPath);
+    logger.log('info', 'Version replaced in CloudronManifest file');
+  }
+}

ts/manager.cloudron/mod.plugins.ts

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

ts/manager.docker/index.ts

@@ -1,13 +1,13 @@
-import { logger } from '../npmci.logging';
+import { logger } from '../npmci.logging.js';
-import * as plugins from './mod.plugins';
+import * as plugins from './mod.plugins.js';
-import * as paths from '../npmci.paths';
+import * as paths from '../npmci.paths.js';
-import { bash } from '../npmci.bash';
+import { bash } from '../npmci.bash.js';
 
 // classes
-import { Npmci } from '../npmci.classes.npmci';
+import { Npmci } from '../npmci.classes.npmci.js';
-import { Dockerfile } from './mod.classes.dockerfile';
+import { Dockerfile } from './mod.classes.dockerfile.js';
-import { DockerRegistry } from './mod.classes.dockerregistry';
+import { DockerRegistry } from './mod.classes.dockerregistry.js';
-import { RegistryStorage } from './mod.classes.registrystorage';
+import { RegistryStorage } from './mod.classes.registrystorage.js';
 
 export class NpmciDockerManager {
   public npmciRef: Npmci;
@@ -77,20 +77,23 @@ export class NpmciDockerManager {
    */
   public prepare = async () => {
     // Always login to GitLab Registry
-    if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') {
+    if (process.env.GITLAB_CI) {
-      logger.log('error', 'No registry token specified by gitlab!');
+      console.log('gitlab ci detected');
-      process.exit(1);
+      if (!process.env.CI_JOB_TOKEN || process.env.CI_JOB_TOKEN === '') {
+        logger.log('error', 'Running in Gitlab CI, but no registry token specified by gitlab!');
+        process.exit(1);
+      }
+      this.npmciRegistryStorage.addRegistry(
+        new DockerRegistry({
+          registryUrl: 'registry.gitlab.com',
+          username: 'gitlab-ci-token',
+          password: process.env.CI_JOB_TOKEN,
+        })
+      );
     }
-    this.npmciRegistryStorage.addRegistry(
-      new DockerRegistry({
-        registryUrl: 'registry.gitlab.com',
-        username: 'gitlab-ci-token',
-        password: process.env.CI_BUILD_TOKEN,
-      })
-    );
 
     // handle registries
-    await plugins.smartparam.forEachMinimatch(
+    await plugins.smartobject.forEachMinimatch(
       process.env,
       'NPMCI_LOGIN_DOCKER*',
       async (envString: string) => {
@@ -134,7 +137,9 @@ export class NpmciDockerManager {
       const dockerfileArray = await Dockerfile.readDockerfiles(this)
         .then(Dockerfile.sortDockerfiles)
         .then(Dockerfile.mapDockerfiles);
-      const dockerRegistryToPushTo = await this.npmciRegistryStorage.getRegistryByUrl(dockerRegistryUrl);
+      const dockerRegistryToPushTo = await this.npmciRegistryStorage.getRegistryByUrl(
+        dockerRegistryUrl
+      );
       if (!dockerRegistryToPushTo) {
         logger.log(
           'error',
@@ -174,4 +179,12 @@ export class NpmciDockerManager {
     await this.prepare();
     return await Dockerfile.readDockerfiles(this).then(Dockerfile.testDockerfiles);
   };
+
+  /**
+   * can be used to get the Dockerfiles in the directory
+   */
+  getDockerfiles = async () => {
+    const dockerfiles = await Dockerfile.readDockerfiles(this);
+    return dockerfiles;
+  }
 }

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

@@ -1,13 +1,13 @@
-import * as plugins from './mod.plugins';
+import * as plugins from './mod.plugins.js';
-import * as paths from '../npmci.paths';
+import * as paths from '../npmci.paths.js';
 
-import { logger } from '../npmci.logging';
+import { logger } from '../npmci.logging.js';
-import { bash } from '../npmci.bash';
+import { bash } from '../npmci.bash.js';
 
-import { DockerRegistry } from './mod.classes.dockerregistry';
+import { DockerRegistry } from './mod.classes.dockerregistry.js';
-import * as helpers from './mod.helpers';
+import * as helpers from './mod.helpers.js';
-import { NpmciDockerManager } from '.';
+import { NpmciDockerManager } from './index.js';
-import { Npmci } from '../npmci.classes.npmci';
+import { Npmci } from '../npmci.classes.npmci.js';
 
 /**
  * class Dockerfile represents a Dockerfile on disk in npmci
@@ -120,15 +120,19 @@ export class Dockerfile {
    * returns a version for a docker file
    * @execution SYNC
    */
-  public static dockerFileVersion(dockerfileNameArg: string): string {
+  public static dockerFileVersion(dockerfileInstanceArg: Dockerfile, dockerfileNameArg: string): string {
     let versionString: string;
-    const versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
+    const versionRegex = /Dockerfile_([^:_]*)$/;
     const regexResultArray = versionRegex.exec(dockerfileNameArg);
     if (regexResultArray && regexResultArray.length === 2) {
       versionString = regexResultArray[1];
     } else {
       versionString = 'latest';
     }
+    versionString = versionString.replace(
+      '##version##',
+      dockerfileInstanceArg.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version
+    );
     return versionString;
   }
 
@@ -152,9 +156,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[
+    const mappedRepo =
-      registryArg
+      npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerRegistryRepoMap[registryArg];
-    ];
     const repo = (() => {
       if (mappedRepo) {
         return mappedRepo;
@@ -178,14 +181,17 @@ export class Dockerfile {
   ): Promise<string> {
     logger.log('info', 'checking for env vars to be supplied to the docker build');
     let buildArgsString: string = '';
-    for (const key of Object.keys(
+    for (const dockerArgKey of Object.keys(
       npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap
     )) {
-      const targetValue =
+      const dockerArgOuterEnvVar =
-        process.env[
+        npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap[dockerArgKey];
-          npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerBuildargEnvMap[key]
+      logger.log(
-        ];
+        'note',
-      buildArgsString = `${buildArgsString} --build-arg ${key}="${targetValue}"`;
+        `docker ARG "${dockerArgKey}" maps to outer env var "${dockerArgOuterEnvVar}"`
+      );
+      const targetValue = process.env[dockerArgOuterEnvVar];
+      buildArgsString = `${buildArgsString} --build-arg ${dockerArgKey}="${targetValue}"`;
     }
     return buildArgsString;
   }
@@ -231,7 +237,7 @@ export class Dockerfile {
       this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.user +
       '/' +
       this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.repo;
-    this.version = Dockerfile.dockerFileVersion(plugins.path.parse(options.filePath).base);
+    this.version = Dockerfile.dockerFileVersion(this, plugins.path.parse(options.filePath).base);
     this.cleanTag = this.repo + ':' + this.version;
     this.buildTag = this.cleanTag;
 
@@ -274,10 +280,12 @@ export class Dockerfile {
     ).split('@')[1];
     console.log(`The image ${this.pushTag} has digest ${imageDigest}`);
     await this.npmciDockerManagerRef.npmciRef.cloudlyConnector.announceDockerContainer({
-      dockerImageUrl: this.pushTag,
+      registryUrl: this.pushTag,
-      dockerImageVersion: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo
+      tag: this.buildTag,
-        .npm.version,
+      labels: [],
+      version: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version,
     });
+    await this.npmciDockerManagerRef.npmciRef.npmciConfig.kvStorage.writeKey('latestPushedDockerTag', this.pushTag)
   }
 
   /**

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

@@ -1,6 +1,6 @@
-import { logger } from '../npmci.logging';
+import { logger } from '../npmci.logging.js';
-import * as plugins from './mod.plugins';
+import * as plugins from './mod.plugins.js';
-import { bash } from '../npmci.bash';
+import { bash } from '../npmci.bash.js';
 
 export interface IDockerRegistryConstructorOptions {
   registryUrl: string;
@@ -26,7 +26,7 @@ export class DockerRegistry {
       process.exit(1);
       return;
     }
-    const registryUrl = dockerRegexResultArray[0];
+    const registryUrl = dockerRegexResultArray[0].replace('https://', '').replace('http://', '');
     const username = dockerRegexResultArray[1];
     const password = dockerRegexResultArray[2];
     return new DockerRegistry({

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

@@ -1,11 +1,10 @@
-import { logger } from '../npmci.logging';
+import { logger } from '../npmci.logging.js';
-import * as plugins from './mod.plugins';
+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>();
+  objectMap = new plugins.lik.ObjectMap<DockerRegistry>();
   constructor() {
     // Nothing here
   }

ts/manager.docker/mod.helpers.ts

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

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 plugins from '../npmci.plugins.js';
-import * as paths from '../npmci.paths';
+import * as paths from '../npmci.paths.js';
 
-import { logger } from '../npmci.logging';
+import { logger } from '../npmci.logging.js';
-import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
+import { bash, bashNoError, nvmAvailable } from '../npmci.bash.js';
-import { Npmci } from '../npmci.classes.npmci';
+import { Npmci } from '../npmci.classes.npmci.js';
 
 export class NpmciNodeJsManager {
   public npmciRef: Npmci;
@@ -44,11 +44,11 @@ export class NpmciNodeJsManager {
     logger.log('info', `now installing node version ${versionArg}`);
     let version: string;
     if (versionArg === 'stable') {
-      version = '16';
+      version = '18';
     } else if (versionArg === 'lts') {
-      version = '14';
+      version = '16';
     } else if (versionArg === 'legacy') {
-      version = '12';
+      version = '14';
     } else {
       version = versionArg;
     }

ts/manager.npm/index.ts

@@ -1,9 +1,9 @@
-import * as plugins from './mod.plugins';
+import * as plugins from './mod.plugins.js';
-import * as paths from '../npmci.paths';
+import * as paths from '../npmci.paths.js';
 
-import { logger } from '../npmci.logging';
+import { logger } from '../npmci.logging.js';
-import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
+import { bash, bashNoError, nvmAvailable } from '../npmci.bash.js';
-import { Npmci } from '../npmci.classes.npmci';
+import { Npmci } from '../npmci.classes.npmci.js';
 
 export class NpmciNpmManager {
   public npmciRef: Npmci;
@@ -54,17 +54,22 @@ 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: string) => {
+    await plugins.smartobject.forEachMinimatch(
-      const npmRegistryUrl = npmEnvArg.split('|')[0];
+      process.env,
-      let npmToken = npmEnvArg.split('|')[1];
+      'NPMCI_TOKEN_NPM*',
-      if (npmEnvArg.split('|')[2] && npmEnvArg.split('|')[2] === 'plain') {
+      (npmEnvArg: string) => {
-        logger.log('ok', 'npm token not base64 encoded.');
+        const npmRegistryUrl = npmEnvArg.split('|')[0];
-      } else {
+        logger.log('ok', `found token for ${npmRegistryUrl}`);
-        logger.log('ok', 'npm token base64 encoded.');
+        let npmToken = npmEnvArg.split('|')[1];
-        npmToken = plugins.smartstring.base64.decode(npmToken);
+        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`;
       }
-      npmrcFileString += `//${npmRegistryUrl}/:_authToken="${npmToken}"\n`;
+    );
-    });
     logger.log('info', `setting default npm registry to ${config.npmRegistryUrl}`);
     npmrcFileString += `registry=https://${config.npmRegistryUrl}\n`;
 
@@ -95,9 +100,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: string) => {
+      await plugins.smartobject.forEachMinimatch(
-        availableRegistries.push(npmEnvArg.split('|')[0]);
+        process.env,
-      });
+        'NPMCI_TOKEN_NPM*',
+        (npmEnvArg: string) => {
+          availableRegistries.push(npmEnvArg.split('|')[0]);
+        }
+      );
 
       // -> configure package access level
       if (config.npmAccessLevel) {
@@ -143,6 +152,7 @@ export class NpmciNpmManager {
     logger.log('info', `now preparing environment:`);
     this.prepare();
     await bash(`npm -v`);
+    await bash(`pnpm -v`);
 
     // -> build it
     await this.install();
@@ -164,16 +174,16 @@ export class NpmciNpmManager {
 
   public async install(): Promise<void> {
     logger.log('info', 'now installing dependencies:');
-    await bash('npm ci');
+    await bash('pnpm install');
   }
 
   public async build(): Promise<void> {
     logger.log('info', 'now building the project:');
-    await bash('npm run build');
+    await bash('pnpm run build');
   }
 
   public async test(): Promise<void> {
     logger.log('info', 'now starting tests:');
-    await bash('npm test');
+    await bash('pnpm test');
   }
 }

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 plugins from './mod.plugins.js';
-import * as paths from '../npmci.paths';
+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 * as plugins from './mod.plugins.js';
-import { bash } from '../npmci.bash';
+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_precheck/index.ts

@@ -0,0 +1,24 @@
+import * as plugins from './plugins.js';
+import * as paths from '../npmci.paths.js';
+import { logger } from '../npmci.logging.js';
+import { Npmci } from '../npmci.classes.npmci.js';
+
+export const handleCli = async (npmciRefArg: Npmci, argvArg: any) => {
+  logger.log('info', 'checking execution context');
+  const presentRunnerTags = process.env.CI_RUNNER_TAGS.split(',').map((stringArg) =>
+    stringArg.trim()
+  );
+  let allDesiredGitlabRunnerTagsPresent = true;
+  for (const desiredRunnerTag of npmciRefArg.npmciConfig.getConfig().gitlabRunnerTags) {
+    if (!presentRunnerTags.includes(desiredRunnerTag)) {
+      allDesiredGitlabRunnerTagsPresent = false;
+      logger.log(
+        'error',
+        `Desired runnerRag ${desiredRunnerTag} is missing in current execution context.`
+      );
+    }
+  }
+  if (!allDesiredGitlabRunnerTagsPresent) {
+    process.exit(1);
+  }
+};

ts/mod_precheck/plugins.ts

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

ts/mod_ssh/index.ts

@@ -1,5 +1,5 @@
-import { logger } from '../npmci.logging';
+import { logger } from '../npmci.logging.js';
-import * as plugins from './mod.plugins';
+import * as plugins from './mod.plugins.js';
 let sshInstance: plugins.smartssh.SshInstance;
 
 export let handleCli = async (argvArg: any) => {
@@ -31,7 +31,7 @@ const notUndefined = (stringArg: string) => {
  */
 export let prepare = async () => {
   sshInstance = new plugins.smartssh.SshInstance(); // init ssh instance
-  plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_SSHKEY_*', evaluateSshEnv);
+  plugins.smartobject.forEachMinimatch(process.env, 'NPMCI_SSHKEY_*', evaluateSshEnv);
   if (!process.env.NPMTS_TEST) {
     sshInstance.writeToDisk();
   } else {

ts/mod_ssh/mod.plugins.ts

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

ts/mod_trigger/index.ts

@@ -1,12 +1,13 @@
-import * as plugins from './mod.plugins';
+import * as plugins from './mod.plugins.js';
-import { bash } from '../npmci.bash';
+import { bash } from '../npmci.bash.js';
-import { logger } from '../npmci.logging';
+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');
-  await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
+  await plugins.smartobject.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
 };
 
 const evaluateTrigger = async (triggerEnvVarArg) => {

ts/mod_trigger/mod.plugins.ts

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

ts/npmci.bash.ts

@@ -1,13 +1,11 @@
-import { logger } from './npmci.logging';
+import { logger } from './npmci.logging.js';
-import * as plugins from './npmci.plugins';
+import * as plugins from './npmci.plugins.js';
-import * as paths from './npmci.paths';
+import * as paths from './npmci.paths.js';
-
-import * as smartpromise from '@pushrocks/smartpromise';
 
 /**
  * wether nvm is available or not
  */
-export let nvmAvailable = smartpromise.defer<boolean>();
+export let nvmAvailable = plugins.smartpromise.defer<boolean>();
 /**
  * the smartshell instance for npmci
  */

ts/npmci.classes.npmci.ts

@@ -1,17 +1,21 @@
-import * as plugins from './npmci.plugins';
+import * as plugins from './npmci.plugins.js';
 
-import { CloudlyConnector } from './connector.cloudly/cloudlyconnector';
 
-import { NpmciInfo } from './npmci.classes.npmciinfo';
+// env
-import { NpmciCli } from './npmci.classes.npmcicli';
+import { NpmciEnv } from './npmci.classes.npmcienv.js';
-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
+// connectors
-import { NpmciDockerManager } from './manager.docker';
+import { CloudlyConnector } from './connector.cloudly/cloudlyconnector.js';
-import { NpmciGitManager } from './manager.git';
+
-import { NpmciNodeJsManager } from './manager.nodejs';
+// managers
-import { NpmciNpmManager } from './manager.npm';
+import { NpmciCloudronManager } from './manager.cloudron/index.js';
-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';
 
 export class Npmci {
   public analytics: plugins.smartanalytics.Analytics;
@@ -23,6 +27,7 @@ export class Npmci {
   public npmciCli: NpmciCli;
 
   // managers
+  public cloudronManager: NpmciCloudronManager;
   public dockerManager: NpmciDockerManager;
   public gitManager: NpmciGitManager;
   public nodejsManager: NpmciNodeJsManager;
@@ -34,22 +39,23 @@ export class Npmci {
       projectId: 'gitzone',
       appName: 'npmci',
     });
+  }
+
+  public async start() {
     this.cloudlyConnector = new CloudlyConnector(this);
     this.npmciEnv = new NpmciEnv(this);
     this.npmciInfo = new NpmciInfo(this);
+    await this.npmciInfo.printToConsole();
     this.npmciCli = new NpmciCli(this);
     this.npmciConfig = new NpmciConfig(this);
+    await this.npmciConfig.init();
 
     // managers
+    this.cloudronManager = new NpmciCloudronManager(this);
     this.dockerManager = new NpmciDockerManager(this);
     this.gitManager = new NpmciGitManager(this);
     this.nodejsManager = new NpmciNodeJsManager(this);
     this.npmManager = new NpmciNpmManager(this);
-  }
-
-  public async start() {
-    await this.npmciInfo.printToConsole();
-    await this.npmciConfig.init();
     this.npmciCli.startParse();
   }
 }

ts/npmci.classes.npmcicli.ts

@@ -1,7 +1,7 @@
-import { logger } from './npmci.logging';
+import { logger } from './npmci.logging.js';
-import * as plugins from './npmci.plugins';
+import * as plugins from './npmci.plugins.js';
-import * as paths from './npmci.paths';
+import * as paths from './npmci.paths.js';
-import { Npmci } from './npmci.classes.npmci';
+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) => {
@@ -24,10 +24,21 @@ export class NpmciCli {
       }
     );
 
+    // cloudron
+    this.smartcli.addCommand('cloudron').subscribe(
+      async (argv) => {
+        await this.npmciRef.cloudronManager.handleCli(argv);
+      },
+      (err) => {
+        console.log(err);
+        process.exit(1);
+      }
+    );
+
     // 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) => {
@@ -36,7 +47,7 @@ export class NpmciCli {
       }
     );
 
-    // command
+    // git
     this.smartcli.addCommand('git').subscribe(
       async (argvArg) => {
         await this.npmciRef.gitManager.handleCli(argvArg);
@@ -79,22 +90,21 @@ export class NpmciCli {
       }
     );
 
+    this.smartcli.addCommand('precheck').subscribe(async (argvArg) => {
+      const modPrecheck = await import('./mod_precheck/index.js');
+      await modPrecheck.handleCli(this.npmciRef, argvArg);
+    });
+
     // trigger
-    this.smartcli.addCommand('ssh').subscribe(
+    this.smartcli.addCommand('ssh').subscribe(async (argvArg) => {
-      async (argvArg) => {
+      const modSsh = await import('./mod_ssh/index.js');
-        const modSsh = await import('./mod_ssh/index');
+      await modSsh.handleCli(argvArg);
-        await modSsh.handleCli(argvArg);
+    });
-      },
-      (err) => {
-        console.log(err);
-        process.exit(1);
-      }
-    );
 
     // 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 plugins from './npmci.plugins.js';
-import * as paths from './npmci.paths';
+import * as paths from './npmci.paths.js';
 
-import { logger } from './npmci.logging';
+import { logger } from './npmci.logging.js';
-import { Npmci } from './npmci.classes.npmci';
+import { Npmci } from './npmci.classes.npmci.js';
 
 /**
  * the main config interface for npmci
@@ -20,8 +20,14 @@ export interface INpmciOptions {
   dockerRegistryRepoMap: { [key: string]: string };
   dockerBuildargEnvMap: { [key: string]: string };
 
+  // gitlab
+  gitlabRunnerTags: string[];
+
   // urls
   urlCloudly: string;
+
+  // cloudron
+  cloudronAppName?: string;
 }
 
 /**
@@ -38,10 +44,12 @@ export class NpmciConfig {
 
   constructor(npmciRefArg: Npmci) {
     this.npmciRef = npmciRefArg;
+  }
 
+  public async init() {
     this.npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
     this.kvStorage = new plugins.npmextra.KeyValueStore(
-      'custom',
+      'userHomeDir',
       `${this.npmciRef.npmciEnv.repo.user}_${this.npmciRef.npmciEnv.repo.repo}`
     );
     this.npmciQenv = new plugins.qenv.Qenv(
@@ -57,12 +65,10 @@ export class NpmciConfig {
       dockerRegistryRepoMap: {},
       npmAccessLevel: 'private',
       npmRegistryUrl: 'registry.npmjs.org',
+      gitlabRunnerTags: [],
       dockerBuildargEnvMap: {},
-      urlCloudly: this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY'),
+      urlCloudly: await this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY'),
     };
-  }
-
-  public async init() {
     this.configObject = this.npmciNpmextra.dataFor<INpmciOptions>('npmci', this.configObject);
   }
 

ts/npmci.classes.npmcienv.ts

@@ -1,5 +1,5 @@
-import * as plugins from './npmci.plugins';
+import * as plugins from './npmci.plugins.js';
-import { Npmci } from './npmci.classes.npmci';
+import { Npmci } from './npmci.classes.npmci.js';
 
 export class NpmciEnv {
   public npmciRef: Npmci;
@@ -9,7 +9,12 @@ export class NpmciEnv {
 
   constructor(npmciRefArg: Npmci) {
     this.npmciRef = npmciRefArg;
-    this.repoString = process.env.CI_REPOSITORY_URL;
+    if (process.env.GITLAB_CI) {
+      this.repoString = process.env.CI_REPOSITORY_URL;
+    }
+    if (process.env.NPMCI_COMPUTED_REPOURL) {
+      this.repoString = process.env.NPMCI_COMPUTED_REPOURL;
+    }
     if (!this.repoString) {
       this.repoString = 'https://undefined:undefined@github.com/undefined/undefined.git';
     }

ts/npmci.classes.npmciinfo.ts

@@ -1,7 +1,7 @@
-import * as plugins from './npmci.plugins';
+import * as plugins from './npmci.plugins.js';
-import * as paths from './npmci.paths';
+import * as paths from './npmci.paths.js';
-import { logger } from './npmci.logging';
+import { logger } from './npmci.logging.js';
-import { Npmci } from './npmci.classes.npmci';
+import { Npmci } from './npmci.classes.npmci.js';
 
 export class NpmciInfo {
   public npmciRef: Npmci;
@@ -11,7 +11,7 @@ export class NpmciInfo {
     this.npmciRef = npmciArg;
   }
 
-  public printToConsole() {
+  public async printToConsole() {
-    logger.log('info', `npmci version: ${this.projectInfo.version}`);
+    await logger.log('info', `npmci version: ${this.projectInfo.version}`);
   }
 }

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,12 @@
-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

@@ -4,44 +4,50 @@ import * as path from 'path';
 export { path };
 
 // @apiglobal
-import * as typedrequest from '@apiglobal/typedrequest';
+import * as typedrequest from '@api.global/typedrequest';
 
 export { typedrequest };
 
 // @servezone
-import * as servezoneInterfaces from '@servezone/servezone-interfaces';
+import * as servezoneInterfaces from '@servezone/interfaces';
 
 export { servezoneInterfaces };
 
-// @pushrocks
+// @push.rocks
-import * as npmextra from '@pushrocks/npmextra';
+import * as lik from '@push.rocks/lik';
-import * as projectinfo from '@pushrocks/projectinfo';
+import * as npmextra from '@push.rocks/npmextra';
-import * as qenv from '@pushrocks/qenv';
+import * as projectinfo from '@push.rocks/projectinfo';
-import * as smartanalytics from '@pushrocks/smartanalytics';
+import * as qenv from '@push.rocks/qenv';
-import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartanalytics from '@push.rocks/smartanalytics';
-import * as smartfile from '@pushrocks/smartfile';
+import * as smartdelay from '@push.rocks/smartdelay';
-import * as smartcli from '@pushrocks/smartcli';
+import * as smartfile from '@push.rocks/smartfile';
-import * as smartlog from '@pushrocks/smartlog';
+import * as smartcli from '@push.rocks/smartcli';
-import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
+import * as smartgit from '@push.rocks/smartgit';
-import * as smartparam from '@pushrocks/smartparam';
+import * as smartlog from '@push.rocks/smartlog';
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
-import * as smartrequest from '@pushrocks/smartrequest';
+import * as smartobject from '@push.rocks/smartobject';
-import * as smartshell from '@pushrocks/smartshell';
+import * as smartpath from '@push.rocks/smartpath';
-import * as smartsocket from '@pushrocks/smartsocket';
+import * as smartpromise from '@push.rocks/smartpromise';
-import * as smartssh from '@pushrocks/smartssh';
+import * as smartrequest from '@push.rocks/smartrequest';
-import * as smartstring from '@pushrocks/smartstring';
+import * as smartshell from '@push.rocks/smartshell';
+import * as smartsocket from '@push.rocks/smartsocket';
+import * as smartssh from '@push.rocks/smartssh';
+import * as smartstring from '@push.rocks/smartstring';
 
 export {
+  lik,
   npmextra,
   projectinfo,
   qenv,
   smartanalytics,
   smartdelay,
   smartfile,
+  smartgit,
   smartcli,
   smartlog,
   smartlogDestinationLocal,
-  smartparam,
+  smartobject,
+  smartpath,
   smartpromise,
   smartrequest,
   smartshell,
@@ -50,6 +56,12 @@ 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"
-}