2.0.35

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "2.0.30",
+  "version": "2.0.35",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -206,11 +206,11 @@
       }
     },
     "@pushrocks/smartlog": {
-      "version": "2.0.10",
+      "version": "2.0.11",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartlog/-/smartlog-2.0.10.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartlog/-/smartlog-2.0.11.tgz",
-      "integrity": "sha512-4Ir4/JvfL+d5VsN+O8BpFSgUc1mWgr9s6S/cwYBCAIrWdqGomUM5RsZs57RMDn9MWW0JGJjGhUA0M+A8LSSgHw==",
+      "integrity": "sha512-V8SMzAAqDpl1+CJ9b3w5e/1ARjk4JOPZ35qZIllVBhHr8meCqnPE2immlfBYWmEp1xy3ntdAA+Lgewtu+iVk6A==",
       "requires": {
-        "@pushrocks/smartlog-interfaces": "^2.0.2"
+        "@pushrocks/smartlog-interfaces": "^2.0.5"
       }
     },
     "@pushrocks/smartlog-interfaces": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "2.0.30",
+  "version": "2.0.35",
   "private": false,
   "description": "acme implementation in TypeScript",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
     "@pushrocks/smartdelay": "^2.0.2",
     "@pushrocks/smartdns": "^3.0.8",
     "@pushrocks/smartexpress": "^3.0.6",
-    "@pushrocks/smartlog": "^2.0.10",
+    "@pushrocks/smartlog": "^2.0.11",
     "@pushrocks/smartpromise": "^2.0.5",
     "@pushrocks/smartrequest": "^1.1.14",
     "@pushrocks/smartstring": "^3.0.8",

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) {
@@ -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,21 @@ 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);
+    this.logger.log('ok', `got certificate request for ${requestBody.domainName}`);
-    let status: interfaces.TCertStatus = await this.certmanager.getCertificateStatus(
+    const certDomain = this.certmatcher.getCertificateDomainNameByDomainName(
-      certDomain
+      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(
@@ -66,7 +74,7 @@ export class SmartAcme {
         };
         break;
       default:
-        if (status === "nonexisting") {
+        if (status === 'nonexisting') {
           this.getCertificateForDomain(certDomain);
           status = 'pending';
         }
@@ -82,6 +90,9 @@ export class SmartAcme {
 
   constructor(optionsArg: ISmartAcmeOptions) {
     this.options = optionsArg;
+    this.options.logger
+      ? (this.logger = optionsArg.logger)
+      : (this.logger = plugins.smartlog.defaultLogger);
   }
 
   /**
@@ -128,13 +139,28 @@ export class SmartAcme {
     await this.certmanager.smartdataDb.close();
   }
 
+  /**
+   * gets a certificate
+   * it runs through the following steps
+   * 
+   * * look in the database
+   * * if in the database return it
+   * * of 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)
+   * * retrieve it from the databse and return it
+   * 
+   * @param domainArg
+   */
   public async getCertificateForDomain(domainArg: string): Promise<Cert> {
     const certDomain = this.certmatcher.getCertificateDomainNameByDomainName(domainArg);
-    await this.certmanager.announceCertificate(certDomain);
     const retrievedCertificate = await this.certmanager.retrieveCertificate(certDomain);
 
     if (retrievedCertificate) {
       return retrievedCertificate;
+    } else {
+      await this.certmanager.announceCertificate(certDomain);
     }
 
     /* Place new order */
@@ -189,11 +215,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(),