2.0.32

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "2.0.28",
+  "version": "2.0.32",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -104,9 +104,9 @@
       }
     },
     "@pushrocks/qenv": {
-      "version": "3.0.2",
+      "version": "4.0.0",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fqenv/-/qenv-3.0.2.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fqenv/-/qenv-4.0.0.tgz",
-      "integrity": "sha512-gXW9Cib6izqY7W1MssryFBrjIoKwadftjv5G3y/BE4LboCkGazqjMJsea6z6G79rwvX1M+yxEEcIdIsDvBBSiA==",
+      "integrity": "sha512-3/odPJaGp3ALtcSG/+N3dGtFX/CVBed9a5XKDa0bv7LoKCgYZeQwpF3jkCnNPjs7GKyzOzALHHID1L+zcb1RXw==",
       "dev": true,
       "requires": {
         "@pushrocks/smartfile": "^6.0.6",
@@ -170,9 +170,9 @@
       }
     },
     "@pushrocks/smartexpress": {
-      "version": "3.0.4",
+      "version": "3.0.6",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.4.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartexpress/-/smartexpress-3.0.6.tgz",
-      "integrity": "sha512-sn6yQpTGylvT/t4arCN7te8EUzimhv9JB+73XOwv503u6HokE//nT8eCAhkjprH3hgHpIgvR3iPGI8UBSCJFsw==",
+      "integrity": "sha512-Y/Av43ttryHO93BtrKAalPMQxymEn3HTjylnkgXFOTE5Ir4epGX8cG7FDnKUQIuM9Gx8nzFJfW16a90KUpExxQ==",
       "requires": {
         "@pushrocks/lik": "^3.0.4",
         "@pushrocks/smartfile": "^6.0.11",
@@ -206,11 +206,11 @@
       }
     },
     "@pushrocks/smartlog": {
-      "version": "2.0.9",
+      "version": "2.0.11",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartlog/-/smartlog-2.0.9.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartlog/-/smartlog-2.0.11.tgz",
-      "integrity": "sha512-F2u3O8OOQ7QXgg9o0lI7HnqEhSQZo2A8u0EuNbQH+Kj2oL62xDwjAg6KkINwH7ObSWpaldZ+I28prG0JxaRzvg==",
+      "integrity": "sha512-V8SMzAAqDpl1+CJ9b3w5e/1ARjk4JOPZ35qZIllVBhHr8meCqnPE2immlfBYWmEp1xy3ntdAA+Lgewtu+iVk6A==",
       "requires": {
-        "@pushrocks/smartlog-interfaces": "^2.0.2"
+        "@pushrocks/smartlog-interfaces": "^2.0.5"
       }
     },
     "@pushrocks/smartlog-interfaces": {
@@ -2351,9 +2351,9 @@
       "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
     },
     "tslint": {
-      "version": "5.12.0",
+      "version": "5.12.1",
-      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-5.12.0.tgz",
+      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-5.12.1.tgz",
-      "integrity": "sha512-CKEcH1MHUBhoV43SA/Jmy1l24HJJgI0eyLbBNSRyFlsQvb9v6Zdq+Nz2vEOH00nC5SUx4SneJ59PZUS/ARcokQ==",
+      "integrity": "sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==",
       "dev": true,
       "requires": {
         "babel-code-frame": "^6.22.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "2.0.28",
+  "version": "2.0.32",
   "private": false,
   "description": "acme implementation in TypeScript",
   "main": "dist/index.js",
@@ -29,8 +29,8 @@
     "@pushrocks/smartdata": "^3.1.13",
     "@pushrocks/smartdelay": "^2.0.2",
     "@pushrocks/smartdns": "^3.0.8",
-    "@pushrocks/smartexpress": "^3.0.4",
+    "@pushrocks/smartexpress": "^3.0.6",
-    "@pushrocks/smartlog": "^2.0.9",
+    "@pushrocks/smartlog": "^2.0.11",
     "@pushrocks/smartpromise": "^2.0.5",
     "@pushrocks/smartrequest": "^1.1.14",
     "@pushrocks/smartstring": "^3.0.8",
@@ -43,10 +43,10 @@
     "@gitzone/tsrun": "^1.1.17",
     "@gitzone/tstest": "^1.0.18",
     "@mojoio/cloudflare": "^2.0.0",
-    "@pushrocks/qenv": "^3.0.2",
+    "@pushrocks/qenv": "^4.0.0",
     "@pushrocks/tapbundle": "^3.0.7",
     "@types/node": "^10.12.18",
-    "tslint": "^5.12.0",
+    "tslint": "^5.12.1",
     "tslint-config-prettier": "^1.17.0"
   }
 }

test/test.ts

