4.0.6

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @gitzone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -1,126 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - lossless
-    - docker
-    - priv
-
-testBuild:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  script:
-    - npmci command npm install -g tslint typescript
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

.snyk

@@ -1,12 +0,0 @@
-# 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: {}

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${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"
     }
   ]
 }

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

npmextra.json

@@ -3,10 +3,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
-      "gitrepo": "smartuniverse",
+      "gitrepo": "smartacme",
-      "shortDescription": "acme with an easy yet powerful interface in TypeScript",
+      "description": "acme with an easy yet powerful interface in TypeScript",
-      "npmPackagename": "@pushrocks/smartuniverse",
+      "npmPackagename": "@push.rocks/smartacme",
       "license": "MIT",
       "projectDomain": "push.rocks"
     }

package.json

@@ -1,13 +1,15 @@
 {
-  "name": "@pushrocks/smartacme",
+  "name": "@push.rocks/smartacme",
-  "version": "3.0.5",
+  "version": "4.0.6",
   "private": false,
   "description": "acme with an easy yet powerful interface in TypeScript",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web --allowimplicitany)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -25,40 +27,42 @@
   },
   "homepage": "https://gitlab.com/umbrellazone/smartacme#README",
   "dependencies": {
-    "@pushrocks/lik": "^3.0.19",
+    "@apiglobal/typedserver": "^2.0.65",
-    "@pushrocks/smartdata": "^3.1.26",
+    "@push.rocks/lik": "^6.0.3",
-    "@pushrocks/smartdelay": "^2.0.6",
+    "@push.rocks/smartdata": "^5.0.8",
-    "@pushrocks/smartdns": "^4.0.2",
+    "@push.rocks/smartdelay": "^3.0.5",
-    "@pushrocks/smartexpress": "^3.0.57",
+    "@push.rocks/smartdns": "^5.0.2",
-    "@pushrocks/smartlog": "^2.0.21",
+    "@push.rocks/smartlog": "^3.0.3",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@push.rocks/smartpromise": "^4.0.3",
-    "@pushrocks/smartrequest": "^1.1.47",
+    "@push.rocks/smartrequest": "^2.0.18",
-    "@pushrocks/smartstring": "^3.0.18",
+    "@push.rocks/smartstring": "^4.0.5",
-    "@pushrocks/smarttime": "^3.0.12",
+    "@push.rocks/smarttime": "^4.0.4",
-    "@pushrocks/smartunique": "^3.0.1",
+    "@push.rocks/smartunique": "^3.0.3",
-    "@tsclass/tsclass": "^3.0.7",
+    "@tsclass/tsclass": "^4.0.42",
-    "acme-client": "^3.3.1"
+    "acme-client": "^4.2.5"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@apiclient.xyz/cloudflare": "^6.0.3",
-    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tstest": "^1.0.28",
+    "@gitzone/tsrun": "^1.2.44",
-    "@mojoio/cloudflare": "^4.0.3",
+    "@gitzone/tstest": "^1.0.77",
-    "@pushrocks/qenv": "^4.0.6",
+    "@push.rocks/qenv": "^5.0.2",
-    "@pushrocks/tapbundle": "^3.2.0",
+    "@push.rocks/tapbundle": "^5.0.12",
-    "@types/node": "^13.7.4",
+    "@types/node": "^20.4.2"
-    "tslint": "^6.0.0",
-    "tslint-config-prettier": "^1.18.0"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

qenv.yml

@@ -1,6 +1,5 @@
 required:
-  - CF_EMAIL
+  - CF_TOKEN
-  - CF_KEY
   - MONGODB_URL
   - MONGODB_PASSWORD
   - MONGODB_DATABASE

readme.md

@@ -0,0 +1,64 @@
+# @push.rocks/smartacme
+acme with an easy yet powerful interface in TypeScript
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartacme)
+* [gitlab.com (source)](https://gitlab.com/push.rocks/smartacme)
+* [github.com (source mirror)](https://github.com/push.rocks/smartacme)
+* [docs (typedoc)](https://push.rocks.gitlab.io/smartacme/)
+
+## Status for master
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/push.rocks/smartacme/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/smartacme/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartacme)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/smartacme)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smartacme)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartacme)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartacme)](https://lossless.cloud)
+
+## Usage
+
+Use TypeScript for best in class instellisense.
+
+```javascript
+import { SmartAcme } from 'smartacme';
+
+const run = async () => {
+  smartAcmeInstance = new smartacme.SmartAcme({
+    accountEmail: 'domains@lossless.org',
+    accountPrivateKey: null,
+    mongoDescriptor: {
+      mongoDbName: testQenv.getEnvVarRequired('MONGODB_DATABASE'),
+      mongoDbPass: testQenv.getEnvVarRequired('MONGODB_PASSWORD'),
+      mongoDbUrl: testQenv.getEnvVarRequired('MONGODB_URL'),
+    },
+    removeChallenge: async (dnsChallenge) => {
+      // somehow provide a function that is able to remove the dns challenge
+    },
+    setChallenge: async (dnsChallenge) => {
+      // somehow provide a function that is able to the dns challenge
+    },
+    environment: 'integration',
+  });
+  await smartAcmeInstance.init();
+
+  // myCert has properties for public/private keys and csr ;)
+  const myCert = await smartAcmeInstance.getCertificateForDomain('bleu.de');
+};
+```
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
+For further information read the linked docs at the top of this readme.
+
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)

