2.0.52

.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_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  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,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  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: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          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: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - 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: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - 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: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          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

.gitignore

@@ -1,5 +1,20 @@
-node_modules/
-nginxconfig/
+.nogit/
+
+# artifacts
 coverage/
-docs/
-.nogit/
+public/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_*/
+
+# custom

.gitlab-ci.yml

@@ -1,30 +1,119 @@
-image: hosttoday/ht-docker-node:npmci
+# 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
 
-before_script:
-  - "apt-get update && apt-get install nginx -y"
-    
-testSTABLE:
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
+  script:
+  - npmci git mirror
+  tags:
+  - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# test stage
+# ====================
+
+testLTS:
   stage: test
   script:
-    - npmci npm install
-    - npmci npm test stable
-  only:
-    - tags
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
-    - notpriv
+  - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
+  - notpriv
 
 release:
   stage: release
-  environment: npmjs-com_registry
   script:
+  - npmci node install lts
+  - npmci npm publish
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  allow_failure: true
+  script:
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
+  tags:
+  - docker
+  - priv
+
+trigger:
+  stage: metadata
+  script:
+  - npmci trigger
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+pages:
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:18-dind
+  stage: metadata
+  script:
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
-    - npmci npm publish
+    - npmci npm install
+    - npmci command tsdoc
+  tags:
+    - docker
+    - notpriv
   only:
     - tags
-  tags:
-    - docker
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public
+  allow_failure: true

.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

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

README.md