@@ -12,9 +12,9 @@ tap.test('should create a valid instance of SmartAcme', async () => {
     accountEmail: 'domains@lossless.org',
     accountPrivateKey: null,
     mongoDescriptor: {
-      mongoDbName: testQenv.getEnvVarOnDemand('MONGODB_DATABASE'),
+      mongoDbName: testQenv.getEnvVarRequired('MONGODB_DATABASE'),
-      mongoDbPass: testQenv.getEnvVarOnDemand('MONGODB_PASSWORD'),
+      mongoDbPass: testQenv.getEnvVarRequired('MONGODB_PASSWORD'),
-      mongoDbUrl: testQenv.getEnvVarOnDemand('MONGODB_URL')
+      mongoDbUrl: testQenv.getEnvVarRequired('MONGODB_URL')
     },
     removeChallenge: async (...args) => {
       console.log(args);
@@ -22,9 +22,7 @@ tap.test('should create a valid instance of SmartAcme', async () => {
     setChallenge: async (...args) => {
       console.log(args);
     },
-    validateRemoteRequest: async () => {
+    environment: "integration"
-      return true;
-    }
   });
   await smartAcmeInstance.init();
   // await smartAcmeInstance.getCertificateForDomain('bleu.de');

ts/interfaces/cert.ts

@@ -1,6 +1,7 @@
 export type TCertStatus = 'existing' | 'nonexisting' | 'pending' | 'failed';
 
 export interface ICert {
+  id: string;
   domainName: string;
   created: number;
   privateKey: string;

ts/smartacme.classes.cert.ts

@@ -12,7 +12,7 @@ import { ICert } from './interfaces';
 })
 export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert> implements interfaces.ICert {
   @unI()
-  public index: string;
+  public id: string;
 
   @svDb()
   public domainName: string;

ts/smartacme.classes.certmanager.ts

@@ -62,6 +62,7 @@ export class CertManager {
   public async storeCertificate(optionsArg: interfaces.ICert) {
     const cert = new Cert(optionsArg);
     await cert.save();
+    this.pendingMap.removeString(optionsArg.domainName);
   }
 
   public async deleteCertificate(domainNameArg: string) {
@@ -86,7 +87,7 @@ export class CertManager {
     }
 
     // otherwise lets continue
-    const existingCertificate = this.retrieveCertificate(certDomainArg);
+    const existingCertificate = await this.retrieveCertificate(certDomainArg);
     if (existingCertificate) {
       return 'existing';
     }
@@ -97,5 +98,7 @@ export class CertManager {
   /**
    * checks all certs for expiration
    */
-  private async checkCerts() {};
+  private async checkCerts() {
+    // TODO
+  };
 }

ts/smartacme.classes.certremoteclient.ts

@@ -26,7 +26,7 @@ export class CertRemoteClient {
   public async getCertificateForDomain(domainNameArg: string): Promise<interfaces.ICert> {
     let certificate: interfaces.ICert;
     const doRequestCycle = async (): Promise<interfaces.ICert> => {
-      const response: interfaces.ICertRemoteResponse = (await plugins.smartrequest.postJson(
+      const responseBody: interfaces.ICertRemoteResponse = (await plugins.smartrequest.postJson(
         this.remoteUrl,
         {
           requestBody: <interfaces.ICertRemoteRequest>{
@@ -35,13 +35,15 @@ export class CertRemoteClient {
           }
         }
       )).body;
-      switch (response.status as interfaces.TCertStatus) {
+      console.log(responseBody);
+      switch (responseBody.status as interfaces.TCertStatus) {
         case 'pending':
           await plugins.smartdelay.delayFor(5000);
           const finalResponse = await doRequestCycle();
           return finalResponse;
         case 'existing':
-          return response.certificate;
+          this.logger.log('ok', `got certificate for ${domainNameArg}`);
+          return responseBody.certificate;
         case 'failed':
         default:
           console.log(`could not retrieve certificate for ${domainNameArg}`);

ts/smartacme.classes.smartacme.ts

@@ -16,6 +16,7 @@ export interface ISmartAcmeOptions {
   setChallenge: (domainName: string, keyAuthorization: string) => Promise<any>;
   removeChallenge: (domainName: string) => Promise<any>;
   environment: 'production' | 'integration';
+  logger?: plugins.smartlog.Smartlog;
 }
 
 /**
@@ -34,6 +35,7 @@ export class SmartAcme {
   // the acme client
   private client: any;
   private smartdns = new plugins.smartdns.Smartdns();
+  public logger: plugins.smartlog.Smartlog;
 
   // the account private key
   private privateKey: string;
@@ -49,15 +51,19 @@ export class SmartAcme {
   /**
    * the remote handler to hand the request and response to.
    */
-  public certremoteHandler = async (req: plugins.smartexpress.Request, res: plugins.smartexpress.Response) => {
+  public certremoteHandler = async (
+    req: plugins.smartexpress.Request,
+    res: plugins.smartexpress.Response
+  ) => {
     const requestBody: interfaces.ICertRemoteRequest = req.body;
-    const certDomain = this.certmatcher.getCertificateDomainNameByDomainName(requestBody.domainName);
+    const certDomain = this.certmatcher.getCertificateDomainNameByDomainName(
-    let status: interfaces.TCertStatus = await this.certmanager.getCertificateStatus(
+      requestBody.domainName
-      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(
@@ -66,7 +72,7 @@ export class SmartAcme {
         };
         break;
       default:
-        if (status === "nonexisting") {
+        if (status === 'nonexisting') {
           this.getCertificateForDomain(certDomain);
           status = 'pending';
         }
@@ -82,6 +88,9 @@ export class SmartAcme {
 
   constructor(optionsArg: ISmartAcmeOptions) {
     this.options = optionsArg;
+    this.options.logger
+      ? (this.logger = optionsArg.logger)
+      : (this.logger = plugins.smartlog.defaultLogger);
   }
 
   /**
@@ -189,11 +198,9 @@ export class SmartAcme {
     const cert = await this.client.getCertificate(order);
 
     /* Done */
-    console.log(`CSR:\n${csr.toString()}`);
-    console.log(`Private key:\n${key.toString()}`);
-    console.log(`Certificate:\n${cert.toString()}`);
 
     await this.certmanager.storeCertificate({
+      id: plugins.smartunique.shortId(),
       domainName: certDomain,
       privateKey: key.toString(),
       publicKey: cert.toString(),