test/test.ts

@@ -1,14 +1,11 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
-import { Qenv } from '@pushrocks/qenv';
+import { Qenv } from '@push.rocks/qenv';
-import * as cloudflare from '@mojoio/cloudflare';
+import * as cloudflare from '@apiclient.xyz/cloudflare';
 
 const testQenv = new Qenv('./', './.nogit/');
-const testCloudflare = new cloudflare.CloudflareAccount({
+const testCloudflare = new cloudflare.CloudflareAccount(testQenv.getEnvVarOnDemand('CF_TOKEN'));
-  email: testQenv.getEnvVarOnDemand('CF_EMAIL'),
-  key: testQenv.getEnvVarOnDemand('CF_KEY')
-});
 
-import * as smartacme from '../ts/index';
+import * as smartacme from '../ts/index.js';
 
 let smartAcmeInstance: smartacme.SmartAcme;
 
@@ -19,28 +16,29 @@ tap.test('should create a valid instance of SmartAcme', async () => {
     mongoDescriptor: {
       mongoDbName: testQenv.getEnvVarRequired('MONGODB_DATABASE'),
       mongoDbPass: testQenv.getEnvVarRequired('MONGODB_PASSWORD'),
-      mongoDbUrl: testQenv.getEnvVarRequired('MONGODB_URL')
+      mongoDbUrl: testQenv.getEnvVarRequired('MONGODB_URL'),
     },
-    removeChallenge: async dnsChallenge => {
+    removeChallenge: async (dnsChallenge) => {
       testCloudflare.convenience.acmeRemoveDnsChallenge(dnsChallenge);
     },
-    setChallenge: async dnsChallenge => {
+    setChallenge: async (dnsChallenge) => {
       testCloudflare.convenience.acmeSetDnsChallenge(dnsChallenge);
     },
-    environment: 'integration'
+    environment: 'integration',
   });
   await smartAcmeInstance.init();
 });
 
 tap.test('should get a domain certificate', async () => {
-  await smartAcmeInstance.getCertificateForDomain('bleu.de');
+  const certificate = await smartAcmeInstance.getCertificateForDomain('bleu.de');
+  console.log(certificate);
 });
 
 tap.test('certmatcher should correctly match domains', async () => {
-  const certMatcherMod = await import('../ts/smartacme.classes.certmatcher');
+  const certMatcherMod = await import('../ts/smartacme.classes.certmatcher.js');
   const certMatcher = new certMatcherMod.CertMatcher();
   const matchedCert = certMatcher.getCertificateDomainNameByDomainName('level3.level2.level1');
-  expect(matchedCert).to.equal('level2.level1');
+  expect(matchedCert).toEqual('level2.level1');
 });
 
 tap.test('should stop correctly', async () => {

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smartacme',
+  version: '4.0.6',
+  description: 'acme with an easy yet powerful interface in TypeScript'
+}

ts/index.ts

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

ts/interfaces/index.ts

@@ -1 +1 @@
-export * from './accountdata';
+export * from './accountdata.js';

ts/smartacme.classes.cert.ts

@@ -1,16 +1,18 @@
-import * as plugins from './smartacme.plugins';
+import * as plugins from './smartacme.plugins.js';
 
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { CertManager } from './smartacme.classes.certmanager';
+import { CertManager } from './smartacme.classes.certmanager.js';
 
-import { Collection, svDb, unI } from '@pushrocks/smartdata';
+import { Collection, svDb, unI } from '@push.rocks/smartdata';
 
 @plugins.smartdata.Collection(() => {
   return CertManager.activeDB;
 })
-export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert, plugins.tsclass.network.ICert>
+export class Cert
-  implements plugins.tsclass.network.ICert {
+  extends plugins.smartdata.SmartDataDbDoc<Cert, plugins.tsclass.network.ICert>
+  implements plugins.tsclass.network.ICert
+{
   @unI()
   public id: string;
 
@@ -40,13 +42,13 @@ export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert, plugins.tsclass
     const shouldBeValidAtLeastUntil =
       Date.now() +
       plugins.smarttime.getMilliSecondsFromUnits({
-        days: 10
+        days: 10,
       });
     return !(this.validUntil >= shouldBeValidAtLeastUntil);
   }
 
   public update(certDataArg: plugins.tsclass.network.ICert) {
-    Object.keys(certDataArg).forEach(key => {
+    Object.keys(certDataArg).forEach((key) => {
       this[key] = certDataArg[key];
     });
   }
@@ -54,7 +56,7 @@ export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert, plugins.tsclass
   constructor(optionsArg: plugins.tsclass.network.ICert) {
     super();
     if (optionsArg) {
-      Object.keys(optionsArg).forEach(key => {
+      Object.keys(optionsArg).forEach((key) => {
         this[key] = optionsArg[key];
       });
     }

ts/smartacme.classes.certmanager.ts

@@ -1,8 +1,8 @@
-import * as plugins from './smartacme.plugins';
+import * as plugins from './smartacme.plugins.js';
-import { Cert } from './smartacme.classes.cert';
+import { Cert } from './smartacme.classes.cert.js';
-import { SmartAcme } from './smartacme.classes.smartacme';
+import { SmartAcme } from './smartacme.classes.smartacme.js';
 
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 export class CertManager {
   // =========
@@ -34,7 +34,7 @@ export class CertManager {
     CertManager.activeDB = this.smartdataDb;
 
     // Pending Map
-    this.interestMap = new plugins.lik.InterestMap(certName => certName);
+    this.interestMap = new plugins.lik.InterestMap((certName) => certName);
   }
 
   /**
@@ -43,8 +43,8 @@ export class CertManager {
    * @param certDomainNameArg the domain Name to retrieve the vcertificate for
    */
   public async retrieveCertificate(certDomainNameArg: string): Promise<Cert> {
-    const existingCertificate: Cert = await Cert.getInstance({
+    const existingCertificate: Cert = await Cert.getInstance<Cert>({
-      domainName: certDomainNameArg
+      domainName: certDomainNameArg,
     });
 
     if (existingCertificate) {
@@ -69,8 +69,8 @@ export class CertManager {
   }
 
   public async deleteCertificate(certDomainNameArg: string) {
-    const cert: Cert = await Cert.getInstance({
+    const cert: Cert = await Cert.getInstance<Cert>({
-      domainName: certDomainNameArg
+      domainName: certDomainNameArg,
     });
     await cert.delete();
   }

ts/smartacme.classes.certmatcher.ts

@@ -1,5 +1,5 @@
-import * as plugins from './smartacme.plugins';
+import * as plugins from './smartacme.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 /**
  * certmatcher is responsible for matching certificates

ts/smartacme.classes.smartacme.ts

@@ -1,7 +1,7 @@
-import * as plugins from './smartacme.plugins';
+import * as plugins from './smartacme.plugins.js';
-import { Cert } from './smartacme.classes.cert';
+import { Cert } from './smartacme.classes.cert.js';
-import { CertManager } from './smartacme.classes.certmanager';
+import { CertManager } from './smartacme.classes.certmanager.js';
-import { CertMatcher } from './smartacme.classes.certmatcher';
+import { CertMatcher } from './smartacme.classes.certmatcher.js';
 
 /**
  * the options for the class @see SmartAcme
@@ -13,7 +13,6 @@ export interface ISmartAcmeOptions {
   setChallenge: (dnsChallengeArg: plugins.tsclass.network.IDnsChallenge) => Promise<any>;
   removeChallenge: (dnsChallengeArg: plugins.tsclass.network.IDnsChallenge) => Promise<any>;
   environment: 'production' | 'integration';
-  logger?: plugins.smartlog.Smartlog;
 }
 
 /**
@@ -32,7 +31,7 @@ export class SmartAcme {
   // the acme client
   private client: any;
   private smartdns = new plugins.smartdns.Smartdns({});
-  public logger: plugins.smartlog.Smartlog;
+  public logger: plugins.smartlog.ConsoleLog;
 
   // the account private key
   private privateKey: string;
@@ -47,9 +46,7 @@ export class SmartAcme {
 
   constructor(optionsArg: ISmartAcmeOptions) {
     this.options = optionsArg;
-    this.options.logger
+    this.logger = new plugins.smartlog.ConsoleLog();
-      ? (this.logger = optionsArg.logger)
-      : (this.logger = plugins.smartlog.defaultLogger);
   }
 
   /**
@@ -66,7 +63,7 @@ export class SmartAcme {
 
     // CertMangaer
     this.certmanager = new CertManager(this, {
-      mongoDescriptor: this.options.mongoDescriptor
+      mongoDescriptor: this.options.mongoDescriptor,
     });
     await this.certmanager.init();
 
@@ -82,13 +79,13 @@ export class SmartAcme {
           return plugins.acme.directory.letsencrypt.staging;
         }
       })(),
-      accountKey: this.privateKey
+      accountKey: this.privateKey,
     });
 
     /* Register account */
     await this.client.createAccount({
       termsOfServiceAgreed: true,
-      contact: [`mailto:${this.options.accountEmail}`]
+      contact: [`mailto:${this.options.accountEmail}`],
     });
   }
 
@@ -124,7 +121,7 @@ export class SmartAcme {
     } else if (retrievedCertificate && !retrievedCertificate.shouldBeRenewed()) {
       return retrievedCertificate;
     } else if (retrievedCertificate && retrievedCertificate.shouldBeRenewed()) {
-      // await retrievedCertificate.delete();
+      await retrievedCertificate.delete();
     }
 
     // lets make sure others get the same interest
@@ -134,8 +131,8 @@ export class SmartAcme {
     const order = await this.client.createOrder({
       identifiers: [
         { type: 'dns', value: certDomainName },
-        { type: 'dns', value: `*.${certDomainName}` }
+        { type: 'dns', value: `*.${certDomainName}` },
-      ]
+      ],
     });
 
     /* Get authorizations and select challenges */
@@ -144,7 +141,7 @@ export class SmartAcme {
     for (const authz of authorizations) {
       console.log(authz);
       const fullHostName: string = `_acme-challenge.${authz.identifier.value}`;
-      const dnsChallenge: string = authz.challenges.find(challengeArg => {
+      const dnsChallenge: string = authz.challenges.find((challengeArg) => {
         return challengeArg.type === 'dns-01';
       });
       // process.exit(1);
@@ -154,8 +151,9 @@ export class SmartAcme {
         /* Satisfy challenge */
         await this.setChallenge({
           hostName: fullHostName,
-          challenge: keyAuthorization
+          challenge: keyAuthorization,
         });
+        await plugins.smartdelay.delayFor(30000);
         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);
@@ -173,7 +171,7 @@ export class SmartAcme {
         try {
           await this.removeChallenge({
             hostName: fullHostName,
-            challenge: keyAuthorization
+            challenge: keyAuthorization,
           });
         } catch (e) {
           console.log(e);
@@ -184,7 +182,7 @@ export class SmartAcme {
     /* Finalize order */
     const [key, csr] = await plugins.acme.forge.createCsr({
       commonName: `*.${certDomainName}`,
-      altNames: [certDomainName]
+      altNames: [certDomainName],
     });
 
     await this.client.finalizeOrder(order, csr);
@@ -202,8 +200,8 @@ export class SmartAcme {
       validUntil:
         Date.now() +
         plugins.smarttime.getMilliSecondsFromUnits({
-          days: 90
+          days: 90,
-        })
+        }),
     });
 
     const newCertificate = await this.certmanager.retrieveCertificate(certDomainName);

ts/smartacme.plugins.ts

@@ -1,28 +1,31 @@
+// @apiglobal scope
+import * as typedserver from '@apiglobal/typedserver';
+
+export { typedserver };
+
 // @pushrocks scope
-import * as lik from '@pushrocks/lik';
+import * as lik from '@push.rocks/lik';
-import * as smartdata from '@pushrocks/smartdata';
+import * as smartdata from '@push.rocks/smartdata';
-import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartdelay from '@push.rocks/smartdelay';
-import * as smartdns from '@pushrocks/smartdns';
+import * as smartdns from '@push.rocks/smartdns';
-import * as smartexpress from '@pushrocks/smartexpress';
+import * as smartlog from '@push.rocks/smartlog';
-import * as smartlog from '@pushrocks/smartlog';
+import * as smartpromise from '@push.rocks/smartpromise';
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartrequest from '@push.rocks/smartrequest';
-import * as smartrequest from '@pushrocks/smartrequest';
+import * as smartunique from '@push.rocks/smartunique';
-import * as smartunique from '@pushrocks/smartunique';
+import * as smartstring from '@push.rocks/smartstring';
-import * as smartstring from '@pushrocks/smartstring';
+import * as smarttime from '@push.rocks/smarttime';
-import * as smarttime from '@pushrocks/smarttime';
 
 export {
   lik,
   smartdata,
   smartdelay,
   smartdns,
-  smartexpress,
   smartlog,
   smartpromise,
   smartrequest,
   smartunique,
   smartstring,
-  smarttime
+  smarttime,
 };
 
 // @tsclass scope

tsconfig.json

@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
     "experimentalDecorators": true,
-    "target": "es2017",
+    "useDefineForClassFields": false,
-    "module": "commonjs"
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
   }
 }

tslint.json

@@ -1,17 +0,0 @@
-{
-  "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"
-}