2.0.3

.gitlab-ci.yml

@@ -3,69 +3,148 @@ image: hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .yarn/
+  - .npmci_cache/
   key: "$CI_BUILD_STAGE"
 
 stages:
+- security
 - test
 - release
-- trigger
+- metadata
-- pages
 
-testLEGACY:
+# ====================
-  stage: test
+# security stage
+# ====================
+mirror:
+  stage: security
   script:
-    - npmci test legacy
+  - npmci git mirror
-  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+sast:
+  stage: security
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  variables:
+    DOCKER_DRIVER: overlay2
   allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command npm run build
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
+  artifacts:
+    reports:
+      sast: gl-sast-report.json
+  tags:
+  - docker
+  - priv
+
+# ====================
+# test stage
+# ====================
 
 testLTS:
   stage: test
   script:
-    - npmci test lts
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - notpriv
     
 testSTABLE:
   stage: test
   script:
-    - npmci test stable
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - notpriv
 
 release:
   stage: release
   script:
-    - npmci publish
+  - npmci node install stable
+  - npmci npm publish
   only:
-    - tags
+  - tags
   tags:
-    - docker
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
+  - priv
 
 trigger:
-  stage: trigger
+  stage: metadata
   script:
-    - npmci trigger
+  - npmci trigger
   only:
-    - tags
+  - tags
   tags:
-    - docker
+  - docker
+  - notpriv
 
 pages:
   image: hosttoday/ht-docker-node:npmci
-  stage: pages
+  stage: metadata
   script:
-    - npmci command yarn global add npmpage
+    - npmci command npm install -g typedoc typescript
-    - npmci command npmpage
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
   tags:
     - docker
+    - notpriv
   only:
     - tags
   artifacts:
     expire_in: 1 week
     paths:
     - public
+  allow_failure: true

.snyk

@@ -0,0 +1,12 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.12.0
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  'npm:node-forge:20180226':
+    - rsa-compat > node-forge:
+        reason: None given
+        expires: '2018-09-11T19:17:24.148Z'
+    - acme-v2 > rsa-compat > node-forge:
+        reason: None given
+        expires: '2018-09-11T19:17:24.148Z'
+patch: {}

README.md

@@ -1,13 +1,16 @@
 # 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)
@@ -19,11 +22,12 @@ acme implementation in TypeScript
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
+
 Use TypeScript for best in class instellisense.
 
 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)
+> | 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)

dist/index.d.ts

@@ -1 +0,0 @@
-export * from './smartacme.classes.smartacme';

dist/index.js

@@ -1,7 +0,0 @@
-"use strict";
-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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG1EQUE2QyJ9

dist/smartacme.classes.acmeaccount.d.ts

@@ -1,21 +0,0 @@
-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

@@ -1,72 +0,0 @@
-"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

@@ -1,78 +0,0 @@
-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.smartacme.d.ts

@@ -1,32 +0,0 @@
-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 {
-    acmeUrl: string;
-    productionBool: boolean;
-    keyPair: IRsaKeypair;
-    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
-     */
-    createAcmeAccount(): Promise<AcmeAccount>;
-}

dist/smartacme.classes.smartacme.js