@@ -1,30 +0,0 @@
-# smartnginx
-
-control nginx from node, TypeScript ready
-
-## Status
-
-[![build status](https://gitlab.com/pushrocks/smartnginx/badges/master/build.svg)](https://gitlab.com/pushrocks/smartnginx/commits/master)
-
-## Features
-
-- easy reverse configuration
-- automatic letsencrypt DNS01 challenge based ssl cert generation
-- automatic nginx process handling zero-downtime config reloading
-- works in Docker environements
-
-## Usage
-
-We recommend the use of TypeScript! :)
-
-```typescript
-import * as smartnginx from 'smartnginx';
-const smartnginxInstance = new smartnginx.SmartNginx();
-myNginxHost = new smartnginx.NginxHost({
-  hostName: 'some.example.com',
-  type: 'reverseProxy',
-  destination: '192.192.192.192' // some destination IP
-});
-myNginxConfig.addZone(myNginxZone); // adds the zone to the config
-myNginxConfig.deploy(); // deploys the referenced NginxConfig and gracefully reloads it
-```

nginxconfig/default.private.pem

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQCHoQbEbAo/0ZDFU9AkubBRi8FeKdhCFrzK+wXZD9JnEJRa3q6o
+CI+6H3YLYleGGP8Vkwca8ykz5BX0MrKAlZWpoEpqgm2lVCBKh9mqCG1bN0aPdlwh
+E24/HZFbeVgyJBvH/7XZJDGlm638dSMoXMmPtwLfq1uTAmHwtHBEqdiLFwIDAQAB
+AoGAJWXibtD3toc7qx2kPCwzkRi/Ng7FwdtxLWswPp0dQCwTLEdQ06agswqvyw3P
+4nsMA0/qWqUIDHXtE8vS6p/Uh21aKTYNgHJA4VZdJvh5Zhogq77dtGFyME7T3914
+isamRo8hxemijJG9oml7y+jW/xnMFhe98dqKf9k0RNI9G1kCQQDHhInM8HEJWnRX
+ckkhGoel7HlfpTaLYIO7Ls4ErsNmBQjralRZVX1+g4+h4/QLCcOYqihNDgSUZMEt
+aEC82c4LAkEArgZXP/gaua0tylBwQETOyUip2apVOvArmH9xLL9qTkXueV39skZb
+36cO9RK7C+HTY4hGNcXDdihxs+Fa4sD6pQJAQc6FZQMpRVyAYxde53xIoYGNxu5H
+P1FmIacebIz4Bf5DIuK/T3fTHJdoGI2HQNzHluMIx+GHwSo6TS/FqoRsYQJAe/ia
+aUC20TU0nJ6nCLG72hqAnUZBh0YW2IFZP3ZxJaed1ioGE90Zj/8zoZShWTqb25j1
+41KqBt+S+ID+vPCa3QJABo8fEGIy/g7M5OB5euLHQLvCvYJDn9YWAryhRedR1B2e
+zEZOO0qxUJSjMdnYFYG6Na/poM3atnJ4W8pJzOtA4w==
+-----END RSA PRIVATE KEY-----

nginxconfig/default.public.pem

@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHoQbEbAo/0ZDFU9AkubBRi8Fe
+KdhCFrzK+wXZD9JnEJRa3q6oCI+6H3YLYleGGP8Vkwca8ykz5BX0MrKAlZWpoEpq
+gm2lVCBKh9mqCG1bN0aPdlwhE24/HZFbeVgyJBvH/7XZJDGlm638dSMoXMmPtwLf
+q1uTAmHwtHBEqdiLFwIDAQAB
+-----END PUBLIC KEY-----

nginxconfig/hosts/default.private.pem

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQD5b6wtr4xHY5gxH0SR+V9XIQPH6DGe2PXlKWN02dgvg7Ej/4uA
+7MmOnem2SUpWE2GwuKCAUCeZkj+riEmky0EWFexaM3BmcvWLSHZ6MAYg5FxTsUG8
+IXxNYUdTPpUBxaCX/yp/dvpiDqSMH67y9LwI85oWHx/zk1jMixaZXvOCXwIDAQAB
+AoGBALFXn1/f9uluuu753yO12/4zf9+qi1T3xmQGuCqFE7o8dD422vVv5KHcTiUH
+GK34G7Wsnph75JvAKjqHrGxZAk0NN59VK4Sl141S7qzXgjQf5Ks7r5y8v8AQgvEM
+zOwutOqlGNHJZ1NlCDJuMNxUe/vyRXRl1WDCeJF6pt8huZgRAkEA/Ppqz8NyU+B7
+kaz3e39uCELsyaDl3Xf82JMmJASBlndso3l3H2ihihAMYHaH21IxKQnfaiKMyfK4
+tvONLB/eZwJBAPxqbKEzLqYM7ds8QG2fty7heIcwtcKjTMThl99/OinNsJdd0DUE
+GPBVaDlvqijEk5R4oQ5CkzrQDe6mVkt90UkCQEogChoUl7RSC4MU3nM2VIRhL8ao
+uZHaLaE8BKn7FAmFtrRzy97NJsAwkZ/WO1qdS8BNn0QXGY+26j7ZQF1UfTMCQG8W
+u4Zaiz5DVG93XfehIjK8wpnlAymNSx0fGAMh8EwznXOQszCSBBPJ0tvsXBwjH7xp
+NqCbBkcNCASvKi2BSxkCQQDphVUlroFh6n4KEfrVQkzHoGU2pWfwTekCwneJ1w8r
+omwcagWn7E0a2DDj7tONmY7NU3kwRU2fLIzdG4Y9rewO
+-----END RSA PRIVATE KEY-----

nginxconfig/hosts/default.public.pem

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB/zCCAWigAwIBAgIJH3Pl1mivagGCMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3NlbGZzaWduZWQuZ2l0LnpvbmUwHhcNMjMwNzI2MTQwNTIwWhcNMjQwNzI1
+MTQwNTIwWjAeMRwwGgYDVQQDExNzZWxmc2lnbmVkLmdpdC56b25lMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQD5b6wtr4xHY5gxH0SR+V9XIQPH6DGe2PXlKWN0
+2dgvg7Ej/4uA7MmOnem2SUpWE2GwuKCAUCeZkj+riEmky0EWFexaM3BmcvWLSHZ6
+MAYg5FxTsUG8IXxNYUdTPpUBxaCX/yp/dvpiDqSMH67y9LwI85oWHx/zk1jMixaZ
+XvOCXwIDAQABo0UwQzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIC9DAmBgNVHREE
+HzAdhhtodHRwOi8vZXhhbXBsZS5vcmcvd2ViaWQjbWUwDQYJKoZIhvcNAQEFBQAD
+gYEAQ0pJ279EDgvsY+YjslMdUaJbZcF9rFgUE3t8vDDZH99kth8gqNddahcLqEV2
+8hyx7qcnplpKNVx8DYvDWoTGRdXBhCP/TBBW3jdsqaBHJey+yfAISBk4pbOow260
+tNQngsMDf+PZQMLm2bT1Pxk2KXd0rFMkVWprcRs2qx3Yz0Q=
+-----END CERTIFICATE-----

nginxconfig/hosts/test100.bleu.de.conf

@@ -0,0 +1,31 @@
+upstream test100.bleu.de {
+	keepalive 100;
+	server 192.192.192.191:3000;
+}
+
+server {
+	# The keepalive parameter sets the maximum number of idle keepalive connections
+		# to upstream servers that are preserved in the cache of each worker process. When
+	# this number is exceeded, the least recently used connections are closed.
+	listen *:80 ;
+	server_name test100.bleu.de;
+	rewrite        ^ https://test100.bleu.de$request_uri? permanent;
+}
+
+server {
+	listen *:443 ssl;
+	server_name test100.bleu.de;
+	ssl_certificate /mnt/HC_Volume_11396573/lossless/push.rocks/smartnginx/nginxconfig/hosts/test100.bleu.de.public.pem;
+	ssl_certificate_key /mnt/HC_Volume_11396573/lossless/push.rocks/smartnginx/nginxconfig/hosts/test100.bleu.de.private.pem;
+	location / {
+		proxy_http_version      1.1;
+		proxy_buffering         off;
+		proxy_redirect					off;
+		proxy_set_header        X-Real-IP $remote_addr;
+		proxy_set_header        X-Forwarded-For $remote_addr;
+		proxy_set_header        X-Forwarded-Proto $scheme;
+		proxy_next_upstream error timeout http_404 http_429 http_500 http_502;
+		proxy_next_upstream_tries 5;
+		proxy_pass              http://test100.bleu.de;
+	}
+}

nginxconfig/hosts/test100.bleu.de.private.pem

@@ -0,0 +1 @@
+some private

nginxconfig/hosts/test100.bleu.de.public.pem

@@ -0,0 +1 @@
+some public

nginxconfig/hosts/test102.bleu.de.conf

@@ -0,0 +1,31 @@
+upstream test102.bleu.de {
+	keepalive 100;
+	server 192.192.192.192:3050;
+}
+
+server {
+	# The keepalive parameter sets the maximum number of idle keepalive connections
+		# to upstream servers that are preserved in the cache of each worker process. When
+	# this number is exceeded, the least recently used connections are closed.
+	listen *:80 ;
+	server_name test102.bleu.de;
+	rewrite        ^ https://test102.bleu.de$request_uri? permanent;
+}
+
+server {
+	listen *:443 ssl;
+	server_name test102.bleu.de;
+	ssl_certificate /mnt/HC_Volume_11396573/lossless/push.rocks/smartnginx/nginxconfig/hosts/test102.bleu.de.public.pem;
+	ssl_certificate_key /mnt/HC_Volume_11396573/lossless/push.rocks/smartnginx/nginxconfig/hosts/test102.bleu.de.private.pem;
+	location / {
+		proxy_http_version      1.1;
+		proxy_buffering         off;
+		proxy_redirect					off;
+		proxy_set_header        X-Real-IP $remote_addr;
+		proxy_set_header        X-Forwarded-For $remote_addr;
+		proxy_set_header        X-Forwarded-Proto $scheme;
+		proxy_next_upstream error timeout http_404 http_429 http_500 http_502;
+		proxy_next_upstream_tries 5;
+		proxy_pass              http://test102.bleu.de;
+	}
+}

nginxconfig/hosts/test102.bleu.de.private.pem

@@ -0,0 +1 @@
+some private

nginxconfig/hosts/test102.bleu.de.public.pem

@@ -0,0 +1 @@
+some public

nginxconfig/nginx.conf

@@ -0,0 +1,79 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx/nginx.pid;
+
+events {
+	worker_connections 768;
+	# multi_accept on;
+}
+
+http {
+	server_names_hash_bucket_size 128;
+
+	##
+	# Basic Settings
+	##
+
+	sendfile on;
+	tcp_nopush on;
+	tcp_nodelay on;
+	keepalive_timeout 65;
+	types_hash_max_size 2048;
+	# server_tokens off;
+
+	# server_names_hash_bucket_size 64;
+	# server_name_in_redirect off;
+
+	include /etc/nginx/mime.types;
+	default_type application/octet-stream;
+
+	##
+	# SSL Settings
+	##
+
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
+	ssl_prefer_server_ciphers on;
+
+	##
+	# Logging Settings
+	##
+
+	access_log /var/log/nginx/access.log;
+	error_log /var/log/nginx/error.log;
+
+	##
+	# Gzip Settings
+	##
+
+	gzip on;
+	gzip_disable "msie6";
+
+	# gzip_vary on;
+	# gzip_proxied any;
+	# gzip_comp_level 6;
+	# gzip_buffers 16 8k;
+	# gzip_http_version 1.1;
+	# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+	##
+	# Virtual Host Configs
+	##
+
+	server {
+		listen *:80 default_server;
+		server_name selfsigned.git.zone;
+		rewrite        ^ https://git.zone redirect;
+	}
+
+	server {
+		listen *:443 ssl default_server;
+		server_name selfsigned.git.zone;
+		ssl_certificate /mnt/HC_Volume_11396573/lossless/push.rocks/smartnginx/nginxconfig/hosts/default.public.pem;
+		ssl_certificate_key /mnt/HC_Volume_11396573/lossless/push.rocks/smartnginx/nginxconfig/hosts/default.private.pem;
+		rewrite        ^ https://git.zone redirect;
+	}
+
+	include /mnt/HC_Volume_11396573/lossless/push.rocks/smartnginx/nginxconfig/hosts/*.conf;
+	include /etc/nginx/sites-enabled/*;
+}
+daemon off;

npmextra.json

@@ -2,7 +2,16 @@
   "npmci": {
     "npmAccessLevel": "public"
   },
-  "npmdocker": {
-    
+  "npmdocker": {},
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "push.rocks",
+      "gitrepo": "smartnginx",
+      "description": "control nginx from node, TypeScript ready",
+      "npmPackagename": "@push.rocks/smartnginx",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,14 +1,14 @@
 {
-  "name": "@pushrocks/smartnginx",
-  "version": "2.0.44",
+  "name": "@push.rocks/smartnginx",
+  "version": "2.0.52",
   "private": false,
   "description": "control nginx from node, TypeScript ready",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
     "test": "tstest test/",
     "cleanTest": "(rm -r nginxconfig) && npm run test",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --allowimplicitany)"
   },
   "repository": {
     "type": "git",
@@ -24,22 +24,37 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartnginx#README",
   "dependencies": {
-    "@pushrocks/lik": "^3.0.4",
-    "@pushrocks/smartfile": "^6.0.11",
-    "@pushrocks/smartlog": "^2.0.11",
-    "@pushrocks/smartpromise": "^2.0.5",
-    "@pushrocks/smartshell": "^2.0.13",
-    "@pushrocks/smartstring": "^3.0.8",
-    "@pushrocks/smartunique": "^3.0.1",
-    "selfsigned": "^1.10.4"
+    "@push.rocks/lik": "^6.0.2",
+    "@push.rocks/smartfile": "^10.0.26",
+    "@push.rocks/smartlog": "^3.0.2",
+    "@push.rocks/smartpath": "^5.0.11",
+    "@push.rocks/smartpromise": "^4.0.2",
+    "@push.rocks/smartshell": "^3.0.3",
+    "@push.rocks/smartstring": "^4.0.7",
+    "@push.rocks/smartunique": "^3.0.3",
+    "selfsigned": "^2.1.1"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.4",
-    "@gitzone/tsrun": "^1.1.17",
-    "@gitzone/tstest": "^1.0.18",
-    "@pushrocks/qenv": "^4.0.0",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "tslint": "^5.15.0",
-    "tslint-config-prettier": "^1.18.0"
-  }
+    "@gitzone/tsbuild": "^2.1.66",
+    "@gitzone/tsrun": "^1.2.44",
+    "@gitzone/tstest": "^1.0.77",
+    "@push.rocks/qenv": "^5.0.2",
+    "@push.rocks/tapbundle": "^5.0.8"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "type": "module",
+  "browserslist": [
+    "last 1 chrome versions"
+  ]
 }

test/test.ts

@@ -1,18 +1,18 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 import path = require('path');
 
-import { Qenv } from '@pushrocks/qenv';
+import { Qenv } from '@push.rocks/qenv';
 const testQenv = new Qenv('./', './.nogit/');
 
-import * as smartnginx from '../ts/index';
+import * as smartnginx from '../ts/index.js';
 
 let testSmartNginx: smartnginx.SmartNginx;
 let testNginxZone01: smartnginx.NginxHost;
 let testNginxZone02: smartnginx.NginxHost;
 
 tap.test('should create a valid instance of SmartNginx', async () => {
-  testSmartNginx = new smartnginx.SmartNginx({defaultProxyUrl: 'https://git.zone'});
-  expect(testSmartNginx).to.be.instanceof(smartnginx.SmartNginx);
+  testSmartNginx = new smartnginx.SmartNginx({ defaultProxyUrl: 'https://git.zone' });
+  expect(testSmartNginx).toBeInstanceOf(smartnginx.SmartNginx);
 });
 
 tap.test(`should produce an instance of NginxConfig`, async () => {
@@ -21,16 +21,16 @@ tap.test(`should produce an instance of NginxConfig`, async () => {
     destination: '192.192.192.191',
     destinationPort: 3000,
     privateKey: 'some private',
-    publicKey: 'some public'
+    publicKey: 'some public',
   });
   testNginxZone02 = new smartnginx.NginxHost(testSmartNginx, {
     hostName: 'test102.bleu.de',
     destination: '192.192.192.192',
     destinationPort: 3050,
     privateKey: 'some private',
-    publicKey: 'some public'
+    publicKey: 'some public',
   });
-  expect(testNginxZone01).to.be.instanceof(smartnginx.NginxHost);
+  expect(testNginxZone01).toBeInstanceOf(smartnginx.NginxHost);
 });
 
 tap.test('.addHostCandidate() should add a zone to NginxConfig Object', async () => {

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smartnginx',
+  version: '2.0.52',
+  description: 'control nginx from node, TypeScript ready'
+}

ts/index.ts

@@ -1,6 +1,4 @@
-import * as plugins from './smartnginx.plugins';
-
 // classes
-export * from './smartnginx.classes.smartnginx';
-export * from './smartnginx.classes.nginxprocess';
-export * from './smartnginx.classes.nginxhost';
+export * from './smartnginx.classes.smartnginx.js';
+export * from './smartnginx.classes.nginxprocess.js';
+export * from './smartnginx.classes.nginxhost.js';

ts/smartnginx.classes.nginxhost.ts

@@ -1,13 +1,13 @@
-import * as plugins from './smartnginx.plugins';
-import * as paths from './smartnginx.paths';
-import * as snippets from './smartnginx.snippets';
+import * as plugins from './smartnginx.plugins.js';
+import * as paths from './smartnginx.paths.js';
+import * as snippets from './smartnginx.snippets.js';
 
-import { SmartNginx } from './smartnginx.classes.smartnginx';
+import { SmartNginx } from './smartnginx.classes.smartnginx.js';
 
-import { IHostConfig } from './interfaces/hostconfig';
+import { type IHostConfig } from './interfaces/hostconfig.js';
 
 export enum hostTypes {
-  reverseProxy
+  reverseProxy,
 }
 
 /**
@@ -40,18 +40,23 @@ export class NginxHost implements IHostConfig {
    * @param certInstanceArg
    */
   public async deploy() {
-    const filePathConfig = plugins.path.join(paths.nginxHostDirPath,  `${this.hostName}.conf`);
-    const filePathPrivate = plugins.path.join(paths.nginxHostDirPath,  `${this.hostName}.private.pem`);
-    const filePathPublic = plugins.path.join(paths.nginxHostDirPath,  `${this.hostName}.public.pem`);
+    const filePathConfig = plugins.path.join(paths.nginxHostDirPath, `${this.hostName}.conf`);
+    const filePathPrivate = plugins.path.join(
+      paths.nginxHostDirPath,
+      `${this.hostName}.private.pem`
+    );
+    const filePathPublic = plugins.path.join(paths.nginxHostDirPath, `${this.hostName}.public.pem`);
 
-    
     // writeConfig
-    this.configString = snippets.getHostConfigString(this.hostName, this.destination, this.destinationPort);
+    this.configString = snippets.getHostConfigString(
+      this.hostName,
+      this.destination,
+      this.destinationPort
+    );
     plugins.smartfile.memory.toFsSync(this.configString, filePathConfig);
 
     // write ssl
     plugins.smartfile.memory.toFsSync(this.privateKey, filePathPrivate);
     plugins.smartfile.memory.toFsSync(this.publicKey, filePathPublic);
-
   }
 }

ts/smartnginx.classes.nginxprocess.ts

@@ -1,9 +1,7 @@
-import * as plugins from './smartnginx.plugins';
-import * as paths from './smartnginx.paths';
-import { SmartNginx } from './smartnginx.classes.smartnginx';
-import { NginxHost } from './smartnginx.classes.nginxhost';
-
-import { Smartshell } from '@pushrocks/smartshell';
+import * as plugins from './smartnginx.plugins.js';
+import * as paths from './smartnginx.paths.js';
+import { SmartNginx } from './smartnginx.classes.smartnginx.js';
+import { NginxHost } from './smartnginx.classes.nginxhost.js';
 
 import { ChildProcess } from 'child_process';
 
@@ -14,8 +12,8 @@ export class NginxProcess {
   public started: boolean = false;
   public smartNginxRef: SmartNginx;
   private nginxChildProcess: ChildProcess;
-  private smartshellInstance = new Smartshell({
-    executor: 'bash'
+  private smartshellInstance = new plugins.smartshell.Smartshell({
+    executor: 'bash',
   });
 
   constructor(nginxRefArg: SmartNginx) {
@@ -27,12 +25,12 @@ export class NginxProcess {
    */
   public async start() {
     if (!this.nginxChildProcess) {
-      this.nginxChildProcess = (await this.smartshellInstance.execStreaming(
-        `nginx -c ${paths.nginxConfFile}`
-      )).childProcess;
+      this.nginxChildProcess = (
+        await this.smartshellInstance.execStreaming(`nginx -c ${paths.nginxConfFile}`)
+      ).childProcess;
     }
     this.started = true;
-    plugins.smartlog.defaultLogger.log('info', 'started Nginx!');
+    console.log('info', 'started Nginx!');
   }
 
   /**

ts/smartnginx.classes.smartnginx.ts

@@ -1,9 +1,9 @@
-import * as plugins from './smartnginx.plugins';
-import * as paths from './smartnginx.paths';
-import * as snippets from './smartnginx.snippets';
-import { NginxHost } from './smartnginx.classes.nginxhost';
-import { NginxProcess } from './smartnginx.classes.nginxprocess';
-import { IHostConfig } from './interfaces/hostconfig';
+import * as plugins from './smartnginx.plugins.js';
+import * as paths from './smartnginx.paths.js';
+import * as snippets from './smartnginx.snippets.js';
+import { NginxHost } from './smartnginx.classes.nginxhost.js';
+import { NginxProcess } from './smartnginx.classes.nginxprocess.js';
+import { type IHostConfig } from './interfaces/hostconfig.js';
 
 export interface ISmartNginxContructorOptions {
   logger?: plugins.smartlog.Smartlog;
@@ -18,15 +18,17 @@ export class SmartNginx {
   public logger: plugins.smartlog.Smartlog;
 
   // the objectmaps
-  private deployedHosts = new plugins.lik.Objectmap<NginxHost>();
-  private hostCandidates = new plugins.lik.Objectmap<NginxHost>();
+  private deployedHosts = new plugins.lik.ObjectMap<NginxHost>();
+  private hostCandidates = new plugins.lik.ObjectMap<NginxHost>();
 
   public nginxProcess: NginxProcess = new NginxProcess(this);
   constructor(optionsArg: ISmartNginxContructorOptions) {
     this.options = optionsArg;
     this.options.logger
       ? (this.logger = this.options.logger)
-      : (this.logger = plugins.smartlog.defaultLogger);
+      : (this.logger = new plugins.smartlog.Smartlog({
+        logContext: null
+      }));
   }
 
   // ===================
@@ -48,7 +50,7 @@ export class SmartNginx {
    * @param hostNameArg
    */
   public getDeployedNginxHostByHostName(hostNameArg: string): NginxHost {
-    return this.deployedHosts.find(nginxHost => {
+    return this.deployedHosts.findSync((nginxHost) => {
       return nginxHost.hostName === hostNameArg;
     });
   }
@@ -65,7 +67,7 @@ export class SmartNginx {
    */
   public async removeDeployedHost(nginxHostArg: NginxHost) {
     if (this.hostCandidates.isEmpty()) {
-      this.deployedHosts.forEach(hostArg => {
+      this.deployedHosts.forEach((hostArg) => {
         this.hostCandidates.add(hostArg);
       });
     }
@@ -80,9 +82,9 @@ export class SmartNginx {
   private async areHostsDiverged(): Promise<boolean> {
     let hostCounter = 0;
     let unfoundHosts = 0;
-    await this.hostCandidates.forEach(async hostCandidateArg => {
+    await this.hostCandidates.forEach(async (hostCandidateArg) => {
       let foundHost = false;
-      await this.deployedHosts.forEach(async deployedHostArg => {
+      await this.deployedHosts.forEach(async (deployedHostArg) => {
         if (
           hostCandidateArg.hostName === deployedHostArg.hostName &&
           hostCandidateArg.destination === deployedHostArg.destination &&
@@ -115,15 +117,27 @@ export class SmartNginx {
 
       // write base config
       plugins.smartfile.fs.ensureDirSync(paths.nginxConfigDirPath);
-      plugins.smartfile.memory.toFsSync(snippets.getBaseConfigString(this.options.defaultProxyUrl), paths.nginxConfFile);
+      plugins.smartfile.memory.toFsSync(
+        snippets.getBaseConfigString(this.options.defaultProxyUrl),
+        paths.nginxConfFile
+      );
 
       // write standard self signed certificate
-      const selfsignedCert = plugins.selfsigned.generate([{ name: 'commonName', value: 'selfsigned.git.zone' }], { days: 365});
-      plugins.smartfile.memory.toFsSync(selfsignedCert.private, plugins.path.join(paths.nginxConfigDirPath, './default.private.pem'));
-      plugins.smartfile.memory.toFsSync(selfsignedCert.public, plugins.path.join(paths.nginxConfigDirPath, './default.public.pem'));
+      const selfsignedCert = plugins.selfsigned.generate(
+        [{ name: 'commonName', value: 'selfsigned.git.zone' }],
+        { days: 365 }
+      );
 
       // deploy hosts
-      plugins.smartfile.fs.ensureEmptyDirSync(paths.nginxHostDirPath);
+      plugins.smartfile.fs.ensureDirSync(paths.nginxHostDirPath);
+      plugins.smartfile.memory.toFsSync(
+        selfsignedCert.private,
+        plugins.path.join(paths.nginxHostDirPath, './default.private.pem')
+      );
+      plugins.smartfile.memory.toFsSync(
+        selfsignedCert.cert,
+        plugins.path.join(paths.nginxHostDirPath, './default.public.pem')
+      );
       for (const host of this.deployedHosts.getArray()) {
         await host.deploy();
         this.logger.log('info', `Host ${host.hostName} deployed!`);
@@ -134,4 +148,13 @@ export class SmartNginx {
       this.hostCandidates.wipe();
     }
   }
+
+  /**
+   * stops the smartnginx instance
+   */
+  public async stop() {
+    if (this.nginxProcess) {
+      await this.nginxProcess.stop();
+    }
+  }
 }

ts/smartnginx.paths.ts

@@ -1,9 +1,9 @@
-import * as plugins from './smartnginx.plugins';
+import * as plugins from './smartnginx.plugins.js';
 
 // directories
-export const packageBase = plugins.path.join(__dirname, '../');
+export const packageBase = plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../');
 export const nginxConfigDirPath = plugins.path.join(packageBase, 'nginxconfig');
 export const nginxHostDirPath = plugins.path.join(nginxConfigDirPath, 'hosts');
 
 // files
-export const nginxConfFile = plugins.path.join(nginxConfigDirPath, 'nginx.conf');
+export const nginxConfFile = plugins.path.join(nginxConfigDirPath, 'nginx.conf');

ts/smartnginx.plugins.ts

@@ -4,19 +4,18 @@ import * as path from 'path';
 export { path };
 
 // @pushrocks scope
-import * as lik from '@pushrocks/lik';
-import * as smartlog from '@pushrocks/smartlog';
-import * as smartpromise from '@pushrocks/smartpromise';
-import * as smartshell from '@pushrocks/smartshell';
-import * as smartfile from '@pushrocks/smartfile';
-import * as smartstring from '@pushrocks/smartstring';
-import * as smartunique from '@pushrocks/smartunique';
+  import * as lik from '@push.rocks/lik';
+  import * as smartfile from '@push.rocks/smartfile';
+  import * as smartlog from '@push.rocks/smartlog';
+  import * as smartpath from '@push.rocks/smartpath';
+  import * as smartpromise from '@push.rocks/smartpromise';
+  import * as smartshell from '@push.rocks/smartshell';
+  import * as smartstring from '@push.rocks/smartstring';
+  import * as smartunique from '@push.rocks/smartunique';
 
-export { lik, smartlog, smartpromise, smartshell, smartfile, smartstring, smartunique };
+export { lik, smartfile, smartlog, smartpath, smartpromise, smartshell, smartstring, smartunique };
 
 // thirdparty scope
-import * as selfsigned from 'selfsigned';
+  import * as selfsigned from 'selfsigned';
 
-export {
-  selfsigned
-};
+export { selfsigned };

ts/smartnginx.snippets.ts

@@ -1,5 +1,5 @@
-import * as plugins from './smartnginx.plugins';
-import * as paths from './smartnginx.paths';
+import * as plugins from './smartnginx.plugins.js';
+import * as paths from './smartnginx.paths.js';
 export let getBaseConfigString = (defaultProxy: string) => {
   const baseConfig = plugins.smartstring.indent.normalize(`
 		user www-data;
@@ -66,7 +66,7 @@ export let getBaseConfigString = (defaultProxy: string) => {
 			server {
 				listen *:80 default_server;
 				server_name selfsigned.git.zone;
-				rewrite        ^ ${defaultProxy} permanent;
+				rewrite        ^ ${defaultProxy} redirect;
 			}
 	
 			server {
@@ -74,7 +74,7 @@ export let getBaseConfigString = (defaultProxy: string) => {
 				server_name selfsigned.git.zone;
 				ssl_certificate ${paths.nginxHostDirPath}/default.public.pem;
 				ssl_certificate_key ${paths.nginxHostDirPath}/default.private.pem;
-				rewrite        ^ ${defaultProxy} permanent;
+				rewrite        ^ ${defaultProxy} redirect;
 			}
 
 			include ${paths.nginxHostDirPath}/*.conf;
@@ -85,8 +85,12 @@ export let getBaseConfigString = (defaultProxy: string) => {
   return baseConfig;
 };
 
-export let getHostConfigString = (hostNameArg: string, destinationIpArg: string, destinationPortArg = 80) => {
-	const hostConfig = plugins.smartstring.indent.normalize(`
+export let getHostConfigString = (
+  hostNameArg: string,
+  destinationIpArg: string,
+  destinationPortArg = 80
+) => {
+  const hostConfig = plugins.smartstring.indent.normalize(`
 		upstream ${hostNameArg} {
 			keepalive 100;
 			server ${destinationIpArg}:${destinationPortArg};

tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": 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"
-}