3.0.0

BREAKING CHANGE(core): streamline scope to certificate retrieval using dns challenge
2.1.2
2020-02-10 20:13:07 +00:00 · 2020-02-10 20:13:06 +00:00 · 2020-02-10 11:15:48 +00:00 · 2020-02-10 11:15:47 +00:00
15 changed files with 367 additions and 514 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,22 @@
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
 public/
 pages/
-.nogit/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,16 +1,16 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci

 cache:
  paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'

 stages:
- security
- test
- release
- metadata
+  - security
+  - test
+  - release
+  - metadata

 # ====================
 # security stage
@ -18,127 +18,103 @@ stages:
 mirror:
  stage: security
  script:
-  - npmci git mirror
+    - npmci git mirror
  tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv

 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node: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
+    - lossless
+    - docker
+    - notpriv

 # ====================
 # test stage
 # ====================

-testLTS:
+testStable:
  stage: test
  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+    - lossless
+    - docker
+    - priv
+
+testBuild:
  stage: test
  script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv

 release:
  stage: release
  script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
  only:
-  - tags
+    - tags
  tags:
-  - docker
-  - notpriv
+    - lossless
+    - 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]
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
  tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv

 trigger:
  stage: metadata
  script:
-  - npmci trigger
+    - npmci trigger
  only:
-  - tags
+    - tags
  tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv

 pages:
-  image: hosttoday/ht-docker-node:npmci
  stage: metadata
  script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
    - npmci npm prepare
    - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
  tags:
+    - lossless
    - docker
    - notpriv
  only:
@ -146,5 +122,5 @@ pages:
  artifacts:
    expire_in: 1 week
    paths:
-    - public
+      - public
  allow_failure: true
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}
--- a/npmextra.json
+++ b/npmextra.json
@ -1,5 +1,6 @@
 {
  "gitzone": {
+    "projectType": "npm",
    "module": {
      "githost": "gitlab.com",
      "gitscope": "pushrocks",
@ -14,4 +15,4 @@
    "npmGlobalTools": [],
    "npmAccessLevel": "public"
  }
-}
+}
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "@pushrocks/smartacme",
-  "version": "2.1.1",
+  "version": "3.0.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -71,24 +71,23 @@
      }
    },
    "@mojoio/cloudflare": {
-      "version": "3.0.5",
-      "resolved": "https://verdaccio.lossless.one/@mojoio%2fcloudflare/-/cloudflare-3.0.5.tgz",
-      "integrity": "sha512-jaJkWQGkc7uJ9L1AbuHXSuskBe8NehRE+N3gekztgWhzuH/AjZHGc0HlAE8qiO8su+tilXkuexbLElSF24W+Gw==",
+      "version": "4.0.3",
+      "resolved": "https://verdaccio.lossless.one/@mojoio%2fcloudflare/-/cloudflare-4.0.3.tgz",
+      "integrity": "sha512-QHjBXzechtg3U1mDqC1aJj8X1PB4eSlIWavFBPlif9F+2TetrTiyfU5LZlP1Z1rRDdTRygTvJXtohsz2BYRFgw==",
      "dev": true,
      "requires": {
-        "@pushrocks/smartdelay": "^2.0.3",
-        "@pushrocks/smartlog": "^2.0.19",
-        "@pushrocks/smartpromise": "^3.0.2",
-        "@pushrocks/smartrequest": "^1.1.16",
-        "@pushrocks/smartstring": "^3.0.10",
-        "@tsclass/tsclass": "^2.0.1"
+        "@pushrocks/smartdelay": "^2.0.6",
+        "@pushrocks/smartlog": "^2.0.21",
+        "@pushrocks/smartpromise": "^3.0.6",
+        "@pushrocks/smartrequest": "^1.1.47",
+        "@pushrocks/smartstring": "^3.0.18",
+        "@tsclass/tsclass": "^3.0.4"
      }
    },
    "@pushrocks/consolecolor": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/@pushrocks/consolecolor/-/consolecolor-2.0.1.tgz",
      "integrity": "sha512-iOFCHVeFZ2OywbdwSxVI4/wokkcLrXVdHLgvMmkNhJ220eeLgjNZWx3EJo3vNW3zq5ybCSCUIq0878djBxrWpw==",
-      "dev": true,
      "requires": {
        "ansi-256-colors": "^1.1.0"
      }
@ -97,7 +96,6 @@
      "version": "3.0.3",
      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fearly/-/early-3.0.3.tgz",
      "integrity": "sha512-71/nwxTpqdp1glmHz4YaGusNl/XOOcPelAxC9RA6rpS/6280QyY2u4yx+mRdMrCzn7ruLYF5awbkS8llNZ94Pg==",
-      "dev": true,
      "requires": {
        "@pushrocks/consolecolor": "^2.0.1",
        "@pushrocks/smartpromise": "^2.0.5"
@ -106,20 +104,20 @@
        "@pushrocks/smartpromise": {
          "version": "2.0.5",
          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
-          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
-          "dev": true
+          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g=="
        }
      }
    },
    "@pushrocks/lik": {
-      "version": "3.0.13",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2flik/-/lik-3.0.13.tgz",
-      "integrity": "sha512-YDxYoh2UksEfUxcjSjTwLsW5j852E5FrMG62CUi1I7ZpBxf96b7P1t2pRWsQsNnHRz6FHckW/A1V6XKASB+jZA==",
+      "version": "3.0.17",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2flik/-/lik-3.0.17.tgz",
+      "integrity": "sha512-Ip56GDuW/ReBPhRVIhaqosqXu12SBW1DT3GkY8hOTiF1YNdKxiaw13QOPva6KPeTffb9DTThOu352KvjMrfxRw==",
      "requires": {
        "@pushrocks/smartdelay": "^2.0.6",
        "@pushrocks/smartpromise": "^3.0.6",
        "@pushrocks/smartrx": "^2.0.5",
        "@pushrocks/smarttime": "^3.0.12",
+        "@pushrocks/smartunique": "^3.0.1",
        "@types/minimatch": "^3.0.3",
        "minimatch": "^3.0.4",
        "symbol-tree": "^3.2.4"
@ -159,19 +157,19 @@
      }
    },
    "@pushrocks/smartdata": {
-      "version": "3.1.23",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartdata/-/smartdata-3.1.23.tgz",
-      "integrity": "sha512-l/W9bue+PkEYndqfcVoM0o20EfohqwcCbSD7HYcs5kLNgsL8ND4VHsuOKtX/COq3lnb9+uMQGkOk3BzM42jU2Q==",
+      "version": "3.1.25",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartdata/-/smartdata-3.1.25.tgz",
+      "integrity": "sha512-omgb42HnDaaZKkhbVRx9Zfxumkg7lVyp526eA93eQaoNHZGPkIPo7H9f4+rWHbN3VZehB/PTmPGcY5IUd5rWUA==",
      "requires": {
-        "@pushrocks/lik": "^3.0.11",
-        "@pushrocks/smartlog": "^2.0.19",
-        "@pushrocks/smartpromise": "^3.0.2",
-        "@pushrocks/smartstring": "^3.0.10",
+        "@pushrocks/lik": "^3.0.17",
+        "@pushrocks/smartlog": "^2.0.21",
+        "@pushrocks/smartpromise": "^3.0.6",
+        "@pushrocks/smartstring": "^3.0.18",
        "@pushrocks/smartunique": "^3.0.1",
-        "@types/lodash": "^4.14.138",
-        "@types/mongodb": "^3.3.1",
+        "@types/lodash": "^4.14.149",
+        "@types/mongodb": "^3.3.15",
        "lodash": "^4.17.15",
-        "mongodb": "^3.3.2",
+        "mongodb": "^3.5.2",
        "runtime-type-checks": "0.0.4"
      }
    },
