1.0.5

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.js

@@ -0,0 +1 @@
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuYWNtZWFjY291bnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUuY2xhc3Nlcy5hY21lYWNjb3VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

dist/smartacme.classes.acmecert.js

@@ -0,0 +1 @@
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuYWNtZWNlcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFjbWUuY2xhc3Nlcy5hY21lY2VydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

dist/smartacme.classes.helper.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="q" />
+import 'typings-global';
+import * as q from 'q';
+import { SmartAcme } from './smartacme.classes.smartacme';
+export interface IRsaKeypair {
+    publicKey: string;
+    privateKey: string;
+}
+export declare class SmartacmeHelper {
+    parentSmartAcme: SmartAcme;
+    constructor(smartAcmeArg: SmartAcme);
+    /**
+     * creates a keypair to use with requests and to generate JWK from
+     */
+    createKeypair(bit?: number): IRsaKeypair;
+    /**
+     * getReg
+     * @executes ASYNC
+     */
+    getReg(): q.Promise<{}>;
+}

dist/smartacme.classes.helper.js

@@ -0,0 +1,40 @@
+"use strict";
+require("typings-global");
+const q = require("q");
+let rsaKeygen = require('rsa-keygen');
+class SmartacmeHelper {
+    constructor(smartAcmeArg) {
+        this.parentSmartAcme = smartAcmeArg;
+    }
+    /**
+     * creates a keypair to use with requests and to generate JWK from
+     */
+    createKeypair(bit = 2048) {
+        let result = rsaKeygen.generate(bit);
+        return {
+            publicKey: result.public_key,
+            privateKey: result.private_key
+        };
+    }
+    /**
+     * getReg
+     * @executes ASYNC
+     */
+    getReg() {
+        let done = q.defer();
+        let body = { resource: 'reg' };
+        this.parentSmartAcme.rawacmeClient.post(this.parentSmartAcme.location, body, this.parentSmartAcme.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;
+    }
+}
+exports.SmartacmeHelper = SmartacmeHelper;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuaGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwwQkFBdUI7QUFDdkIsdUJBQXNCO0FBQ3RCLElBQUksU0FBUyxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQTtBQVNyQztJQUdJLFlBQVksWUFBdUI7UUFDL0IsSUFBSSxDQUFDLGVBQWUsR0FBRyxZQUFZLENBQUE7SUFDdkMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsYUFBYSxDQUFDLEdBQUcsR0FBRyxJQUFJO1FBQ3BCLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDcEMsTUFBTSxDQUFDO1lBQ0gsU0FBUyxFQUFFLE1BQU0sQ0FBQyxVQUFVO1lBQzVCLFVBQVUsRUFBRSxNQUFNLENBQUMsV0FBVztTQUNqQyxDQUFBO0lBQ0wsQ0FBQztJQUVEOzs7T0FHRztJQUNILE1BQU07UUFDRixJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDcEIsSUFBSSxJQUFJLEdBQUcsRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUE7UUFDOUIsSUFBSSxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUNuQyxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFDN0IsSUFBSSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsT0FBTyxFQUNsQyxDQUFDLEdBQUcsRUFBRSxHQUFHO1lBQ0wsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDTixPQUFPLENBQUMsS0FBSyxDQUFDLGtDQUFrQyxDQUFDLENBQUE7Z0JBQ2pELE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hCLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hCLE1BQU0sQ0FBQTtZQUNWLENBQUM7WUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7WUFDckMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ2xCLENBQUMsQ0FDSixDQUFBO1FBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDdkIsQ0FBQztDQUNKO0FBekNELDBDQXlDQyJ9

dist/smartacme.classes.smartacme.d.ts

@@ -1,29 +1,42 @@
 /// <reference types="q" />
 import 'typings-global';
 import * as q from 'q';
+import { SmartacmeHelper, IRsaKeypair } from './smartacme.classes.helper';
+export declare type TChallenge = 'dns-01' | 'http-01';
 /**
  * class SmartAcme exports methods for maintaining SSL Certificates
  */
 export declare class SmartAcme {
-    preparedBool: boolean;
-    acmeUrls: any;
+    helper: SmartacmeHelper;
+    acmeUrl: string;
     productionBool: boolean;
-    keyPair: any;
+    keyPair: IRsaKeypair;
+    location: string;
+    link: string;
+    rawacmeClient: any;
+    JWK: any;
+    /**
+     * the constructor for class SmartAcme
+     */
     constructor(productionArg?: boolean);
-    /**
-     * prepares the SmartAcme class
-     */
-    prepareAcme(): q.Promise<{}>;
     /**
      * creates an account if not currently present in module
+     * @executes ASYNC
      */
     createAccount(): q.Promise<{}>;
+    agreeTos(): q.Promise<{}>;
     /**
-     * creates a keyPair
+     * requests a challenge for a domain
+     * @param domainNameArg - the domain name to request a challenge for
+     * @param challengeType - the challenge type to request
      */
-    createKeyPair(): q.Promise<{}>;
+    requestChallenge(domainNameArg: string, challengeTypeArg?: TChallenge): q.Promise<{}>;
     /**
-     * gets the Acme Urls
+     * getCertificate - takes care of cooldown, validation polling and certificate retrieval
      */
-    getAcmeUrls(): q.Promise<{}>;
+    getCertificate(): void;
+    /**
+     * accept a challenge - for private use only
+     */
+    private acceptChallenge(challenge);
 }

npmextra.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartacme",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "acme implementation in TypeScript",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -24,9 +24,9 @@
   "homepage": "https://gitlab.com/pushrocks/smartacme#README",
   "dependencies": {
     "@types/q": "0.x.x",
-    "le-acme-core": "^2.0.7",
     "q": "^1.4.1",
-    "rsa-compat": "^1.2.7",
+    "rawacme": "^0.2.1",
+    "rsa-keygen": "^1.0.6",
     "smartfile": "^4.1.0",
     "smartstring": "^2.0.20",
     "typings-global": "^1.0.14"

test/test.js

@@ -10,22 +10,29 @@ describe('smartacme', function () {
         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);
-    });
     it('should have created keyPair', function () {
+        should(testAcme.acmeUrl).be.of.type('string');
     });
     it('should register a new account', function (done) {
+        this.timeout(10000);
         testAcme.createAccount().then(x => {
-            console.log(x);
             done();
         }).catch(err => {
             console.log(err);
             done(err);
         });
     });
+    it('should agree to ToS', function (done) {
+        this.timeout(10000);
+        testAcme.agreeTos().then(() => {
+            done();
         });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFFaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksUUFBNkIsQ0FBQTtJQUNqQyxFQUFFLENBQUMsZ0NBQWdDLEVBQUU7UUFDakMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNuQixRQUFRLEdBQUcsSUFBSSxTQUFTLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDcEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQ3ZELENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLDBCQUEwQixFQUFFLFVBQVUsSUFBSTtRQUN6QyxRQUFRLENBQUMsV0FBVyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsSUFBSSxFQUFFLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNqRCxDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRSxVQUFVLElBQUk7UUFDNUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNyQyxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRTtJQUVsQyxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQywrQkFBK0IsRUFBRSxVQUFVLElBQUk7UUFDOUMsUUFBUSxDQUFDLGFBQWEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzNCLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDZCxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUNoQixJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDYixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUEifQ==
+    });
+    it('should request a challenge for a domain', function (done) {
+        this.timeout(10000);
+        testAcme.requestChallenge('bleu.de').then(() => {
+            done();
+        });
+    });
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFFaEMsNEJBQTRCO0FBQzVCLDJDQUEwQztBQUUxQyxRQUFRLENBQUMsV0FBVyxFQUFFO0lBQ2xCLElBQUksUUFBNkIsQ0FBQTtJQUVqQyxFQUFFLENBQUMsZ0NBQWdDLEVBQUU7UUFDakMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNuQixRQUFRLEdBQUcsSUFBSSxTQUFTLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDcEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQ3ZELENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLDZCQUE2QixFQUFFO1FBQzlCLE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDakQsQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsK0JBQStCLEVBQUUsVUFBVSxJQUFJO1FBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsUUFBUSxDQUFDLGFBQWEsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzNCLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNiLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMscUJBQXFCLEVBQUUsVUFBUyxJQUFJO1FBQ25DLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQztZQUNyQixJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMseUNBQXlDLEVBQUUsVUFBUyxJQUFJO1FBQ3ZELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsUUFBUSxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLElBQUksQ0FBQztZQUN0QyxJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSJ9

test/test.ts

@@ -6,29 +6,38 @@ 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 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(testAcme.acmeUrl).be.of.type('string')
     })
