2.0.36

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "2.0.32",
+  "version": "2.0.36",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "2.0.32",
+  "version": "2.0.36",
   "private": false,
   "description": "acme implementation in TypeScript",
   "main": "dist/index.js",

ts/smartacme.classes.certremoteclient.ts

@@ -35,9 +35,9 @@ export class CertRemoteClient {
           }
         }
       )).body;
-      console.log(responseBody);
       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;

ts/smartacme.classes.smartacme.ts

@@ -56,9 +56,11 @@ export class SmartAcme {
     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) {
@@ -137,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 */