1.0.7

.gitlab-ci.yml

@@ -5,6 +5,9 @@ stages:
   - test2
   - release
 
+before_script:
+  - npmci prepare ssh
+
 testLTS:
   stage: test1
   script:

README.md

@@ -1,6 +1,9 @@
 # Cert
 Easily obain SSL certificates from LetsEncrypt. Supports DNS-01 challenge. TypeScript ready.
 
+## Status
+[![build status](https://gitlab.com/pushrocks/cert/badges/master/build.svg)](https://gitlab.com/pushrocks/cert/commits/master)
+
 ## Usage 
 
 ```typescript
@@ -13,13 +16,17 @@ let myCert = new Cert({
     gitOriginRepo: "git@githhub.com/someuser/somereopo" // good for persistence in highly volatile environments like docker
 });
 
-myCert.getDomainCert("example.com");
+myCert.getDomainCert("example.com"); // returns promise
 ```
 
-### sslDir
+> **Note:** cert supports async parallel cert fetching.
+However any subsequent calls will wait for the queue of the same dns zone to clear.
+In other words: test1.domain1.tld and test2.domain2.tld will run in parallel, but test2.domain1.tld will wait for test1.domain1.tld !
+
+## sslDir
 to use the certificates it is important to understand what the structure of the ssl directory looks like.
 
-### using a git origin repo.
+## using a git origin repo.
 Often times you want to keep track of certificates in order to keep them
 even if the point of initial certificate request is gone. Imagine you have a dockerenvironement
 and you keep starting new container versions for the same domain. YOu ideally want to use a proxy
@@ -27,3 +34,8 @@ that handles SSL managemet for you. But even the proxy needs to be updated from
 
 So you need some kind of persistence between versions. This is why you can sync up all certificates to a git repo over ssh
 Just make sure your id_rsa is in place for the node user and is allowed for the origin repo.
+
+## Environment
+Since cert relies on [letsencrypt.sh](https://github.com/lukas2511/letsencrypt.sh) in the background bash is needed on the system.
+If you plan on using this on Windows check out [npmdocker](https://www.npmjs.com/package/npmdocker) which runs node programs in docker.
+As of summer 2016 Windows will also ship with bash nativly included.

dist/cert.classes.cert.d.ts

@@ -0,0 +1,44 @@
+/// <reference types="q" />
+import * as plugins from "./cert.plugins";
+export interface ICertConstructorOptions {
+    cfEmail: string;
+    cfKey: string;
+    sslDir?: string;
+    gitOriginRepo?: string;
+    testMode?: boolean;
+}
+export declare class Cert {
+    private _cfEmail;
+    private _cfKey;
+    private _sslDir;
+    private _gitOriginRepo;
+    private _testMode;
+    domainCertRequestMap: plugins.lik.Stringmap;
+    certificatesPresent: Certificate[];
+    certificatesValid: Certificate[];
+    /**
+     * Constructor for Cert object
+     */
+    constructor(optionsArg: ICertConstructorOptions);
+    /**
+     * Pulls already requested certificates from git origin
+     */
+    sslGitOriginPull: () => void;
+    /**
+     * Pushes all new requested certificates to git origin
+     */
+    sslGitOriginAddCommitPush: () => void;
+    /**
+     * gets a ssl cert for a given domain
+     */
+    getDomainCert(domainNameArg: string, optionsArg?: {
+        force: boolean;
+    }): plugins.q.Promise<{}>;
+    cleanOldCertificates(): void;
+}
+export declare class Certificate {
+    domainName: string;
+    creationDate: Date;
+    expiryDate: Date;
+    constructor();
+}

dist/cert.classes.cert.helpers.d.ts

@@ -0,0 +1,20 @@
+/// <reference types="q" />
+import { Cert } from "./index.ts";
+import * as plugins from "./cert.plugins";
+/**
+ * schedule a retry of certificate request
+ */
+export declare let scheduleRetry: (domainArg: string, certClassArg: Cert) => plugins.q.Promise<{}>;
+/**
+ * check if a given domainCert is still valid
+ */
+export declare let checkDomainsStillValid: (domainNameArg: string, sslDirArg: string) => boolean;
+export interface certConfig {
+    domainName: string;
+    created: number;
+    expires: number;
+}
+/**
+ * update a ssl directory
+ */
+export declare let updateSslDirSync: (sslDirArg: string, domainNameArg: string) => void;

dist/cert.classes.cert.helpers.js

@@ -0,0 +1,59 @@
+"use strict";
+const plugins = require("./cert.plugins");
+const paths = require("./cert.paths");
+/**
+ * schedule a retry of certificate request
+ */
+exports.scheduleRetry = (domainArg, certClassArg) => {
+    let done = plugins.q.defer();
+    setTimeout(() => {
+        certClassArg.getDomainCert(domainArg)
+            .then(done.resolve);
+    }, 60000);
+    return done.promise;
+};
+/**
+ * check if a given domainCert is still valid
+ */
+exports.checkDomainsStillValid = (domainNameArg, sslDirArg) => {
+    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;
+    }
+};
+;
+/**
+ * update a ssl directory
+ */
+exports.updateSslDirSync = (sslDirArg, domainNameArg) => {
+    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 = plugins.smartfile.fs.listFilesSync(domainCertFolder, certRegex)[0];
+        let certTime = parseInt(certRegex.exec(certFileNameWithTime)[1]);
+        let certConfig = {
+            domainName: domainNameArg,
+            created: certTime,
+            expires: certTime + 7776000
+        };
+        plugins.smartfile.memory.toFsSync(JSON.stringify(certConfig), plugins.path.join(sslDirArg, domainNameArg, "config.json"));
+    }
+    ;
+};
+let updateGitOrigin = (syncDirectionArg) => {
+};
+updateGitOrigin(0 /* toOrigin */);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5jbGFzc2VzLmNlcnQuaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NlcnQuY2xhc3Nlcy5jZXJ0LmhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLE1BQVksT0FBTyxXQUFNLGdCQUFnQixDQUFDLENBQUE7QUFDMUMsTUFBWSxLQUFLLFdBQU0sY0FBYyxDQUFDLENBQUE7QUFJdEM7O0dBRUc7QUFDUSxxQkFBYSxHQUFHLENBQUMsU0FBZ0IsRUFBQyxZQUFpQjtJQUMxRCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLFVBQVUsQ0FBQztRQUNQLFlBQVksQ0FBQyxhQUFhLENBQUMsU0FBUyxDQUFDO2FBQ2hDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDNUIsQ0FBQyxFQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ1QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFDO0FBRUY7O0dBRUc7QUFDUSw4QkFBc0IsR0FBRyxDQUFDLGFBQXFCLEVBQUUsU0FBaUI7SUFDekUsSUFBSSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsYUFBYSxFQUFFLGFBQWEsQ0FBQyxDQUFDO0lBQ2xGLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGNBQWMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN4RCxJQUFJLFlBQVksR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQ2hELGdCQUFnQixFQUNoQixNQUFNLENBQ1QsQ0FBQztRQUNGLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUMsWUFBWSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUMsR0FBRyxJ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

dist/cert.hook.js

@@ -1,39 +1,42 @@
 #!/usr/bin/env node
 "use strict";
-var plugins = require("./cert.plugins");
+const plugins = require("./cert.plugins");
-var paths = require("./cert.paths");
+const paths = require("./cert.paths");
-var smartcli = new plugins.smartcli.Smartcli();
+let smartcli = new plugins.smartcli.Smartcli();
-var config = plugins.smartfile.fs.toObjectSync(paths.config);
+let config = plugins.smartfile.fs.toObjectSync(paths.config);
-var cflare = new plugins.cflare.CflareAccount();
+let cflare = new plugins.cflare.CflareAccount();
 cflare.auth({
     email: config.cfEmail,
     key: config.cfKey
 });
-var setChallenge = function (domainNameArg, challengeArg) {
+let setChallenge = (domainNameArg, challengeArg) => {
-    var done = plugins.q.defer();
+    let done = plugins.q.defer();
     plugins.beautylog.log("setting challenge for " + domainNameArg);
-    cflare.createRecord(prefixName(domainNameArg), "TXT", challengeArg).then(function () {
+    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(function () {
+        cooldown().then(() => {
             done.resolve();
         });
     });
     return done.promise;
 };
-var cleanChallenge = function (domainNameArg) {
+let cleanChallenge = (domainNameArg) => {
-    var done = plugins.q.defer();
+    let done = plugins.q.defer();
     plugins.beautylog.log("cleaning challenge for " + domainNameArg);
     cflare.removeRecord(prefixName(domainNameArg), "TXT");
+    cooldown().then(() => {
+        done.resolve();
+    });
     return done.promise;
 };
-var cooldown = function () {
+let cooldown = () => {
-    var done = plugins.q.defer();
+    let done = plugins.q.defer();
-    var cooldowntime = 40000;
+    let cooldowntime = 60000;
-    var passedTime = 0;
+    let passedTime = 0;
     plugins.beautylog.log("Cooling down! " + (cooldowntime / 1000).toString() + " seconds left");
-    var coolDownCounter = function () {
+    let coolDownCounter = () => {
-        setTimeout(function () {
+        setTimeout(() => {
             if (cooldowntime <= passedTime) {
                 plugins.beautylog.ok("Cooled down!");
                 done.resolve();
@@ -48,18 +51,18 @@ var cooldown = function () {
     coolDownCounter();
     return done.promise;
 };
-var prefixName = function (domainNameArg) {
+let prefixName = (domainNameArg) => {
     return "_acme-challenge." + domainNameArg;
 };
 smartcli.addCommand({
     commandName: "deploy_challenge"
-}).then(function (argv) {
+}).then((argv) => {
     setChallenge(argv._[1], argv._[3]);
 });
 smartcli.addCommand({
     commandName: "clean_challenge"
-}).then(function (argv) {
+}).then((argv) => {
     cleanChallenge(argv._[1]);
 });
 smartcli.startParse();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5ob29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2VydC5ob29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsSUFBWSxPQUFPLFdBQU0sZ0JBQWdCLENBQUMsQ0FBQTtBQUMxQyxJQUFZLEtBQUssV0FBTSxjQUFjLENBQUMsQ0FBQTtBQUV0QyxJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7QUFFL0MsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUM3RCxJQUFJLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7QUFDaEQsTUFBTSxDQUFDLElBQUksQ0FBQztJQUNSLEtBQUssRUFBRSxNQUFNLENBQUMsT0FBTztJQUNyQixHQUFHLEVBQUUsTUFBTSxDQUFDLEtBQUs7Q0FDcEIsQ0FBQyxDQUFDO0FBRUgsSUFBSSxZQUFZLEdBQUcsVUFBQyxhQUFxQixFQUFFLFlBQW9CO0lBQzNELElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsd0JBQXdCLEdBQUcsYUFBYSxDQUFDLENBQUM7SUFDaEUsTUFBTSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEVBQUUsS0FBSyxFQUFFLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQztRQUNyRSxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBQ2hELE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLDhEQUE4RCxDQUFDLENBQUM7UUFDdkYsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUFDO1lBQ1osSUFBSSxDQUFDLE9BQU8sRUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5ob29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2VydC5ob29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsTUFBWSxPQUFPLFdBQU0sZ0JBQWdCLENBQUMsQ0FBQTtBQUMxQyxNQUFZLEtBQUssV0FBTSxjQUFjLENBQUMsQ0FBQTtBQUV0QyxJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7QUFFL0MsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUM3RCxJQUFJLE1BQU0sR0FBRyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7QUFDaEQsTUFBTSxDQUFDLElBQUksQ0FBQztJQUNSLEtBQUssRUFBRSxNQUFNLENBQUMsT0FBTztJQUNyQixHQUFHLEVBQUUsTUFBTSxDQUFDLEtBQUs7Q0FDcEIsQ0FBQyxDQUFDO0FBRUgsSUFBSSxZQUFZLEdBQUcsQ0FBQyxhQUFxQixFQUFFLFlBQW9CO0lBQzNELElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsd0JBQXdCLEdBQUcsYUFBYSxDQUFDLENBQUM7SUFDaEUsTUFBTSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEVBQUUsS0FBSyxFQUFFLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQztRQUNyRSxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBQ2hELE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLDhEQUE4RCxDQUFDLENBQUM7UUFDdkYsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUFDO1lBQ1osSUFBSSxDQUFDLE9BQU8sRUFB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

dist/cert.paths.d.ts

@@ -1,7 +1,8 @@
+export declare let certDir: string;
+export declare let defaultSslDir: string;
+export declare let assetDir: string;
+export declare let accountsDir: string;
 export declare let certHook: string;
 export declare let config: string;
 export declare let leShConfig: string;
 export declare let letsencryptSh: string;
-export declare let certDir: string;
-export declare let defaultSslDir: string;
-export declare let assetDir: string;

dist/cert.paths.js

@@ -1,12 +1,13 @@
 "use strict";
-var plugins = require("./cert.plugins");
+const plugins = require("./cert.plugins");
+//dirs
+exports.certDir = plugins.path.join(__dirname, "assets/certs");
+exports.defaultSslDir = plugins.path.join(__dirname, "assets/defaultSslDir");
+exports.assetDir = plugins.path.join(__dirname, "assets/");
+exports.accountsDir = plugins.path.join(__dirname, "assets/accounts/");
 // files
 exports.certHook = plugins.path.join(__dirname, "cert.hook.js");
 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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NlcnQucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLGdCQUFnQixDQUFDLENBQUE7QUFFMUMsTUFBTTtBQUNLLGVBQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsY0FBYyxDQUFDLENBQUM7QUFDdEQscUJBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsc0JBQXNCLENBQUMsQ0FBQztBQUNwRSxnQkFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxTQUFTLENBQUMsQ0FBQztBQUNsRCxtQkFBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBRXpFLFFBQVE7QUFDRyxnQkFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxjQUFjLENBQUMsQ0FBQztBQUN2RCxjQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFDLG9CQUFvQixDQUFDLENBQUM7QUFDM0Qsa0JBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsd0JBQXdCLENBQUMsQ0FBQztBQUNuRSxxQkFBYSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyx1QkFBdUIsQ0FBQyxDQUFDIn0=
-exports.certDir = plugins.path.join(__dirname, "assets/certs");
-exports.defaultSslDir = plugins.path.join(__dirname, "assets/defaultSslDir");
-exports.assetDir = plugins.path.join(__dirname, "assets/");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5wYXRocy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NlcnQucGF0aHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQVksT0FBTyxXQUFNLGdCQUFnQixDQUFDLENBQUE7QUFFMUMsUUFBUTtBQUNHLGdCQUFRLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFDLGNBQWMsQ0FBQyxDQUFDO0FBQ3ZELGNBQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUMzRCxrQkFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyx3QkFBd0IsQ0FBQyxDQUFDO0FBQ25FLHFCQUFhLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFDLHVCQUF1QixDQUFDLENBQUM7QUFFaEYsTUFBTTtBQUNLLGVBQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsY0FBYyxDQUFDLENBQUM7QUFDdEQscUJBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUMsc0JBQXNCLENBQUMsQ0FBQztBQUNwRSxnQkFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxTQUFTLENBQUMsQ0FBQyJ9

dist/cert.plugins.d.ts

@@ -2,9 +2,10 @@ import "typings-global";
 export import beautylog = require("beautylog");
 export import cflare = require("cflare");
 export declare let fs: any;
+export import lik = require("lik");
 export import path = require("path");
 export import q = require("q");
-export declare let shelljs: any;
+export import shelljs = require("shelljs");
 export import smartcli = require("smartcli");
 export import smartfile = require("smartfile");
 export import smartgit = require("smartgit");

dist/cert.plugins.js

@@ -3,6 +3,7 @@ require("typings-global");
 exports.beautylog = require("beautylog");
 exports.cflare = require("cflare");
 exports.fs = require("fs-extra");
+exports.lik = require("lik");
 exports.path = require("path");
 exports.q = require("q");
 exports.shelljs = require("shelljs");
@@ -10,4 +11,4 @@ exports.smartcli = require("smartcli");
 exports.smartfile = require("smartfile");
 exports.smartgit = require("smartgit");
 exports.smartstring = require("smartstring");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2VydC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLGNBQU0sV0FBVyxRQUFRLENBQUMsQ0FBQztBQUM5QixVQUFFLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0FBQ3RCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUN2QixTQUFDLFdBQVcsR0FBRyxDQUFDLENBQUM7QUFDcEIsZUFBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUMxQixnQkFBUSxXQUFXLFVBQVUsQ0FBQyxDQUFDO0FBQy9CLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDakMsZ0JBQVEsV0FBVyxVQUFVLENBQUMsQ0FBQztBQUMvQixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2VydC5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2VydC5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLGNBQU0sV0FBVyxRQUFRLENBQUMsQ0FBQztBQUM5QixVQUFFLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0FBQ3RCLFdBQUcsV0FBVyxLQUFLLENBQUMsQ0FBQztBQUNyQixZQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDdkIsU0FBQyxXQUFXLEdBQUcsQ0FBQyxDQUFDO0FBQ2pCLGVBQU8sV0FBVyxTQUFTLENBQUMsQ0FBQztBQUM3QixnQkFBUSxXQUFXLFVBQVUsQ0FBQyxDQUFDO0FBQy9CLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDakMsZ0JBQVEsV0FBVyxVQUFVLENBQUMsQ0FBQztBQUMvQixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDIn0=

dist/index.d.ts

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

dist/install.js

@@ -1,19 +1,19 @@
 "use strict";
-var plugins = require("./cert.plugins");
+const plugins = require("./cert.plugins");
-var paths = require("./cert.paths");
+const paths = require("./cert.paths");
-exports.startInstall = function () {
+exports.startInstall = () => {
-    var done = plugins.q.defer();
+    let done = plugins.q.defer();
     plugins.beautylog.info("installing letsencrypt.sh locally...");
     plugins.fs.ensureDir(plugins.path.join(__dirname, "assets/"));
-    plugins.smartfile.remote.toFs("https://raw.githubusercontent.com/lukas2511/letsencrypt.sh/master/letsencrypt.sh", paths.letsencryptSh).then(function () {
+    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;
 };
-var smartcli = new plugins.smartcli.Smartcli();
+let smartcli = new plugins.smartcli.Smartcli();
 smartcli.addCommand({
     commandName: "install"
 }).then(exports.startInstall);
 smartcli.startParse();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2luc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQVksT0FBTyxXQUFNLGdCQUFnQixDQUFDLENBQUE7QUFDMUMsSUFBWSxLQUFLLFdBQU0sY0FBYyxDQUFDLENBQUE7QUFFM0Isb0JBQVksR0FBRztJQUN0QixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHNDQUFzQyxDQUFDLENBQUM7SUFFL0QsT0FBTyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDOUQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUN6QixrRkFBa0YsRUFDbEYsS0FBSyxDQUFDLGFBQWEsQ0FDdEIsQ0FBQyxJQUFJLENBQUM7UUFDSCxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNuQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDSCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUM7QUFFRixJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7QUFDL0MsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUMsU0FBUztDQUN4QixDQUFDLENBQUMsSUFBSSxDQUFDLG9CQUFZLENBQUMsQ0FBQztBQUN0QixRQUFRLENBQUMsVUFBVSxFQUFFLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdGFsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2luc3RhbGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLGdCQUFnQixDQUFDLENBQUE7QUFDMUMsTUFBWSxLQUFLLFdBQU0sY0FBYyxDQUFDLENBQUE7QUFFM0Isb0JBQVksR0FBRztJQUN0QixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHNDQUFzQyxDQUFDLENBQUM7SUFFL0QsT0FBTyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDOUQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUN6QixrRkFBa0YsRUFDbEYsS0FBSyxDQUFDLGFBQWEsQ0FDdEIsQ0FBQyxJQUFJLENBQUM7UUFDSCxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNuQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDSCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUM7QUFFRixJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7QUFDL0MsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNoQixXQUFXLEVBQUMsU0FBUztDQUN4QixDQUFDLENBQUMsSUFBSSxDQUFDLG9CQUFZLENBQUMsQ0FBQztBQUN0QixRQUFRLENBQUMsVUFBVSxFQUFFLENBQUMifQ==

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cert",
-  "version": "0.0.16",
+  "version": "1.0.7",
   "description": "Easily obain SSL certificates from LetsEncrypt. Supports DNS-01 challenge. TypeScript ready.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -27,24 +27,25 @@
   },
   "homepage": "https://gitlab.com/pushrocks/cert#readme",
   "dependencies": {
-    "@types/minimatch": "*",
+    "@types/minimatch": "2.x.x",
-    "@types/q": "*",
+    "@types/q": "0.x.x",
-    "@types/shelljs": "*",
+    "@types/shelljs": "0.x.x",
-    "beautylog": "^5.0.13",
+    "beautylog": "^5.0.18",
     "cflare": "0.0.9",
     "fs-extra": "^0.30.0",
+    "lik": "^1.0.5",
     "q": "^1.4.1",
-    "shelljs": "^0.7.0",
+    "shelljs": "^0.7.1",
     "smartcli": "^1.0.4",
-    "smartfile": "^4.0.10",
+    "smartfile": "^4.0.12",
-    "smartgit": "0.1.8",
+    "smartgit": "0.1.9",
-    "smartstring": "^2.0.10",
+    "smartstring": "^2.0.15",
     "typings-global": "^1.0.6"
   },
   "devDependencies": {
     "npmts-g": "^5.2.6",
     "qenv": "^1.0.8",
-    "should": "^9.0.2",
+    "should": "^10.0.0",
     "typings-test": "^1.0.1"
   }
 }

test/test.js

@@ -1,24 +1,25 @@
 "use strict";
 require("typings-test");
 require("should");
-var qenv_1 = require("qenv");
+const qenv_1 = require("qenv");
-var path = require("path");
+const path = require("path");
-var install_1 = require("../dist/install");
+const q = require("q");
-var cert = require("../dist/index");
+const install_1 = require("../dist/install");
-var testQenv = new qenv_1.Qenv(process.cwd(), process.cwd() + "/.nogit");
+const cert = require("../dist/index");
-var testCert;
+let testQenv = new qenv_1.Qenv(process.cwd(), process.cwd() + "/.nogit");
+let testCert;
 describe("cert", function () {
     describe("install", function () {
         it("should download letsencrypt.sh", function (done) {
             this.timeout(5000);
-            install_1.startInstall().then(function () {
+            install_1.startInstall().then(() => {
                 done();
             });
         });
     });
     describe("Cert", function () {
         it("should create a new Cert object from class", function () {
-            this.timeout(20000);
+            this.timeout(40000);
             testCert = new cert.Cert({
                 cfEmail: process.env.CF_EMAIL,
                 cfKey: process.env.CF_KEY,
@@ -29,11 +30,18 @@ describe("cert", function () {
             testCert.should.be.instanceof(cert.Cert);
         });
         it("should get a valid certificate", function (done) {
-            this.timeout(120000);
+            this.timeout(1200000);
-            testCert.getDomainCert("hello2.bleu.de").then(function () {
+            let promiseArray = [];
+            function getRandomArbitrary(min, max) {
+                return Math.floor(Math.random() * (max - min) + min);
+            }
+            promiseArray.push(testCert.getDomainCert(`testing${getRandomArbitrary(1, 100000)}.bleu.de`));
+            promiseArray.push(testCert.getDomainCert(`testing${getRandomArbitrary(1, 100000)}.bleu.de`));
+            promiseArray.push(testCert.getDomainCert(`testing${getRandomArbitrary(1, 100000)}.bleu.de`));
+            q.all(promiseArray).then(() => {
                 done();
             });
         });
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQixxQkFBbUIsTUFBTSxDQUFDLENBQUE7QUFDMUIsSUFBTyxJQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFFOUIsd0JBQTJCLGlCQUFpQixDQUFDLENBQUE7QUFDN0MsSUFBWSxJQUFJLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFHdEMsSUFBSSxRQUFRLEdBQUcsSUFBSSxXQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztBQUVsRSxJQUFJLFFBQWtCLENBQUM7QUFFdkIsUUFBUSxDQUFDLE1BQU0sRUFBQztJQUNaLFFBQVEsQ0FBQyxTQUFTLEVBQUM7UUFDZixFQUFFLENBQUMsZ0NBQWdDLEVBQUMsVUFBUyxJQUFJO1lBQzdDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsc0JBQVksRUFBRSxDQUFDLElBQUksQ0FBQztnQkFDaEIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQTtRQUNOLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFDRixRQUFRLENBQUMsTUFBTSxFQUFDO1FBQ1osRUFBRSxDQUFDLDRDQUE0QyxFQUFDO1lBQzVDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIsUUFBUSxHQUFHLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQztnQkFDckIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtnQkFDN0IsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTTtnQkFDekIsTUFBTSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFDLGFBQWEsQ0FBQztnQkFDOUMsYUFBYSxFQUFDLGtEQUFrRDtnQkFDaEUsUUFBUSxFQUFDLElBQUk7YUFDaEIsQ0FBQyxDQUFDO1lBQ0gsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxDQUFDLENBQUMsQ0FBQTtRQUNGLEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBQyxVQUFTLElBQUk7WUFDN0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNyQixRQUFRLENBQUMsYUFBYSxDQUFDLGdCQUFnQixDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQix1QkFBbUIsTUFBTSxDQUFDLENBQUE7QUFDMUIsTUFBTyxJQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDOUIsTUFBTyxDQUFDLFdBQVcsR0FBRyxDQUFDLENBQUM7QUFDeEIsMEJBQTJCLGlCQUFpQixDQUFDLENBQUE7QUFDN0MsTUFBWSxJQUFJLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFHdEMsSUFBSSxRQUFRLEdBQUcsSUFBSSxXQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztBQUVsRSxJQUFJLFFBQWtCLENBQUM7QUFFdkIsUUFBUSxDQUFDLE1BQU0sRUFBQztJQUNaLFFBQVEsQ0FBQyxTQUFTLEVBQUM7UUFDZixFQUFFLENBQUMsZ0NBQWdDLEVBQUMsVUFBUyxJQUFJO1lBQzdDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkIsc0JBQVksRUFBRSxDQUFDLElBQUksQ0FBQztnQkFDaEIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQTtRQUNOLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFDRixRQUFRLENBQUMsTUFBTSxFQUFDO1FBQ1osRUFBRSxDQUFDLDRDQUE0QyxFQUFDO1lBQzVDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIsUUFBUSxHQUFHLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQztnQkFDckIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtnQkFDN0IsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTTtnQkFDekIsTUFBTSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFDLGFBQWEsQ0FBQztnQkFDOUMsYUFBYSxFQUFDLGtEQUFrRDtnQkFDaEUsUUFBUSxFQUFDLElBQUk7YUFDaEIsQ0FBQyxDQUFDO1lBQ0gsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxDQUFDLENBQUMsQ0FBQTtRQUNGLEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBQyxVQUFTLElBQUk7WUFDN0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUN0QixJQUFJLFlBQVksR0FBRyxFQUFFLENBQUM7WUFDdEIsNEJBQTRCLEdBQUcsRUFBRSxHQUFHO2dCQUNoQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUM7WUFDekQsQ0FBQztZQUNELFlBQVksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxVQUFVLGtCQUFrQixDQUFDLENBQUMsRUFBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztZQUM1RixZQUFZLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsVUFBVSxrQkFBa0IsQ0FBQyxDQUFDLEVBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDNUYsWUFBWSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLFVBQVUsa0JBQWtCLENBQUMsQ0FBQyxFQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQzVGLENBQUMsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFDIn0=

test/test.ts

@@ -2,7 +2,7 @@ import "typings-test";
 import "should";
 import {Qenv} from "qenv";
 import path = require("path");
-
+import q = require("q");
 import {startInstall} from "../dist/install";
 import * as cert from "../dist/index";
 
@@ -22,7 +22,7 @@ describe("cert",function(){
     })
     describe("Cert",function(){
         it("should create a new Cert object from class",function(){
-            this.timeout(20000);
+            this.timeout(40000);
             testCert = new cert.Cert({
                 cfEmail: process.env.CF_EMAIL,
                 cfKey: process.env.CF_KEY,
@@ -33,8 +33,15 @@ describe("cert",function(){
             testCert.should.be.instanceof(cert.Cert);
         })
         it("should get a valid certificate",function(done){
-            this.timeout(120000);
+            this.timeout(1200000);
-            testCert.getDomainCert("hello2.bleu.de").then(() => {
+            let promiseArray = [];
+            function getRandomArbitrary(min, max) {
+                return Math.floor(Math.random() * (max - min) + min);
+            }
+            promiseArray.push(testCert.getDomainCert(`testing${getRandomArbitrary(1,100000)}.bleu.de`));
+            promiseArray.push(testCert.getDomainCert(`testing${getRandomArbitrary(1,100000)}.bleu.de`));
+            promiseArray.push(testCert.getDomainCert(`testing${getRandomArbitrary(1,100000)}.bleu.de`));
+            q.all(promiseArray).then(() => {
                 done();
             });
         })

ts/cert.classes.cert.helpers.ts

@@ -0,0 +1,86 @@
+import {Cert} from "./index.ts";
+import * as plugins from "./cert.plugins";
+import * as paths from "./cert.paths";
+
+
+
+/**
+ * schedule a retry of certificate request
+ */
+export let scheduleRetry = (domainArg:string,certClassArg:Cert) => {
+    let done = plugins.q.defer();
+    setTimeout(() => {
+        certClassArg.getDomainCert(domainArg)
+            .then(done.resolve);
+    },60000);
+    return done.promise;
+};
+
+/**
+ * check if a given domainCert is still valid
+ */
+export 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;
+    }
+
+}
+
+export interface certConfig {
+    domainName: string;
+    created: number;
+    expires: number;
+};
+
+/**
+ * update a ssl directory
+ */
+export 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/cert.classes.cert.ts

@@ -0,0 +1,164 @@
+import * as plugins from "./cert.plugins";
+import * as paths from "./cert.paths";
+import * as helpers from "./cert.classes.cert.helpers"
+
+export interface ICertConstructorOptions {
+    cfEmail: string,
+    cfKey: string,
+    sslDir?: string,
+    gitOriginRepo?: string,
+    testMode?: boolean
+};
+
+export class Cert {
+    private _cfEmail: string;
+    private _cfKey: string;
+    private _sslDir: string;
+    private _gitOriginRepo: string;
+    private _testMode: boolean;
+    domainCertRequestMap: plugins.lik.Stringmap = new plugins.lik.Stringmap();
+    certificatesPresent: Certificate[];
+    certificatesValid: Certificate[];
+
+    /**
+     * Constructor for Cert object
+     */
+    constructor(optionsArg: ICertConstructorOptions) {
+        this._cfEmail = optionsArg.cfEmail;
+        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 sslDir
+        if (!this._sslDir) this._sslDir = paths.defaultSslDir;
+        // 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
+        );
+        plugins.shelljs.exec("chmod 700 " + paths.letsencryptSh);
+        plugins.shelljs.exec("chmod 700 " + paths.certHook);
+        plugins.shelljs.exec(
+            `bash -c "${paths.letsencryptSh} -c --no-lock -f ${paths.leShConfig} -d notthere.notthere -t dns-01 -k ${paths.certHook} -o ${paths.certDir}"`,
+            {
+                silent: true
+            });
+    };
+
+    /**
+     * Pulls already requested certificates from git origin
+     */
+    sslGitOriginPull = () => {
+        if (this._gitOriginRepo) {
+            plugins.smartgit.pull(this._sslDir, "origin", "master");
+        }
+    };
+
+    /**
+     * Pushes all new requested certificates to git origin
+     */
+    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");
+        }
+    };
+
+    /**
+     * gets a ssl cert for a given domain
+     */
+    getDomainCert(domainNameArg: string, optionsArg: { force: boolean } = { force: false }) {
+        let done = plugins.q.defer();
+        let domainStringData = new plugins.smartstring.Domain(domainNameArg);
+        let sameZoneRequesting: boolean = this.domainCertRequestMap.checkMinimatch("*" + domainStringData.zoneName)
+        // make sure no one else requires the same domain at the same time
+        if (!this.domainCertRequestMap.checkString(domainNameArg)) {
+            this.domainCertRequestMap.addString(domainNameArg);
+            if (!helpers.checkDomainsStillValid(domainNameArg, this._sslDir) || optionsArg.force) {
+                if (!sameZoneRequesting) {
+                    this.sslGitOriginPull();
+                    plugins.smartfile.fs.ensureDir(paths.certDir);
+                    plugins.beautylog.info(`getting cert for ${domainNameArg}`);
+                    plugins.shelljs.exec(
+                        `bash -c "${paths.letsencryptSh} -c --no-lock -f ${paths.leShConfig} -d ${domainNameArg} -t dns-01 -k ${paths.certHook} -o ${paths.certDir}"`,
+                        {
+                            silent: true
+                        },
+                        (codeArg, stdoutArg) => {
+                            if (codeArg == 0) {
+                                console.log(stdoutArg);
+                                let fetchedCertsArray: string[] = plugins.smartfile.fs.listFoldersSync(paths.certDir);
+                                if (fetchedCertsArray.indexOf(domainNameArg) != -1) {
+                                    helpers.updateSslDirSync(this._sslDir, domainNameArg);
+                                    plugins.smartfile.fs.removeSync(plugins.path.join(paths.certDir, domainNameArg));
+                                    this.sslGitOriginAddCommitPush();
+                                } else {
+                                    plugins.beautylog.error(`Couldn't copy final certificate for ${domainNameArg}!`);
+                                };
+                                done.resolve();
+                            } else {
+                                plugins.beautylog.warn(`${domainNameArg} scheduled for retry. Waiting 1 minute!`);
+                                helpers.scheduleRetry(domainNameArg, this).then(done.resolve);
+                            }
+                            this.domainCertRequestMap.removeString(domainNameArg);
+                        }
+                    );
+                } else {
+                    plugins.beautylog.info(`${domainNameArg} is waiting for domains names of same zone to finish`);
+                    this.domainCertRequestMap.removeString(domainNameArg);
+                    this.domainCertRequestMap.registerUntilTrue(
+                        () => {
+                            return !this.domainCertRequestMap.checkMinimatch("*" + domainStringData.zoneName);
+                        },
+                        () => {
+                            this.getDomainCert(domainNameArg).then(done.resolve);
+                        }
+                    );
+                }
+            } else {
+                plugins.beautylog.info("certificate for " + domainNameArg + " is still valid! Not fetching new one!");
+                this.domainCertRequestMap.removeString(domainNameArg);
+                done.resolve();
+            };
+        } else {
+            plugins.beautylog.warn(`${domainNameArg} is already requesting`);
+        };
+
+        return done.promise;
+    };
+    cleanOldCertificates() {
+
+    };
+}
+
+export class Certificate {
+    domainName: string;
+    creationDate: Date;
+    expiryDate: Date;
+    constructor() {
+
+    };
+};
+

ts/cert.hook.ts

@@ -30,12 +30,15 @@ let cleanChallenge = (domainNameArg) => {
     let done = plugins.q.defer();
     plugins.beautylog.log("cleaning challenge for " + domainNameArg);
     cflare.removeRecord(prefixName(domainNameArg), "TXT");
+    cooldown().then(() => {
+        done.resolve();
+    });
     return done.promise;
 }
 
 let cooldown = () => {
     let done = plugins.q.defer();
-    let cooldowntime = 40000;
+    let cooldowntime = 60000;
     let passedTime = 0;
     plugins.beautylog.log("Cooling down! " + (cooldowntime/1000).toString() + " seconds left");
     let coolDownCounter = () => {

ts/cert.paths.ts

@@ -1,12 +1,14 @@
 import * as plugins from "./cert.plugins";
 
+//dirs
+export let certDir = plugins.path.join(__dirname,"assets/certs");
+export let defaultSslDir = plugins.path.join(__dirname,"assets/defaultSslDir");
+export let assetDir = plugins.path.join(__dirname,"assets/");
+export let accountsDir = plugins.path.join(__dirname,"assets/accounts/");
+
 // 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 defaultSslDir = plugins.path.join(__dirname,"assets/defaultSslDir");
-export let assetDir = plugins.path.join(__dirname,"assets/");

ts/cert.plugins.ts

@@ -2,9 +2,10 @@ import "typings-global";
 export import beautylog = require("beautylog");
 export import cflare = require("cflare");
 export let fs = require("fs-extra");
+export import lik = require("lik");
 export import path = require("path");
 export import q = require("q");
-export let shelljs = require("shelljs");
+export import shelljs = require("shelljs");
 export import smartcli = require("smartcli");
 export import smartfile = require("smartfile");
 export import smartgit = require("smartgit");

ts/index.ts

@@ -1,164 +1,4 @@
 import * as plugins from "./cert.plugins";
 import * as paths from "./cert.paths";
 
-export interface ICertConstructorOptions {
+export * from "./cert.classes.cert";
-    cfEmail: string,
-    cfKey: string,
-    sslDir?: string,
-    gitOriginRepo?: string,
-    testMode?: boolean
-}; 
-
-export class Cert {
-    private _cfEmail: string;
-    private _cfKey: string;
-    private _sslDir: string;
-    private _gitOriginRepo: string;
-    private _testMode: boolean
-    certificatesPresent: Certificate[];
-    certificatesValid: Certificate[];
-    constructor(optionsArg:ICertConstructorOptions) {
-        this._cfEmail = optionsArg.cfEmail;
-        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 sslDir
-        if (!this._sslDir) this._sslDir = paths.defaultSslDir;
-        // 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() {
-
-    };
-}
-
-export class Certificate {
-    domainName: string;
-    creationDate: Date;
-    expiryDate: Date;
-    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);