2.0.27

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: hosttoday/ht-docker-node:npmts
+image: hosttoday/ht-docker-node:npmci
 
 stages:
 - test
@@ -10,17 +10,20 @@ before_script:
 testSTABLE:
   stage: test
   script:
-    - npmci test stable
+    - npmci npm install
+    - npmci npm test stable
   only:
     - tags
   tags:
     - docker
+    - notpriv
 
 release:
   stage: release
   environment: npmjs-com_registry
   script:
-    - npmci publish
+    - npmci npm prepare
+    - npmci npm publish
   only:
     - tags
   tags:

LICENSE

@@ -0,0 +1,21 @@
+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.

README.md

@@ -1,27 +1,30 @@
 # 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
+- 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";
-myNginxConfig = new smartnginx.NginxConfig();
-myNginxZone = new smartnginx.NginxZone({
-    zoneName:"some.example.com",
-    type:"reverseProxy",
-    destination:"192.192.192.192" // some destination IP
+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
-```
+```

dist/smartnginx.snippets.js

@@ -1,5 +1,6 @@
 "use strict";
 const plugins = require("./smartnginx.plugins");
+const paths = require("./smartnginx.paths");
 exports.getBaseConfigString = () => {
     let baseConfig = plugins.smartstring.indent.normalize(`
 		user www-data;
@@ -63,7 +64,7 @@ exports.getBaseConfigString = () => {
 			# Virtual Host Configs
 			##
 
-			include /etc/nginx/conf.d/*.conf;
+			include ${paths.nginxHostFileBase}/*.conf;
 			include /etc/nginx/sites-enabled/*;
 		}
 		daemon off;
@@ -85,8 +86,8 @@ exports.getHostConfigString = (hostNameArg, destinationIpArg) => {
 		server {
 			listen *:443 ssl;
 			server_name ${hostNameArg};
-			ssl_certificate /LE_CERTS/${hostNameArg}/fullchain.pem;
-			ssl_certificate_key /LE_CERTS/${hostNameArg}/privkey.pem;
+			ssl_certificate ${paths.nginxCertBase}/${hostNameArg}/fullchain.pem;
+			ssl_certificate_key ${paths.nginxCertBase}/${hostNameArg}/privkey.pem;
 
 			location / {
 				proxy_pass http://${hostNameArg};
@@ -99,4 +100,4 @@ exports.getHostConfigString = (hostNameArg, destinationIpArg) => {
 	`);
     return hostConfig;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5zbmlwcGV0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbnguc25pcHBldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFDckMsMkJBQW1CLEdBQUc7SUFDaEMsSUFBSSxVQUFVLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFrRXJELENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUM7QUFDbkIsQ0FBQyxDQUFBO0FBR1UsMkJBQW1CLEdBQUcsQ0FBQyxXQUFrQixFQUFDLGdCQUF1QjtJQUMzRSxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7YUFDMUMsV0FBVztZQUNaLGdCQUFnQjs7Ozs7aUJBS1gsV0FBVzs4QkFDRSxXQUFXOzs7OztpQkFLeEIsV0FBVzsrQkFDRyxXQUFXO21DQUNQLFdBQVc7Ozt3QkFHdEIsV0FBVzs7Ozs7OztFQU9qQyxDQUFDLENBQUM7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDO0FBQ25CLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5zbmlwcGV0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbnguc25pcHBldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFDaEQsTUFBWSxLQUFLLFdBQU0sb0JBQW9CLENBQUMsQ0FBQTtBQUNqQywyQkFBbUIsR0FBRztJQUNoQyxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O2FBOEQxQyxLQUFLLENBQUMsaUJBQWlCOzs7O0VBSWxDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUM7QUFDbkIsQ0FBQyxDQUFBO0FBR1UsMkJBQW1CLEdBQUcsQ0FBQyxXQUFrQixFQUFDLGdCQUF1QjtJQUMzRSxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7YUFDMUMsV0FBVztZQUNaLGdCQUFnQjs7Ozs7aUJBS1gsV0FBVzs4QkFDRSxXQUFXOzs7OztpQkFLeEIsV0FBVztxQkFDUCxLQUFLLENBQUMsYUFBYSxJQUFJLFdBQVc7eUJBQzlCLEtBQUssQ0FBQyxhQUFhLElBQUksV0FBVzs7O3dCQUduQyxXQUFXOzs7Ozs7O0VBT2pDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUM7QUFDbkIsQ0FBQyxDQUFDIn0=

npmextra.json

@@ -0,0 +1,8 @@
+{
+  "npmci": {
+    "npmAccessLevel": "public"
+  },
+  "npmdocker": {
+    
+  }
+}

package.json

@@ -1,12 +1,14 @@
 {
-  "name": "smartnginx",
-  "version": "1.0.2",
+  "name": "@pushrocks/smartnginx",
+  "version": "2.0.27",
+  "private": false,
   "description": "control nginx from node, TypeScript ready",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)",
-    "cleanTest": "(rm -r nginxconfig)"
+    "test": "tstest test/",
+    "cleanTest": "(rm -r nginxconfig) && npm run test",
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -22,19 +24,20 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartnginx#README",
   "dependencies": {
-    "@types/q": "^0.0.27",
-    "@types/shelljs": "^0.3.27",
-    "beautylog": "^5.0.18",
-    "cert": "1.0.6",
-    "q": "^1.4.1",
-    "shelljs": "^0.7.1",
-    "smartfile": "^4.0.12",
-    "smartstring": "^2.0.15"
+    "@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"
   },
   "devDependencies": {
-    "npmts-g": "^5.2.6",
-    "qenv": "^1.0.8",
-    "should": "^10.0.0",
-    "typings-test": "^1.0.1"
+    "@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.12.1",
+    "tslint-config-prettier": "^1.17.0"
   }
 }

qenv.yml

@@ -1,3 +1 @@
 vars:
-- CF_EMAIL
-- CF_KEY

test/test.d.ts

@@ -1,2 +0,0 @@
-import "typings-test";
-import "should";

test/test.js

@@ -1,61 +0,0 @@
-"use strict";
-require("typings-test");
-const path = require("path");
-require("should");
-const qenv_1 = require("qenv");
-const smartnginx = require("../dist/index");
-// setup environment
-let testQenv = new qenv_1.Qenv(process.cwd(), path.join(process.cwd(), ".nogit"));
-describe("smartnginx", function () {
-    let testNginxConfig;
-    let testNginxZone01;
-    let testNginxZone02;
-    describe("NginxZone", function () {
-        it(`"new NginxZone()" should produce an instance of NginxConfig`, function () {
-            testNginxZone01 = new smartnginx.NginxHost({
-                hostName: "test100.bleu.de",
-                type: smartnginx.hostTypes.reverseProxy,
-                destination: "192.192.192.191"
-            });
-            testNginxZone02 = new smartnginx.NginxHost({
-                hostName: "test102.bleu.de",
-                type: smartnginx.hostTypes.reverseProxy,
-                destination: "192.192.192.192"
-            });
-            testNginxZone01.should.be.instanceof(smartnginx.NginxHost);
-            console.log(testNginxZone01.configString);
-        });
-    });
-    describe("NginxConfig", function () {
-        this.timeout(10000);
-        it(`"new NginxConfig()" should produce an instance of NginxConfig`, function () {
-            testNginxConfig = new smartnginx.NginxConfig({
-                cfEmail: process.env.CF_EMAIL,
-                cfKey: process.env.CF_KEY,
-                testMode: true
-            });
-            testNginxConfig.should.be.instanceof(smartnginx.NginxConfig);
-        });
-        describe(".addZone()", function () {
-            it("should add a zone to NginxConfig Object", function () {
-                testNginxConfig.addHost(testNginxZone01);
-                testNginxConfig.addHost(testNginxZone02);
-            });
-        });
-        describe(".deploy()", function () {
-            this.timeout(600000);
-            it("should deploy a config from an instance", function (done) {
-                testNginxConfig.deploy()
-                    .then(() => {
-                    done();
-                });
-            });
-        });
-        describe(".stop", function () {
-            it("should end the process", function () {
-                testNginxConfig.nginxProcess.stop();
-            });
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsTUFBTyxJQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDOUIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQix1QkFBbUIsTUFBTSxDQUFDLENBQUE7QUFDMUIsTUFBWSxVQUFVLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFFNUMsb0JBQW9CO0FBQ3BCLElBQUksUUFBUSxHQUFHLElBQUksV0FBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO0FBQ3pFLFFBQVEsQ0FBQyxZQUFZLEVBQUM7SUFDbEIsSUFBSSxlQUFzQyxDQUFDO0lBQzNDLElBQUksZUFBb0MsQ0FBQztJQUN6QyxJQUFJLGVBQW9DLENBQUM7SUFDekMsUUFBUSxDQUFDLFdBQVcsRUFBQztRQUNqQixFQUFFLENBQUMsNkRBQTZELEVBQUM7WUFDN0QsZUFBZSxHQUFHLElBQUksVUFBVSxDQUFDLFNBQVMsQ0FBQztnQkFDdkMsUUFBUSxFQUFDLGlCQUFpQjtnQkFDMUIsSUFBSSxFQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsWUFBWTtnQkFDdEMsV0FBVyxFQUFDLGlCQUFpQjthQUNoQyxDQUFDLENBQUM7WUFDSCxlQUFlLEdBQUcsSUFBSSxVQUFVLENBQUMsU0FBUyxDQUFDO2dCQUN2QyxRQUFRLEVBQUMsaUJBQWlCO2dCQUMxQixJQUFJLEVBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxZQUFZO2dCQUN0QyxXQUFXLEVBQUMsaUJBQWlCO2FBQ2hDLENBQUMsQ0FBQztZQUNILGVBQWUsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDM0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDOUMsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDLENBQUMsQ0FBQztJQUNILFFBQVEsQ0FBQyxhQUFhLEVBQUM7UUFDbkIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNwQixFQUFFLENBQUMsK0RBQStELEVBQUM7WUFDL0QsZUFBZSxHQUFHLElBQUksVUFBVSxDQUFDLFdBQVcsQ0FBQztnQkFDekMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtnQkFDN0IsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTTtnQkFDekIsUUFBUSxFQUFDLElBQUk7YUFDaEIsQ0FBQyxDQUFDO1lBQ0gsZUFBZSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNqRSxDQUFDLENBQUMsQ0FBQztRQUNILFFBQVEsQ0FBQyxZQUFZLEVBQUM7WUFDbEIsRUFBRSxDQUFDLHlDQUF5QyxFQUFDO2dCQUN6QyxlQUFlLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO2dCQUN6QyxlQUFlLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1lBQzdDLENBQUMsQ0FBQyxDQUFBO1FBQ04sQ0FBQyxDQUFDLENBQUM7UUFDSCxRQUFRLENBQUMsV0FBVyxFQUFDO1lBQ2pCLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDckIsRUFBRSxDQUFDLHlDQUF5QyxFQUFDLFVBQVMsSUFBSTtnQkFDdEQsZUFBZSxDQUFDLE1BQU0sRUFBRTtxQkFDbkIsSUFBSSxDQUFDO29CQUNGLElBQUksRUFBRSxDQUFDO2dCQUNYLENBQUMsQ0FBQyxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDLENBQUMsQ0FBQztRQUNILFFBQVEsQ0FBQyxPQUFPLEVBQUM7WUFDYixFQUFFLENBQUMsd0JBQXdCLEVBQUM7Z0JBQ3hCLGVBQWUsQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDeEMsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDLENBQUMifQ==

test/test.ts

@@ -1,60 +1,55 @@
-import "typings-test";
-import path = require("path");
-import "should";
-import {Qenv} from "qenv";
-import * as smartnginx from "../dist/index";
+import { tap, expect } from '@pushrocks/tapbundle';
+import path = require('path');
 
-// setup environment
-let testQenv = new Qenv(process.cwd(),path.join(process.cwd(),".nogit"));
-describe("smartnginx",function(){
-    let testNginxConfig:smartnginx.NginxConfig;
-    let testNginxZone01:smartnginx.NginxHost;
-    let testNginxZone02:smartnginx.NginxHost;
-    describe("NginxZone",function(){
-        it(`"new NginxZone()" should produce an instance of NginxConfig`,function(){
-            testNginxZone01 = new smartnginx.NginxHost({
-                hostName:"test100.bleu.de",
-                type:smartnginx.hostTypes.reverseProxy,
-                destination:"192.192.192.191"
-            });
-            testNginxZone02 = new smartnginx.NginxHost({
-                hostName:"test102.bleu.de",
-                type:smartnginx.hostTypes.reverseProxy,
-                destination:"192.192.192.192"
-            });
-            testNginxZone01.should.be.instanceof(smartnginx.NginxHost);
-            console.log(testNginxZone01.configString);
-        });
-    });
-    describe("NginxConfig",function(){
-        this.timeout(10000);
-        it(`"new NginxConfig()" should produce an instance of NginxConfig`,function(){
-            testNginxConfig = new smartnginx.NginxConfig({
-                cfEmail: process.env.CF_EMAIL,
-                cfKey: process.env.CF_KEY,
-                testMode:true
-            });
-            testNginxConfig.should.be.instanceof(smartnginx.NginxConfig);
-        });
-        describe(".addZone()",function(){
-            it("should add a zone to NginxConfig Object",function(){
-                testNginxConfig.addHost(testNginxZone01);
-                testNginxConfig.addHost(testNginxZone02);
-            })
-        });
-        describe(".deploy()",function(){
-            this.timeout(600000);
-            it("should deploy a config from an instance",function(done){
-                testNginxConfig.deploy()
-                    .then(() => {
-                        done();
-                    });
-            })
-        });
-        describe(".stop",function(){
-            it("should end the process",function(){
-                testNginxConfig.nginxProcess.stop();
-            })
-        })
-    });
+import { Qenv } from '@pushrocks/qenv';
+const testQenv = new Qenv('./', './.nogit/');
+
+import * as smartnginx from '../ts/index';
+
+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({});
+  expect(testSmartNginx).to.be.instanceof(smartnginx.SmartNginx);
 });
+
+tap.test(`should produce an instance of NginxConfig`, async () => {
+  testNginxZone01 = new smartnginx.NginxHost(testSmartNginx, {
+    hostName: 'test100.bleu.de',
+    destination: '192.192.192.191',
+    destinationPort: 3000,
+    privateKey: 'some private',
+    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'
+  });
+  expect(testNginxZone01).to.be.instanceof(smartnginx.NginxHost);
+});
+
+tap.test('.addHostCandidate() should add a zone to NginxConfig Object', async () => {
+  testSmartNginx.addHostCandidate(testNginxZone01);
+  testSmartNginx.addHostCandidate(testNginxZone02);
+});
+
+tap.test('.deploy() should deploy a config from an instance', async () => {
+  await testSmartNginx.deploy();
+});
+
+tap.test('should not redeploy', async () => {
+  testSmartNginx.addHostCandidate(testNginxZone01);
+  testSmartNginx.addHostCandidate(testNginxZone02);
+  await testSmartNginx.deploy();
+});
+
+tap.test('.stop() should end the process', async () => {
+  testSmartNginx.nginxProcess.stop();
+});
+
+tap.start();

ts/index.ts

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

ts/interfaces/hostconfig.ts

@@ -0,0 +1,7 @@
+export interface IHostConfig {
+  hostName: string;
+  destination: string;
+  destinationPort: number;
+  privateKey: string;
+  publicKey: string;
+}

ts/smartnginx.classes.nginxconfig.ts

@@ -1,71 +0,0 @@
-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";
-let allConfigs: NginxConfig[] = [];
-
-/**
- * main class that manages a NginxInstance
- */
-export class NginxConfig {
-    hosts: NginxHost[] = [];
-    cert: plugins.cert.Cert; // the Cert Instance from which the config gets its certificates
-    nginxProcess: NginxProcess = new NginxProcess(this);
-    isDeployed: boolean = false;
-    constructor(optionsArg: plugins.cert.ICertConstructorOptions) {
-        this.cert = new plugins.cert.Cert({
-            cfEmail: optionsArg.cfEmail,
-            cfKey: optionsArg.cfKey,
-            sslDir: paths.nginxCertBase,
-            gitOriginRepo: optionsArg.gitOriginRepo,
-            testMode: optionsArg.testMode
-        });
-    };
-
-    // interact with Hosts
-    addHost(nginxHostArg: NginxHost){
-        this.hosts.push(nginxHostArg);
-    }
-    listHosts(): NginxHost[]{
-        return this.hosts;
-    };
-    removeHost(nginxHostArg: NginxHost) {
-
-    }
-    clean() {
-        this.hosts = [];
-    }
-    // handle deployment of hosts
-    deploy() {
-        let done = plugins.q.defer();
-        plugins.smartfile.fs.ensureDirSync(paths.nginxConfigBase);
-        plugins.smartfile.fs.ensureDirSync(paths.nginxHostFileBase);
-        plugins.smartfile.fs.ensureDirSync(paths.nginxCertBase);
-        for (let config of allConfigs) {
-            config.isDeployed = false;
-        };
-        this.isDeployed = true;
-        // write base config
-        plugins.smartfile.memory.toFsSync(
-            snippets.getBaseConfigString(),
-            paths.nginxConfFile
-        );
-        // deploy hosts
-        let promiseArray = [];
-        for (let host of this.hosts) {
-            let hostDeployedPromise = host.deploy(this.cert);
-            hostDeployedPromise.then(() => {
-                plugins.beautylog.info(`Host ${host.hostName} deployed!`);
-                this.nginxProcess.reloadConfig();
-            });
-            promiseArray.push(hostDeployedPromise);
-        };
-        plugins.q.all(promiseArray)
-            .then(() => {
-                done.resolve();
-            });
-            
-        return done.promise;
-    };
-};

ts/smartnginx.classes.nginxhost.ts

@@ -1,43 +1,57 @@
-import * as plugins from "./smartnginx.plugins";
-import * as paths from "./smartnginx.paths";
-import * as snippets from "./smartnginx.snippets"
+import * as plugins from './smartnginx.plugins';
+import * as paths from './smartnginx.paths';
+import * as snippets from './smartnginx.snippets';
 
-/**
- * the host config data that NginxHost needs to create a valid instance
- */
-export interface IHostConfigData {
-    hostName: string,
-    type: hostTypes,
-    destination: string
-}
+import { SmartNginx } from './smartnginx.classes.smartnginx';
+
+import { IHostConfig } from './interfaces/hostconfig';
 
 export enum hostTypes {
-    reverseProxy,
-    static
+  reverseProxy
 }
 
 /**
  * manages a single nginx host
  */
-export class NginxHost {
-    hostName: string; // the host name e.g. domain name
-    type: hostTypes;
-    destination: string;
-    configString: string; // the actual host config file as string
-    constructor(optionsArg:IHostConfigData) {
-        this.hostName = optionsArg.hostName;
-        this.type = optionsArg.type;
-        this.destination = optionsArg.destination;
-        this.configString = snippets.getHostConfigString(optionsArg.hostName, optionsArg.destination);
-    };
-    deploy(certInstanceArg: plugins.cert.Cert) {
-        let done = plugins.q.defer();
-        let filePath = plugins.path.join(paths.nginxHostFileBase, this.hostName + ".conf");
-        // writeConfig
-        plugins.smartfile.memory.toFsSync(this.configString, filePath);
-        // get cert
-        certInstanceArg.getDomainCert(this.hostName)
-            .then(done.resolve);
-        return done.promise;
-    };
-};
+export class NginxHost implements IHostConfig {
+  /**
+   * smartnginxInstance this NginHost belongs to
+   */
+  public smartnginxInstance: SmartNginx;
+
+  public hostName: string; // the host name e.g. domain name
+  public destination: string;
+  public destinationPort: number;
+  public configString: string; // the actual host config file as string
+  public privateKey: string;
+  public publicKey: string;
+
+  constructor(smartnginxInstanceArg: SmartNginx, optionsArg: IHostConfig) {
+    this.smartnginxInstance = smartnginxInstanceArg;
+    this.hostName = optionsArg.hostName;
+    this.destination = optionsArg.destination;
+    this.destinationPort = optionsArg.destinationPort;
+    this.privateKey = optionsArg.privateKey;
+    this.publicKey = optionsArg.publicKey;
+  }
+
+  /**
+   *
+   * @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`);
+
+    
+    // writeConfig
+    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,74 +1,69 @@
-import * as plugins from "./smartnginx.plugins";
-import * as paths from "./smartnginx.paths";
-import { NginxConfig } from "./smartnginx.classes.nginxconfig";
-import { NginxHost } from "./smartnginx.classes.nginxhost";
+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 { ChildProcess } from 'child_process';
 
 /**
  * manages a nginxprocess for an NginxConfig
  */
 export class NginxProcess {
-    started: boolean = false;
-    nginxConfig:NginxConfig;
-    nginxChildProcess: plugins.childProcess.ChildProcess;
-    constructor(nginxConfigArg) {
-        this.nginxConfig = nginxConfigArg;
-    };
+  public started: boolean = false;
+  public smartNginxRef: SmartNginx;
+  private nginxChildProcess: ChildProcess;
+  private smartshellInstance = new Smartshell({
+    executor: 'bash'
+  });
 
-    /**
-     * start nginx
-     */
-    start() {
-        let done = plugins.q.defer();
-        if (typeof this.nginxChildProcess == "undefined"){
-            this.nginxChildProcess = plugins.childProcess.exec(`nginx -c ${paths.nginxConfFile}`, function (error, stdout, stderr) {
-                console.log(`stdout: ${stdout}`);
-                console.log(`stderr: ${stderr}`);
-                if (error !== null) {
-                    console.log(`exec error: ${error}`);
-                };
-            });
-        };
-        this.started = true;
-        plugins.beautylog.info("started Nginx!");
-        done.resolve();
-        return done.promise;
-    };
+  constructor(nginxRefArg: SmartNginx) {
+    this.smartNginxRef = nginxRefArg;
+  }
 
-    /**
-     * reload config
-     */
-    reloadConfig(){
-        let done = plugins.q.defer();
-        if(this.started == false){
-            this.start();
-        } else {
-            plugins.shelljs.exec("nginx -s reload");
-        };
-        plugins.beautylog.ok("NginxProcess has loaded the new config!")
-        done.resolve();
-        return done.promise;
-    };
+  /**
+   * start nginx
+   */
+  public async start() {
+    if (!this.nginxChildProcess) {
+      this.nginxChildProcess = (await this.smartshellInstance.execStreaming(
+        `nginx -c ${paths.nginxConfFile}`
+      )).childProcess;
+    }
+    this.started = true;
+    plugins.smartlog.defaultLogger.log('info', 'started Nginx!');
+  }
 
-    /**
-     * stop the nginx instance
-     */
-    stop() {
-        let done = plugins.q.defer();
-        if (typeof this.nginxChildProcess != "undefined") {
-            plugins.shelljs.exec("nginx -s quit");
-            this.started = false;
-            plugins.beautylog.info("stopped Nginx!");
-        } else {
-            plugins.beautylog.log("nginx already stopped!");
-        };
-        done.resolve();
-        return done.promise;
-    };
+  /**
+   * reload config
+   */
+  public async reloadConfig() {
+    if (!this.started) {
+      this.start();
+    } else {
+      await this.smartshellInstance.exec('nginx -s reload');
+    }
+    this.smartNginxRef.logger.log('info', 'NginxProcess has loaded the new config!');
+  }
 
-    /**
-     * checks if nginx is in path
-     */
-    check(): boolean {
-        return;
-    };
+  /**
+   * stop the nginx instance
+   */
+  public async stop() {
+    if (this.nginxChildProcess) {
+      this.smartshellInstance.exec('nginx -s quit');
+      this.started = false;
+      this.smartNginxRef.logger.log('info', 'stopped Nginx!');
+    } else {
+      this.smartNginxRef.logger.log('info', 'nginx already stopped!');
+    }
+  }
+
+  /**
+   * checks if nginx is in path
+   */
+  public check(): boolean {
+    return;
+  }
 }

ts/smartnginx.classes.smartnginx.ts

@@ -0,0 +1,125 @@
+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';
+
+/**
+ * main class that manages a NginxInstance
+ */
+export class SmartNginx {
+  public logger: plugins.smartlog.Smartlog;
+
+  // the objectmaps
+  private deployedHosts = new plugins.lik.Objectmap<NginxHost>();
+  private hostCandidates = new plugins.lik.Objectmap<NginxHost>();
+
+  public nginxProcess: NginxProcess = new NginxProcess(this);
+  constructor(optionsArg: { logger?: plugins.smartlog.Smartlog }) {
+    optionsArg.logger
+      ? (this.logger = optionsArg.logger)
+      : (this.logger = plugins.smartlog.defaultLogger);
+  }
+
+  // ===================
+  // interact with Hosts
+  // ===================
+
+  /**
+   * add a host
+   * @param nginxHostArg
+   */
+  public addHostCandidate(optionsArg: IHostConfig): NginxHost {
+    const nginxHost = new NginxHost(this, optionsArg);
+    this.hostCandidates.add(nginxHost);
+    return nginxHost;
+  }
+
+  /**
+   * Gets a NginxHost by hostname
+   * @param hostNameArg
+   */
+  public getDeployedNginxHostByHostName(hostNameArg: string): NginxHost {
+    return this.deployedHosts.find(nginxHost => {
+      return nginxHost.hostName === hostNameArg;
+    });
+  }
+  /**
+   * listHosts
+   */
+  public async listDeployedHosts(): Promise<NginxHost[]> {
+    return this.deployedHosts.getArray();
+  }
+
+  /**
+   * remove a Host
+   * @param nginxHostArg
+   */
+  public async removeDeployedHost(nginxHostArg: NginxHost) {
+    if (this.hostCandidates.isEmpty()) {
+      this.deployedHosts.forEach(hostArg => {
+        this.hostCandidates.add(hostArg);
+      });
+    }
+    this.hostCandidates.remove(nginxHostArg);
+    this.deploy();
+  }
+
+  /**
+   * check wether there has been a diverging host configuration
+   * this function will only redeploy the nginx configuration in case there has been a change
+   */
+  private async areHostsDiverged(): Promise<boolean> {
+    let hostCounter = 0;
+    let unfoundHosts = 0;
+    await this.hostCandidates.forEach(async hostCandidateArg => {
+      let foundHost = false;
+      await this.deployedHosts.forEach(async deployedHostArg => {
+        if (
+          hostCandidateArg.hostName === deployedHostArg.hostName &&
+          hostCandidateArg.destination === deployedHostArg.destination &&
+          hostCandidateArg.destinationPort === deployedHostArg.destinationPort
+        ) {
+          hostCounter++;
+          foundHost = true;
+        }
+      });
+      if (!foundHost) {
+        unfoundHosts++;
+      }
+    });
+    return (
+      this.deployedHosts.getArray().length !== this.hostCandidates.getArray().length ||
+      hostCounter !== this.deployedHosts.getArray().length ||
+      unfoundHosts !== 0
+    );
+  }
+
+  /**
+   * deploy the current stack and restart nginx
+   */
+  public async deploy() {
+    if (await this.areHostsDiverged()) {
+      this.logger.log('ok', `hosts have diverged, trigger config deployment and nginx reload!`);
+      this.deployedHosts.wipe();
+      this.deployedHosts.addArray(this.hostCandidates.getArray());
+      this.hostCandidates.wipe();
+
+      // write base config
+      plugins.smartfile.fs.ensureDirSync(paths.nginxConfigDirPath);
+      plugins.smartfile.memory.toFsSync(snippets.getBaseConfigString(), paths.nginxConfFile);
+
+      // deploy hosts
+      plugins.smartfile.fs.ensureEmptyDirSync(paths.nginxHostDirPath);
+      for (const host of this.deployedHosts.getArray()) {
+        await host.deploy();
+        this.logger.log('info', `Host ${host.hostName} deployed!`);
+      }
+      this.nginxProcess.reloadConfig();
+    } else {
+      this.logger.log('info', `hosts have not diverged, skipping nginx reload`);
+      this.hostCandidates.wipe();
+    }
+  }
+}

ts/smartnginx.paths.ts

@@ -1,10 +1,9 @@
-import * as plugins from "./smartnginx.plugins"
+import * as plugins from './smartnginx.plugins';
 
 // directories
-export let packageBase = plugins.path.join(__dirname,"../");
-export let nginxConfigBase = plugins.path.join(packageBase,"nginxconfig");
-export let nginxHostFileBase = plugins.path.join(nginxConfigBase,"hosts");
-export let nginxCertBase = plugins.path.join(nginxConfigBase,"cert");
+export const packageBase = plugins.path.join(__dirname, '../');
+export const nginxConfigDirPath = plugins.path.join(packageBase, 'nginxconfig');
+export const nginxHostDirPath = plugins.path.join(nginxConfigDirPath, 'hosts');
 
 // files
-export let nginxConfFile = plugins.path.join(nginxConfigBase,"nginx.conf");
+export const nginxConfFile = plugins.path.join(nginxConfigDirPath, 'nginx.conf');

ts/smartnginx.plugins.ts

@@ -1,9 +1,14 @@
-import "typings-global";
-export import beautylog = require("beautylog");
-export import cert = require("cert");
-export import childProcess = require("child_process");
-export import path = require("path");
-export import q = require("q");
-export import shelljs = require("shelljs");
-export import smartfile = require("smartfile");
-export import smartstring = require("smartstring");
+// native
+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';
+
+export { lik, smartlog, smartpromise, smartshell, smartfile, smartstring };

ts/smartnginx.snippets.ts

@@ -1,9 +1,10 @@
-import * as plugins from "./smartnginx.plugins";
+import * as plugins from './smartnginx.plugins';
+import * as paths from './smartnginx.paths';
 export let getBaseConfigString = () => {
-	let baseConfig = plugins.smartstring.indent.normalize(`
+  const baseConfig = plugins.smartstring.indent.normalize(`
 		user www-data;
 		worker_processes auto;
-		pid /run/nginx.pid;
+		pid /run/nginx/nginx.pid;
 
 		events {
 			worker_connections 768;
@@ -62,42 +63,47 @@ export let getBaseConfigString = () => {
 			# Virtual Host Configs
 			##
 
-			include /etc/nginx/conf.d/*.conf;
+			include ${paths.nginxHostDirPath}/*.conf;
 			include /etc/nginx/sites-enabled/*;
 		}
 		daemon off;
 	`);
-	return baseConfig;
-}
+  return baseConfig;
+};
 
-
-export let getHostConfigString = (hostNameArg:string,destinationIpArg:string) => {
-	let 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};
 		}
 
 		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 ${hostNameArg};
 			rewrite        ^ https://${hostNameArg}$request_uri? permanent;
 		}
 
 		server {
-			listen *:443 ssl;
+			listen *:443 ssl http2;
 			server_name ${hostNameArg};
-			ssl_certificate /LE_CERTS/${hostNameArg}/fullchain.pem;
-			ssl_certificate_key /LE_CERTS/${hostNameArg}/privkey.pem;
-
+			ssl_certificate ${paths.nginxHostDirPath}/${hostNameArg}.public.pem;
+			ssl_certificate_key ${paths.nginxHostDirPath}/${hostNameArg}.private.pem;
 			location / {
-				proxy_pass http://${hostNameArg};
-				include /etc/nginx/proxy_params;
-			}
-			location ~ /\.git {
-				deny all;
+				http2_push_preload      on;
+				proxy_http_version      1.1;
+				proxy_redirect          off;
+				proxy_buffering         off;
+				proxy_set_header        Host $http_host;
+				proxy_set_header        X-Real-IP $remote_addr;
+				proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+				proxy_set_header        X-Forwarded-Proto $scheme;
+				proxy_pass              http://${hostNameArg}:${destinationPortArg};
 			}
 		}
 	`);
-	return hostConfig;
+  return hostConfig;
 };
-

tslint.json

@@ -0,0 +1,17 @@
+{
+  "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"
+}