0.0.13

.gitignore

@@ -1,4 +1,6 @@
 node_modules
 docs/
 coverage/
-.nogit/
+.nogit/
+dist/assets/
+test/assets/

.gitlab-ci.yml

@@ -6,9 +6,11 @@ stages:
   - release
     
 testLTS:
-  stage: test
+  stage: test1
   script:
     - npmci test lts
+  only:
+    - tags
   tags:
     - docker
     - lossless
@@ -17,6 +19,8 @@ testSTABLE:
   stage: test2
   script:
     - npmci test stable
+  only:
+    - tags
   tags:
     - docker
     - lossless

README.md

@@ -1,8 +1,6 @@
 # Cert
 Easily obain SSL certificates from LetsEncrypt. Supports DNS-01 challenge. TypeScript ready.
 
-> Note: this package is in pre-alpha stage and will be ready soon.
-
 ## Usage 
 
 ```typescript

dist/cert.hook.js

@@ -1,3 +1,65 @@
+#!/usr/bin/env node
 "use strict";
-
+var plugins = require("./cert.plugins");
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJjZXJ0Lmhvb2suanMiLCJzb3VyY2VzQ29udGVudCI6W119
+var paths = require("./cert.paths");
+var smartcli = new plugins.smartcli.Smartcli();
+var config = plugins.smartfile.fs.toObjectSync(paths.config);
+var cflare = new plugins.cflare.CflareAccount();
+cflare.auth({
+    email: config.cfEmail,
+    key: config.cfKey
+});
+var setChallenge = function (domainNameArg, challengeArg) {
+    var done = plugins.q.defer();
+    plugins.beautylog.log("setting challenge for " + domainNameArg);
+    cflare.createRecord(prefixName(domainNameArg), "TXT", challengeArg).then(function () {
+        plugins.beautylog.ok("Challenge has been set!");
+        plugins.beautylog.info("We need to cool down to let DNS propagate to edge locations!");
+        cooldown().then(function () {
+            done.resolve();
+        });
+    });
+    return done.promise;
+};
+var cleanChallenge = function (domainNameArg) {
+    var done = plugins.q.defer();
+    plugins.beautylog.log("cleaning challenge for " + domainNameArg);
+    cflare.removeRecord(prefixName(domainNameArg), "TXT");
+    return done.promise;
+};
+var cooldown = function () {
+    var done = plugins.q.defer();
+    var cooldowntime = 40000;
+    var passedTime = 0;
+    plugins.beautylog.log("Cooling down! " + (cooldowntime / 1000).toString() + " seconds left");
+    var coolDownCounter = function () {
+        setTimeout(function () {
+            if (cooldowntime <= passedTime) {
+                plugins.beautylog.ok("Cooled down!");
+                done.resolve();
+            }
+            else {
+                passedTime = passedTime + 5000;
+                plugins.beautylog.log("Cooling down! " + ((cooldowntime - passedTime) / 1000).toString() + " seconds left");
+                coolDownCounter();
+            }
+        }, 5000);
+    };
+    coolDownCounter();
+    return done.promise;
+};
+var prefixName = function (domainNameArg) {
+    return "_acme-challenge." + domainNameArg;
+};
+smartcli.addCommand({
+    commandName: "deploy_challenge"
+}).then(function (argv) {
+    setChallenge(argv._[1], argv._[3]);
+});
+smartcli.addCommand({
+    commandName: "clean_challenge"
+}).then(function (argv) {
+    cleanChallenge(argv._[1]);
+});
+smartcli.startParse();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5ob29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2VydC5ob29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsSUFBWSxPQUFPLFdBQU0sZ0JBQWdCLENBQUMsQ0FBQTtBQUMxQyxJQUFZLEtBQUssV0FBTSxjQUFjLENBQUMsQ0FBQTtBQUV0QyxJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7QUFFL0MsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUM3RCxJQUFJLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7QUFDaEQsTUFBTSxDQUFDLElBQUksQ0FBQztJQUNSLEtBQUssRUFBRSxNQUFNLENBQUMsT0FBTztJQUNyQixHQUFHLEVBQUUsTUFBTSxDQUFDLEtBQUs7Q0FDcEIsQ0FBQyxDQUFDO0FBRUgsSUFBSSxZQUFZLEdBQUcsVUFBQyxhQUFxQixFQUFFLFlBQW9CO0lBQzNELElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsd0JBQXdCLEdBQUcsYUFBYSxDQUFDLENBQUM7SUFDaEUsTUFBTSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEVBQUUsS0FBSyxFQUFFLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQztRQUNyRSxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBQ2hELE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLDhEQUE4RCxDQUFDLENBQUM7UUFDdkYsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUFDO1lBQ1osSUFBSSxDQUFDLE9BQU8sRUFB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

dist/cert.paths.d.ts

@@ -1,2 +1,6 @@
-import "typings-global";
+export declare let certHook: string;
-export import path = require("path");
+export declare let config: string;
+export declare let leShConfig: string;
+export declare let letsencryptSh: string;
+export declare let certDir: string;
+export declare let assetDir: string;

dist/cert.paths.js

@@ -1,5 +1,11 @@
 "use strict";
-require("typings-global");
+var plugins = require("./cert.plugins");
-exports.path = require("path");
+// files
-
+exports.certHook = plugins.path.join(__dirname, "cert.hook.js");
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNlcnQucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQyIsImZpbGUiOiJjZXJ0LnBhdGhzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmV4cG9ydCBpbXBvcnQgcGF0aCA9IHJlcXVpcmUoXCJwYXRoXCIpO1xuXG4iXX0=
+exports.config = plugins.path.join(__dirname, "assets/config.json");
+exports.leShConfig = plugins.path.join(__dirname, "assets/leshconfig.json");
+exports.letsencryptSh = plugins.path.join(__dirname, "assets/letsencrypt.sh");
+//dirs
+exports.certDir = plugins.path.join(__dirname, "/assets/certs");
+exports.assetDir = plugins.path.join(__dirname, "/assets/");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NlcnQucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQVksT0FBTyxXQUFNLGdCQUFnQixDQUFDLENBQUE7QUFFMUMsUUFBUTtBQUNHLGdCQUFRLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFDLGNBQWMsQ0FBQyxDQUFDO0FBQ3ZELGNBQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUMzRCxrQkFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyx3QkFBd0IsQ0FBQyxDQUFDO0FBQ25FLHFCQUFhLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFDLHVCQUF1QixDQUFDLENBQUM7QUFFaEYsTUFBTTtBQUNLLGVBQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsZUFBZSxDQUFDLENBQUM7QUFDdkQsZ0JBQVEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsVUFBVSxDQUFDLENBQUMifQ==

dist/cert.plugins.d.ts

@@ -0,0 +1,11 @@
+import "typings-global";
+export import beautylog = require("beautylog");
+export import cflare = require("cflare");
+export declare let fs: any;
+export import path = require("path");
+export import q = require("q");
+export declare let shelljs: any;
+export import smartcli = require("smartcli");
+export import smartfile = require("smartfile");
+export import smartgit = require("smartgit");
+export import smartstring = require("smartstring");

dist/cert.plugins.js

@@ -1,3 +1,13 @@
-
+"use strict";
-
+require("typings-global");
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJjZXJ0LnBsdWdpbnMuanMiLCJzb3VyY2VzQ29udGVudCI6W119
+exports.beautylog = require("beautylog");
+exports.cflare = require("cflare");
+exports.fs = require("fs-extra");
+exports.path = require("path");
+exports.q = require("q");
+exports.shelljs = require("shelljs");
+exports.smartcli = require("smartcli");
+exports.smartfile = require("smartfile");
+exports.smartgit = require("smartgit");
+exports.smartstring = require("smartstring");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2VydC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLGNBQU0sV0FBVyxRQUFRLENBQUMsQ0FBQztBQUM5QixVQUFFLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0FBQ3RCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUN2QixTQUFDLFdBQVcsR0FBRyxDQUFDLENBQUM7QUFDcEIsZUFBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUMxQixnQkFBUSxXQUFXLFVBQVUsQ0FBQyxDQUFDO0FBQy9CLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDakMsZ0JBQVEsV0FBVyxVQUFVLENBQUMsQ0FBQztBQUMvQixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDIn0=

dist/index.d.ts

@@ -1,17 +1,26 @@
+/// <reference types="q" />
+import * as plugins from "./cert.plugins";
 export declare class Cert {
-    cfEmail: string;
+    private _cfEmail;
-    cfKey: string;
+    private _cfKey;
-    sslDir: string;
+    private _sslDir;
-    certificatesPresent: any;
+    private _gitOriginRepo;
-    certificatesValid: any;
+    private _testMode;
-    gitOriginRepo: any;
+    certificatesPresent: Certificate[];
+    certificatesValid: Certificate[];
     constructor(optionsArg: {
         cfEmail: string;
         cfKey: string;
         sslDir: string;
         gitOriginRepo?: string;
+        testMode?: boolean;
     });
-    getDomainCert(): void;
+    sslGitOriginPull: () => void;
+    sslGitOriginAddCommitPush: () => void;
+    getDomainCert(domainNameArg: string, optionsArg?: {
+        force: boolean;
+    }): plugins.q.Promise<{}>;
+    cleanOldCertificates(): void;
 }
 export declare class Certificate {
     domainName: string;

dist/install.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="q" />
+import * as plugins from "./cert.plugins";
+export declare let startInstall: () => plugins.q.Promise<{}>;

dist/install.js

@@ -1,12 +1,19 @@
 "use strict";
-var beautylog = require("beautylog");
+var plugins = require("./cert.plugins");
-var path = require("path");
+var paths = require("./cert.paths");
-var smartfile = require("smartfile");
+exports.startInstall = function () {
-var fs = require("fs-extra");
+    var done = plugins.q.defer();
-beautylog.info("installing letsencrypt.sh locally...");
+    plugins.beautylog.info("installing letsencrypt.sh locally...");
-fs.ensureDir(path.join(__dirname, "assets/"));
+    plugins.fs.ensureDir(plugins.path.join(__dirname, "assets/"));
-smartfile.remote.toFs("https://raw.githubusercontent.com/lukas2511/letsencrypt.sh/master/letsencrypt.sh", path.join(__dirname, "assets/", "le.sh")).then(function () {
+    plugins.smartfile.remote.toFs("https://raw.githubusercontent.com/lukas2511/letsencrypt.sh/master/letsencrypt.sh", paths.letsencryptSh).then(function () {
-    beautylog.success("Done!");
+        plugins.beautylog.success("Done!");
-});
+        done.resolve();
-
+    });
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQVksU0FBUyxXQUFNLFdBQVcsQ0FBQyxDQUFBO0FBQ3ZDLElBQVksSUFBSSxXQUFNLE1BQU0sQ0FBQyxDQUFBO0FBQzdCLElBQVksU0FBUyxXQUFNLFdBQVcsQ0FBQyxDQUFBO0FBQ3ZDLElBQUksRUFBRSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUM3QixTQUFTLENBQUMsSUFBSSxDQUFDLHNDQUFzQyxDQUFDLENBQUM7QUFFdkQsRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO0FBQzdDLFNBQVMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUNqQixrRkFBa0YsRUFDbEYsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsU0FBUyxFQUFDLE9BQU8sQ0FBQyxDQUN6QyxDQUFDLElBQUksQ0FBQztJQUNILFNBQVMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDL0IsQ0FBQyxDQUFDLENBQUMiLCJmaWxlIjoiaW5zdGFsbC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIGJlYXV0eWxvZyBmcm9tIFwiYmVhdXR5bG9nXCI7XG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gXCJwYXRoXCI7XG5pbXBvcnQgKiBhcyBzbWFydGZpbGUgZnJvbSBcInNtYXJ0ZmlsZVwiO1xubGV0IGZzID0gcmVxdWlyZShcImZzLWV4dHJhXCIpO1xuYmVhdXR5bG9nLmluZm8oXCJpbnN0YWxsaW5nIGxldHNlbmNyeXB0LnNoIGxvY2FsbHkuLi5cIik7XG5cbmZzLmVuc3VyZURpcihwYXRoLmpvaW4oX19kaXJuYW1lLFwiYXNzZXRzL1wiKSk7XG5zbWFydGZpbGUucmVtb3RlLnRvRnMoXG4gICAgXCJodHRwczovL3Jhdy5naXRodWJ1c2VyY29udGVudC5jb20vbHVrYXMyNTExL2xldHNlbmNyeXB0LnNoL21hc3Rlci9sZXRzZW5jcnlwdC5zaFwiLFxuICAgIHBhdGguam9pbihfX2Rpcm5hbWUsXCJhc3NldHMvXCIsXCJsZS5zaFwiKVxuKS50aGVuKCgpID0+IHtcbiAgICBiZWF1dHlsb2cuc3VjY2VzcyhcIkRvbmUhXCIpO1xufSk7Il19
+    return done.promise;
+};
+var smartcli = new plugins.smartcli.Smartcli();
+smartcli.addCommand({
+    commandName: "install"
+}).then(exports.startInstall);
+smartcli.startParse();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2luc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQVksT0FBTyxXQUFNLGdCQUFnQixDQUFDLENBQUE7QUFDMUMsSUFBWSxLQUFLLFdBQU0sY0FBYyxDQUFDLENBQUE7QUFFM0Isb0JBQVksR0FBRztJQUN0QixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHNDQUFzQyxDQUFDLENBQUM7SUFFL0QsT0FBTyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDOUQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUN6QixrRkFBa0YsRUFDbEYsS0FBSyxDQUFDLGFBQWEsQ0FDdEIsQ0FBQyxJQUFJLENBQUM7UUFDSCxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNuQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDSCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUM7QUFFRixJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7QUFDL0MsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUMsU0FBUztDQUN4QixDQUFDLENBQUMsSUFBSSxDQUFDLG9CQUFZLENBQUMsQ0FBQztBQUN0QixRQUFRLENBQUMsVUFBVSxFQUFFLENBQUMifQ==

package.json

@@ -1,11 +1,14 @@
 {
   "name": "cert",
-  "version": "0.0.6",
+  "version": "0.0.13",
   "description": "Easily obain SSL certificates from LetsEncrypt. Supports DNS-01 challenge. TypeScript ready.",
   "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)",
+    "test": "(npm run cleanTest && npmts)",
-    "install": "node dist/install.js"
+    "cleanTest": "(rm -rf ./test/assets)",
+    "install": "node dist/install.js install",
+    "compile": "(npmts --notest)"
   },
   "repository": {
     "type": "git",
@@ -24,16 +27,19 @@
   },
   "homepage": "https://gitlab.com/pushrocks/cert#readme",
   "dependencies": {
-    "beautylog": "^5.0.12",
+    "@types/minimatch": "^2.0.26-alpha",
-    "cflare": "0.0.6",
+    "@types/q": "0.0.25-alpha",
+    "@types/shelljs": "^0.3.25-alpha",
+    "beautylog": "^5.0.13",
+    "cflare": "0.0.9",
     "fs-extra": "^0.30.0",
-    "letsencrypt": "^1.4.4",
     "q": "^1.4.1",
-    "smartcli": "^1.0.2",
+    "shelljs": "^0.7.0",
-    "smartfile": "^3.0.10",
+    "smartcli": "^1.0.4",
-    "smartgit": "0.0.10",
+    "smartfile": "^4.0.10",
-    "smartstring": "^2.0.9",
+    "smartgit": "0.1.8",
-    "typings-global": "^1.0.3"
+    "smartstring": "^2.0.10",
+    "typings-global": "^1.0.6"
   },
   "devDependencies": {
     "npmts-g": "^5.2.6",

test/test.js

@@ -2,6 +2,38 @@
 require("typings-test");
 require("should");
 var qenv_1 = require("qenv");
+var path = require("path");
+var install_1 = require("../dist/install");
+var cert = require("../dist/index");
 var testQenv = new qenv_1.Qenv(process.cwd(), process.cwd() + "/.nogit");
-
+var testCert;
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQixxQkFBbUIsTUFBTSxDQUFDLENBQUE7QUFFMUIsSUFBSSxRQUFRLEdBQUcsSUFBSSxXQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy10ZXN0XCI7XG5pbXBvcnQgXCJzaG91bGRcIjtcbmltcG9ydCAqIGFzIGNlcnQgZnJvbSBcIi4uL2Rpc3QvaW5kZXhcIjtcbmltcG9ydCB7UWVudn0gZnJvbSBcInFlbnZcIjtcblxubGV0IHRlc3RRZW52ID0gbmV3IFFlbnYocHJvY2Vzcy5jd2QoKSwgcHJvY2Vzcy5jd2QoKSArIFwiLy5ub2dpdFwiKTsiXX0=
+describe("cert", function () {
+    describe("install", function () {
+        it("should download letsencrypt.sh", function (done) {
+            this.timeout(5000);
+            install_1.startInstall().then(function () {
+                done();
+            });
+        });
+    });
+    describe("Cert", function () {
+        it("should create a new Cert object from class", function () {
+            this.timeout(20000);
+            testCert = new cert.Cert({
+                cfEmail: process.env.CF_EMAIL,
+                cfKey: process.env.CF_KEY,
+                sslDir: path.join(process.cwd(), "test/assets"),
+                gitOriginRepo: "git@gitlab.com:sandboxzone/sandbox-sslorigin.git",
+                testMode: true
+            });
+            testCert.should.be.instanceof(cert.Cert);
+        });
+        it("should get a valid certificate", function (done) {
+            this.timeout(120000);
+            testCert.getDomainCert("hello2.bleu.de").then(function () {
+                done();
+            });
+        });
+    });
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQixxQkFBbUIsTUFBTSxDQUFDLENBQUE7QUFDMUIsSUFBTyxJQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFFOUIsd0JBQTJCLGlCQUFpQixDQUFDLENBQUE7QUFDN0MsSUFBWSxJQUFJLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFHdEMsSUFBSSxRQUFRLEdBQUcsSUFBSSxXQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztBQUVsRSxJQUFJLFFBQWtCLENBQUM7QUFFdkIsUUFBUSxDQUFDLE1BQU0sRUFBQztJQUNaLFFBQVEsQ0FBQyxTQUFTLEVBQUM7UUFDZixFQUFFLENBQUMsZ0NBQWdDLEVBQUMsVUFBUyxJQUFJO1lBQzdDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsc0JBQVksRUFBRSxDQUFDLElBQUksQ0FBQztnQkFDaEIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQTtRQUNOLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFDRixRQUFRLENBQUMsTUFBTSxFQUFDO1FBQ1osRUFBRSxDQUFDLDRDQUE0QyxFQUFDO1lBQzVDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIsUUFBUSxHQUFHLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQztnQkFDckIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtnQkFDN0IsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTTtnQkFDekIsTUFBTSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFDLGFBQWEsQ0FBQztnQkFDOUMsYUFBYSxFQUFDLGtEQUFrRDtnQkFDaEUsUUFBUSxFQUFDLElBQUk7YUFDaEIsQ0FBQyxDQUFDO1lBQ0gsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxDQUFDLENBQUMsQ0FBQTtRQUNGLEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBQyxVQUFTLElBQUk7WUFDN0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNyQixRQUFRLENBQUMsYUFBYSxDQUFDLGdCQUFnQixDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFDIn0=

test/test.ts

@@ -1,7 +1,42 @@
 import "typings-test";
 import "should";
-import * as cert from "../dist/index";
 import {Qenv} from "qenv";
+import path = require("path");
+
+import {startInstall} from "../dist/install";
+import * as cert from "../dist/index";
+
 
 let testQenv = new Qenv(process.cwd(), process.cwd() + "/.nogit");
 
+let testCert:cert.Cert;
+
+describe("cert",function(){
+    describe("install",function(){
+        it("should download letsencrypt.sh",function(done){
+            this.timeout(5000);
+            startInstall().then(() => {
+                done();
+            })
+        })
+    })
+    describe("Cert",function(){
+        it("should create a new Cert object from class",function(){
+            this.timeout(20000);
+            testCert = new cert.Cert({
+                cfEmail: process.env.CF_EMAIL,
+                cfKey: process.env.CF_KEY,
+                sslDir: path.join(process.cwd(),"test/assets"),
+                gitOriginRepo:"git@gitlab.com:sandboxzone/sandbox-sslorigin.git",
+                testMode:true
+            });
+            testCert.should.be.instanceof(cert.Cert);
+        })
+        it("should get a valid certificate",function(done){
+            this.timeout(120000);
+            testCert.getDomainCert("hello2.bleu.de").then(() => {
+                done();
+            });
+        })
+    })
+});

ts/cert.hook.ts

@@ -1,3 +1,73 @@
-import * as smartcli from "smartcli";
+#!/usr/bin/env node
-import * as cflare from "cflare";
+// the shebang line above makes sure this script will get interpreted by node
 
+import * as plugins from "./cert.plugins";
+import * as paths from "./cert.paths";
+
+let smartcli = new plugins.smartcli.Smartcli();
+
+let config = plugins.smartfile.fs.toObjectSync(paths.config);
+let cflare = new plugins.cflare.CflareAccount();
+cflare.auth({
+    email: config.cfEmail,
+    key: config.cfKey
+});
+
+let setChallenge = (domainNameArg: string, challengeArg: string) => {
+    let done = plugins.q.defer();
+    plugins.beautylog.log("setting challenge for " + domainNameArg);
+    cflare.createRecord(prefixName(domainNameArg), "TXT", challengeArg).then(() => {
+        plugins.beautylog.ok("Challenge has been set!");
+        plugins.beautylog.info("We need to cool down to let DNS propagate to edge locations!");
+        cooldown().then(() => {
+            done.resolve();
+        });
+    });
+    return done.promise;
+}
+
+let cleanChallenge = (domainNameArg) => {
+    let done = plugins.q.defer();
+    plugins.beautylog.log("cleaning challenge for " + domainNameArg);
+    cflare.removeRecord(prefixName(domainNameArg), "TXT");
+    return done.promise;
+}
+
+let cooldown = () => {
+    let done = plugins.q.defer();
+    let cooldowntime = 40000;
+    let passedTime = 0;
+    plugins.beautylog.log("Cooling down! " + (cooldowntime/1000).toString() + " seconds left");
+    let coolDownCounter = () => {
+        setTimeout(() => {
+            if(cooldowntime <= passedTime){
+                plugins.beautylog.ok("Cooled down!");
+                done.resolve();
+            } else {
+                passedTime = passedTime + 5000;
+                plugins.beautylog.log("Cooling down! " + ((cooldowntime - passedTime)/1000).toString() + " seconds left");
+                coolDownCounter();
+            }
+        }, 5000);
+    }
+    coolDownCounter();
+    return done.promise;
+}
+
+let prefixName = (domainNameArg: string): string => {
+    return "_acme-challenge." + domainNameArg;
+}
+
+smartcli.addCommand({
+    commandName: "deploy_challenge"
+}).then((argv) => {
+    setChallenge(argv._[1], argv._[3]);
+});
+
+smartcli.addCommand({
+    commandName: "clean_challenge"
+}).then((argv) => {
+    cleanChallenge(argv._[1]);
+});
+
+smartcli.startParse();

ts/cert.paths.ts

@@ -1,3 +1,11 @@
-import "typings-global";
+import * as plugins from "./cert.plugins";
-export import path = require("path");
 
+// files
+export let certHook = plugins.path.join(__dirname,"cert.hook.js");
+export let config = plugins.path.join(__dirname,"assets/config.json");
+export let leShConfig = plugins.path.join(__dirname,"assets/leshconfig.json");
+export let letsencryptSh = plugins.path.join(__dirname,"assets/letsencrypt.sh");
+
+//dirs
+export let certDir = plugins.path.join(__dirname,"/assets/certs");
+export let assetDir = plugins.path.join(__dirname,"/assets/");

ts/cert.plugins.ts

@@ -1,6 +1,12 @@
 import "typings-global";
+export import beautylog = require("beautylog");
+export import cflare = require("cflare");
+export let fs = require("fs-extra");
 export import path = require("path");
-export let q = require("q");
+export import q = require("q");
+export let shelljs = require("shelljs");
+export import smartcli = require("smartcli");
 export import smartfile = require("smartfile");
+export import smartgit = require("smartgit");
 export import smartstring = require("smartstring");
 

ts/index.ts

@@ -1,31 +1,160 @@
+import * as plugins from "./cert.plugins";
 import * as paths from "./cert.paths";
 
 export class Cert {
-    cfEmail:string;
+    private _cfEmail: string;
-    cfKey:string;
+    private _cfKey: string;
-    sslDir:string;
+    private _sslDir: string;
-    certificatesPresent;
+    private _gitOriginRepo: string;
-    certificatesValid;
+    private _testMode: boolean
-    gitOriginRepo;
+    certificatesPresent: Certificate[];
-    constructor(optionsArg:{
+    certificatesValid: Certificate[];
-        cfEmail:string,
+    constructor(optionsArg: {
-        cfKey:string,
+        cfEmail: string,
-        sslDir:string,
+        cfKey: string,
-        gitOriginRepo?:string
+        sslDir: string,
-    }){
+        gitOriginRepo?: string,
-        this.cfEmail = optionsArg.cfEmail;
+        testMode?: boolean
-        this.cfKey = optionsArg.cfKey;
+    }) {
-        this.sslDir = optionsArg.sslDir;
+        this._cfEmail = optionsArg.cfEmail;
-        this.gitOriginRepo = optionsArg.gitOriginRepo;
+        this._cfKey = optionsArg.cfKey;
+        this._sslDir = optionsArg.sslDir;
+        this._gitOriginRepo = optionsArg.gitOriginRepo;
+        this._testMode = optionsArg.testMode;
+        // write hook config
+        let config = {
+            cfEmail: this._cfEmail,
+            cfKey: this._cfKey
+        }
+        plugins.smartfile.memory.toFsSync(
+            JSON.stringify(config),
+            plugins.path.join(__dirname, "assets/config.json")
+        );
+        // setup Git
+        if (this._gitOriginRepo) {
+            plugins.smartgit.init(this._sslDir);
+            plugins.smartgit.remote.add(this._sslDir, "origin", this._gitOriginRepo);
+            this.sslGitOriginPull();
+        }
+        // setup leSh config;
+        let leShConfigString;
+        if (this._testMode) {
+            leShConfigString = `CA="https://acme-staging.api.letsencrypt.org/directory"\n`;
+        } else {
+            leShConfigString = " ";
+        };
+        plugins.smartfile.memory.toFsSync(
+            leShConfigString,
+            paths.leShConfig
+        );
+    };
+    sslGitOriginPull = () => {
+        if (this._gitOriginRepo) {
+            plugins.smartgit.pull(this._sslDir, "origin", "master");
+        }
+    };
+    sslGitOriginAddCommitPush = () => {
+        if (this._gitOriginRepo) {
+            plugins.smartgit.add.addAll(this._sslDir);
+            plugins.smartgit.commit(this._sslDir, "added new SSL certificates and deleted obsolete ones.");
+            plugins.smartgit.push(this._sslDir, "origin", "master");
+        }
+    };
+    getDomainCert(domainNameArg: string, optionsArg: { force: boolean } = { force: false }) {
+        let done = plugins.q.defer();
+        this.sslGitOriginPull();
+        if (!checkDomainsStillValid(domainNameArg, this._sslDir) || optionsArg.force) {
+            plugins.shelljs.exec("chmod 700 " + paths.letsencryptSh);
+            plugins.shelljs.exec("chmod 700 " + paths.certHook);
+            plugins.smartfile.fs.ensureDir(paths.certDir);
+            plugins.shelljs.exec(
+                `bash -c "${paths.letsencryptSh} -c -f ${paths.leShConfig} -d ${domainNameArg} -t dns-01 -k ${paths.certHook} -o ${paths.certDir}"`
+            );
+            let fetchedCertsArray: string[] = plugins.smartfile.fs.listFoldersSync(paths.certDir);
+            if (fetchedCertsArray.indexOf(domainNameArg) != -1) {
+                updateSslDirSync(this._sslDir, domainNameArg);
+            }
+            this.sslGitOriginAddCommitPush();
+            done.resolve();
+        } else {
+            plugins.beautylog.info("certificate for " + domainNameArg + " is still valid! Not fetching new one!");
+            done.resolve();
+        };
+        return done.promise;
+    };
+    cleanOldCertificates() {
+
     };
-    getDomainCert(){};
 }
 
 export class Certificate {
-    domainName:string;
+    domainName: string;
-    creationDate:Date;
+    creationDate: Date;
-    expiryDate:Date;
+    expiryDate: Date;
-    constructor(){
+    constructor() {
 
     };
-}
+}
+
+interface certConfig {
+    domainName: string;
+    created: number;
+    expires: number;
+}
+
+let checkDomainsStillValid = (domainNameArg: string, sslDirArg: string): boolean => {
+    let domainConfigPath = plugins.path.join(sslDirArg, domainNameArg,"config.json");
+    if (plugins.smartfile.fs.fileExistsSync(domainConfigPath)){
+        let domainConfig = plugins.smartfile.fs.toObjectSync(
+            domainConfigPath,
+            "json"
+        );
+        if (Date.now() >= ((domainConfig.expires - 604800) * 1000)) {
+            return false;
+        } else {
+            return true;
+        }
+    } else {
+        return false;
+    }
+
+}
+
+let updateSslDirSync = (sslDirArg: string, domainNameArg: string) => {
+    plugins.smartfile.fs.ensureDirSync(sslDirArg);
+    let domainCertFolder = plugins.path.join(paths.certDir, domainNameArg)
+    if (plugins.smartfile.fs.listFoldersSync(paths.certDir).indexOf(domainNameArg) != -1) {
+        plugins.smartfile.fs.copySync(
+            plugins.path.join(domainCertFolder, "fullchain.pem"),
+            plugins.path.join(sslDirArg, domainNameArg, "fullchain.pem")
+        );
+        plugins.smartfile.fs.copySync(
+            plugins.path.join(domainCertFolder, "privkey.pem"),
+            plugins.path.join(sslDirArg, domainNameArg, "privkey.pem")
+        );
+        // create cert config
+        let certRegex = /.*\-([0-9]*)\.pem/;
+        let certFileNameWithTime: string = plugins.smartfile.fs.listFilesSync(domainCertFolder, certRegex)[0];
+        let certTime = parseInt(certRegex.exec(certFileNameWithTime)[1]);
+        let certConfig: certConfig = {
+            domainName: domainNameArg,
+            created: certTime,
+            expires: certTime + 7776000
+        };
+        plugins.smartfile.memory.toFsSync(
+            JSON.stringify(certConfig),
+            plugins.path.join(sslDirArg, domainNameArg, "config.json")
+        );
+    };
+}
+
+const enum gitSyncDirection {
+    toOrigin,
+    fromOrigin
+}
+
+let updateGitOrigin = (syncDirectionArg: gitSyncDirection) => {
+
+};
+
+updateGitOrigin(gitSyncDirection.toOrigin);

ts/install.ts

@@ -1,13 +1,23 @@
-import * as beautylog from "beautylog";
+import * as plugins from "./cert.plugins";
-import * as path from "path";
+import * as paths from "./cert.paths";
-import * as smartfile from "smartfile";
-let fs = require("fs-extra");
-beautylog.info("installing letsencrypt.sh locally...");
 
-fs.ensureDir(path.join(__dirname,"assets/"));
+export let startInstall = () => {
-smartfile.remote.toFs(
+    let done = plugins.q.defer();
-    "https://raw.githubusercontent.com/lukas2511/letsencrypt.sh/master/letsencrypt.sh",
+    plugins.beautylog.info("installing letsencrypt.sh locally...");
-    path.join(__dirname,"assets/","le.sh")
+
-).then(() => {
+    plugins.fs.ensureDir(plugins.path.join(__dirname, "assets/"));
-    beautylog.success("Done!");
+    plugins.smartfile.remote.toFs(
-});
+        "https://raw.githubusercontent.com/lukas2511/letsencrypt.sh/master/letsencrypt.sh",
+        paths.letsencryptSh
+    ).then(() => {
+        plugins.beautylog.success("Done!");
+        done.resolve();
+    });
+    return done.promise;
+};
+
+let smartcli = new plugins.smartcli.Smartcli();
+smartcli.addCommand({
+    commandName:"install"
+}).then(startInstall);
+smartcli.startParse();