@ -226,15 +224,15 @@
      }
    },
    "@pushrocks/smartexpress": {
-      "version": "3.0.54",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.54.tgz",
-      "integrity": "sha512-W+UvUgSN1fdHIA1/BouACadP/9HQAW9jxC6rb+CiyssMqLMkYejS7bkPBd3+gRDpidRQnAdcjOZ3xpZd1eQnfQ==",
+      "version": "3.0.57",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.57.tgz",
+      "integrity": "sha512-7E2YlGKAWT5iiRIcDZxwrwQj6QjGPXasSMKnEBOGThDtsJa62udN+tS5gMaGNRKYnRFuLEU8CCtT/248y3azVg==",
      "requires": {
-        "@pushrocks/lik": "^3.0.11",
+        "@pushrocks/lik": "^3.0.13",
        "@pushrocks/smartfile": "^7.0.6",
-        "@pushrocks/smartmanifest": "^1.0.6",
+        "@pushrocks/smartmanifest": "^1.0.8",
        "@pushrocks/smartpromise": "^3.0.6",
-        "@pushrocks/smartrequest": "^1.1.43",
+        "@pushrocks/smartrequest": "^1.1.47",
        "@types/express": "^4.17.2",
        "@types/finalhandler": "^1.1.0",
        "@types/helmet": "0.0.45",
@ -246,75 +244,12 @@
        "helmet": "^3.21.2",
        "rendertron-middleware": "^0.1.5",
        "sitemap": "^5.1.0"
-      },
-      "dependencies": {
-        "@pushrocks/smartfile": {
-          "version": "7.0.6",
-          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-7.0.6.tgz",
-          "integrity": "sha512-X1kWg1HSQ/MqasRIHPCf6D9CRrcIrpTjW8KLc4GkApJ/W/IVaKsQkJQfdimlg1uc/9v8AYnoRdiGa51yxyghZA==",
-          "requires": {
-            "@pushrocks/smarthash": "^2.0.6",
-            "@pushrocks/smartpath": "^4.0.1",
-            "@pushrocks/smartpromise": "^3.0.5",
-            "@pushrocks/smartrequest": "^1.1.27",
-            "@types/fs-extra": "^8.0.0",
-            "fs-extra": "^8.1.0",
-            "glob": "^7.1.4",
-            "js-yaml": "^3.13.1"
-          }
-        },
-        "@types/fs-extra": {
-          "version": "8.0.1",
-          "resolved": "https://verdaccio.lossless.one/@types%2ffs-extra/-/fs-extra-8.0.1.tgz",
-          "integrity": "sha512-J00cVDALmi/hJOYsunyT52Hva5TnJeKP5yd1r+mH/ZU0mbYZflR0Z5kw5kITtKTRYMhm1JMClOFYdHnQszEvqw==",
-          "requires": {
-            "@types/node": "*"
-          }
-        },
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://verdaccio.lossless.one/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://verdaccio.lossless.one/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://verdaccio.lossless.one/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
-        },
-        "js-yaml": {
-          "version": "3.13.1",
-          "resolved": "https://verdaccio.lossless.one/js-yaml/-/js-yaml-3.13.1.tgz",
-          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-          "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
-          }
-        }
      }
    },
    "@pushrocks/smartfile": {
      "version": "7.0.6",
      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-7.0.6.tgz",
      "integrity": "sha512-X1kWg1HSQ/MqasRIHPCf6D9CRrcIrpTjW8KLc4GkApJ/W/IVaKsQkJQfdimlg1uc/9v8AYnoRdiGa51yxyghZA==",
-      "dev": true,
      "requires": {
        "@pushrocks/smarthash": "^2.0.6",
        "@pushrocks/smartpath": "^4.0.1",
@ -381,9 +316,9 @@
      }
    },
    "@pushrocks/smartmanifest": {
-      "version": "1.0.6",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartmanifest/-/smartmanifest-1.0.6.tgz",
-      "integrity": "sha512-2EalWj9P0jPvbQxAy9YH10AC+xCBfI25MRuWsIrNhhpAxfhZL7l0wrXiKENLXaS5Rh8BsC1cB6sufYfKvoE5gg=="
+      "version": "1.0.8",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartmanifest/-/smartmanifest-1.0.8.tgz",
+      "integrity": "sha512-inHmTp58Z8xl+c6mdOrfxc9IjUKuqho1i+WUI74G7rn6HwEn3cMd/06R1v80Xlx+95EYWzBwnYtuo7j7DafrdQ=="
    },
    "@pushrocks/smartparam": {
      "version": "1.0.4",
@ -434,16 +369,6 @@
        "@pushrocks/smartevent": "^2.0.3",
        "@pushrocks/smartpromise": "^3.0.2",
        "rxjs": "^6.5.3"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "6.5.4",
-          "resolved": "https://verdaccio.lossless.one/rxjs/-/rxjs-6.5.4.tgz",
-          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        }
      }
    },
    "@pushrocks/smartshell": {
@ -460,11 +385,11 @@
      }
    },
    "@pushrocks/smartstring": {
-      "version": "3.0.17",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartstring/-/smartstring-3.0.17.tgz",
-      "integrity": "sha512-60JQptpgw+PjxoC5Gx+Y9m3/dtMstHC5ElpdJhIlbJ7dQV7LkCGSonLAG+NZhPbvrhow2KZ3fob8stW0Iuy3JQ==",
+      "version": "3.0.18",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartstring/-/smartstring-3.0.18.tgz",
+      "integrity": "sha512-34Ca5HW6w8fcG2sdbRVDViOZ0vdOHXc/1Qof2KhM5bvWFajU6VASlJjCYNJBrjGg9VCeC2rH6bGIgvd7prSRkg==",
      "requires": {
-        "crypto-random-string": "^3.0.1",
+        "crypto-random-string": "^3.1.0",
        "js-base64": "^2.5.1",
        "normalize-newline": "^3.0.0",
        "randomatic": "^3.1.1",
@ -498,7 +423,6 @@
      "version": "3.2.0",
      "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.2.0.tgz",
      "integrity": "sha512-xnKIGe7NJqxWBaFeKIEXShDjV2wap1XJqmlp3m1MKqmIF62vRpZnkzpyE1ZAoNwiYQmIsXIpvP/PDv+iPevPfw==",
-      "dev": true,
      "requires": {
        "@pushrocks/early": "^3.0.3",
        "@pushrocks/smartdelay": "^2.0.3",
@ -511,7 +435,6 @@
          "version": "2.0.6",
          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartdelay/-/smartdelay-2.0.6.tgz",
          "integrity": "sha512-4wUnzWNhRPODpaaL5GuRaje/C5dg+TMhBxmr57PKc2fqYpy6azWJwonf/s5xpcbJLCPJRbj1x8M5MqgCFq2uvg==",
-          "dev": true,
          "requires": {
            "@pushrocks/smartpromise": "^3.0.6"
          }
@ -520,7 +443,6 @@
          "version": "7.0.6",
          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartfile/-/smartfile-7.0.6.tgz",
          "integrity": "sha512-X1kWg1HSQ/MqasRIHPCf6D9CRrcIrpTjW8KLc4GkApJ/W/IVaKsQkJQfdimlg1uc/9v8AYnoRdiGa51yxyghZA==",
-          "dev": true,
          "requires": {
            "@pushrocks/smarthash": "^2.0.6",
            "@pushrocks/smartpath": "^4.0.1",
@ -535,14 +457,12 @@
        "@pushrocks/smartpromise": {
          "version": "3.0.6",
          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-3.0.6.tgz",
-          "integrity": "sha512-vlQlBGNVIjfClgnsfgQBU6GIKcskYSFzEcKLt18ngPzPEcjKklXcxaqzLXpnoxR+KBh30QPE8255ncYHXuPPOg==",
-          "dev": true
+          "integrity": "sha512-vlQlBGNVIjfClgnsfgQBU6GIKcskYSFzEcKLt18ngPzPEcjKklXcxaqzLXpnoxR+KBh30QPE8255ncYHXuPPOg=="
        },
        "@pushrocks/smartrequest": {
          "version": "1.1.47",
          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrequest/-/smartrequest-1.1.47.tgz",
          "integrity": "sha512-0AuqtAI14VeWeXl2WpJbgCybVlG03rOjdGchAqy5k5lg9ACLhN3Z4kmoLgpBysWO/L2SjlAKB489SRyV3acykg==",
-          "dev": true,
          "requires": {
            "@pushrocks/smartpromise": "^3.0.5",
            "@types/form-data": "^2.5.0",
@ -554,7 +474,6 @@
          "version": "2.5.0",
          "resolved": "https://verdaccio.lossless.one/@types%2fform-data/-/form-data-2.5.0.tgz",
          "integrity": "sha512-23/wYiuckYYtFpL+4RPWiWmRQH2BjFuqCUi2+N3amB1a1Drv+i/byTrGvlLwRVLFNAZbwpbQ7JvTK+VCAPMbcg==",
-          "dev": true,
          "requires": {
            "form-data": "*"
          }
@ -563,7 +482,6 @@
          "version": "8.0.1",
          "resolved": "https://verdaccio.lossless.one/@types%2ffs-extra/-/fs-extra-8.0.1.tgz",
          "integrity": "sha512-J00cVDALmi/hJOYsunyT52Hva5TnJeKP5yd1r+mH/ZU0mbYZflR0Z5kw5kITtKTRYMhm1JMClOFYdHnQszEvqw==",
-          "dev": true,
          "requires": {
            "@types/node": "*"
          }
@ -572,7 +490,6 @@
          "version": "2.5.1",
          "resolved": "https://verdaccio.lossless.one/form-data/-/form-data-2.5.1.tgz",
          "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
-          "dev": true,
          "requires": {
            "asynckit": "^0.4.0",
            "combined-stream": "^1.0.6",
@ -583,7 +500,6 @@
          "version": "8.1.0",
          "resolved": "https://verdaccio.lossless.one/fs-extra/-/fs-extra-8.1.0.tgz",
          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "dev": true,
          "requires": {
            "graceful-fs": "^4.2.0",
            "jsonfile": "^4.0.0",
@ -594,7 +510,6 @@
          "version": "7.1.6",
          "resolved": "https://verdaccio.lossless.one/glob/-/glob-7.1.6.tgz",
          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "dev": true,
          "requires": {
            "fs.realpath": "^1.0.0",
            "inflight": "^1.0.4",
@ -607,14 +522,12 @@
        "graceful-fs": {
          "version": "4.2.3",
          "resolved": "https://verdaccio.lossless.one/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-          "dev": true
+          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
        },
        "js-yaml": {
          "version": "3.13.1",
          "resolved": "https://verdaccio.lossless.one/js-yaml/-/js-yaml-3.13.1.tgz",
          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-          "dev": true,
          "requires": {
            "argparse": "^1.0.7",
            "esprima": "^4.0.0"
@ -623,10 +536,9 @@
      }
    },
    "@tsclass/tsclass": {
-      "version": "2.0.13",
-      "resolved": "https://verdaccio.lossless.one/@tsclass%2ftsclass/-/tsclass-2.0.13.tgz",
-      "integrity": "sha512-ZhN3vLAahP4DOayACh/bskG4SpeqNpR4oH9776hZvz6GoFj7KQinzf03gzC5o2o6tnmOusQ1FYu1NGYmy6Rvdg==",
-      "dev": true,
+      "version": "3.0.4",
+      "resolved": "https://verdaccio.lossless.one/@tsclass%2ftsclass/-/tsclass-3.0.4.tgz",
+      "integrity": "sha512-q9PnwBFDTTlwKp6jYn/tL6zhqWvwaKyGsf81xI8xcV6IhjmFo3hk0iM4L3ydw7iTwqR+WmhYaWO5WdMy3/KA+w==",
      "requires": {
        "@pushrocks/tapbundle": "^3.0.13"
      }
@ -651,14 +563,12 @@
    "@types/chai": {
      "version": "4.2.7",
      "resolved": "https://verdaccio.lossless.one/@types%2fchai/-/chai-4.2.7.tgz",
-      "integrity": "sha512-luq8meHGYwvky0O7u0eQZdA7B4Wd9owUCqvbw2m3XCrCU8mplYOujMBbvyS547AxJkC+pGnd0Cm15eNxEUNU8g==",
-      "dev": true
+      "integrity": "sha512-luq8meHGYwvky0O7u0eQZdA7B4Wd9owUCqvbw2m3XCrCU8mplYOujMBbvyS547AxJkC+pGnd0Cm15eNxEUNU8g=="
    },
    "@types/chai-as-promised": {
      "version": "7.1.2",
      "resolved": "https://verdaccio.lossless.one/@types%2fchai-as-promised/-/chai-as-promised-7.1.2.tgz",
      "integrity": "sha512-PO2gcfR3Oxa+u0QvECLe1xKXOqYTzCmWf0FhLhjREoW3fPAVamjihL7v1MOVLJLsnAMdLcjkfrs01yvDMwVK4Q==",
-      "dev": true,
      "requires": {
        "@types/chai": "*"
      }
@ -667,7 +577,6 @@
      "version": "1.4.2",
      "resolved": "https://verdaccio.lossless.one/@types%2fchai-string/-/chai-string-1.4.2.tgz",
      "integrity": "sha512-ld/1hV5qcPRGuwlPdvRfvM3Ka/iofOk2pH4VkasK4b1JJP1LjNmWWn0LsISf6RRzyhVOvs93rb9tM09e+UuF8Q==",
-      "dev": true,
      "requires": {
        "@types/chai": "*"
      }
@ -700,9 +609,9 @@
      }
    },
    "@types/express-serve-static-core": {
-      "version": "4.17.1",
-      "resolved": "https://verdaccio.lossless.one/@types%2fexpress-serve-static-core/-/express-serve-static-core-4.17.1.tgz",
-      "integrity": "sha512-9e7jj549ZI+RxY21Cl0t8uBnWyb22HzILupyHZjYEVK//5TT/1bZodU+yUbLnPdoYViBBnNWbxp4zYjGV0zUGw==",
+      "version": "4.17.2",
+      "resolved": "https://verdaccio.lossless.one/@types%2fexpress-serve-static-core/-/express-serve-static-core-4.17.2.tgz",
+      "integrity": "sha512-El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg==",
      "requires": {
        "@types/node": "*",
        "@types/range-parser": "*"
@ -742,7 +651,6 @@
      "version": "8.0.1",
      "resolved": "https://verdaccio.lossless.one/@types%2ffs-extra/-/fs-extra-8.0.1.tgz",
      "integrity": "sha512-J00cVDALmi/hJOYsunyT52Hva5TnJeKP5yd1r+mH/ZU0mbYZflR0Z5kw5kITtKTRYMhm1JMClOFYdHnQszEvqw==",
-      "dev": true,
      "requires": {
        "@types/node": "*"
      }
@ -776,18 +684,18 @@
      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
    },
    "@types/mongodb": {
-      "version": "3.3.14",
-      "resolved": "https://verdaccio.lossless.one/@types%2fmongodb/-/mongodb-3.3.14.tgz",
-      "integrity": "sha512-Ie0Fjoifm/TPY2rNOgixzhNSjDgxgR0dMKQk9XqUXHnkfuw26SpbMXjwECfxSnEdG1bH6bIlpLIK7HvGHQhzqg==",
+      "version": "3.3.15",
+      "resolved": "https://verdaccio.lossless.one/@types%2fmongodb/-/mongodb-3.3.15.tgz",
+      "integrity": "sha512-q2dL0VEdFdE9iS0xrTP0NSgJJBFH4hBvt3beglCwU3qMWrz7dCuu/CrRjPB4+R8jLjCi/Gik2Mkd+lU0sYsZgQ==",
      "requires": {
        "@types/bson": "*",
        "@types/node": "*"
      }
    },
    "@types/node": {
-      "version": "13.1.8",
-      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-13.1.8.tgz",
-      "integrity": "sha512-6XzyyNM9EKQW4HKuzbo/CkOIjn/evtCmsU+MUM1xDfJ+3/rNjBttM1NgN7AOQvN6tP1Sl1D1PIKMreTArnxM9A=="
+      "version": "13.7.0",
+      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-13.7.0.tgz",
+      "integrity": "sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ=="
    },
    "@types/range-parser": {
      "version": "1.2.3",
@ -795,9 +703,9 @@
      "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
    },
    "@types/sax": {
-      "version": "1.2.0",
-      "resolved": "https://verdaccio.lossless.one/@types%2fsax/-/sax-1.2.0.tgz",
-      "integrity": "sha512-D8ef/GGUjiHuUOiXV6tkJw6Zq2Sm8vcBScJSvj+monDI5YncJ6M3oNIXR7EtmWPVqJw0jsZF2ARN/X5gvGmQSA==",
+      "version": "1.2.1",
+      "resolved": "https://verdaccio.lossless.one/@types%2fsax/-/sax-1.2.1.tgz",
+      "integrity": "sha512-dqYdvN7Sbw8QT/0Ci5rhjE4/iCMJEM0Y9rHpCu+gGXD9Lwbz28t6HI2yegsB6BoV1sShRMU6lAmAcgRjmFy7LA==",
      "requires": {
        "@types/node": "*"
      }
@ -869,24 +777,23 @@
      }
    },
    "acme-client": {
-      "version": "2.2.2",
-      "resolved": "https://verdaccio.lossless.one/acme-client/-/acme-client-2.2.2.tgz",
-      "integrity": "sha512-dEIbynspvfRKHD7/I3B/zu2PDE3Zk/kJu95koZeMxycRAkmIxPiuc6z11im/i6P/jxzf3QxyXFqCg3PnP6gZnw==",
+      "version": "3.3.1",
+      "resolved": "https://verdaccio.lossless.one/acme-client/-/acme-client-3.3.1.tgz",
+      "integrity": "sha512-pDf10DuaMHn1NUefzlMntFy4nwNuk1iB2MVSnddGMmLRJ0m/vIX0ULpvNHCgQHzfIzh1BU29Klf8Bkc+KXToEQ==",
      "requires": {
-        "axios": "^0.18.0",
-        "babel-runtime": "^6.26.0",
+        "axios": "^0.19.0",
        "backo2": "^1.0.0",
        "bluebird": "^3.5.0",
-        "debug": "^3.0.0",
-        "node-forge": "^0.7.6",
+        "debug": "^4.1.1",
+        "node-forge": "^0.9.1",
        "openssl-wrapper": "^0.3.0",
-        "tempfile": "^2.0.0"
+        "tempfile": "^3.0.0"
      },
      "dependencies": {
        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://verdaccio.lossless.one/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "4.1.1",
+          "resolved": "https://verdaccio.lossless.one/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
          "requires": {
            "ms": "^2.1.1"
          }
@ -937,8 +844,7 @@
    "ansi-256-colors": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz",
-      "integrity": "sha1-kQ3lDvzHwJ49gvL4er1rcAwYgYo=",
-      "dev": true
+      "integrity": "sha1-kQ3lDvzHwJ49gvL4er1rcAwYgYo="
    },
    "ansi-regex": {
      "version": "3.0.0",
@ -989,8 +895,7 @@
    "assertion-error": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="
    },
    "asynckit": {
      "version": "0.4.0",
@ -1008,21 +913,11 @@
      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
    },
    "axios": {
-      "version": "0.18.1",
-      "resolved": "https://verdaccio.lossless.one/axios/-/axios-0.18.1.tgz",
-      "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
+      "version": "0.19.2",
+      "resolved": "https://verdaccio.lossless.one/axios/-/axios-0.19.2.tgz",
+      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
      "requires": {
-        "follow-redirects": "1.5.10",
-        "is-buffer": "^2.0.2"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://verdaccio.lossless.one/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "follow-redirects": "1.5.10"
      }
    },
    "backo2": {
@ -1075,9 +970,9 @@
      }
    },
    "bowser": {
-      "version": "2.8.1",
-      "resolved": "https://verdaccio.lossless.one/bowser/-/bowser-2.8.1.tgz",
-      "integrity": "sha512-FxxltGKqMHkVa3KtpA+kdnxH0caHPDewccyrK3vW1bsMw6Zco4vRPmMunowX0pXlDZqhxkKSpToADQI2Sk4OeQ=="
+      "version": "2.9.0",
+      "resolved": "https://verdaccio.lossless.one/bowser/-/bowser-2.9.0.tgz",
+      "integrity": "sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA=="
    },
    "brace-expansion": {
      "version": "1.1.11",
@ -1130,7 +1025,6 @@
      "version": "4.2.0",
      "resolved": "https://verdaccio.lossless.one/chai/-/chai-4.2.0.tgz",
      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
-      "dev": true,
      "requires": {
        "assertion-error": "^1.1.0",
        "check-error": "^1.0.2",
@ -1144,7 +1038,6 @@
      "version": "7.1.1",
      "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
      "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
-      "dev": true,
      "requires": {
        "check-error": "^1.0.2"
      }
@ -1152,8 +1045,7 @@
    "chai-string": {
      "version": "1.5.0",
      "resolved": "https://verdaccio.lossless.one/chai-string/-/chai-string-1.5.0.tgz",
-      "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw==",
-      "dev": true
+      "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw=="
    },
    "chalk": {
      "version": "2.4.2",
@ -1169,8 +1061,7 @@
    "check-error": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-      "dev": true
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII="
    },
    "cli-cursor": {
      "version": "2.1.0",
@ -1272,11 +1163,6 @@
      "resolved": "https://verdaccio.lossless.one/cookie-signature/-/cookie-signature-1.0.6.tgz",
      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
    },
-    "core-js": {
-      "version": "2.6.10",
-      "resolved": "https://verdaccio.lossless.one/core-js/-/core-js-2.6.10.tgz",
-      "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
-    },
    "core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@ -1351,7 +1237,6 @@
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
-      "dev": true,
      "requires": {
        "type-detect": "^4.0.0"
      }
@ -1630,7 +1515,6 @@
      "version": "8.1.0",
      "resolved": "https://verdaccio.lossless.one/fs-extra/-/fs-extra-8.1.0.tgz",
      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
      "requires": {
        "graceful-fs": "^4.2.0",
        "jsonfile": "^4.0.0",
@ -1640,8 +1524,7 @@
        "graceful-fs": {
          "version": "4.2.3",
          "resolved": "https://verdaccio.lossless.one/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-          "dev": true
+          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
        }
      }
    },
@ -1659,8 +1542,7 @@
    "get-func-name": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
-      "dev": true
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE="
    },
    "get-stream": {
      "version": "4.1.0",
@ -1683,7 +1565,6 @@
      "version": "7.1.6",
      "resolved": "https://verdaccio.lossless.one/glob/-/glob-7.1.6.tgz",
      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
      "requires": {
        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
@ -1857,11 +1738,6 @@
      "resolved": "https://verdaccio.lossless.one/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
    },
-    "is-buffer": {
-      "version": "2.0.4",
-      "resolved": "https://verdaccio.lossless.one/is-buffer/-/is-buffer-2.0.4.tgz",
-      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
-    },
    "is-fullwidth-code-point": {
      "version": "2.0.0",
      "resolved": "https://verdaccio.lossless.one/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@ -1921,7 +1797,6 @@
      "version": "3.13.1",
      "resolved": "https://verdaccio.lossless.one/js-yaml/-/js-yaml-3.13.1.tgz",
      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "dev": true,
      "requires": {
        "argparse": "^1.0.7",
        "esprima": "^4.0.0"
@ -2206,9 +2081,9 @@
      }
    },
    "mongodb": {
-      "version": "3.5.1",
-      "resolved": "https://verdaccio.lossless.one/mongodb/-/mongodb-3.5.1.tgz",
-      "integrity": "sha512-kpxt4/OfGZ3x9Py+c81yWARLFE3L5UDczF6319Xq0c+pp+8rrzqRiJKjhRAY261JorlRqtrpp7ROK2wCAMA4sw==",
+      "version": "3.5.2",
+      "resolved": "https://verdaccio.lossless.one/mongodb/-/mongodb-3.5.2.tgz",
+      "integrity": "sha512-Lxt4th2tK2MxmkDBR5cMik+xEnkvhwg0BC5kGcHm9RBwaNEsrIryvV5istGXOHbnif5KslMpY1FbX6YbGJ/Trg==",
      "requires": {
        "bl": "^2.2.0",
        "bson": "^1.1.1",
@ -2245,9 +2120,9 @@
      "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
    },
    "node-forge": {
-      "version": "0.7.6",
-      "resolved": "https://verdaccio.lossless.one/node-forge/-/node-forge-0.7.6.tgz",
-      "integrity": "sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="
+      "version": "0.9.1",
+      "resolved": "https://verdaccio.lossless.one/node-forge/-/node-forge-0.9.1.tgz",
+      "integrity": "sha512-G6RlQt5Sb4GMBzXvhfkeFmbqR6MzhtnT7VTHuLadjkii3rdYHNdw0m8zA4BTxVIh68FicCQ2NSUANpsqkr9jvQ=="
    },
    "normalize-newline": {
      "version": "3.0.0",
@ -2437,8 +2312,7 @@
    "pathval": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
-      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
-      "dev": true
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA="
    },
    "performance-now": {
      "version": "2.1.0",
@ -2534,11 +2408,6 @@
      "resolved": "https://verdaccio.lossless.one/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
    },
-    "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://verdaccio.lossless.one/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-    },
    "rendertron-middleware": {
      "version": "0.1.5",
      "resolved": "https://verdaccio.lossless.one/rendertron-middleware/-/rendertron-middleware-0.1.5.tgz",
@ -2614,9 +2483,9 @@
      }
    },
    "resolve": {
-      "version": "1.14.2",
-      "resolved": "https://verdaccio.lossless.one/resolve/-/resolve-1.14.2.tgz",
-      "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==",
+      "version": "1.15.1",
+      "resolved": "https://verdaccio.lossless.one/resolve/-/resolve-1.15.1.tgz",
+      "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
      "dev": true,
      "requires": {
        "path-parse": "^1.0.6"
@ -2649,7 +2518,6 @@
      "version": "6.5.4",
      "resolved": "https://verdaccio.lossless.one/rxjs/-/rxjs-6.5.4.tgz",
      "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
-      "dev": true,
      "requires": {
        "tslib": "^1.9.0"
      }
@ -2774,9 +2642,9 @@
      },
      "dependencies": {
        "@types/node": {
-          "version": "12.12.25",
-          "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.12.25.tgz",
-          "integrity": "sha512-nf1LMGZvgFX186geVZR1xMZKKblJiRfiASTHw85zED2kI1yDKHDwTKMdkaCbTlXoRKlGKaDfYywt+V0As30q3w=="
+          "version": "12.12.26",
+          "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.12.26.tgz",
+          "integrity": "sha512-UmUm94/QZvU5xLcUlNR8hA7Ac+fGpO1EG/a8bcWVz0P0LqtxFmun9Y2bbtuckwGboWJIT70DoWq1r3hb56n3DA=="
        }
      }
    },
@ -2784,7 +2652,6 @@
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/smartchai/-/smartchai-2.0.1.tgz",
      "integrity": "sha512-9M+R56OhAHXScxgr2vzQqxGx0XMS0QXriNZuP7hjlbVbo2FUT+l60iEzbwPt9Ga+5u2cEEjSSoZEQVqlROaddA==",
-      "dev": true,
      "requires": {
        "@types/chai": "^4.1.2",
        "@types/chai-as-promised": "^7.1.0",
@ -2901,17 +2768,17 @@
      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
    },
    "temp-dir": {
-      "version": "1.0.0",
-      "resolved": "https://verdaccio.lossless.one/temp-dir/-/temp-dir-1.0.0.tgz",
-      "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0="
+      "version": "2.0.0",
+      "resolved": "https://verdaccio.lossless.one/temp-dir/-/temp-dir-2.0.0.tgz",
+      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="
    },
    "tempfile": {
-      "version": "2.0.0",
-      "resolved": "https://verdaccio.lossless.one/tempfile/-/tempfile-2.0.0.tgz",
-      "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=",
+      "version": "3.0.0",
+      "resolved": "https://verdaccio.lossless.one/tempfile/-/tempfile-3.0.0.tgz",
+      "integrity": "sha512-uNFCg478XovRi85iD42egu+eSFUmmka750Jy7L5tfHI5hQKKtbPnxaSaXAbBqCDYrw3wx4tXjKwci4/QmsZJxw==",
      "requires": {
-        "temp-dir": "^1.0.0",
-        "uuid": "^3.0.1"
+        "temp-dir": "^2.0.0",
+        "uuid": "^3.3.2"
      }
    },
    "through2": {
@ -2962,9 +2829,9 @@
      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
    },
    "tslint": {
-      "version": "5.20.1",
-      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-5.20.1.tgz",
-      "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==",
+      "version": "6.0.0",
+      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-6.0.0.tgz",
+      "integrity": "sha512-9nLya8GBtlFmmFMW7oXXwoXS1NkrccqTqAtwXzdPV9e2mqSEvCki6iHL/Fbzi5oqbugshzgGPk7KBb2qNP1DSA==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.0.0",
@ -2978,8 +2845,16 @@
        "mkdirp": "^0.5.1",
        "resolve": "^1.3.2",
        "semver": "^5.3.0",
-        "tslib": "^1.8.0",
+        "tslib": "^1.10.0",
        "tsutils": "^2.29.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.10.0",
+          "resolved": "https://verdaccio.lossless.one/tslib/-/tslib-1.10.0.tgz",
+          "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+          "dev": true
+        }
      }
    },
    "tslint-config-prettier": {
@ -3013,8 +2888,7 @@
    "type-detect": {
      "version": "4.0.8",
      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
    },
    "type-fest": {
      "version": "0.8.1",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@pushrocks/smartacme",
-  "version": "2.1.1",
+  "version": "3.0.0",
  "private": false,
  "description": "acme with an easy yet powerful interface in TypeScript",
  "main": "dist/index.js",
@ -25,28 +25,40 @@
  },
  "homepage": "https://gitlab.com/umbrellazone/smartacme#README",
  "dependencies": {
-    "@pushrocks/lik": "^3.0.13",
-    "@pushrocks/smartdata": "^3.1.23",
+    "@pushrocks/lik": "^3.0.17",
+    "@pushrocks/smartdata": "^3.1.25",
    "@pushrocks/smartdelay": "^2.0.6",
    "@pushrocks/smartdns": "^3.0.8",
-    "@pushrocks/smartexpress": "^3.0.54",
+    "@pushrocks/smartexpress": "^3.0.57",
    "@pushrocks/smartlog": "^2.0.21",
    "@pushrocks/smartpromise": "^3.0.6",
    "@pushrocks/smartrequest": "^1.1.47",
-    "@pushrocks/smartstring": "^3.0.17",
+    "@pushrocks/smartstring": "^3.0.18",
    "@pushrocks/smarttime": "^3.0.12",
    "@pushrocks/smartunique": "^3.0.1",
-    "acme-client": "2.2.2"
+    "@tsclass/tsclass": "^3.0.4",
+    "acme-client": "^3.3.1"
  },
  "devDependencies": {
    "@gitzone/tsbuild": "^2.1.17",
    "@gitzone/tsrun": "^1.2.8",
    "@gitzone/tstest": "^1.0.28",
-    "@mojoio/cloudflare": "^3.0.5",
+    "@mojoio/cloudflare": "^4.0.3",
    "@pushrocks/qenv": "^4.0.6",
    "@pushrocks/tapbundle": "^3.2.0",
-    "@types/node": "^13.1.8",
-    "tslint": "^5.20.1",
+    "@types/node": "^13.7.0",
+    "tslint": "^6.0.0",
    "tslint-config-prettier": "^1.18.0"
-  }
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }
--- a/test/test.ts
+++ b/test/test.ts
@ -1,7 +1,12 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 import { Qenv } from '@pushrocks/qenv';
+import * as cloudflare from '@mojoio/cloudflare';

 const testQenv = new Qenv('./', './.nogit/');
+const testCloudflare = new cloudflare.CloudflareAccount({
+  email: testQenv.getEnvVarOnDemand('CF_EMAIL'),
+  key: testQenv.getEnvVarOnDemand('CF_KEY')
+});

 import * as smartacme from '../ts/index';

@ -16,16 +21,19 @@ tap.test('should create a valid instance of SmartAcme', async () => {
      mongoDbPass: testQenv.getEnvVarRequired('MONGODB_PASSWORD'),
      mongoDbUrl: testQenv.getEnvVarRequired('MONGODB_URL')
    },
-    removeChallenge: async (...args) => {
-      console.log(args);
+    removeChallenge: async (dnsChallenge) => {
+      testCloudflare.convenience.acmeRemoveDnsChallenge(dnsChallenge);
    },
-    setChallenge: async (...args) => {
-      console.log(args);
+    setChallenge: async (dnsChallenge) => {
+      testCloudflare.convenience.acmeSetDnsChallenge(dnsChallenge);
    },
    environment: 'integration'
  });
  await smartAcmeInstance.init();
-  // await smartAcmeInstance.getCertificateForDomain('bleu.de');
+});
+
+tap.test('should get a domain certificate', async () => {
+  await smartAcmeInstance.getCertificateForDomain('bleu.de');
 });

 tap.test('certmatcher should correctly match domains', async () => {
--- a/ts/index.ts
+++ b/ts/index.ts
@ -1,3 +1 @@
 export * from './smartacme.classes.smartacme';
-
-export * from './smartacme.classes.certremoteclient';
--- a/ts/interfaces/cert.ts
+++ b/ts/interfaces/cert.ts
@ -1,6 +1,6 @@
 export type TCertStatus = 'existing' | 'nonexisting' | 'pending' | 'failed';

-export interface ICert {
+export interface IOldCert {
  id: string;
  domainName: string;
  created: number;
--- a/ts/smartacme.classes.cert.ts
+++ b/ts/smartacme.classes.cert.ts
@ -9,7 +9,7 @@ import { Collection, svDb, unI } from '@pushrocks/smartdata';
@plugins.smartdata.Collection(() => {
  return CertManager.activeDB;
 })
-export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert> implements interfaces.ICert {
+export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert> implements plugins.tsclass.network.ICert {
  @unI()
  public id: string;

@ -28,26 +28,30 @@ export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert> implements inte
  @svDb()
  public csr: string;

+  @svDb()
+  public validUntil: number;

+  public isStillValid(): boolean {
+    return this.validUntil >= Date.now();
+  }

-  /**
-   * computed value for when the certificate is still valid
-   */
-  get validUntil (): number {
-    return this.created + plugins.smarttime.getMilliSecondsFromUnits({
-      days: 90
+  public shouldBeRenewed(): boolean {
+    const shouldBeValidAtLeastUntil =
+      Date.now() +
+      plugins.smarttime.getMilliSecondsFromUnits({
+        days: 10
+      });
+    return this.validUntil >= shouldBeValidAtLeastUntil;
+  }
+
+  public update(certDataArg: plugins.tsclass.network.ICert) {
+    Object.keys(certDataArg).forEach(key => {
+      this[key] = certDataArg[key];
    });
  }


-  get isStillValid (): boolean {
-    const shouldBeValitAtLeastUntil = Date.now() + plugins.smarttime.getMilliSecondsFromUnits({
-      days: 10
-    });
-    return this.validUntil >= shouldBeValitAtLeastUntil;
-  }
-
-  constructor(optionsArg: interfaces.ICert) {
+  constructor(optionsArg: plugins.tsclass.network.ICert) {
    super();
    if (optionsArg) {
      Object.keys(optionsArg).forEach(key => {
--- a/ts/smartacme.classes.certmanager.ts
+++ b/ts/smartacme.classes.certmanager.ts
@ -16,7 +16,7 @@ export class CertManager {
  private mongoDescriptor: plugins.smartdata.IMongoDescriptor;
  public smartdataDb: plugins.smartdata.SmartdataDb;

-  public pendingMap: plugins.lik.Stringmap;
+  public interestMap: plugins.lik.InterestMap<string, Cert>;

  constructor(
    smartAcmeArg: SmartAcme,
@ -34,18 +34,17 @@ export class CertManager {
    CertManager.activeDB = this.smartdataDb;

    // Pending Map
-    this.pendingMap = new plugins.lik.Stringmap();
+    this.interestMap = new plugins.lik.InterestMap((certName) => certName);
  }

  /**
   * retrieves a certificate
   * @returns the Cert class or null
-   * @param domainName the domain Name to retrieve the vcertificate for
+   * @param certDomainNameArg the domain Name to retrieve the vcertificate for
   */
-  public async retrieveCertificate(domainName: string): Promise<Cert> {
-    await this.checkCerts();
+  public async retrieveCertificate(certDomainNameArg: string): Promise<Cert> {
    const existingCertificate: Cert = await Cert.getInstance({
-      domainName
+      domainName: certDomainNameArg
    });

    if (existingCertificate) {
@ -59,44 +58,20 @@ export class CertManager {
   * stores the certificate
   * @param optionsArg
   */
-  public async storeCertificate(optionsArg: interfaces.ICert) {
+  public async storeCertificate(optionsArg: plugins.tsclass.network.ICert) {
    const cert = new Cert(optionsArg);
    await cert.save();
-    this.pendingMap.removeString(optionsArg.domainName);
-  }
-
-  public async deleteCertificate(domainNameArg: string) {}
-
-  /**
-   * announce a certificate as being in the process of being retrieved
-   */
-  public async announceCertificate(domainNameArg: string) {
-    this.pendingMap.addString(domainNameArg);
-  }
-
-  /**
-   * gets the status of a certificate by certDomain name
-   * @param certDomainArg
-   */
-  public async getCertificateStatus(certDomainArg: string): Promise<interfaces.TCertStatus> {
-    const isPending = this.pendingMap.checkString(certDomainArg);
-    if (isPending) {
-      return 'pending';
+    const interest = this.interestMap.findInterest(cert.domainName);
+    if (interest) {
+      interest.fullfillInterest(cert);
+      interest.markLost();
    }
-
-    // otherwise lets continue
-    const existingCertificate = await this.retrieveCertificate(certDomainArg);
-    if (existingCertificate) {
-      return 'existing';
-    }
-
-    return 'nonexisting';
  }

-  /**
-   * checks all certs for expiration
-   */
-  private async checkCerts() {
-    // TODO
+  public async deleteCertificate(certDomainNameArg: string) {
+    const cert: Cert = await Cert.getInstance({
+      domainName: certDomainNameArg
+    });
+    await cert.delete();
  }
 }
--- a/ts/smartacme.classes.certremoteclient.ts
+++ b/ts/smartacme.classes.certremoteclient.ts
@ -1,56 +0,0 @@
-import * as plugins from './smartacme.plugins';
-import * as interfaces from './interfaces';
-
-// tslint:disable-next-line: max-classes-per-file
-export class CertRemoteClient {
-  private remoteUrl: string;
-  private secret: string;
-  private logger: plugins.smartlog.Smartlog;
-
-  constructor(optionsArg: {
-    remoteUrl: string;
-    secret: string;
-    logger?: plugins.smartlog.Smartlog;
-  }) {
-    this.remoteUrl = optionsArg.remoteUrl;
-    this.secret = optionsArg.secret;
-    optionsArg.logger
-      ? (this.logger = optionsArg.logger)
-      : (this.logger = plugins.smartlog.defaultLogger);
-  }
-
-  /**
-   *
-   * @param domainNameArg
-   */
-  public async getCertificateForDomain(domainNameArg: string): Promise<interfaces.ICert> {
-    let certificate: interfaces.ICert;
-    const doRequestCycle = async (): Promise<interfaces.ICert> => {
-      const responseBody: interfaces.ICertRemoteResponse = (await plugins.smartrequest.postJson(
-        this.remoteUrl,
-        {
-          requestBody: <interfaces.ICertRemoteRequest>{
-            domainName: domainNameArg,
-            secret: this.secret
-          }
-        }
-      )).body;
-      switch (responseBody.status as interfaces.TCertStatus) {
-        case 'pending':
-          this.logger.log('info', `request for ${domainNameArg} still pending!`);
-          await plugins.smartdelay.delayFor(5000);
-          const finalResponse = await doRequestCycle();
-          return finalResponse;
-        case 'existing':
-          this.logger.log('ok', `got certificate for ${domainNameArg}`);
-          return responseBody.certificate;
-        case 'failed':
-        default:
-          console.log(`could not retrieve certificate for ${domainNameArg}`);
-          return null;
-      }
-    };
-    certificate = await doRequestCycle();
-    return certificate;
-  }
-}
--- a/ts/smartacme.classes.smartacme.ts
+++ b/ts/smartacme.classes.smartacme.ts
@ -13,8 +13,8 @@ export interface ISmartAcmeOptions {
  accountPrivateKey?: string;
  accountEmail: string;
  mongoDescriptor: plugins.smartdata.IMongoDescriptor;
-  setChallenge: (domainName: string, keyAuthorization: string) => Promise<any>;
-  removeChallenge: (domainName: string) => Promise<any>;
+  setChallenge: (dnsChallengeArg: plugins.tsclass.network.IDnsChallenge) => Promise<any>;
+  removeChallenge: (dnsChallengeArg: plugins.tsclass.network.IDnsChallenge) => Promise<any>;
  environment: 'production' | 'integration';
  logger?: plugins.smartlog.Smartlog;
 }
@ -41,53 +41,13 @@ export class SmartAcme {
  private privateKey: string;

  // challenge fullfillment
-  private setChallenge: (domainName: string, keyAuthorization: string) => Promise<any>;
-  private removeChallenge: (domainName: string) => Promise<any>;
+  private setChallenge: (dnsChallengeArg: plugins.tsclass.network.IDnsChallenge) => Promise<any>;
+  private removeChallenge: (dnsChallengeArg: plugins.tsclass.network.IDnsChallenge) => Promise<any>;

  // certmanager
  private certmanager: CertManager;
  private certmatcher: CertMatcher;

-  /**
-   * the remote handler to hand the request and response to.
-   */
-  public certremoteHandler = async (
-    req: plugins.smartexpress.Request,
-    res: plugins.smartexpress.Response
-  ) => {
-    const requestBody: interfaces.ICertRemoteRequest = req.body;
-    this.logger.log('ok', `got certificate request for ${requestBody.domainName}`);
-    const certDomain = this.certmatcher.getCertificateDomainNameByDomainName(
-      requestBody.domainName
-    );
-    this.logger.log('ok', `mapping ${requestBody.domainName} to ${certDomain}`);
-    let status: interfaces.TCertStatus = await this.certmanager.getCertificateStatus(certDomain);
-    let response: interfaces.ICertRemoteResponse;
-    switch (status) {
-      case 'existing':
-        this.logger.log('ok', `certificate exists for ${certDomain}. Sending certificate!`);
-        response = {
-          status,
-          certificate: await (await this.certmanager.retrieveCertificate(
-            certDomain
-          )).createSavableObject()
-        };
-        break;
-      default:
-        if (status === 'nonexisting') {
-          this.getCertificateForDomain(certDomain);
-          status = 'pending';
-        }
-        response = {
-          status
-        };
-        break;
-    }
-    res.status(200);
-    res.send(response);
-    res.end();
-  };
-
  constructor(optionsArg: ISmartAcmeOptions) {
    this.options = optionsArg;
    this.options.logger
@ -103,7 +63,7 @@ export class SmartAcme {
   */
  public async init() {
    this.privateKey =
-      this.options.accountPrivateKey || (await plugins.acme.forge.createPrivateKey());
+      this.options.accountPrivateKey || (await plugins.acme.forge.createPrivateKey()).toString();
    this.setChallenge = this.options.setChallenge;
    this.removeChallenge = this.options.removeChallenge;

@ -144,8 +104,8 @@ export class SmartAcme {
   * it runs through the following steps
   *
   * * look in the database
-   * * if in the database return it
-   * * of not in the database announce it
+   * * if in the database and still valid return it
+   * * if not in the database announce it
   * * then get it from letsencrypt
   * * store it
   * * remove it from the pending map (which it go onto by announcing it)
@ -154,18 +114,29 @@ export class SmartAcme {
   * @param domainArg
   */
  public async getCertificateForDomain(domainArg: string): Promise<Cert> {
-    const certDomain = this.certmatcher.getCertificateDomainNameByDomainName(domainArg);
-    const retrievedCertificate = await this.certmanager.retrieveCertificate(certDomain);
+    const certDomainName = this.certmatcher.getCertificateDomainNameByDomainName(domainArg);
+    const retrievedCertificate = await this.certmanager.retrieveCertificate(certDomainName);

-    if (retrievedCertificate) {
+    if (!retrievedCertificate && await this.certmanager.interestMap.checkInterest(certDomainName)) {
+      const existingCertificateInterest = this.certmanager.interestMap.findInterest(certDomainName);
+      const certificate = existingCertificateInterest.interestFullfilled;
+      return certificate;
+    } else if (retrievedCertificate && !retrievedCertificate.shouldBeRenewed()) {
      return retrievedCertificate;
-    } else {
-      await this.certmanager.announceCertificate(certDomain);
+    } else if (retrievedCertificate && retrievedCertificate.shouldBeRenewed) {
+      await retrievedCertificate.delete();
    }

+    // lets make sure others get the same interest
+    await this.certmanager.interestMap.addInterest(certDomainName);
+    
+
    /* Place new order */
    const order = await this.client.createOrder({
-      identifiers: [{ type: 'dns', value: certDomain }, { type: 'dns', value: `*.${certDomain}` }]
+      identifiers: [
+        { type: 'dns', value: certDomainName },
+        { type: 'dns', value: `*.${certDomainName}` }
+      ]
    });

    /* Get authorizations and select challenges */
@ -173,7 +144,7 @@ export class SmartAcme {

    for (const authz of authorizations) {
      console.log(authz);
-      const domainDnsName: string = `_acme-challenge.${authz.identifier.value}`;
+      const fullHostName: string = `_acme-challenge.${authz.identifier.value}`;
      const dnsChallenge: string = authz.challenges.find(challengeArg => {
        return challengeArg.type === 'dns-01';
      });
@ -182,8 +153,11 @@ export class SmartAcme {

      try {
        /* Satisfy challenge */
-        await this.setChallenge(domainDnsName, keyAuthorization);
-        await this.smartdns.checkUntilAvailable(domainDnsName, 'TXT', keyAuthorization, 100, 5000);
+        await this.setChallenge({
+          hostName: fullHostName,
+          challenge: keyAuthorization
+        });
+        await this.smartdns.checkUntilAvailable(fullHostName, 'TXT', keyAuthorization, 100, 5000);
        console.log('Cool down an extra 60 second for region availability');
        await plugins.smartdelay.delayFor(60000);

@ -198,7 +172,10 @@ export class SmartAcme {
      } finally {
        /* Clean up challenge response */
        try {
-          await this.removeChallenge(domainDnsName);
+          await this.removeChallenge({
+            hostName: fullHostName,
+            challenge: keyAuthorization
+          });
        } catch (e) {
          console.log(e);
        }
@ -207,8 +184,8 @@ export class SmartAcme {

    /* Finalize order */
    const [key, csr] = await plugins.acme.forge.createCsr({
-      commonName: `*.${certDomain}`,
-      altNames: [certDomain]
+      commonName: `*.${certDomainName}`,
+      altNames: [certDomainName]
    });

    await this.client.finalizeOrder(order, csr);
@ -218,14 +195,19 @@ export class SmartAcme {

    await this.certmanager.storeCertificate({
      id: plugins.smartunique.shortId(),
-      domainName: certDomain,
+      domainName: certDomainName,
      privateKey: key.toString(),
      publicKey: cert.toString(),
      csr: csr.toString(),
-      created: Date.now()
+      created: Date.now(),
+      validUntil:
+        Date.now() +
+        plugins.smarttime.getMilliSecondsFromUnits({
+          days: 90
+        })
    });

-    const newCertificate = await this.certmanager.retrieveCertificate(certDomain);
+    const newCertificate = await this.certmanager.retrieveCertificate(certDomainName);
    return newCertificate;
  }
 }
--- a/ts/smartacme.plugins.ts
+++ b/ts/smartacme.plugins.ts
@ -25,7 +25,14 @@ export {
  smarttime
 };

-// thirs party scope
+// @tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export {
+  tsclass
+}
+
+// third party scope
 import * as acme from 'acme-client';

 export { acme };
Author	SHA1	Message	Date
Phil Kunz	6c95cec709	3.0.0	2020-02-10 20:13:07 +00:00
Phil Kunz	59173b3ca8	BREAKING CHANGE(core): streamline scope to certificate retrieval using dns challenge	2020-02-10 20:13:06 +00:00
Phil Kunz	c2036bba90	2.1.2	2020-02-10 11:15:48 +00:00
Phil Kunz	83afea95e6	fix(core): update	2020-02-10 11:15:47 +00:00