@@ -1,67 +0,0 @@
-"use strict";
-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
- */
-class SmartAcme {
-    /**
-     * the constructor for class SmartAcme
-     */
-    constructor(productionArg = 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;
-        }
-    }
-    /**
-     * init the smartacme instance
-     */
-    init() {
-        let done = q.defer();
-        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
-     */
-    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLmNsYXNzZXMuc21hcnRhY21lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsc0JBQXNCO0FBQ3RCLDRCQUEyQixDQUFDLFdBQVc7QUFDdkMsK0NBQThDO0FBQzlDLCtDQUE4QztBQUU5QyxtRkFBNkQ7QUFVN0QsaUZBQTZEO0FBQXBELHNEQUFBLFdBQVcsQ0FBQTtBQUNwQiwyRUFBdUc7QUFBOUYsZ0RBQUEsUUFBUSxDQUFBO0FBRWpCOztHQUVHO0FBQ0g7SUFNRTs7T0FFRztJQUNILFlBQVksZ0JBQXlCLEtBQUs7UUFDeEMsSUFBSSxDQUFDLGNBQWMsR0FBRyxhQUFhLENBQUE7UUFDbkMsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsYUFBYSxFQUFFLENBQUE7UUFDdEMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUM7WUFDeEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQTtRQUNoRCxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDTixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsdUJBQXVCLENBQUE7UUFDeEQsQ0FBQztJQUNILENBQUM7SUFFRDs7T0FFRztJQUNILElBQUk7UUFDRixJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDcEIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQzFCO1lBQ0UsR0FBRyxFQUFFLElBQUksQ0FBQyxPQUFPO1lBQ2pCLFNBQVMsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVM7WUFDakMsVUFBVSxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVTtTQUNwQyxFQUNELENBQUMsR0FBRyxFQUFFLE1BQU07WUFDVixFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNSLE9BQU8sQ0FBQyxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtnQkFDakQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDaEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDaEIsTUFBTSxDQUFBO1lBQ1IsQ0FBQztZQUVELGtDQUFrQztZQUNsQyxJQUFJLENBQUMsYUFBYSxHQUFHLE1BQU0sQ0FBQTtZQUMzQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDaEIsQ0FBQyxDQUNGLENBQUE7UUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUNyQixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsaUJBQWlCO1FBQ2YsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBZSxDQUFBO1FBQ2pDLElBQUksV0FBVyxHQUFHLElBQUksMkNBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUN2QyxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUMsSUFBSSxDQUFDO1lBQzFCLE1BQU0sQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUE7UUFDL0IsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ04sSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQTtRQUMzQixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3JCLENBQUM7Q0FDRjtBQTVERCw4QkE0REMifQ==

dist/smartacme.helpers.d.ts

@@ -1,10 +0,0 @@
-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

@@ -1,41 +0,0 @@
-"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.d.ts

@@ -1,2 +0,0 @@
-export declare let packageDir: string;
-export declare let assetDir: string;

dist/smartacme.paths.js

@@ -1,8 +0,0 @@
-"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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhY21lLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhY21lLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkJBQTRCO0FBQzVCLHVDQUFzQztBQUUzQixRQUFBLFVBQVUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxLQUFLLENBQUMsQ0FBQTtBQUN2QyxRQUFBLFFBQVEsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGtCQUFVLEVBQUMsU0FBUyxDQUFDLENBQUE7QUFDckQsU0FBUyxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsZ0JBQVEsQ0FBQyxDQUFBIn0=

dist/smartacme.plugins.d.ts

@@ -1,9 +0,0 @@
-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

@@ -1,19 +0,0 @@
-"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

@@ -1,13 +1,16 @@
 # 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)
@@ -19,41 +22,42 @@ acme implementation in TypeScript
 [![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'
+import { SmartAcme } from 'smartacme';
 
-let smac = new SmartAcme()
+let smac = new SmartAcme()(async () => {
+  // learn async/await, it'll make your life easier
 
-(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();
 
-    // optionally accepts a filePath Arg with a stored acmeaccount.json
+  // will return a dnsHash to set in your DNS record
-    // will create an account and 
+  let myCert = await myAccount.createAcmeCert('example.com');
-    let myAccount = await smac.createAcmeAccount()
 
-    // will return a dnsHash to set in your DNS record
+  // gets and accepts the specified challenge
-    let myCert = await myAccount.createAcmeCert('example.com')
+  // first argument optional, defaults to dns-01 (which is the cleanest method for production use)
+  let myChallenge = await myCert.getChallenge('dns-01');
 
-    // 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
+
---- | ---
+| 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 
+| 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)
+> | 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

@@ -1,7 +1,6 @@
 {
-    "npmci": {
+  "npmci": {
-        "globalNpmTools": [
+    "npmGlobalTools": [],
-            "npmts"
+    "npmAccessLevel": "public"
-        ]
+  }
-    }
 }

package.json

@@ -1,11 +1,13 @@
 {
-  "name": "smartacme",
+  "name": "@pushrocks/smartacme",
-  "version": "1.0.11",
+  "version": "2.0.3",
+  "private": false,
   "description": "acme implementation in TypeScript",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts --nodocs)"
+    "test": "(tstest test/)",
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -23,20 +25,18 @@
   },
   "homepage": "https://gitlab.com/umbrellazone/smartacme#README",
   "dependencies": {
-    "@types/node-forge": "^0.6.8",
+    "@pushrocks/smartdelay": "^2.0.2",
-    "dnsly": "^2.0.4",
+    "@pushrocks/smartpromise": "^2.0.5",
-    "node-forge": "^0.7.1",
+    "acme-v2": "^1.2.1",
-    "rawacme": "^0.2.1",
+    "rsa-compat": "^1.6.0"
-    "rsa-keygen": "^1.0.6",
-    "smartdelay": "^1.0.1",
-    "smartfile": "^4.1.10",
-    "smartq": "^1.1.1",
-    "smartstring": "^2.0.24",
-    "typings-global": "^1.0.16"
   },
   "devDependencies": {
-    "cflare": "0.0.19",
+    "@gitzone/tsbuild": "^2.0.22",
-    "qenv": "^1.1.3",
+    "@gitzone/tsrun": "^1.1.12",
-    "tapbundle": "^1.0.10"
+    "@gitzone/tstest": "^1.0.15",
+    "@types/node": "^10.11.4",
+    "cflare": "^1.0.5",
+    "qenv": "^1.1.7",
+    "tapbundle": "^2.0.2"
   }
 }

test/test.ts

@@ -1,90 +1,14 @@
-import { expect, tap } from 'tapbundle'
+import { tap, expect } from 'tapbundle';
-import * as cflare from 'cflare'
-import * as qenv from 'qenv'
 
-let testQenv = new qenv.Qenv(process.cwd(), process.cwd() + '/.nogit')
+import * as smartacme from '../ts/index';
 
-// import the module to test
+let smartAcmeInstance: smartacme.SmartAcme;
-import * as smartacme from '../dist/index'
 
-let myCflareAccount = new cflare.CflareAccount()
+tap.test('should create a valid instance of SmartAcme', async () => {
-myCflareAccount.auth({
+  smartAcmeInstance = new smartacme.SmartAcme();
-  email: process.env.CF_EMAIL,
+  await smartAcmeInstance.init();
-  key: process.env.CF_KEY
+  console.log(smartAcmeInstance.directoryUrls);
-})
+  await smartAcmeInstance.getCertificateForDomain('bleu.de');
+});
 
-let testSmartAcme: smartacme.SmartAcme
+tap.start();
-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/index.ts

@@ -1 +1 @@
-export * from './smartacme.classes.smartacme'
+export * from './smartacme.classes.smartacme';

ts/smartacme.classes.acmeaccount.ts

@@ -1,94 +0,0 @@
-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

@@ -1,255 +0,0 @@
-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.keypair.ts

@@ -0,0 +1,27 @@
+import * as plugins from './smartacme.plugins';
+const rsa = require('rsa-compat').RSA;
+
+export class KeyPair {
+  rsaKeyPair: any;
+
+  /**
+   * generates a fresh rsa keyPair
+   */
+  static async generateFresh(): Promise<KeyPair> {
+    const done = plugins.smartpromise.defer();
+    var options = { bitlen: 2048, exp: 65537, public: true, pem: true, internal: true };
+    rsa.generateKeypair(options, function(err, keypair) {
+      if (err) {
+        console.log(err);
+      }
+      done.resolve(keypair);
+    });
+    const result: any = await done.promise;
+    const keyPair = new KeyPair(result);
+    return keyPair;
+  }
+
+  constructor(rsaKeyPairArg) {
+    this.rsaKeyPair = rsaKeyPairArg;
+  }
+}

ts/smartacme.classes.smartacme.ts

@@ -1,82 +1,86 @@
-// third party modules
+const acme = require('acme-v2').ACME.create({
-import * as q from 'smartq' // promises
+  RSA: require('rsa-compat').RSA,
-import * as plugins from './smartacme.plugins'
-import * as helpers from './smartacme.helpers'
 
-import { AcmeAccount } from './smartacme.classes.acmeaccount'
+  // used for constructing user-agent
+  os: require('os'),
+  process: require('process'),
 
-/**
+  // used for overriding the default user-agent
- * a rsa keypair needed for account creation and subsequent requests
+  userAgent: 'My custom UA String',
- */
+  getUserAgentString: function(deps) {
-export interface IRsaKeypair {
+    return 'My custom UA String';
-  publicKey: string
+  },
-  privateKey: string
-}
 
-export { AcmeAccount } from './smartacme.classes.acmeaccount'
+  // don't try to validate challenges locally
-export { AcmeCert, ISmartAcmeChallenge, ISmartAcmeChallengeChosen } from './smartacme.classes.acmecert'
+  skipChallengeTest: true
+});
+
+import { KeyPair } from './smartacme.classes.keypair';
+import * as plugins from './smartacme.plugins';
+const rsa = require('rsa-compat').RSA;
 
-/**
- * class SmartAcme exports methods for maintaining SSL Certificates
- */
 export class SmartAcme {
-  acmeUrl: string // the acme url to use for this instance
+  domainKeyPair: KeyPair;
-  productionBool: boolean // a boolean to quickly know wether we are in production or not
+  accountKeyPair: KeyPair;
-  keyPair: IRsaKeypair // the keyPair needed for account creation
+  accountData: any;
-  rawacmeClient
+  directoryUrls: any;
 
-  /**
+  async init() {
-   * the constructor for class SmartAcme
+    // get directory url
-   */
+    this.directoryUrls = await acme.init('https://acme-staging-v02.api.letsencrypt.org/directory');
-  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
-    }
-  }
 
-  /**
+    // create keyPairs
-   * init the smartacme instance
+    this.domainKeyPair = await KeyPair.generateFresh();
-   */
+    this.accountKeyPair = await KeyPair.generateFresh();
-  init() {
+
-    let done = q.defer()
+    // get account
-    plugins.rawacme.createClient(
+    const registrationData = await acme.accounts
-      {
+      .create({
-        url: this.acmeUrl,
+        email: 'domains@lossless.org', // valid email (server checks MX records)
-        publicKey: this.keyPair.publicKey,
+        accountKeypair: this.accountKeyPair.rsaKeyPair,
-        privateKey: this.keyPair.privateKey
+        agreeToTerms: async tosUrl => {
-      },
+          return tosUrl;
-      (err, client) => {
-        if (err) {
-          console.error('smartacme: something went wrong:')
-          console.log(err)
-          done.reject(err)
-          return
         }
-
+      })
-        // make client available in class 
+      .catch(e => {
-        this.rawacmeClient = client
+        console.log(e);
-        done.resolve()
+      });
-      }
+    this.accountData = registrationData;
-    )
-    return done.promise
   }
 
-  /**
+  async getCertificateForDomain(domain) {
-   * creates an account if not currently present in module
+    const result = await acme.certificates
-   * @executes ASYNC
+      .create({
-   */
+        domainKeypair: this.domainKeyPair.rsaKeyPair,
-  createAcmeAccount() {
+        accountKeypair: this.accountKeyPair.rsaKeyPair,
-    let done = q.defer<AcmeAccount>()
+        domains: ['bleu.de'],
-    let acmeAccount = new AcmeAccount(this)
+        challengeType: 'dns-01',
-    acmeAccount.register().then(() => {
+
-      return acmeAccount.agreeTos()
+        setChallenge: async (hostname, key, val, cb) => {
-    }).then(() => {
+          console.log('set challenge');
-      done.resolve(acmeAccount)
+          console.log(hostname);
-    })
+          //console.log(key);
-    return done.promise
+          //console.log(val);
+          const dnsKey = rsa.utils.toWebsafeBase64(
+            require('crypto')
+              .createHash('sha256')
+              .update(val)
+              .digest('base64')
+          );
+
+          console.log(dnsKey);
+          await plugins.smartdelay.delayFor(20000);
+          console.log('ready!');
+          cb();
+        }, // return Promise
+        removeChallenge: async (hostname, key) => {
+          console.log('removing challenge');
+          return;
+        } // return Promise
+      })
+      .catch(e => {
+        console.log(e);
+      }); // returns Promise<pems={ privkey (key), cert, chain (ca) }>
+    console.log(result);
   }
 }

ts/smartacme.helpers.ts

@@ -1,50 +0,0 @@
-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.paths.ts

@@ -1,6 +0,0 @@
-import * as path from 'path'
-import * as smartfile from 'smartfile'
-
-export let packageDir = path.join(__dirname,'../')
-export let assetDir = path.join(packageDir,'assets/')
-smartfile.fs.ensureDirSync(assetDir)

ts/smartacme.plugins.ts

@@ -1,22 +1,4 @@
-import 'typings-global' // typings for node
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartdelay from '@pushrocks/smartdelay';
 
-import * as path from 'path' // native node path module
+export { smartpromise, smartdelay };
-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
-}

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }