1.0.6

README.md

@@ -1,14 +1,16 @@
 # smartacme
+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-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/)
 
 ## 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/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)
+[![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)
@@ -16,4 +18,19 @@
 [![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()
+
+let myAccount = smac.getAccount() // optionally accepts a filePath Arg with a stored acmeaccount.json
+let myCert = myAccount.getChallenge('example.com','dns-01') // will return a dnsHash to set in your DNS record
+myCert.get().then(() => {
+    console.log(myCert.certificate) // your certificate, ready to use in whatever way you prefer
+})
+```
+
 [![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)

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/smartacme.classes.acmeaccount.d.ts

@@ -0,0 +1,23 @@
+/// <reference types="q" />
+import * as q from 'q';
+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(): q.Promise<{}>;
+    /**
+     * agree to letsencrypr terms of service
+     */
+    agreeTos(): q.Promise<{}>;
+    createAcmeCert(domainNameArg: string, countryArg?: string, countryShortArg?: string, city?: string, companyArg?: string, companyShortArg?: string): q.Promise<AcmeCert>;
+}

dist/smartacme.classes.acmeaccount.js

@@ -0,0 +1,71 @@
+"use strict";
+const q = require("q");
+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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuYWNtZWFjY291bnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUuY2xhc3Nlcy5hY21lYWNjb3VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsdUJBQXNCO0FBTXRCLDZFQUF1RDtBQUV2RDs7R0FFRztBQUNIO0lBS0ksWUFBWSxrQkFBNkI7UUFDckMsSUFBSSxDQUFDLGVBQWUsR0FBRyxrQkFBa0IsQ0FBQTtJQUM3QyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxRQUFRO1FBQ0osSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3BCLElBQUksQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FDckM7WUFDSSxPQUFPLEVBQUUsQ0FBQyw2QkFBNkIsQ0FBQztTQUMzQyxFQUNELENBQUMsR0FBRyxFQUFFLEdBQUc7WUFDTCxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNOLE9BQU8sQ0FBQyxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtnQkFDakQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDaEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDaEIsTUFBTSxDQUFBO1lBQ1YsQ0FBQztZQUNELElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUE7WUFDdkIsSUFBSSxDQUFDLElBQUksR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQTtZQUM1QixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtZQUN0QixJQUFJLENBQUMsUUFBUSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFBO1lBQ3BDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNsQixDQUFDLENBQUMsQ0FBQTtRQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRDs7T0FFRztJQUNILFFBQVE7UUFDSixJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDcEIsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDckMsSUFBSSxjQUFjLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUMxQyxJQUFJLEdBQUcsR0FBRyxjQUFjLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDbEUsSUFBSSxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFBRSxTQUFTLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxHQUFHO1lBQ2pHLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDaEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDaEIsTUFBTSxDQUFBO1lBQ1YsQ0FBQztZQUNELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNsQixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRCxjQUFjLENBQ1YsYUFBcUIsRUFDckIsVUFBVSxHQUFHLFNBQVMsRUFDdEIsZUFBZSxHQUFHLElBQUksRUFDdEIsSUFBSSxHQUFHLFFBQVEsRUFDZixVQUFVLEdBQUcsY0FBYyxFQUMzQixlQUFlLEdBQUcsSUFBSTtRQUd0QixJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFZLENBQUE7UUFDOUIsSUFBSSxRQUFRLEdBQUcsSUFBSSxxQ0FBUSxDQUN2QjtZQUNJLEdBQUcsRUFBRSxJQUFJO1lBQ1QsR0FBRyxFQUFFLElBQUk7WUFDVCxNQUFNLEVBQUUsYUFBYTtZQUNyQixPQUFPLEVBQUUsVUFBVTtZQUNuQixhQUFhLEVBQUUsZUFBZTtZQUM5QixRQUFRLEVBQUUsSUFBSTtZQUNkLFlBQVksRUFBRSxVQUFVO1lBQ3hCLGtCQUFrQixFQUFFLGVBQWU7WUFDbkMsUUFBUSxFQUFFLElBQUk7WUFDZCxZQUFZLEVBQUUsSUFBSTtZQUNsQixpQkFBaUIsRUFBRSxJQUFJO1NBQzFCLEVBQ0QsSUFBSSxDQUNQLENBQUE7UUFDRCxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQ3RCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7Q0FDSjtBQWxGRCxrQ0FrRkMifQ==

dist/smartacme.classes.acmecert.d.ts

@@ -0,0 +1,79 @@
+/// <reference types="q" />
+import * as q from 'q';
+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 ISmartAcmeChallengeAccepted 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;
+    acceptedChallenge: ISmartAcmeChallengeAccepted;
+    fullchain: string;
+    parentAcmeAccount: AcmeAccount;
+    csr: any;
+    validFrom: Date;
+    validTo: Date;
+    keypair: IRsaKeypair;
+    keyPairFinal: IRsaKeypair;
+    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): q.Promise<ISmartAcmeChallengeAccepted>;
+    /**
+     * checks if DNS records are set
+     */
+    checkDns(): Promise<any>;
+    /**
+     * validates a challenge, only call after you have set the challenge at the expected location
+     */
+    requestValidation(): q.Promise<{}>;
+    /**
+     * requests a certificate
+     */
+    requestCert(): q.Promise<{}>;
+    /**
+     * getCertificate - takes care of cooldown, validation polling and certificate retrieval
+     */
+    getCertificate(): void;
+    /**
+     * accept a challenge - for private use only
+     */
+    private acceptChallenge(challengeArg);
+}

dist/smartacme.classes.smartacme.d.ts

@@ -1,29 +1,34 @@
 /// <reference types="q" />
-import 'typings-global';
 import * as q from 'q';
+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, ISmartAcmeChallengeAccepted } from './smartacme.classes.acmecert';
 /**
  * class SmartAcme exports methods for maintaining SSL Certificates
  */
 export declare class SmartAcme {
-    preparedBool: boolean;
-    acmeUrls: any;
+    acmeUrl: string;
     productionBool: boolean;
-    keyPair: any;
+    keyPair: IRsaKeypair;
+    rawacmeClient: any;
+    /**
+     * the constructor for class SmartAcme
+     */
     constructor(productionArg?: boolean);
     /**
-     * prepares the SmartAcme class
+     * init the smartacme instance
      */
-    prepareAcme(): q.Promise<{}>;
+    init(): q.Promise<{}>;
     /**
      * creates an account if not currently present in module
+     * @executes ASYNC
      */
-    createAccount(): q.Promise<{}>;
-    /**
-     * creates a keyPair
-     */
-    createKeyPair(): q.Promise<{}>;
-    /**
-     * gets the Acme Urls
-     */
-    getAcmeUrls(): q.Promise<{}>;
+    createAccount(): q.Promise<AcmeAccount>;
 }

dist/smartacme.classes.smartacme.js

@@ -1,101 +1,66 @@
 "use strict";
-require("typings-global");
-const q = require("q");
-let ACME = require('le-acme-core').ACME.create();
-let RSA = require('rsa-compat').RSA;
-let bitlen = 1024;
-let exp = 65537;
-let options = {
-    public: true,
-    pem: true,
-    internal: true
-};
+// third party modules
+const q = require("q"); // 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
  */
 class SmartAcme {
-    constructor(productionArg = false) {
-        this.preparedBool = false;
-        this.productionBool = productionArg;
-    }
     /**
-     * prepares the SmartAcme class
+     * the constructor for class SmartAcme
      */
-    prepareAcme() {
-        let done = q.defer();
-        if (this.preparedBool === false) {
-            this.getAcmeUrls()
-                .then(() => {
-                return this.createKeyPair();
-            })
-                .then((x) => {
-                console.log('prepared smartacme instance');
-                done.resolve();
-            });
+    constructor(productionArg = false) {
+        this.productionBool = productionArg;
+        this.keyPair = helpers.createKeypair();
+        if (this.productionBool) {
+            this.acmeUrl = plugins.rawacme.LETSENCRYPT_URL;
         }
         else {
-            done.resolve();
+            this.acmeUrl = plugins.rawacme.LETSENCRYPT_STAGING_URL;
         }
-        return done.promise;
     }
     /**
-     * creates an account if not currently present in module
+     * init the smartacme instance
      */
-    createAccount() {
+    init() {
         let done = q.defer();
-        this.prepareAcme()
-            .then(() => {
-            let options = {
-                newRegUrl: this.acmeUrls.newReg,
-                email: 'domains@lossless.org',
-                accountKeypair: {
-                    privateKeyPem: this.keyPair
-                },
-                agreeToTerms: function (tosUrl, done) {
-                    done(null, tosUrl);
-                }
-            };
-            ACME.registerNewAccount(options, (err, regr) => {
-                if (err) {
-                    console.log(err);
-                    done.reject(err);
-                }
-                done.resolve(regr);
-            });
-        }).catch(err => { console.log(err); });
-        return done.promise;
-    }
-    /**
-     * creates a keyPair
-     */
-    createKeyPair() {
-        let done = q.defer();
-        RSA.generateKeypair(bitlen, exp, options, (err, keypair) => {
+        plugins.rawacme.createClient({
+            url: this.acmeUrl,
+            publicKey: this.keyPair.publicKey,
+            privateKey: this.keyPair.privateKey
+        }, (err, client) => {
             if (err) {
+                console.error('smartacme: something went wrong:');
                 console.log(err);
                 done.reject(err);
+                return;
             }
-            console.log(keypair);
-            this.keyPair = keypair;
+            // make client available in class 
+            this.rawacmeClient = client;
             done.resolve();
         });
         return done.promise;
     }
     /**
-     * gets the Acme Urls
+     * creates an account if not currently present in module
+     * @executes ASYNC
      */
-    getAcmeUrls() {
+    createAccount() {
         let done = q.defer();
-        ACME.getAcmeUrls(ACME.stagingServerUrl, (err, urls) => {
-            if (err) {
-                throw err;
-            }
-            this.acmeUrls = urls;
-            console.log(this.acmeUrls);
-            done.resolve();
+        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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwwQkFBdUI7QUFDdkIsdUJBQXNCO0FBTXRCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUE7QUFDaEQsSUFBSSxHQUFHLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDLEdBQUcsQ0FBQTtBQUVuQyxJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUE7QUFDakIsSUFBSSxHQUFHLEdBQUcsS0FBSyxDQUFBO0FBQ2YsSUFBSSxPQUFPLEdBQUc7SUFDVixNQUFNLEVBQUUsSUFBSTtJQUNaLEdBQUcsRUFBRSxJQUFJO0lBQ1QsUUFBUSxFQUFFLElBQUk7Q0FDakIsQ0FBQTtBQUNEOztHQUVHO0FBQ0g7SUFLSSxZQUFZLGdCQUF5QixLQUFLO1FBSjFDLGlCQUFZLEdBQVksS0FBSyxDQUFBO1FBS3pCLElBQUksQ0FBQyxjQUFjLEdBQUcsYUFBYSxDQUFBO0lBQ3ZDLENBQUM7SUFFRDs7T0FFRztJQUNILFdBQVc7UUFDUCxJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDcEIsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFlBQVksS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDO1lBQzlCLElBQUksQ0FBQyxXQUFXLEVBQUU7aUJBQ2IsSUFBSSxDQUFDO2dCQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUE7WUFDL0IsQ0FBQyxDQUFDO2lCQUNELElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQ0osT0FBTyxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFBO2dCQUMxQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7WUFDbEIsQ0FBQyxDQUFDLENBQUE7UUFDVixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDbEIsQ0FBQztRQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRDs7T0FFRztJQUNILGFBQWE7UUFDVCxJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDcEIsSUFBSSxDQUFDLFdBQVcsRUFBRTthQUNiLElBQUksQ0FBQztZQUNGLElBQUksT0FBTyxHQUFHO2dCQUNWLFNBQVMsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU07Z0JBQy9CLEtBQUssRUFBRSxzQkFBc0I7Z0JBQzdCLGNBQWMsRUFBRTtvQkFDWixhQUFhLEVBQUUsSUFBSSxDQUFDLE9BQU87aUJBQzlCO2dCQUNELFlBQVksRUFBRSxVQUFVLE1BQU0sRUFBRSxJQUFJO29CQUNoQyxJQUFJLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFBO2dCQUN0QixDQUFDO2FBQ0osQ0FBQTtZQUNELElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFHLEVBQUUsSUFBSTtnQkFDdkMsRUFBRSxDQUFBLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztvQkFDTCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO29CQUNoQixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNwQixDQUFDO2dCQUNELElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDdEIsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUV6QyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUN2QixDQUFDO0lBRUQ7O09BRUc7SUFDSCxhQUFhO1FBQ1QsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3BCLEdBQUcsQ0FBQyxlQUFlLENBQUMsTUFBTSxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsQ0FBQyxHQUFHLEVBQUUsT0FBTztZQUNuRCxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hCLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUE7WUFDcEIsQ0FBQztZQUNELE9BQU8sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUE7WUFDcEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUE7WUFDdEIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ2xCLENBQUMsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDdkIsQ0FBQztJQUVEOztPQUVHO0lBQ0gsV0FBVztRQUNQLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUNwQixJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLEdBQUcsRUFBRSxJQUFJO1lBQzlDLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ04sTUFBTSxHQUFHLENBQUE7WUFDYixDQUFDO1lBQ0QsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUE7WUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7WUFDMUIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ2xCLENBQUMsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDdkIsQ0FBQztDQUNKO0FBMUZELDhCQTBGQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxzQkFBc0I7QUFDdEIsdUJBQXNCLENBQUMsV0FBVztBQUNsQywrQ0FBOEM7QUFDOUMsK0NBQThDO0FBRTlDLG1GQUE2RDtBQVU3RCxpRkFBNkQ7QUFBcEQsc0RBQUEsV0FBVyxDQUFBO0FBQ3BCLDJFQUF5RztBQUFoRyxnREFBQSxRQUFRLENBQUE7QUFFakI7O0dBRUc7QUFDSDtJQU1JOztPQUVHO0lBQ0gsWUFBWSxnQkFBeUIsS0FBSztRQUN0QyxJQUFJLENBQUMsY0FBYyxHQUFHLGFBQWEsQ0FBQTtRQUNuQyxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxhQUFhLEVBQUUsQ0FBQTtRQUN0QyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUN0QixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFBO1FBQ2xELENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQTtRQUMxRCxDQUFDO0lBQ0wsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSTtRQUNBLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUNwQixPQUFPLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FDeEI7WUFDSSxHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU87WUFDakIsU0FBUyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUztZQUNqQyxVQUFVLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVO1NBQ3RDLEVBQ0QsQ0FBQyxHQUFHLEVBQUUsTUFBTTtZQUNSLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQ04sT0FBTyxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO2dCQUNqRCxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixNQUFNLENBQUE7WUFDVixDQUFDO1lBRUQsa0NBQWtDO1lBQ2xDLElBQUksQ0FBQyxhQUFhLEdBQUcsTUFBTSxDQUFBO1lBQzNCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNsQixDQUFDLENBQ0osQ0FBQTtRQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRDs7O09BR0c7SUFDSCxhQUFhO1FBQ1QsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBZSxDQUFBO1FBQ2pDLElBQUksV0FBVyxHQUFHLElBQUksMkNBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUN2QyxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUFDO1lBQ3hCLE1BQU0sQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUE7UUFDakMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ0osSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQTtRQUM3QixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7Q0FDSjtBQTVERCw4QkE0REMifQ==

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,40 @@
+"use strict";
+require("typings-global");
+const q = require("q");
+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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLHVCQUFzQjtBQUV0QiwrQ0FBOEM7QUFLOUM7O0dBRUc7QUFDUSxRQUFBLGFBQWEsR0FBRyxDQUFDLEdBQUcsR0FBRyxJQUFJO0lBQ2xDLElBQUksTUFBTSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzVDLE1BQU0sQ0FBQztRQUNILFNBQVMsRUFBRSxNQUFNLENBQUMsVUFBVTtRQUM1QixVQUFVLEVBQUUsTUFBTSxDQUFDLFdBQVc7S0FDakMsQ0FBQTtBQUNMLENBQUMsQ0FBQTtBQUVEOztHQUVHO0FBQ1EsUUFBQSxVQUFVLEdBQUcsQ0FBQyxhQUFxQjtJQUMxQyxNQUFNLENBQUMsa0JBQWtCLEdBQUcsYUFBYSxDQUFBO0FBQzdDLENBQUMsQ0FBQTtBQUVEOzs7R0FHRztBQUNILElBQUksTUFBTSxHQUFHLENBQUMsWUFBdUIsRUFBRSxRQUFnQjtJQUNuRCxJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDcEIsSUFBSSxJQUFJLEdBQUcsRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUE7SUFDOUIsWUFBWSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQzNCLFFBQVEsRUFDUixJQUFJLEVBQ0osWUFBWSxDQUFDLE9BQU8sRUFDcEIsQ0FBQyxHQUFHLEVBQUUsR0FBRztRQUNMLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDTixPQUFPLENBQUMsS0FBSyxDQUFDLGtDQUFrQyxDQUFDLENBQUE7WUFDakQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUNoQixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLE1BQU0sQ0FBQTtRQUNWLENBQUM7UUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7UUFDckMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ2xCLENBQUMsQ0FDSixDQUFBO0lBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDdkIsQ0FBQyxDQUFBIn0=

dist/smartacme.plugins.d.ts

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

dist/smartacme.plugins.js

@@ -0,0 +1,16 @@
+"use strict";
+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 smartfile = require("smartfile");
+exports.smartfile = smartfile;
+const smartstring = require("smartstring");
+exports.smartstring = smartstring;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCLENBQUMsbUJBQW1CO0FBRzNDLElBQUksU0FBUyxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQSxDQUFDLGFBQWE7QUFXL0MsOEJBQVM7QUFWYixJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUEsQ0FBQyx3QkFBd0I7QUFXckQsMEJBQU87QUFWWCxJQUFJLFNBQVMsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUE7QUFXakMsOEJBQVM7QUFUYiwwQkFBMEI7QUFDMUIsK0JBQThCO0FBSzFCLHNCQUFLO0FBSlQsdUNBQXNDO0FBUWxDLDhCQUFTO0FBUGIsMkNBQTBDO0FBUXRDLGtDQUFXIn0=

npmextra.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartacme",
-  "version": "1.0.2",
+  "version": "1.0.6",
   "description": "acme implementation in TypeScript",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -23,17 +23,22 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartacme#README",
   "dependencies": {
+    "@types/node-forge": "^0.6.5",
     "@types/q": "0.x.x",
-    "le-acme-core": "^2.0.7",
+    "dnsly": "^1.0.7",
+    "node-forge": "^0.6.47",
     "q": "^1.4.1",
-    "rsa-compat": "^1.2.7",
-    "smartfile": "^4.1.0",
-    "smartstring": "^2.0.20",
+    "rawacme": "^0.2.1",
+    "rsa-keygen": "^1.0.6",
+    "smartfile": "^4.1.2",
+    "smartstring": "^2.0.22",
     "typings-global": "^1.0.14"
   },
   "devDependencies": {
     "@types/should": "^8.1.30",
-    "should": "^11.1.1",
+    "cflare": "0.0.10",
+    "qenv": "^1.1.1",
+    "should": "^11.1.2",
     "typings-test": "^1.0.3"
   }
 }

test/test.js

@@ -4,28 +4,56 @@ 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 () {
+    let testSmartAcme;
+    let testAcmeAccount;
+    let testAcmeCert;
+    let testChallenge;
+    it('should create a valid instance', function (done) {
         this.timeout(10000);
-        testAcme = new smartacme.SmartAcme();
-        should(testAcme).be.instanceOf(smartacme.SmartAcme);
-    });
-    it('should get the ACME urls', function (done) {
-        testAcme.getAcmeUrls().then(() => { done(); });
-    });
-    it('should prepare the Instance', function (done) {
-        testAcme.prepareAcme().then(done);
+        testSmartAcme = new smartacme.SmartAcme();
+        testSmartAcme.init().then(() => {
+            should(testSmartAcme).be.instanceOf(smartacme.SmartAcme);
+            done();
+        }).catch(err => { done(err); });
     });
     it('should have created keyPair', function () {
+        should(testSmartAcme.acmeUrl).be.of.type('string');
     });
     it('should register a new account', function (done) {
-        testAcme.createAccount().then(x => {
-            console.log(x);
+        this.timeout(10000);
+        testSmartAcme.createAccount().then(x => {
+            testAcmeAccount = x;
             done();
         }).catch(err => {
             console.log(err);
             done(err);
         });
     });
+    it('should create a AcmeCert', function () {
+        testAcmeAccount.createAcmeCert('test1.bleu.de').then(x => {
+            testAcmeCert = x;
+            should(testAcmeAccount).be.instanceOf(smartacme.AcmeCert);
+        });
+    });
+    it('should get a challenge for a AcmeCert', function (done) {
+        this.timeout(10000);
+        testAcmeCert.requestChallenge().then((challengeAccepted) => {
+            console.log(challengeAccepted);
+            testChallenge = challengeAccepted;
+            done();
+        });
+    });
+    it('should check for a DNS record', function (done) {
+        testAcmeCert.checkDns().then(x => {
+            console.log(x);
+            done();
+        });
+    });
+    it('should poll for validation of a challenge', function (done) {
+        this.timeout(10000);
+        testAcmeCert.requestValidation().then(x => {
+            done();
+        });
+    });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFFaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksUUFBNkIsQ0FBQTtJQUNqQyxFQUFFLENBQUMsZ0NBQWdDLEVBQUU7UUFDakMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNuQixRQUFRLEdBQUcsSUFBSSxTQUFTLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDcEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQ3ZELENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLDBCQUEwQixFQUFFLFVBQVUsSUFBSTtRQUN6QyxRQUFRLENBQUMsV0FBVyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsSUFBSSxFQUFFLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNqRCxDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRSxVQUFVLElBQUk7UUFDNUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNyQyxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRTtJQUVsQyxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQywrQkFBK0IsRUFBRSxVQUFVLElBQUk7UUFDOUMsUUFBUSxDQUFDLGFBQWEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzNCLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDZCxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUNoQixJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDYixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFHaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksYUFBa0MsQ0FBQTtJQUN0QyxJQUFJLGVBQXNDLENBQUE7SUFDMUMsSUFBSSxZQUFnQyxDQUFBO0lBQ3BDLElBQUksYUFBb0QsQ0FBQTtJQUV4RCxFQUFFLENBQUMsZ0NBQWdDLEVBQUUsVUFBVSxJQUFJO1FBQy9DLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsYUFBYSxHQUFHLElBQUksU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFBO1FBQ3pDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDdEIsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQ3hELElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNsQyxDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRTtRQUM5QixNQUFNLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ3RELENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLCtCQUErQixFQUFFLFVBQVUsSUFBSTtRQUM5QyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ25CLGFBQWEsQ0FBQyxhQUFhLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNoQyxlQUFlLEdBQUcsQ0FBQyxDQUFBO1lBQ25CLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNiLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsMEJBQTBCLEVBQUU7UUFDM0IsZUFBZSxDQUFDLGNBQWMsQ0FBQyxlQUFlLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNsRCxZQUFZLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM3RCxDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLHVDQUF1QyxFQUFFLFVBQVUsSUFBSTtRQUN0RCxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ25CLFlBQVksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLGlCQUFpQjtZQUNuRCxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLENBQUE7WUFDOUIsYUFBYSxHQUFHLGlCQUFpQixDQUFBO1lBQ2pDLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQywrQkFBK0IsRUFBRSxVQUFTLElBQUk7UUFDN0MsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDZCxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsMkNBQTJDLEVBQUUsVUFBVSxJQUFJO1FBQzFELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsWUFBWSxDQUFDLGlCQUFpQixFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbkMsSUFBSSxFQUFFLENBQUE7UUFDVixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUEifQ==

test/test.ts

@@ -1,34 +1,68 @@
 import 'typings-test'
 import * as should from 'should'
+import * as cflare from 'cflare'
+import * as qenv from 'qenv'
 
 // 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 () {
+    let testSmartAcme: smartacme.SmartAcme
+    let testAcmeAccount: smartacme.AcmeAccount
+    let testAcmeCert: smartacme.AcmeCert
+    let testChallenge: smartacme.ISmartAcmeChallengeAccepted
+    
+    it('should create a valid instance', function (done) {
         this.timeout(10000)
-        testAcme = new smartacme.SmartAcme()
-        should(testAcme).be.instanceOf(smartacme.SmartAcme)
+        testSmartAcme = new smartacme.SmartAcme()
+        testSmartAcme.init().then(() => {
+            should(testSmartAcme).be.instanceOf(smartacme.SmartAcme)
+            done()
+        }).catch(err => { done(err) })
     })
 
-    it('should get the ACME urls', function (done) {
-        testAcme.getAcmeUrls().then(() => { done() })
-    })
-
-    it('should prepare the Instance', function (done) {
-        testAcme.prepareAcme().then(done)
-    })
     it('should have created keyPair', function () {
-
+        should(testSmartAcme.acmeUrl).be.of.type('string')
     })
+
     it('should register a new account', function (done) {
-        testAcme.createAccount().then(x => {
-            console.log(x)
+        this.timeout(10000)
+        testSmartAcme.createAccount().then(x => {
+            testAcmeAccount = x
             done()
         }).catch(err => {
             console.log(err)
             done(err)
         })
     })
+
+    it('should create a AcmeCert', function() {
+        testAcmeAccount.createAcmeCert('test1.bleu.de').then(x => {
+            testAcmeCert = x
+            should(testAcmeAccount).be.instanceOf(smartacme.AcmeCert)
+        })
+    })
+
+    it('should get a challenge for a AcmeCert', function (done) {
+        this.timeout(10000)
+        testAcmeCert.requestChallenge().then((challengeAccepted) => {
+            console.log(challengeAccepted)
+            testChallenge = challengeAccepted
+            done()
+        })
+    })
+
+    it('should check for a DNS record', function(done) {
+        testAcmeCert.checkDns().then(x => {
+            console.log(x)
+            done()
+        })
+    })
+
+    it.skip('should poll for validation of a challenge', function (done) {
+        this.timeout(10000)
+        testAcmeCert.requestValidation().then(x => {
+            done()
+        })
+    })
 })

ts/smartacme.classes.acmeaccount.ts

@@ -0,0 +1,94 @@
+import * as q from 'q'
+
+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,259 @@
+import * as q from 'q'
+
+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 ISmartAcmeChallengeAccepted 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
+    acceptedChallenge: ISmartAcmeChallengeAccepted
+    fullchain: string
+    parentAcmeAccount: AcmeAccount
+    csr
+    validFrom: Date
+    validTo: Date
+    keypair: IRsaKeypair
+    keyPairFinal: IRsaKeypair
+    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<ISmartAcmeChallengeAccepted>()
+        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 dnsChallenge = res.body.challenges.filter(x => {
+                    return x.type === challengeTypeArg
+                })[0]
+                this.acceptChallenge(dnsChallenge)
+                    .then((x: ISmartAcmeChallengeAccepted) => {
+                        done.resolve(x)
+                    })
+            }
+        )
+        return done.promise
+    }
+
+    /**
+     * checks if DNS records are set
+     */
+    async checkDns() {
+        let myRecord
+        try {
+            myRecord = await myDnsly.getRecord(helpers.prefixName(this.domainName), 'TXT')
+        } catch (err) {
+            await this.checkDns()
+        }
+        return myRecord[0][0]
+    }
+
+    /**
+     * validates a challenge, only call after you have set the challenge at the expected location
+     */
+    requestValidation() {
+        let done = q.defer()
+        this.parentAcmeAccount.parentSmartAcme.rawacmeClient.poll(this.acceptedChallenge.uri, (err, res) => {
+            if (err) {
+                console.log(err)
+                done.reject(err)
+            }
+            console.log(`Validation response:`)
+            console.log(JSON.stringify(res.body))
+            if (res.body.status === 'pending' || 'invalid') {
+                setTimeout(
+                    () => {
+                        this.requestValidation().then(x => { done.resolve(x) })
+                    },
+                    2000
+                )
+            } else {
+                done.resolve(res.body)
+            }
+        })
+        return done.promise
+    }
+
+    /**
+     * 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
+     */
+    private acceptChallenge(challengeArg: ISmartAcmeChallenge) {
+        let done = q.defer()
+
+        /**
+         * the key is needed to accept the challenge
+         */
+        let authKey: string = plugins.rawacme.keyAuthz(
+            challengeArg.token,
+            this.parentAcmeAccount.parentSmartAcme.keyPair.publicKey
+        )
+
+        /**
+         * needed in case selected challenge is of type dns-01
+         */
+        let keyHash: string = plugins.rawacme.dnsKeyAuthzHash(authKey) // needed if dns challenge is chosen
+
+        this.parentAcmeAccount.parentSmartAcme.rawacmeClient.post(
+            challengeArg.uri,
+            {
+                resource: 'challenge',
+                keyAuthorization: authKey
+            },
+            this.parentAcmeAccount.parentSmartAcme.keyPair,
+            (err, res) => {
+                if (err) {
+                    console.log(err)
+                    done.reject(err)
+                }
+                /**
+                 * the return challenge
+                 */
+                let returnDNSChallenge: ISmartAcmeChallengeAccepted = {
+                    uri: res.body.uri,
+                    type: res.body.type,
+                    token: res.body.token,
+                    keyAuthorization: res.body.keyAuthorization,
+                    status: res.body.status,
+                    dnsKeyHash: keyHash,
+                    domainName: this.domainName,
+                    domainNamePrefixed: helpers.prefixName(this.domainName)
+                }
+                this.acceptedChallenge = returnDNSChallenge
+                done.resolve(returnDNSChallenge)
+            }
+        )
+        return done.promise
+    }
+}

ts/smartacme.classes.smartacme.ts

@@ -1,110 +1,81 @@
-import 'typings-global'
-import * as q from 'q'
-import * as path from 'path'
-import * as smartfile from 'smartfile'
-import * as smartstring from 'smartstring'
-import * as paths from './smartacme.paths'
+// third party modules
+import * as q from 'q' // promises
+import * as plugins from './smartacme.plugins'
+import * as helpers from './smartacme.helpers'
 
-let ACME = require('le-acme-core').ACME.create()
-let RSA = require('rsa-compat').RSA
+import { AcmeAccount } from './smartacme.classes.acmeaccount'
 
-let bitlen = 1024
-let exp = 65537
-let options = {
-    public: true,
-    pem: true,
-    internal: true
+/**
+ * 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, ISmartAcmeChallengeAccepted } from './smartacme.classes.acmecert'
+
 /**
  * class SmartAcme exports methods for maintaining SSL Certificates
  */
 export class SmartAcme {
-    preparedBool: boolean = false
-    acmeUrls: any
-    productionBool: boolean
-    keyPair: any
+    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
+    rawacmeClient
+
+    /**
+     * the constructor for class SmartAcme
+     */
     constructor(productionArg: boolean = false) {
         this.productionBool = productionArg
+        this.keyPair = helpers.createKeypair()
+        if (this.productionBool) {
+            this.acmeUrl = plugins.rawacme.LETSENCRYPT_URL
+        } else {
+            this.acmeUrl = plugins.rawacme.LETSENCRYPT_STAGING_URL
+        }
     }
 
     /**
-     * prepares the SmartAcme class
+     * init the smartacme instance
      */
-    prepareAcme() {
+    init() {
         let done = q.defer()
-        if (this.preparedBool === false) {
-            this.getAcmeUrls()
-                .then(() => {
-                    return this.createKeyPair()
-                })
-                .then((x) => {
-                    console.log('prepared smartacme instance')
-                    done.resolve()
-                })
-        } else {
-            done.resolve()
-        }
+        plugins.rawacme.createClient(
+            {
+                url: this.acmeUrl,
+                publicKey: this.keyPair.publicKey,
+                privateKey: this.keyPair.privateKey
+            },
+            (err, client) => {
+                if (err) {
+                    console.error('smartacme: something went wrong:')
+                    console.log(err)
+                    done.reject(err)
+                    return
+                }
+
+                // make client available in class 
+                this.rawacmeClient = client
+                done.resolve()
+            }
+        )
         return done.promise
     }
 
     /**
      * creates an account if not currently present in module
+     * @executes ASYNC
      */
     createAccount() {
-        let done = q.defer()
-        this.prepareAcme()
-            .then(() => {
-                let options = {
-                    newRegUrl: this.acmeUrls.newReg,
-                    email: 'domains@lossless.org', // valid email (server checks MX records)
-                    accountKeypair: { // privateKeyPem or privateKeyJwt 
-                        privateKeyPem: this.keyPair
-                    },
-                    agreeToTerms: function (tosUrl, done) {
-                        done(null, tosUrl)
-                    }
-                }
-                ACME.registerNewAccount(options, (err, regr) => {
-                    if(err) {
-                        console.log(err)
-                        done.reject(err)
-                    }
-                    done.resolve(regr)
-                })
-            }).catch(err => { console.log(err) })
-
-        return done.promise
-    }
-
-    /**
-     * creates a keyPair
-     */
-    createKeyPair() {
-        let done = q.defer()
-        RSA.generateKeypair(bitlen, exp, options, (err, keypair) => {
-            if (err) {
-                console.log(err)
-                done.reject(err)
-            }
-            console.log(keypair)
-            this.keyPair = keypair
-            done.resolve()
-        })
-        return done.promise
-    }
-
-    /**
-     * gets the Acme Urls
-     */
-    getAcmeUrls() {
-        let done = q.defer()
-        ACME.getAcmeUrls(ACME.stagingServerUrl, (err, urls) => {
-            if (err) {
-                throw err
-            }
-            this.acmeUrls = urls
-            console.log(this.acmeUrls)
-            done.resolve()
+        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 'q'
+
+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,20 @@
+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 smartfile from 'smartfile'
+import * as smartstring from 'smartstring'
+
+export {
+    dnsly,
+    rsaKeygen,
+    rawacme,
+    nodeForge,
+    smartfile,
+    smartstring
+}