1.0.10

.gitignore

@@ -2,3 +2,4 @@ node_modules/
 coverage/
 public/
 pages/
+.nogit/

.npmignore

@@ -0,0 +1,4 @@
+node_modules/
+coverage/
+public/
+pages/

README.md

@@ -2,18 +2,18 @@
 acme implementation in TypeScript
 
 ## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartacme)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartacme)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartacme)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartacme/)
+[![npm](https://umbrellazone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartacme)
+[![git](https://umbrellazone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/umbrellazone/smartacme)
+[![git](https://umbrellazone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/umbrellazone/smartacme)
+[![docs](https://umbrellazone.gitlab.io/assets/repo-button-docs.svg)](https://umbrellazone.gitlab.io/smartacme/)
 
 ## Status for master
-[![build status](https://GitLab.com/pushrocks/smartacme/badges/master/build.svg)](https://GitLab.com/pushrocks/smartacme/commits/master)
-[![coverage report](https://GitLab.com/pushrocks/smartacme/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartacme/commits/master)
+[![build status](https://GitLab.com/umbrellazone/smartacme/badges/master/build.svg)](https://GitLab.com/umbrellazone/smartacme/commits/master)
+[![coverage report](https://GitLab.com/umbrellazone/smartacme/badges/master/coverage.svg)](https://GitLab.com/umbrellazone/smartacme/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/smartacme.svg)](https://www.npmjs.com/package/smartacme)
-[![Dependency Status](https://david-dm.org/pushrocks/smartacme.svg)](https://david-dm.org/pushrocks/smartacme)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartacme/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartacme/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartacme/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartacme)
+[![Dependency Status](https://david-dm.org/umbrellazone/smartacme.svg)](https://david-dm.org/umbrellazone/smartacme)
+[![bitHound Dependencies](https://www.bithound.io/github/umbrellazone/smartacme/badges/dependencies.svg)](https://www.bithound.io/github/umbrellazone/smartacme/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/umbrellazone/smartacme/badges/code.svg)](https://www.bithound.io/github/umbrellazone/smartacme)
 [![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
@@ -21,4 +21,9 @@ acme implementation in TypeScript
 ## Usage
 Use TypeScript for best in class instellisense.
 
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+For further information read the linked docs at the top of this README.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://umbrellazone.gitlab.io/assets/repo-footer.svg)](https://umbrella.zone)

assets/private.pem

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAyocFq3vvbiRNCsEcXtsqimIi6UM1OmxiYVQ0NoLvBtpaWk+E
-TvNIjmUgh5QQaQfRyRGoWvhskp+E8p6go4GsbRtzx0TvL8uINTcC3SHHo6Qvl599
-4QUUPUrioHdh+lX1oj+zIPVUOaL4dl0US1Ebs5vrZVbCfNXSm86vBaPIj6IkWEkj
-4S5xGsYlVaQUI8Tvv2fbPziIivbkxS1v/EEMnfk6i5PWgCsnMupYxz58WaVp9xyu
-+v/DMPB09mqo4DzchtUNF/b5eOWh3pDJoewYyRVMDDPJoQiTKkJn3kt64EaQuZK2
-nUXcihlmaKIx5ayxirsgfvIvxidHnkQcluvciQIDAQABAoIBAQCTPUKz/3B8pMuW
-C/syQyhUXzB+YawrA20q0Wr8Toi0dL7HdZP9SgXv8DmMF+suUM8F3V6GdKGKn4qq
-UQT8mmPfFtw/fTBfkRs/hPUCC3L214D6PKvpkiW6wdytSN3kf+YKxUDXr0RCeuck
-NltwvlDjbXHfxQm0dEefms3HzeEb+jwCyyLVLv+cDly7w7Qqq+67A6mduV/hb53p
-92VFm36r7njr+1CYHq+ixV+oyUrEue7yW7w1SjZRkii3AY8Tbvk1f0lVw+XkyYf7
-bQvmGSGJh1FmBi7Lytc2hKnqBLTn+iWx3S5pdPhcKTMwC/OD8p+r/DfyqThW/KVa
-aaXdoY/5AoGBAO4uAcmHOhR+M/Jnue4srZJ82EkNOQy+zaFlg9KCU9R4qZ59/klH
-fp0PkOw3bDFT4/1i12nm4XXqhI9Z7nsKdAoajOYpnifJVEAwQh9MlRBM7Lw+ZS0q
-IcH7dvvP1XQ7E2U4C0cWUMcpWNpnmwV67gtqy0KZwk5i+WlFuugQzmhbAoGBANmu
-JX6bPKUx0kBJLWhJeAxsk0OoHJ4uGihs1zxT6gl6s+AKQG4db9vU2w99lJ0nR3Aw
-MLA4evSMFa5Od96W4KnoiMNHS4c5QiiVKsRSU1losWfwq0jyg406oyTh8rd0eOQn
-LDOKP7nDTij8A6l0/t5a2MCu4bLQQXTedPrX+wPrAoGBAM/XO94Fb+xUGLaOR1SM
-jkaHRSGyNTdnBP+zGy5GZirBxJo2rgB6MAWUgM1wq6v73bbOWtXiEJqaNGT3gEDE
-ZXAvrQZoCMgFSszcj8bKSEW6Ktc1x4p6+oxRCIpC2aycpJcuKcE1uvWgohWsVT2a
-AUHbRlXu4P0QJz7zB1/c0pGDAoGAbIvSVpfCXf3CAhx7cA1yt39Mz+f8nUQP9yiP
-C54sjh2JpKZ4CnDTXqN9uPO+L79ueBsPrE/9wAQ6q3ilfXFvBkrWJ8pdd0iuHN6F
-PPBwb50tGc+BGhcUUlBzGekxxxllTx/ZgrnlnRQu3XENwmp8zRQwEaUjFq+SdFyZ
-qJwap5ECgYEA7UGxxRXAjfStTLnsrnr9svvr3QhwnZBg5JAjeR6FKC0cGFzdBrJ5
-rV/Zy4mGbTBBVh5oU3MplB3AUHejuFv+8eCik2mJug8k3G8KQAk9mB8oV97k0cp+
-bdlu9vlutIoCG9RXxCHdgRVLiLK+OkLv6p7hQOIY7fsIRaAuI+vPKSk=
------END RSA PRIVATE KEY-----

assets/public.pem

@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyocFq3vvbiRNCsEcXtsq
-imIi6UM1OmxiYVQ0NoLvBtpaWk+ETvNIjmUgh5QQaQfRyRGoWvhskp+E8p6go4Gs
-bRtzx0TvL8uINTcC3SHHo6Qvl5994QUUPUrioHdh+lX1oj+zIPVUOaL4dl0US1Eb
-s5vrZVbCfNXSm86vBaPIj6IkWEkj4S5xGsYlVaQUI8Tvv2fbPziIivbkxS1v/EEM
-nfk6i5PWgCsnMupYxz58WaVp9xyu+v/DMPB09mqo4DzchtUNF/b5eOWh3pDJoewY
-yRVMDDPJoQiTKkJn3kt64EaQuZK2nUXcihlmaKIx5ayxirsgfvIvxidHnkQcluvc
-iQIDAQAB
------END PUBLIC KEY-----

dist/index.js

@@ -2,5 +2,6 @@
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./smartacme.classes.smartacme"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsbURBQTZDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG1EQUE2QyJ9

dist/smartacme.classes.acmeaccount.d.ts

@@ -0,0 +1,21 @@
+import { SmartAcme } from './smartacme.classes.smartacme';
+import { AcmeCert } from './smartacme.classes.acmecert';
+/**
+ * class AcmeAccount represents an AcmeAccount
+ */
+export declare class AcmeAccount {
+    parentSmartAcme: SmartAcme;
+    location: string;
+    link: string;
+    JWK: any;
+    constructor(smartAcmeParentArg: SmartAcme);
+    /**
+     * register the account with letsencrypt
+     */
+    register(): Promise<{}>;
+    /**
+     * agree to letsencrypr terms of service
+     */
+    agreeTos(): Promise<{}>;
+    createAcmeCert(domainNameArg: string, countryArg?: string, countryShortArg?: string, city?: string, companyArg?: string, companyShortArg?: string): Promise<AcmeCert>;
+}

dist/smartacme.classes.acmeaccount.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const q = require("smartq");
+const smartacme_classes_acmecert_1 = require("./smartacme.classes.acmecert");
+/**
+ * class AcmeAccount represents an AcmeAccount
+ */
+class AcmeAccount {
+    constructor(smartAcmeParentArg) {
+        this.parentSmartAcme = smartAcmeParentArg;
+    }
+    /**
+     * register the account with letsencrypt
+     */
+    register() {
+        let done = q.defer();
+        this.parentSmartAcme.rawacmeClient.newReg({
+            contact: ['mailto:domains@lossless.org']
+        }, (err, res) => {
+            if (err) {
+                console.error('smartacme: something went wrong:');
+                console.log(err);
+                done.reject(err);
+                return;
+            }
+            this.JWK = res.body.key;
+            this.link = res.headers.link;
+            console.log(this.link);
+            this.location = res.headers.location;
+            done.resolve();
+        });
+        return done.promise;
+    }
+    /**
+     * agree to letsencrypr terms of service
+     */
+    agreeTos() {
+        let done = q.defer();
+        let tosPart = this.link.split(',')[1];
+        let tosLinkPortion = tosPart.split(';')[0];
+        let url = tosLinkPortion.split(';')[0].trim().replace(/[<>]/g, '');
+        this.parentSmartAcme.rawacmeClient.post(this.location, { Agreement: url, resource: 'reg' }, (err, res) => {
+            if (err) {
+                console.log(err);
+                done.reject(err);
+                return;
+            }
+            done.resolve();
+        });
+        return done.promise;
+    }
+    createAcmeCert(domainNameArg, countryArg = 'Germany', countryShortArg = 'DE', city = 'Bremen', companyArg = 'Some Company', companyShortArg = 'SC') {
+        let done = q.defer();
+        let acmeCert = new smartacme_classes_acmecert_1.AcmeCert({
+            bit: 2064,
+            key: null,
+            domain: domainNameArg,
+            country: countryArg,
+            country_short: countryShortArg,
+            locality: city,
+            organization: companyArg,
+            organization_short: companyShortArg,
+            password: null,
+            unstructured: null,
+            subject_alt_names: null
+        }, this);
+        done.resolve(acmeCert);
+        return done.promise;
+    }
+}
+exports.AcmeAccount = AcmeAccount;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuYWNtZWFjY291bnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUuY2xhc3Nlcy5hY21lYWNjb3VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDRCQUEyQjtBQU0zQiw2RUFBdUQ7QUFFdkQ7O0dBRUc7QUFDSDtJQUtFLFlBQVksa0JBQTZCO1FBQ3ZDLElBQUksQ0FBQyxlQUFlLEdBQUcsa0JBQWtCLENBQUE7SUFDM0MsQ0FBQztJQUVEOztPQUVHO0lBQ0gsUUFBUTtRQUNOLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUNwQixJQUFJLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQ3ZDO1lBQ0UsT0FBTyxFQUFFLENBQUUsNkJBQTZCLENBQUU7U0FDM0MsRUFDRCxDQUFDLEdBQUcsRUFBRSxHQUFHO1lBQ1AsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDUixPQUFPLENBQUMsS0FBSyxDQUFDLGtDQUFrQyxDQUFDLENBQUE7Z0JBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hCLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hCLE1BQU0sQ0FBQTtZQUNSLENBQUM7WUFDRCxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFBO1lBQ3ZCLElBQUksQ0FBQyxJQUFJLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUE7WUFDNUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDdEIsSUFBSSxDQUFDLFFBQVEsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQTtZQUNwQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDaEIsQ0FBQyxDQUFDLENBQUE7UUFDSixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxRQUFRO1FBQ04sSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3BCLElBQUksT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFFLENBQUMsQ0FBRSxDQUFBO1FBQ3ZDLElBQUksY0FBYyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUUsQ0FBQyxDQUFFLENBQUE7UUFDNUMsSUFBSSxHQUFHLEdBQUcsY0FBYyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBRSxDQUFDLENBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ3BFLElBQUksQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQUUsU0FBUyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRztZQUNuRyxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hCLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hCLE1BQU0sQ0FBQTtZQUNSLENBQUM7WUFDRCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDaEIsQ0FBQyxDQUFDLENBQUE7UUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0lBRUQsY0FBYyxDQUNaLGFBQXFCLEVBQ3JCLFVBQVUsR0FBRyxTQUFTLEVBQ3RCLGVBQWUsR0FBRyxJQUFJLEVBQ3RCLElBQUksR0FBRyxRQUFRLEVBQ2YsVUFBVSxHQUFHLGNBQWMsRUFDM0IsZUFBZSxHQUFHLElBQUk7UUFHdEIsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBWSxDQUFBO1FBQzlCLElBQUksUUFBUSxHQUFHLElBQUkscUNBQVEsQ0FDekI7WUFDRSxHQUFHLEVBQUUsSUFBSTtZQUNULEdBQUcsRUFBRSxJQUFJO1lBQ1QsTUFBTSxFQUFFLGFBQWE7WUFDckIsT0FBTyxFQUFFLFVBQVU7WUFDbkIsYUFBYSxFQUFFLGVBQWU7WUFDOUIsUUFBUSxFQUFFLElBQUk7WUFDZCxZQUFZLEVBQUUsVUFBVTtZQUN4QixrQkFBa0IsRUFBRSxlQUFlO1lBQ25DLFFBQVEsRUFBRSxJQUFJO1lBQ2QsWUFBWSxFQUFFLElBQUk7WUFDbEIsaUJBQWlCLEVBQUUsSUFBSTtTQUN4QixFQUNELElBQUksQ0FDTCxDQUFBO1FBQ0QsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN0QixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0NBQ0Y7QUFsRkQsa0NBa0ZDIn0=

dist/smartacme.classes.acmecert.d.ts

@@ -0,0 +1,78 @@
+import { IRsaKeypair } from './smartacme.classes.smartacme';
+import { AcmeAccount } from './smartacme.classes.acmeaccount';
+/**
+ * types of challenges supported by letsencrypt and this module
+ */
+export declare type TChallengeType = 'dns-01' | 'http-01';
+/**
+ * values that a challenge's status can have
+ */
+export declare type TChallengeStatus = 'pending';
+export interface ISmartAcmeChallenge {
+    uri: string;
+    status: TChallengeStatus;
+    type: TChallengeType;
+    token: string;
+    keyAuthorization: string;
+}
+export interface ISmartAcmeChallengeChosen extends ISmartAcmeChallenge {
+    dnsKeyHash: string;
+    domainName: string;
+    domainNamePrefixed: string;
+}
+export interface IAcmeCsrConstructorOptions {
+    bit: number;
+    key: string;
+    domain: string;
+    country: string;
+    country_short: string;
+    locality: string;
+    organization: string;
+    organization_short: string;
+    password: string;
+    unstructured: string;
+    subject_alt_names: string[];
+}
+/**
+ * class AcmeCert represents a cert for domain
+ */
+export declare class AcmeCert {
+    domainName: string;
+    attributes: any;
+    fullchain: string;
+    parentAcmeAccount: AcmeAccount;
+    csr: any;
+    validFrom: Date;
+    validTo: Date;
+    keypair: IRsaKeypair;
+    keyPairFinal: IRsaKeypair;
+    chosenChallenge: ISmartAcmeChallengeChosen;
+    dnsKeyHash: string;
+    constructor(optionsArg: IAcmeCsrConstructorOptions, parentAcmeAccount: AcmeAccount);
+    /**
+     * requests a challenge for a domain
+     * @param domainNameArg - the domain name to request a challenge for
+     * @param challengeType - the challenge type to request
+     */
+    requestChallenge(challengeTypeArg?: TChallengeType): Promise<ISmartAcmeChallengeChosen>;
+    /**
+     * checks if DNS records are set, will go through a max of 30 cycles
+     */
+    checkDns(cycleArg?: number): Promise<void>;
+    /**
+     * validates a challenge, only call after you have set the challenge at the expected location
+     */
+    requestValidation(): Promise<void>;
+    /**
+     * requests a certificate
+     */
+    requestCert(): Promise<{}>;
+    /**
+     * getCertificate - takes care of cooldown, validation polling and certificate retrieval
+     */
+    getCertificate(): void;
+    /**
+     * accept a challenge - for private use only
+     */
+    acceptChallenge(): Promise<{}>;
+}

dist/smartacme.classes.helper.d.ts

@@ -1,8 +0,0 @@
-import 'typings-global';
-export interface IRsaKeypair {
-    publicKey: string;
-    privateKey: string;
-}
-export declare class SmartacmeHelper {
-    createKeypair(bit?: number): IRsaKeypair;
-}

dist/smartacme.classes.helper.js

@@ -1,14 +0,0 @@
-"use strict";
-require("typings-global");
-let rsaKeygen = require('rsa-keygen');
-class SmartacmeHelper {
-    createKeypair(bit = 2048) {
-        let result = rsaKeygen.generate(bit);
-        return {
-            publicKey: result.public_key,
-            privateKey: result.private_key
-        };
-    }
-}
-exports.SmartacmeHelper = SmartacmeHelper;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuaGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwwQkFBdUI7QUFDdkIsSUFBSSxTQUFTLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO0FBT3JDO0lBQ0ksYUFBYSxDQUFDLEdBQUcsR0FBRyxJQUFJO1FBQ3BCLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDbkMsTUFBTSxDQUFDO1lBQ0osU0FBUyxFQUFHLE1BQU0sQ0FBQyxVQUFVO1lBQzdCLFVBQVUsRUFBRSxNQUFNLENBQUMsV0FBVztTQUNoQyxDQUFBO0lBQ04sQ0FBQztDQUNKO0FBUkQsMENBUUMifQ==

dist/smartacme.classes.smartacme.d.ts

@@ -1,23 +1,32 @@
-/// <reference types="q" />
-import 'typings-global';
-import * as q from 'q';
-import { SmartacmeHelper, IRsaKeypair } from './smartacme.classes.helper';
+import { AcmeAccount } from './smartacme.classes.acmeaccount';
+/**
+ * a rsa keypair needed for account creation and subsequent requests
+ */
+export interface IRsaKeypair {
+    publicKey: string;
+    privateKey: string;
+}
+export { AcmeAccount } from './smartacme.classes.acmeaccount';
+export { AcmeCert, ISmartAcmeChallenge, ISmartAcmeChallengeChosen } from './smartacme.classes.acmecert';
 /**
  * class SmartAcme exports methods for maintaining SSL Certificates
  */
 export declare class SmartAcme {
-    helper: SmartacmeHelper;
     acmeUrl: string;
     productionBool: boolean;
     keyPair: IRsaKeypair;
-    JWK: any;
+    rawacmeClient: any;
     /**
      * the constructor for class SmartAcme
      */
     constructor(productionArg?: boolean);
+    /**
+     * init the smartacme instance
+     */
+    init(): Promise<{}>;
     /**
      * creates an account if not currently present in module
      * @executes ASYNC
      */
-    createAccount(): q.Promise<{}>;
+    createAcmeAccount(): Promise<AcmeAccount>;
 }

dist/smartacme.classes.smartacme.js

@@ -1,9 +1,14 @@
 "use strict";
-require("typings-global");
-const q = require("q");
-let rsaKeygen = require('rsa-keygen');
-let rawacme = require('rawacme');
-const smartacme_classes_helper_1 = require("./smartacme.classes.helper");
+Object.defineProperty(exports, "__esModule", { value: true });
+// third party modules
+const q = require("smartq"); // promises
+const plugins = require("./smartacme.plugins");
+const helpers = require("./smartacme.helpers");
+const smartacme_classes_acmeaccount_1 = require("./smartacme.classes.acmeaccount");
+var smartacme_classes_acmeaccount_2 = require("./smartacme.classes.acmeaccount");
+exports.AcmeAccount = smartacme_classes_acmeaccount_2.AcmeAccount;
+var smartacme_classes_acmecert_1 = require("./smartacme.classes.acmecert");
+exports.AcmeCert = smartacme_classes_acmecert_1.AcmeCert;
 /**
  * class SmartAcme exports methods for maintaining SSL Certificates
  */
@@ -13,22 +18,20 @@ class SmartAcme {
      */
     constructor(productionArg = false) {
         this.productionBool = productionArg;
-        this.helper = new smartacme_classes_helper_1.SmartacmeHelper();
-        this.keyPair = this.helper.createKeypair();
+        this.keyPair = helpers.createKeypair();
         if (this.productionBool) {
-            this.acmeUrl = rawacme.LETSENCRYPT_STAGING_URL;
+            this.acmeUrl = plugins.rawacme.LETSENCRYPT_URL;
         }
         else {
-            this.acmeUrl = rawacme.LETSENCRYPT_URL;
+            this.acmeUrl = plugins.rawacme.LETSENCRYPT_STAGING_URL;
         }
     }
     /**
-     * creates an account if not currently present in module
-     * @executes ASYNC
+     * init the smartacme instance
      */
-    createAccount() {
+    init() {
         let done = q.defer();
-        rawacme.createClient({
+        plugins.rawacme.createClient({
             url: this.acmeUrl,
             publicKey: this.keyPair.publicKey,
             privateKey: this.keyPair.privateKey
@@ -39,22 +42,26 @@ class SmartAcme {
                 done.reject(err);
                 return;
             }
-            client.newReg({
-                contact: ['mailto:domains@lossless.org']
-            }, (err, res) => {
-                if (err) {
-                    console.error('smartacme: something went wrong:');
-                    console.log(err);
-                    done.reject(err);
-                    return;
-                }
-                this.JWK = res.body.key;
-                console.log(this.JWK);
+            // make client available in class 
+            this.rawacmeClient = client;
             done.resolve();
         });
+        return done.promise;
+    }
+    /**
+     * creates an account if not currently present in module
+     * @executes ASYNC
+     */
+    createAcmeAccount() {
+        let done = q.defer();
+        let acmeAccount = new smartacme_classes_acmeaccount_1.AcmeAccount(this);
+        acmeAccount.register().then(() => {
+            return acmeAccount.agreeTos();
+        }).then(() => {
+            done.resolve(acmeAccount);
         });
         return done.promise;
     }
 }
 exports.SmartAcme = SmartAcme;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwwQkFBdUI7QUFDdkIsdUJBQXNCO0FBRXRCLElBQUksU0FBUyxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQTtBQUdyQyxJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUE7QUFHaEMseUVBQXlFO0FBRXpFOztHQUVHO0FBQ0g7SUFPSTs7T0FFRztJQUNILFlBQVksZ0JBQXlCLEtBQUs7UUFDdEMsSUFBSSxDQUFDLGNBQWMsR0FBRyxhQUFhLENBQUE7UUFDbkMsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLDBDQUFlLEVBQUUsQ0FBQTtRQUNuQyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUE7UUFDMUMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUM7WUFDdEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsdUJBQXVCLENBQUE7UUFDbEQsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ0osSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFBO1FBQzFDLENBQUM7SUFDTCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsYUFBYTtRQUNULElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUNwQixPQUFPLENBQUMsWUFBWSxDQUNoQjtZQUNJLEdBQUcsRUFBRSxJQUFJLENBQUMsT0FBTztZQUNqQixTQUFTLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTO1lBQ2pDLFVBQVUsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVU7U0FDdEMsRUFDRCxDQUFDLEdBQUcsRUFBRSxNQUFNO1lBQ1IsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDTixPQUFPLENBQUMsS0FBSyxDQUFDLGtDQUFrQyxDQUFDLENBQUE7Z0JBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hCLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hCLE1BQU0sQ0FBQTtZQUNWLENBQUM7WUFFRCxNQUFNLENBQUMsTUFBTSxDQUNUO2dCQUNJLE9BQU8sRUFBRSxDQUFDLDZCQUE2QixDQUFDO2FBQzNDLEVBQ0QsQ0FBQyxHQUFHLEVBQUUsR0FBRztnQkFDTCxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUNOLE9BQU8sQ0FBQyxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtvQkFDakQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtvQkFDaEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtvQkFDaEIsTUFBTSxDQUFBO2dCQUNWLENBQUM7Z0JBQ0QsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQTtnQkFDdkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ3JCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtZQUNsQixDQUFDLENBQUMsQ0FBQTtRQUVWLENBQUMsQ0FDSixDQUFBO1FBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDdkIsQ0FBQztDQUNKO0FBN0RELDhCQTZEQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsc0JBQXNCO0FBQ3RCLDRCQUEyQixDQUFDLFdBQVc7QUFDdkMsK0NBQThDO0FBQzlDLCtDQUE4QztBQUU5QyxtRkFBNkQ7QUFVN0QsaUZBQTZEO0FBQXBELHNEQUFBLFdBQVcsQ0FBQTtBQUNwQiwyRUFBdUc7QUFBOUYsZ0RBQUEsUUFBUSxDQUFBO0FBRWpCOztHQUVHO0FBQ0g7SUFNRTs7T0FFRztJQUNILFlBQVksZ0JBQXlCLEtBQUs7UUFDeEMsSUFBSSxDQUFDLGNBQWMsR0FBRyxhQUFhLENBQUE7UUFDbkMsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsYUFBYSxFQUFFLENBQUE7UUFDdEMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUM7WUFDeEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQTtRQUNoRCxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDTixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsdUJBQXVCLENBQUE7UUFDeEQsQ0FBQztJQUNILENBQUM7SUFFRDs7T0FFRztJQUNILElBQUk7UUFDRixJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDcEIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQzFCO1lBQ0UsR0FBRyxFQUFFLElBQUksQ0FBQyxPQUFPO1lBQ2pCLFNBQVMsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVM7WUFDakMsVUFBVSxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVTtTQUNwQyxFQUNELENBQUMsR0FBRyxFQUFFLE1BQU07WUFDVixFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNSLE9BQU8sQ0FBQyxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtnQkFDakQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDaEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDaEIsTUFBTSxDQUFBO1lBQ1IsQ0FBQztZQUVELGtDQUFrQztZQUNsQyxJQUFJLENBQUMsYUFBYSxHQUFHLE1BQU0sQ0FBQTtZQUMzQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDaEIsQ0FBQyxDQUNGLENBQUE7UUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsaUJBQWlCO1FBQ2YsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBZSxDQUFBO1FBQ2pDLElBQUksV0FBVyxHQUFHLElBQUksMkNBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUN2QyxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUFDO1lBQzFCLE1BQU0sQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUE7UUFDL0IsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ04sSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQTtRQUMzQixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3JCLENBQUM7Q0FDRjtBQTVERCw4QkE0REMifQ==

dist/smartacme.helpers.d.ts

@@ -0,0 +1,10 @@
+import 'typings-global';
+import { IRsaKeypair } from './smartacme.classes.smartacme';
+/**
+ * creates a keypair to use with requests and to generate JWK from
+ */
+export declare let createKeypair: (bit?: number) => IRsaKeypair;
+/**
+ * prefix a domain name to make sure it complies with letsencrypt
+ */
+export declare let prefixName: (domainNameArg: string) => string;

dist/smartacme.helpers.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("typings-global");
+const q = require("smartq");
+const plugins = require("./smartacme.plugins");
+/**
+ * creates a keypair to use with requests and to generate JWK from
+ */
+exports.createKeypair = (bit = 2048) => {
+    let result = plugins.rsaKeygen.generate(bit);
+    return {
+        publicKey: result.public_key,
+        privateKey: result.private_key
+    };
+};
+/**
+ * prefix a domain name to make sure it complies with letsencrypt
+ */
+exports.prefixName = (domainNameArg) => {
+    return '_acme-challenge.' + domainNameArg;
+};
+/**
+ * gets an existing registration
+ * @executes ASYNC
+ */
+let getReg = (SmartAcmeArg, location) => {
+    let done = q.defer();
+    let body = { resource: 'reg' };
+    SmartAcmeArg.rawacmeClient.post(location, body, SmartAcmeArg.keyPair, (err, res) => {
+        if (err) {
+            console.error('smartacme: something went wrong:');
+            console.log(err);
+            done.reject(err);
+            return;
+        }
+        console.log(JSON.stringify(res.body));
+        done.resolve();
+    });
+    return done.promise;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUN2Qiw0QkFBMkI7QUFFM0IsK0NBQThDO0FBSzlDOztHQUVHO0FBQ1EsUUFBQSxhQUFhLEdBQUcsQ0FBQyxHQUFHLEdBQUcsSUFBSTtJQUNwQyxJQUFJLE1BQU0sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUM1QyxNQUFNLENBQUM7UUFDTCxTQUFTLEVBQUUsTUFBTSxDQUFDLFVBQVU7UUFDNUIsVUFBVSxFQUFFLE1BQU0sQ0FBQyxXQUFXO0tBQy9CLENBQUE7QUFDSCxDQUFDLENBQUE7QUFFRDs7R0FFRztBQUNRLFFBQUEsVUFBVSxHQUFHLENBQUMsYUFBcUI7SUFDNUMsTUFBTSxDQUFDLGtCQUFrQixHQUFHLGFBQWEsQ0FBQTtBQUMzQyxDQUFDLENBQUE7QUFFRDs7O0dBR0c7QUFDSCxJQUFJLE1BQU0sR0FBRyxDQUFDLFlBQXVCLEVBQUUsUUFBZ0I7SUFDckQsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQ3BCLElBQUksSUFBSSxHQUFHLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxDQUFBO0lBQzlCLFlBQVksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUM3QixRQUFRLEVBQ1IsSUFBSSxFQUNKLFlBQVksQ0FBQyxPQUFPLEVBQ3BCLENBQUMsR0FBRyxFQUFFLEdBQUc7UUFDUCxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ1IsT0FBTyxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO1lBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7WUFDaEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUNoQixNQUFNLENBQUE7UUFDUixDQUFDO1FBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO1FBQ3JDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNoQixDQUFDLENBQ0YsQ0FBQTtJQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3JCLENBQUMsQ0FBQSJ9

dist/smartacme.paths.js

@@ -1,7 +1,8 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const smartfile = require("smartfile");
 exports.packageDir = path.join(__dirname, '../');
 exports.assetDir = path.join(exports.packageDir, 'assets/');
 smartfile.fs.ensureDirSync(exports.assetDir);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSw2QkFBNEI7QUFDNUIsdUNBQXNDO0FBRTNCLFFBQUEsVUFBVSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFDLEtBQUssQ0FBQyxDQUFBO0FBQ3ZDLFFBQUEsUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsa0JBQVUsRUFBQyxTQUFTLENBQUMsQ0FBQTtBQUNyRCxTQUFTLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxnQkFBUSxDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkJBQTRCO0FBQzVCLHVDQUFzQztBQUUzQixRQUFBLFVBQVUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxLQUFLLENBQUMsQ0FBQTtBQUN2QyxRQUFBLFFBQVEsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGtCQUFVLEVBQUMsU0FBUyxDQUFDLENBQUE7QUFDckQsU0FBUyxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsZ0JBQVEsQ0FBQyxDQUFBIn0=

dist/smartacme.plugins.d.ts

@@ -0,0 +1,9 @@
+import 'typings-global';
+declare let rsaKeygen: any;
+declare let rawacme: any;
+declare let nodeForge: any;
+import * as dnsly from 'dnsly';
+import * as smartdelay from 'smartdelay';
+import * as smartfile from 'smartfile';
+import * as smartstring from 'smartstring';
+export { dnsly, rsaKeygen, rawacme, nodeForge, smartdelay, smartfile, smartstring };

dist/smartacme.plugins.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("typings-global"); // typings for node
+let rsaKeygen = require('rsa-keygen'); // rsa keygen
+exports.rsaKeygen = rsaKeygen;
+let rawacme = require('rawacme'); // acme helper functions
+exports.rawacme = rawacme;
+let nodeForge = require('node-forge');
+exports.nodeForge = nodeForge;
+// push.rocks modules here
+const dnsly = require("dnsly");
+exports.dnsly = dnsly;
+const smartdelay = require("smartdelay");
+exports.smartdelay = smartdelay;
+const smartfile = require("smartfile");
+exports.smartfile = smartfile;
+const smartstring = require("smartstring");
+exports.smartstring = smartstring;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QixDQUFDLG1CQUFtQjtBQUczQyxJQUFJLFNBQVMsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUEsQ0FBQyxhQUFhO0FBWWpELDhCQUFTO0FBWFgsSUFBSSxPQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFBLENBQUMsd0JBQXdCO0FBWXZELDBCQUFPO0FBWFQsSUFBSSxTQUFTLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO0FBWW5DLDhCQUFTO0FBVlgsMEJBQTBCO0FBQzFCLCtCQUE4QjtBQU01QixzQkFBSztBQUxQLHlDQUF3QztBQVN0QyxnQ0FBVTtBQVJaLHVDQUFzQztBQVNwQyw4QkFBUztBQVJYLDJDQUEwQztBQVN4QyxrQ0FBVyJ9

docs/index.md

@@ -0,0 +1,59 @@
+# smartacme
+acme implementation in TypeScript
+
+## Availabililty
+[![npm](https://umbrellazone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartacme)
+[![git](https://umbrellazone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/umbrellazone/smartacme)
+[![git](https://umbrellazone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/umbrellazone/smartacme)
+[![docs](https://umbrellazone.gitlab.io/assets/repo-button-docs.svg)](https://umbrellazone.gitlab.io/smartacme/)
+
+## Status for master
+[![build status](https://GitLab.com/umbrellazone/smartacme/badges/master/build.svg)](https://GitLab.com/umbrellazone/smartacme/commits/master)
+[![coverage report](https://GitLab.com/umbrellazone/smartacme/badges/master/coverage.svg)](https://GitLab.com/umbrellazone/smartacme/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/smartacme.svg)](https://www.npmjs.com/package/smartacme)
+[![Dependency Status](https://david-dm.org/umbrellazone/smartacme.svg)](https://david-dm.org/umbrellazone/smartacme)
+[![bitHound Dependencies](https://www.bithound.io/github/umbrellazone/smartacme/badges/dependencies.svg)](https://www.bithound.io/github/umbrellazone/smartacme/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/umbrellazone/smartacme/badges/code.svg)](https://www.bithound.io/github/umbrellazone/smartacme)
+[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+
+## Usage
+Use TypeScript for best in class instellisense.
+
+```javascript
+import { SmartAcme } from 'smartacme'
+
+let smac = new SmartAcme()
+
+(async () => { // learn async/await, it'll make your life easier
+
+    // optionally accepts a filePath Arg with a stored acmeaccount.json
+    // will create an account and 
+    let myAccount = await smac.createAcmeAccount()
+    
+    // will return a dnsHash to set in your DNS record
+    let myCert = await myAccount.createAcmeCert('example.com')
+
+    // gets and accepts the specified challenge
+    // first argument optional, defaults to dns-01 (which is the cleanest method for production use)
+    let myChallenge = await myCert.getChallenge('dns-01')
+
+    /* ----------
+    Now you need to set the challenge in your DNS
+    myChallenge.domainNamePrefixed is the address for the record
+    myChallenge.dnsKeyHash is the ready to use txt record value expected by letsencrypt
+    -------------*/
+})()
+```
+
+## Other relevant npm modules
+module name | description
+--- | ---
+cert | a higlevel production module that uses smartacme to manage certs
+smartnginx | a highlevel production tool for docker environments to manage nginx 
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://umbrellazone.gitlab.io/assets/repo-footer.svg)](https://umbrella.zone

npmextra.json

@@ -0,0 +1,7 @@
+{
+    "npmci": {
+        "globalNpmTools": [
+            "npmts"
+        ]
+    }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartacme",
-  "version": "1.0.3",
+  "version": "1.0.10",
   "description": "acme implementation in TypeScript",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@gitlab.com/pushrocks/smartacme.git"
+    "url": "git+ssh://git@gitlab.com/umbrellazone/smartacme.git"
   },
   "keywords": [
     "TypeScript",
@@ -19,21 +19,24 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://gitlab.com/pushrocks/smartacme/issues"
+    "url": "https://gitlab.com/umbrellazone/smartacme/issues"
   },
-  "homepage": "https://gitlab.com/pushrocks/smartacme#README",
+  "homepage": "https://gitlab.com/umbrellazone/smartacme#README",
   "dependencies": {
-    "@types/q": "0.x.x",
-    "q": "^1.4.1",
+    "@types/node-forge": "^0.6.8",
+    "dnsly": "^2.0.4",
+    "node-forge": "^0.7.1",
     "rawacme": "^0.2.1",
     "rsa-keygen": "^1.0.6",
-    "smartfile": "^4.1.0",
-    "smartstring": "^2.0.20",
-    "typings-global": "^1.0.14"
+    "smartdelay": "^1.0.1",
+    "smartfile": "^4.1.10",
+    "smartq": "^1.1.1",
+    "smartstring": "^2.0.24",
+    "typings-global": "^1.0.16"
   },
   "devDependencies": {
-    "@types/should": "^8.1.30",
-    "should": "^11.1.1",
-    "typings-test": "^1.0.3"
+    "cflare": "0.0.19",
+    "qenv": "^1.1.3",
+    "tapbundle": "^1.0.10"
   }
 }

qenv.yml

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

test/test.d.ts

@@ -1 +0,0 @@
-import 'typings-test';

test/test.js

@@ -1,26 +0,0 @@
-"use strict";
-require("typings-test");
-const should = require("should");
-// import the module to test
-const smartacme = require("../dist/index");
-describe('smartacme', function () {
-    let testAcme;
-    it('should create a valid instance', function () {
-        this.timeout(10000);
-        testAcme = new smartacme.SmartAcme();
-        should(testAcme).be.instanceOf(smartacme.SmartAcme);
-    });
-    it('should have created keyPair', function () {
-        should(testAcme.acmeUrl).be.of.type('string');
-    });
-    it('should register a new account', function (done) {
-        this.timeout(40000);
-        testAcme.createAccount().then(x => {
-            done();
-        }).catch(err => {
-            console.log(err);
-            done(err);
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFFaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksUUFBNkIsQ0FBQTtJQUNqQyxFQUFFLENBQUMsZ0NBQWdDLEVBQUU7UUFDakMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNuQixRQUFRLEdBQUcsSUFBSSxTQUFTLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDcEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQ3ZELENBQUMsQ0FBQyxDQUFBO0lBQ0YsRUFBRSxDQUFDLDZCQUE2QixFQUFFO1FBQzlCLE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDakQsQ0FBQyxDQUFDLENBQUE7SUFDRixFQUFFLENBQUMsK0JBQStCLEVBQUUsVUFBVSxJQUFJO1FBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsUUFBUSxDQUFDLGFBQWEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzNCLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNiLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSJ9

test/test.ts

@@ -1,26 +1,90 @@
-import 'typings-test'
-import * as should from 'should'
+import { expect, tap } from 'tapbundle'
+import * as cflare from 'cflare'
+import * as qenv from 'qenv'
+
+let testQenv = new qenv.Qenv(process.cwd(), process.cwd() + '/.nogit')
 
 // import the module to test
 import * as smartacme from '../dist/index'
 
-describe('smartacme', function () {
-    let testAcme: smartacme.SmartAcme
-    it('should create a valid instance', function () {
-        this.timeout(10000)
-        testAcme = new smartacme.SmartAcme()
-        should(testAcme).be.instanceOf(smartacme.SmartAcme)
-    })
-    it('should have created keyPair', function () {
-        should(testAcme.acmeUrl).be.of.type('string')
-    })
-    it('should register a new account', function (done) {
-        this.timeout(40000)
-        testAcme.createAccount().then(x => {
-            done()
-        }).catch(err => {
-            console.log(err)
-            done(err)
-        })
+let myCflareAccount = new cflare.CflareAccount()
+myCflareAccount.auth({
+  email: process.env.CF_EMAIL,
+  key: process.env.CF_KEY
+})
+
+let testSmartAcme: smartacme.SmartAcme
+let testAcmeAccount: smartacme.AcmeAccount
+let testAcmeCert: smartacme.AcmeCert
+let testChallenge: smartacme.ISmartAcmeChallengeChosen
+
+tap.test('smartacme -> should create a valid instance', async (tools) => {
+  tools.timeout(10000)
+  testSmartAcme = new smartacme.SmartAcme(false)
+  await testSmartAcme.init().then(async () => {
+    expect(testSmartAcme).to.be.instanceOf(smartacme.SmartAcme)
   })
 })
+
+tap.test('smartacme -> should have created keyPair', async () => {
+  expect(testSmartAcme.acmeUrl).to.be.a('string')
+})
+
+tap.test('smartacme -> should register a new account', async (tools) => {
+  tools.timeout(10000)
+  await testSmartAcme.createAcmeAccount().then(async x => {
+    testAcmeAccount = x
+  })
+})
+
+tap.test('smartacme -> should create a AcmeCert', async () => {
+  await testAcmeAccount.createAcmeCert('test2.bleu.de').then(async x => {
+    testAcmeCert = x
+    expect(testAcmeAccount).to.be.instanceOf(smartacme.AcmeCert)
+  })
+})
+
+tap.test('smartacme -> should get a challenge for a AcmeCert', async (tools) => {
+  tools.timeout(10000)
+  await testAcmeCert.requestChallenge().then(async (challengeChosen) => {
+    console.log(challengeChosen)
+    testChallenge = challengeChosen
+  })
+})
+
+tap.test('smartacme -> should set the challenge', async (tools) => {
+  tools.timeout(20000)
+  await myCflareAccount.createRecord(
+    testChallenge.domainNamePrefixed,
+    'TXT', testChallenge.dnsKeyHash
+  )
+})
+
+tap.test('smartacme -> should check for a DNS record', async (tools) => {
+  tools.timeout(20000)
+  await testAcmeCert.checkDns().then(x => {
+    console.log(x)
+  })
+})
+
+tap.test('smartacme -> should accept the challenge', async (tools) => {
+  tools.timeout(10000)
+  await testAcmeCert.acceptChallenge()
+})
+
+tap.test('smartacme -> should poll for validation of a challenge', async (tools) => {
+  tools.timeout(10000)
+  await testAcmeCert.requestValidation().then(async x => {
+    console.log(x)
+  })
+})
+
+tap.test('smartacme -> should remove the challenge', async (tools) => {
+  tools.timeout(20000)
+  await myCflareAccount.removeRecord(
+    testChallenge.domainNamePrefixed,
+    'TXT'
+  )
+})
+
+tap.start()

ts/smartacme.classes.acmeaccount.ts

@@ -0,0 +1,94 @@
+import * as q from 'smartq'
+
+import * as plugins from './smartacme.plugins'
+import * as helpers from './smartacme.helpers'
+
+import { SmartAcme, IRsaKeypair } from './smartacme.classes.smartacme'
+import { AcmeCert } from './smartacme.classes.acmecert'
+
+/**
+ * class AcmeAccount represents an AcmeAccount
+ */
+export class AcmeAccount {
+  parentSmartAcme: SmartAcme
+  location: string
+  link: string
+  JWK
+  constructor(smartAcmeParentArg: SmartAcme) {
+    this.parentSmartAcme = smartAcmeParentArg
+  }
+
+  /**
+   * register the account with letsencrypt
+   */
+  register() {
+    let done = q.defer()
+    this.parentSmartAcme.rawacmeClient.newReg(
+      {
+        contact: [ 'mailto:domains@lossless.org' ]
+      },
+      (err, res) => {
+        if (err) {
+          console.error('smartacme: something went wrong:')
+          console.log(err)
+          done.reject(err)
+          return
+        }
+        this.JWK = res.body.key
+        this.link = res.headers.link
+        console.log(this.link)
+        this.location = res.headers.location
+        done.resolve()
+      })
+    return done.promise
+  }
+
+  /**
+   * agree to letsencrypr terms of service
+   */
+  agreeTos() {
+    let done = q.defer()
+    let tosPart = this.link.split(',')[ 1 ]
+    let tosLinkPortion = tosPart.split(';')[ 0 ]
+    let url = tosLinkPortion.split(';')[ 0 ].trim().replace(/[<>]/g, '')
+    this.parentSmartAcme.rawacmeClient.post(this.location, { Agreement: url, resource: 'reg' }, (err, res) => {
+      if (err) {
+        console.log(err)
+        done.reject(err)
+        return
+      }
+      done.resolve()
+    })
+    return done.promise
+  }
+
+  createAcmeCert(
+    domainNameArg: string,
+    countryArg = 'Germany',
+    countryShortArg = 'DE',
+    city = 'Bremen',
+    companyArg = 'Some Company',
+    companyShortArg = 'SC'
+
+  ) {
+    let done = q.defer<AcmeCert>()
+    let acmeCert = new AcmeCert(
+      {
+        bit: 2064,
+        key: null, // not needed right now
+        domain: domainNameArg,
+        country: countryArg,
+        country_short: countryShortArg,
+        locality: city,
+        organization: companyArg,
+        organization_short: companyShortArg,
+        password: null,
+        unstructured: null,
+        subject_alt_names: null
+      },
+      this
+    )
+    done.resolve(acmeCert)
+    return done.promise
+  }
+}

ts/smartacme.classes.acmecert.ts

@@ -0,0 +1,255 @@
+import * as q from 'smartq'
+
+import * as plugins from './smartacme.plugins'
+import * as helpers from './smartacme.helpers'
+
+import { SmartAcme, IRsaKeypair } from './smartacme.classes.smartacme'
+import { AcmeAccount } from './smartacme.classes.acmeaccount'
+
+/**
+ * types of challenges supported by letsencrypt and this module
+ */
+export type TChallengeType = 'dns-01' | 'http-01'
+
+/**
+ * values that a challenge's status can have
+ */
+export type TChallengeStatus = 'pending'
+
+export interface ISmartAcmeChallenge {
+  uri: string
+  status: TChallengeStatus
+  type: TChallengeType
+  token: string
+  keyAuthorization: string
+}
+
+export interface ISmartAcmeChallengeChosen extends ISmartAcmeChallenge {
+  dnsKeyHash: string
+  domainName: string
+  domainNamePrefixed: string
+}
+
+export interface IAcmeCsrConstructorOptions {
+  bit: number,
+  key: string,
+  domain: string,
+  country: string,
+  country_short: string,
+  locality: string,
+  organization: string,
+  organization_short: string,
+  password: string,
+  unstructured: string,
+  subject_alt_names: string[]
+}
+
+// Dnsly instance (we really just need one)
+let myDnsly = new plugins.dnsly.Dnsly('google')
+
+/**
+ * class AcmeCert represents a cert for domain
+ */
+export class AcmeCert {
+  domainName: string
+  attributes
+  fullchain: string
+  parentAcmeAccount: AcmeAccount
+  csr
+  validFrom: Date
+  validTo: Date
+  keypair: IRsaKeypair
+  keyPairFinal: IRsaKeypair
+  chosenChallenge: ISmartAcmeChallengeChosen
+  dnsKeyHash: string
+  constructor(optionsArg: IAcmeCsrConstructorOptions, parentAcmeAccount: AcmeAccount) {
+    this.domainName = optionsArg.domain
+    this.parentAcmeAccount = parentAcmeAccount
+    this.keypair = helpers.createKeypair(optionsArg.bit)
+    let privateKeyForged = plugins.nodeForge.pki.privateKeyFromPem(this.keypair.privateKey)
+    let publicKeyForged = plugins.nodeForge.pki.publicKeyToPem(
+      plugins.nodeForge.pki.setRsaPublicKey(privateKeyForged.n, privateKeyForged.e)
+    )
+    this.keyPairFinal = {
+      privateKey: privateKeyForged,
+      publicKey: publicKeyForged
+    }
+
+    // set dates
+    this.validFrom = new Date()
+    this.validTo = new Date()
+    this.validTo.setDate(this.validFrom.getDate() + 90)
+
+    // set attributes
+    this.attributes = [
+      { name: 'commonName', value: optionsArg.domain },
+      { name: 'countryName', value: optionsArg.country },
+      { shortName: 'ST', value: optionsArg.country_short },
+      { name: 'localityName', value: optionsArg.locality },
+      { name: 'organizationName', value: optionsArg.organization },
+      { shortName: 'OU', value: optionsArg.organization_short },
+      { name: 'challengePassword', value: optionsArg.password },
+      { name: 'unstructuredName', value: optionsArg.unstructured }
+    ]
+
+    // set up csr
+    this.csr = plugins.nodeForge.pki.createCertificationRequest()
+    this.csr.setSubject(this.attributes)
+    this.csr.setAttributes(this.attributes)
+  }
+
+  /**
+   * requests a challenge for a domain
+   * @param domainNameArg - the domain name to request a challenge for
+   * @param challengeType - the challenge type to request
+   */
+  requestChallenge(challengeTypeArg: TChallengeType = 'dns-01') {
+    let done = q.defer<ISmartAcmeChallengeChosen>()
+    this.parentAcmeAccount.parentSmartAcme.rawacmeClient.newAuthz(
+      {
+        identifier: {
+          type: 'dns',
+          value: this.domainName
+        }
+      },
+      this.parentAcmeAccount.parentSmartAcme.keyPair,
+      (err, res) => {
+        if (err) {
+          console.error('smartacme: something went wrong:')
+          console.log(err)
+          done.reject(err)
+        }
+        let preChosenChallenge = res.body.challenges.filter(x => {
+          return x.type === challengeTypeArg
+        })[ 0 ]
+
+        /**
+         * the key is needed to accept the challenge
+         */
+        let authKey: string = plugins.rawacme.keyAuthz(
+          preChosenChallenge.token,
+          this.parentAcmeAccount.parentSmartAcme.keyPair.publicKey
+        )
+
+        /**
+         * needed in case selected challenge is of type dns-01
+         */
+        this.dnsKeyHash = plugins.rawacme.dnsKeyAuthzHash(authKey) // needed if dns challenge is chosen
+        /**
+         * the return challenge
+         */
+        this.chosenChallenge = {
+          uri: preChosenChallenge.uri,
+          type: preChosenChallenge.type,
+          token: preChosenChallenge.token,
+          keyAuthorization: authKey,
+          status: preChosenChallenge.status,
+          dnsKeyHash: this.dnsKeyHash,
+          domainName: this.domainName,
+          domainNamePrefixed: helpers.prefixName(this.domainName)
+        }
+        done.resolve(this.chosenChallenge)
+      }
+    )
+    return done.promise
+  }
+
+  /**
+   * checks if DNS records are set, will go through a max of 30 cycles
+   */
+  async checkDns(cycleArg = 1) {
+    let result = await myDnsly.checkUntilAvailable(helpers.prefixName(this.domainName), 'TXT', this.dnsKeyHash)
+    if (result) {
+      console.log('DNS is set!')
+      return
+    } else {
+      throw new Error('DNS not set!')
+    }
+  }
+
+  /**
+   * validates a challenge, only call after you have set the challenge at the expected location
+   */
+  async requestValidation() {
+    let makeRequest = () => {
+      let done = q.defer()
+      this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.chosenChallenge.uri, async (err, res) => {
+        if (err) {
+          console.log(err)
+          return
+        }
+        console.log(`Validation response:`)
+        console.log(JSON.stringify(res.body))
+        if (res.body.status === 'pending' || res.body.status === 'invalid') {
+          await plugins.smartdelay.delayFor(3000)
+          makeRequest().then((x: any) => { done.resolve(x) })
+        } else {
+          console.log('perfect!')
+          done.resolve(res.body)
+        }
+      })
+      return done.promise
+    }
+    await makeRequest()
+  }
+
+  /**
+   * requests a certificate
+   */
+  requestCert() {
+    let done = q.defer()
+    let payload = {
+      csr: plugins.rawacme.base64.encode(
+        plugins.rawacme.toDer(
+          plugins.nodeForge.pki.certificationRequestToPem(
+            this.csr
+          )
+        )
+      ),
+      notBefore: this.validFrom.toISOString(),
+      notAfter: this.validTo.toISOString()
+    }
+    this.parentAcmeAccount.parentSmartAcme.rawacmeClient.newCert(
+      payload,
+      helpers.createKeypair(),
+      (err, res) => {
+        if (err) {
+          console.log(err)
+          done.reject(err)
+        }
+        console.log(res.body)
+        done.resolve(res.body)
+      })
+    return done.promise
+  }
+
+  /**
+   * getCertificate - takes care of cooldown, validation polling and certificate retrieval
+   */
+  getCertificate() {
+
+  }
+
+  /**
+   * accept a challenge - for private use only
+   */
+  acceptChallenge() {
+    let done = q.defer()
+    this.parentAcmeAccount.parentSmartAcme.rawacmeClient.post(
+      this.chosenChallenge.uri,
+      {
+        resource: 'challenge',
+        keyAuthorization: this.chosenChallenge.keyAuthorization
+      },
+      this.parentAcmeAccount.parentSmartAcme.keyPair,
+      (err, res) => {
+        if (err) {
+          console.log(err)
+          done.reject(err)
+        }
+        done.resolve(res.body)
+      }
+    )
+    return done.promise
+  }
+}

ts/smartacme.classes.helper.ts

@@ -1,17 +0,0 @@
-import 'typings-global'
-let rsaKeygen = require('rsa-keygen')
-
-export interface IRsaKeypair {
-    publicKey: string
-    privateKey: string
-}
-
-export class SmartacmeHelper {
-    createKeypair(bit = 2048): IRsaKeypair {
-        let result = rsaKeygen.generate(bit)
-         return {
-            publicKey:  result.public_key,
-            privateKey: result.private_key
-         }
-    }
-}

ts/smartacme.classes.smartacme.ts

@@ -1,45 +1,49 @@
-import 'typings-global'
-import * as q from 'q'
-import * as path from 'path'
-let rsaKeygen = require('rsa-keygen')
-import * as smartfile from 'smartfile'
-import * as smartstring from 'smartstring'
-let rawacme = require('rawacme')
-import * as paths from './smartacme.paths'
+// third party modules
+import * as q from 'smartq' // promises
+import * as plugins from './smartacme.plugins'
+import * as helpers from './smartacme.helpers'
 
-import { SmartacmeHelper, IRsaKeypair } from './smartacme.classes.helper'
+import { AcmeAccount } from './smartacme.classes.acmeaccount'
+
+/**
+ * a rsa keypair needed for account creation and subsequent requests
+ */
+export interface IRsaKeypair {
+  publicKey: string
+  privateKey: string
+}
+
+export { AcmeAccount } from './smartacme.classes.acmeaccount'
+export { AcmeCert, ISmartAcmeChallenge, ISmartAcmeChallengeChosen } from './smartacme.classes.acmecert'
 
 /**
  * class SmartAcme exports methods for maintaining SSL Certificates
  */
 export class SmartAcme {
-    helper: SmartacmeHelper // bundles helper methods that would clutter the main SmartAcme class
-    acmeUrl: string // the acme url to use
+  acmeUrl: string // the acme url to use for this instance
   productionBool: boolean // a boolean to quickly know wether we are in production or not
   keyPair: IRsaKeypair // the keyPair needed for account creation
-    JWK
+  rawacmeClient
 
   /**
    * the constructor for class SmartAcme
    */
   constructor(productionArg: boolean = false) {
     this.productionBool = productionArg
-        this.helper = new SmartacmeHelper()
-        this.keyPair = this.helper.createKeypair()
+    this.keyPair = helpers.createKeypair()
     if (this.productionBool) {
-            this.acmeUrl = rawacme.LETSENCRYPT_STAGING_URL
+      this.acmeUrl = plugins.rawacme.LETSENCRYPT_URL
     } else {
-            this.acmeUrl = rawacme.LETSENCRYPT_URL
+      this.acmeUrl = plugins.rawacme.LETSENCRYPT_STAGING_URL
     }
   }
 
   /**
-     * creates an account if not currently present in module
-     * @executes ASYNC
+   * init the smartacme instance
    */
-    createAccount() {
+  init() {
     let done = q.defer()
-        rawacme.createClient(
+    plugins.rawacme.createClient(
       {
         url: this.acmeUrl,
         publicKey: this.keyPair.publicKey,
@@ -53,24 +57,26 @@ export class SmartAcme {
           return
         }
 
-                client.newReg(
-                    {
-                        contact: ['mailto:domains@lossless.org']
-                    },
-                    (err, res) => {
-                        if (err) {
-                            console.error('smartacme: something went wrong:')
-                            console.log(err)
-                            done.reject(err)
-                            return
-                        }
-                        this.JWK = res.body.key
-                        console.log(this.JWK)
+        // make client available in class 
+        this.rawacmeClient = client
         done.resolve()
-                    })
-
       }
     )
     return done.promise
   }
+
+  /**
+   * creates an account if not currently present in module
+   * @executes ASYNC
+   */
+  createAcmeAccount() {
+    let done = q.defer<AcmeAccount>()
+    let acmeAccount = new AcmeAccount(this)
+    acmeAccount.register().then(() => {
+      return acmeAccount.agreeTos()
+    }).then(() => {
+      done.resolve(acmeAccount)
+    })
+    return done.promise
+  }
 }

ts/smartacme.helpers.ts

@@ -0,0 +1,50 @@
+import 'typings-global'
+import * as q from 'smartq'
+
+import * as plugins from './smartacme.plugins'
+
+import { SmartAcme, IRsaKeypair } from './smartacme.classes.smartacme'
+import { AcmeAccount } from './smartacme.classes.acmeaccount'
+
+/**
+ * creates a keypair to use with requests and to generate JWK from
+ */
+export let createKeypair = (bit = 2048): IRsaKeypair => {
+  let result = plugins.rsaKeygen.generate(bit)
+  return {
+    publicKey: result.public_key,
+    privateKey: result.private_key
+  }
+}
+
+/**
+ * prefix a domain name to make sure it complies with letsencrypt
+ */
+export let prefixName = (domainNameArg: string): string => {
+  return '_acme-challenge.' + domainNameArg
+}
+
+/**
+ * gets an existing registration
+ * @executes ASYNC
+ */
+let getReg = (SmartAcmeArg: SmartAcme, location: string) => {
+  let done = q.defer()
+  let body = { resource: 'reg' }
+  SmartAcmeArg.rawacmeClient.post(
+    location,
+    body,
+    SmartAcmeArg.keyPair,
+    (err, res) => {
+      if (err) {
+        console.error('smartacme: something went wrong:')
+        console.log(err)
+        done.reject(err)
+        return
+      }
+      console.log(JSON.stringify(res.body))
+      done.resolve()
+    }
+  )
+  return done.promise
+}

ts/smartacme.plugins.ts

@@ -0,0 +1,22 @@
+import 'typings-global' // typings for node
+
+import * as path from 'path' // native node path module
+let rsaKeygen = require('rsa-keygen') // rsa keygen
+let rawacme = require('rawacme') // acme helper functions
+let nodeForge = require('node-forge')
+
+// push.rocks modules here
+import * as dnsly from 'dnsly'
+import * as smartdelay from 'smartdelay'
+import * as smartfile from 'smartfile'
+import * as smartstring from 'smartstring'
+
+export {
+  dnsly,
+  rsaKeygen,
+  rawacme,
+  nodeForge,
+  smartdelay,
+  smartfile,
+  smartstring
+}