+
     it('should register a new account', function (done) {
+        this.timeout(10000)
         testAcme.createAccount().then(x => {
-            console.log(x)
             done()
         }).catch(err => {
             console.log(err)
             done(err)
         })
     })
+
+    it('should agree to ToS', function(done) {
+        this.timeout(10000)
+        testAcme.agreeTos().then(() => {
+            done()
+        })
+    })
+
+    it('should request a challenge for a domain', function(done) {
+        this.timeout(10000)
+        testAcme.requestChallenge('bleu.de').then(() => {
+            done()
+        })
+    })
 })

ts/smartacme.classes.acmeaccount.ts

@@ -0,0 +1,5 @@
+import 'typings-global'
+
+export class AcmeAccount {
+    
+}

ts/smartacme.classes.acmecert.ts

@@ -0,0 +1,5 @@
+import 'typings-global'
+
+export class AcmeCert {
+    
+}

ts/smartacme.classes.helper.ts

@@ -0,0 +1,53 @@
+import 'typings-global'
+import * as q from 'q'
+let rsaKeygen = require('rsa-keygen')
+
+import { SmartAcme } from './smartacme.classes.smartacme'
+
+export interface IRsaKeypair {
+    publicKey: string
+    privateKey: string
+}
+
+export class SmartacmeHelper {
+    parentSmartAcme: SmartAcme
+
+    constructor(smartAcmeArg: SmartAcme) {
+        this.parentSmartAcme = smartAcmeArg
+    }
+
+    /**
+     * creates a keypair to use with requests and to generate JWK from
+     */
+    createKeypair(bit = 2048): IRsaKeypair {
+        let result = rsaKeygen.generate(bit)
+        return {
+            publicKey: result.public_key,
+            privateKey: result.private_key
+        }
+    }
+
+    /**
+     * getReg
+     * @executes ASYNC
+     */
+    getReg() {
+        let done = q.defer()
+        let body = { resource: 'reg' }
+        this.parentSmartAcme.rawacmeClient.post(
+            this.parentSmartAcme.location,
+            body, this.parentSmartAcme.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.classes.smartacme.ts

@@ -1,111 +1,178 @@
 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'
 
-let ACME = require('le-acme-core').ACME.create()
-let RSA = require('rsa-compat').RSA
+import { SmartacmeHelper, IRsaKeypair } from './smartacme.classes.helper'
+
+export type TChallenge = 'dns-01' | 'http-01'
+
 
-let bitlen = 1024
-let exp = 65537
-let options = {
-    public: true,
-    pem: true,
-    internal: true
-}
 /**
  * class SmartAcme exports methods for maintaining SSL Certificates
  */
 export class SmartAcme {
-    preparedBool: boolean = false
-    acmeUrls: any
-    productionBool: boolean
-    keyPair: any
-    constructor(productionArg: boolean = false) {
-        this.productionBool = productionArg
-    }
+    helper: SmartacmeHelper // bundles helper methods that would clutter the main SmartAcme class
+    acmeUrl: string // the acme url to use
+    productionBool: boolean // a boolean to quickly know wether we are in production or not
+    keyPair: IRsaKeypair // the keyPair needed for account creation
+    location: string
+    link: string
+    rawacmeClient
+    JWK
 
     /**
-     * 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: boolean = false) {
+        this.productionBool = productionArg
+        this.helper = new SmartacmeHelper(this)
+        this.keyPair = this.helper.createKeypair()
+        if (this.productionBool) {
+            this.acmeUrl = rawacme.LETSENCRYPT_URL
         } else {
-            done.resolve()
+            this.acmeUrl = rawacme.LETSENCRYPT_STAGING_URL
         }
-        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
+        rawacme.createClient(
+            {
+                url: this.acmeUrl,
+                publicKey: this.keyPair.publicKey,
+                privateKey: this.keyPair.privateKey
             },
-                    agreeToTerms: function (tosUrl, done) {
-                        done(null, tosUrl)
-                    }
-                }
-                ACME.registerNewAccount(options, (err, regr) => {
+            (err, client) => {
                 if (err) {
+                    console.error('smartacme: something went wrong:')
                     console.log(err)
                     done.reject(err)
-                    }
-                    done.resolve(regr)
-                })
-            }).catch(err => { console.log(err) })
-
-        return done.promise
+                    return
                 }
 
-    /**
-     * creates a keyPair
-     */
-    createKeyPair() {
-        let done = q.defer()
-        RSA.generateKeypair(bitlen, exp, options, (err, keypair) => {
+                // make client available in class 
+                this.rawacmeClient = client
+
+                // create the registration
+                client.newReg(
+                    {
+                        contact: ['mailto:domains@lossless.org']
+                    },
+                    (err, res) => {
                         if (err) {
+                            console.error('smartacme: something went wrong:')
                             console.log(err)
                             done.reject(err)
+                            return
                         }
-            console.log(keypair)
-            this.keyPair = keypair
-        })
+                        this.JWK = res.body.key
+                        this.link = res.headers.link
+                        console.log(this.link)
+                        this.location = res.headers.location
                         done.resolve()
+                    })
+
+            }
+        )
         return done.promise
     }
 
-    /**
-     * gets the Acme Urls
-     */
-    getAcmeUrls() {
+    agreeTos() {
         let done = q.defer()
-        ACME.getAcmeUrls(ACME.stagingServerUrl, (err, urls) => {
+        let tosPart = this.link.split(',')[1]
+        let tosLinkPortion = tosPart.split(';')[0]
+        let url = tosLinkPortion.split(';')[0].trim().replace(/[<>]/g, '')
+        this.rawacmeClient.post(this.location, { Agreement: url, resource: 'reg' }, (err, res) => {
             if (err) {
-                throw err
+                console.log(err)
+                done.reject(err)
+                return
             }
-            this.acmeUrls = urls
-            console.log(this.acmeUrls)
             done.resolve()
         })
         return done.promise
     }
+
+    /**
+     * requests a challenge for a domain
+     * @param domainNameArg - the domain name to request a challenge for
+     * @param challengeType - the challenge type to request
+     */
+    requestChallenge(domainNameArg: string, challengeTypeArg: TChallenge = 'dns-01') {
+        let done = q.defer()
+        this.rawacmeClient.newAuthz(
+            {
+                identifier: {
+                    type: 'dns',
+                    value: domainNameArg
+                }
+            },
+            this.keyPair,
+            (err, res) => {
+                if (err) {
+                    console.error('smartacme: something went wrong:')
+                    console.log(err)
+                    done.reject(err)
+                }
+                console.log(JSON.stringify(res.body))
+                let dnsChallenge = res.body.challenges.filter(x => {
+                    return x.type === challengeTypeArg
+                })[0]
+                this.acceptChallenge(dnsChallenge)
+                    .then(x => {
+                        done.resolve(x)
+                    })
+            }
+        )
+        return done.promise
+    }
+
+    /**
+     * getCertificate - takes care of cooldown, validation polling and certificate retrieval
+     */
+    getCertificate() {
+
+    }
+
+    /**
+     * accept a challenge - for private use only
+     */
+    private acceptChallenge(challenge) {
+        let done = q.defer()
+
+        let authKey: string = rawacme.keyAuthz(challenge.token, this.keyPair.publicKey)
+        let dnsKeyHash: string = rawacme.dnsKeyAuthzHash(authKey) // needed if dns challenge is chosen
+
+        console.log(authKey)
+
+        this.rawacmeClient.post(
+            challenge.uri,
+            {
+                resource: 'challenge',
+                keyAuthorization: authKey
+            },
+            this.keyPair,
+            (err, res) => {
+                if (err) {
+                    console.log(err)
+                    done.reject(err)
+                }
+                console.log('acceptChallenge:')
+                console.log(JSON.stringify(res.body))
+                done.resolve(dnsKeyHash)
+            }
+        )
+        return done.promise
+    }
+
+
 }