2.0.27

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "2.0.22",
+  "version": "2.0.27",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -170,13 +170,14 @@
       }
     },
     "@pushrocks/smartexpress": {
-      "version": "3.0.0",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.0.tgz",
-      "integrity": "sha512-F3x+AFUxkKxb5WgQuIZsfkrNzMz0PaYYIw4gdQbAPn5N/UCEP4eE2OQWXnAcCSYwsXI8hgjEuUOC9gTbCSPDRg==",
+      "version": "3.0.4",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.4.tgz",
+      "integrity": "sha512-sn6yQpTGylvT/t4arCN7te8EUzimhv9JB+73XOwv503u6HokE//nT8eCAhkjprH3hgHpIgvR3iPGI8UBSCJFsw==",
       "requires": {
         "@pushrocks/lik": "^3.0.4",
         "@pushrocks/smartfile": "^6.0.11",
         "@pushrocks/smartpromise": "^2.0.5",
+        "@pushrocks/smartrequest": "^1.1.14",
         "@types/express": "^4.16.0",
         "@types/finalhandler": "0.0.33",
         "@types/helmet": "0.0.42",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "2.0.22",
+  "version": "2.0.27",
   "private": false,
   "description": "acme implementation in TypeScript",
   "main": "dist/index.js",
@@ -29,13 +29,13 @@
     "@pushrocks/smartdata": "^3.1.13",
     "@pushrocks/smartdelay": "^2.0.2",
     "@pushrocks/smartdns": "^3.0.8",
-    "@pushrocks/smartexpress": "^3.0.0",
+    "@pushrocks/smartexpress": "^3.0.4",
     "@pushrocks/smartpromise": "^2.0.5",
     "@pushrocks/smartrequest": "^1.1.14",
     "@pushrocks/smartstring": "^3.0.8",
     "@pushrocks/smarttime": "^3.0.5",
     "@pushrocks/smartunique": "^3.0.1",
-    "acme-client": "^2.2.2"
+    "acme-client": "2.2.2"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.4",

ts/smartacme.classes.certmanager.ts

@@ -3,7 +3,6 @@ import { Cert } from './smartacme.classes.cert';
 import { SmartAcme } from './smartacme.classes.smartacme';
 
 import * as interfaces from './interfaces';
-import { ICert } from './interfaces';
 
 
 export class CertManager {
@@ -35,7 +34,7 @@ export class CertManager {
 
     // Pending Map
     this.pendingMap = new plugins.lik.Stringmap();
-  };
+  }
 
   /**
    * retrieves a certificate
@@ -62,10 +61,10 @@ export class CertManager {
    * @param privateKeyArg 
    * @param csrArg 
    */
-  public async storeCertificate(optionsArg: ICert) {
+  public async storeCertificate(optionsArg: interfaces.ICert) {
     const cert = new Cert(optionsArg);
-    cert.save();
-  };
+    await cert.save();
+  }
 
   public async deleteCertificate(domainNameArg: string) {
 

ts/smartacme.classes.smartacme.ts

@@ -15,7 +15,7 @@ export interface ISmartAcmeOptions {
   mongoDescriptor: plugins.smartdata.IMongoDescriptor;
   setChallenge: (domainName: string, keyAuthorization: string) => Promise<any>;
   removeChallenge: (domainName: string) => Promise<any>;
-  validateRemoteRequest: () => Promise<boolean>;
+  environment: 'production' | 'integration';
 }
 
 /**
@@ -41,12 +41,15 @@ export class SmartAcme {
   // challenge fullfillment
   private setChallenge: (domainName: string, keyAuthorization: string) => Promise<any>;
   private removeChallenge: (domainName: string) => Promise<any>;
-  private validateRemoteRequest: () => Promise<boolean>;
 
   // certmanager
   private certmanager: CertManager;
   private certmatcher: CertMatcher;
-  private certremoteHandler: plugins.smartexpress.Handler;
+
+  /**
+   * the remote handler to hand the request and response to.
+   */
+  public certremoteHandler: (req: plugins.smartexpress.Request, res: plugins.smartexpress.Response) => Promise<any>;
 
   constructor(optionsArg: ISmartAcmeOptions) {
     this.options = optionsArg;
@@ -74,7 +77,7 @@ export class SmartAcme {
     this.certmatcher = new CertMatcher();
 
     // CertRemoteHandler
-    this.certremoteHandler = new plugins.smartexpress.Handler('POST', async (req, res) => {
+    this.certremoteHandler = async (req, res) => {
       const requestBody: interfaces.ICertRemoteRequest = req.body;
       const status: interfaces.TCertStatus = await this.certmanager.getCertificateStatus(requestBody.domainName);
       const existingCertificate = await this.certmanager.retrieveCertificate(
@@ -85,13 +88,7 @@ export class SmartAcme {
          case 'existing':
           response = {
             status,
-            certificate: {
-              created: existingCertificate.created,
-              csr: existingCertificate.csr,
-              domainName: existingCertificate.domainName,
-              privateKey: existingCertificate.privateKey,
-              publicKey: existingCertificate.publicKey
-            }
+            certificate: await existingCertificate.createSavableObject()
           };
           break;
         default:
@@ -103,11 +100,17 @@ export class SmartAcme {
       res.status(200);
       res.send(response);
       res.end();
-    });
+    };
 
     // ACME Client
     this.client = new plugins.acme.Client({
-      directoryUrl: plugins.acme.directory.letsencrypt.staging,
+      directoryUrl: (() => {
+        if(this.options.environment === 'production') {
+          return plugins.acme.directory.letsencrypt.production;
+        } else {
+          return plugins.acme.directory.letsencrypt.staging;
+        }
+      })(),
       accountKey: this.privateKey
     });
 
@@ -123,9 +126,9 @@ export class SmartAcme {
   }
 
   public async getCertificateForDomain(domainArg: string): Promise<Cert> {
-    const domain = this.certmatcher.getCertificateDomainNameByDomainName(domainArg);
+    const certDomain = this.certmatcher.getCertificateDomainNameByDomainName(domainArg);
 
-    const retrievedCertificate = await this.certmanager.retrieveCertificate(domain);
+    const retrievedCertificate = await this.certmanager.retrieveCertificate(certDomain);
 
     if (retrievedCertificate) {
       return retrievedCertificate;
@@ -133,7 +136,7 @@ export class SmartAcme {
 
     /* Place new order */
     const order = await this.client.createOrder({
-      identifiers: [{ type: 'dns', value: domain }, { type: 'dns', value: `*.${domain}` }]
+      identifiers: [{ type: 'dns', value: certDomain }, { type: 'dns', value: `*.${certDomain}` }]
     });
 
     /* Get authorizations and select challenges */
@@ -152,6 +155,8 @@ export class SmartAcme {
         /* Satisfy challenge */
         await this.setChallenge(domainDnsName, keyAuthorization);
         await this.smartdns.checkUntilAvailable(domainDnsName, 'TXT', keyAuthorization, 100, 5000);
+        console.log('Cool down an extra 60 second for region availability');
+        await plugins.smartdelay.delayFor(60000);
 
         /* Verify that challenge is satisfied */
         await this.client.verifyChallenge(authz, dnsChallenge);
@@ -173,8 +178,8 @@ export class SmartAcme {
 
     /* Finalize order */
     const [key, csr] = await plugins.acme.forge.createCsr({
-      commonName: `*.${domain}`,
-      altNames: [domain]
+      commonName: `*.${certDomain}`,
+      altNames: [certDomain]
     });
 
     await this.client.finalizeOrder(order, csr);
@@ -186,14 +191,14 @@ export class SmartAcme {
     console.log(`Certificate:\n${cert.toString()}`);
 
     await this.certmanager.storeCertificate({
-      domainName: domainArg,
+      domainName: certDomain,
       privateKey: key.toString(),
       publicKey: cert.toString(),
       csr: csr.toString(),
       created: Date.now()
     });
 
-    const newCertificate = await this.certmanager.retrieveCertificate(domainArg);
+    const newCertificate = await this.certmanager.retrieveCertificate(certDomain);
     return newCertificate;
   }
 }