@postalsys/certs 1.0.1 → 1.0.3

package/lib/certs.js

@@ -274,13 +274,43 @@ class Certs {
             values[dataKey] = Object.assign(currendData || {}, updates);
         }
 
+        let run = this.redis.multi();
+
+        if ('cert' in updates) {
+            run = run.sadd(this.getKey('certlist'), domain);
+        }
+
         if (incrVersion) {
-            await this.redis.hincrby(this.settings.getKey('settings'), versionKey, 1);
+            run = run.hincrby(this.settings.getKey('settings'), versionKey, 1);
         }
 
         if (Object.keys(values).length) {
-            return await this.settings.set(values);
+            run = this.settings.getSet(run, values);
         }
+
+        await run.exec();
+    }
+
+    async deleteCertificateData(domain) {
+        let dataKey = `domain:${domain}:data`;
+        let lastCheckKey = `domain:${domain}:lastCheck`;
+        let privateKeyKey = `domain:${domain}:privateKey`;
+        let lastErrorKey = `domain:${domain}:lastError`;
+        let versionKey = `domain:${domain}:certVersion`;
+
+        return await this.redis
+            .multi()
+            .hdel(this.settings.getKey('settings'), dataKey)
+            .hdel(this.settings.getKey('settings'), lastCheckKey)
+            .hdel(this.settings.getKey('settings'), privateKeyKey)
+            .hdel(this.settings.getKey('settings'), lastErrorKey)
+            .hdel(this.settings.getKey('settings'), versionKey)
+            .srem(this.getKey('certlist'), domain)
+            .exec();
+    }
+
+    async listCertificateDomains() {
+        return (await this.redis.smembers(this.getKey('certlist'))).sort((a, b) => a.toLowerCase().trim().localeCompare(b.toLowerCase().trim()));
     }
 
     async acquireCert(domain) {
@@ -313,21 +343,21 @@ class Certs {
             return existingCertificateData;
         }
 
-        try {
-            // reload from db, maybe already renewed
-            if (existingCertificateData.validTo && existingCertificateData.validTo > new Date(Date.now() + RENEW_AFTER_REMAINING)) {
-                // no need to renew
-                return existingCertificateData;
-            }
+        // reload from db, maybe already renewed
+        if (existingCertificateData && existingCertificateData.validTo && existingCertificateData.validTo > new Date(Date.now() + RENEW_AFTER_REMAINING)) {
+            // no need to renew
+            return existingCertificateData;
+        }
 
-            let privateKey = existingCertificateData.privateKey;
-            if (!privateKey) {
-                // generate new key
-                this.logger.trace({ msg: 'Provision new private key', domain });
-                privateKey = await generateKey(this.acmeOptions.keyBits, this.acmeOptions.keyExponent);
-                await this.setCertificateData(domain, { domain, privateKey, status: 'pending', lastError: null });
-            }
+        let privateKey = existingCertificateData && existingCertificateData.privateKey;
+        if (!privateKey) {
+            // generate new key
+            this.logger.trace({ msg: 'Provision new private key', domain });
+            privateKey = await generateKey(this.acmeOptions.keyBits, this.acmeOptions.keyExponent);
+            await this.setCertificateData(domain, { domain, privateKey, status: 'pending', lastError: null });
+        }
 
+        try {
             const jwkPrivateKey = pem2jwk(privateKey);
             const csr = await CSR.csr({
                 jwk: jwkPrivateKey,
@@ -397,6 +427,19 @@ class Certs {
                 } catch (err) {
                     this.logger.error({ msg: 'Failed to update certificate record', domain, err });
                 }
+            } else if (privateKey) {
+                try {
+                    await this.setCertificateData(domain, {
+                        status: 'failed',
+                        lastError: {
+                            err: err.message,
+                            code: err.code,
+                            time: new Date()
+                        }
+                    });
+                } catch (err) {
+                    this.logger.error({ msg: 'Failed to update certificate record', domain, err });
+                }
             }
 
             if (existingCertificateData && existingCertificateData.cert) {
@@ -471,12 +514,13 @@ class Certs {
     async getCertificate(domain, skipAcquire) {
         domain = normalizeDomain(domain);
         let certificateData = await this.loadCertificateData(domain);
+
         if (certificateData && certificateData.status === 'valid' && certificateData.validTo && certificateData.validTo >= new Date()) {
             return certificateData;
         }
 
         if (skipAcquire) {
-            return false;
+            return certificateData || false;
         }
 
         return await this.acquireCert(domain);

package/lib/settings.js

@@ -20,6 +20,26 @@ class Settings {
         return `${this.ns}certs:${name}`;
     }
 
+    getSet(run, ...args) {
+        let settingsKey = this.getKey('settings');
+
+        let props = false;
+
+        if (args.length === 1 && typeof args[0] === 'object' && args[0]) {
+            props = {};
+            for (let key of Object.keys(args[0])) {
+                props[key] = msgpack.encode(args[0][key]);
+            }
+        } else if (args.length === 2 && typeof args[0] === 'string') {
+            props = {
+                [args[0]]: msgpack.encode(args[1])
+            };
+        } else {
+            return false;
+        }
+        return run.hmset(settingsKey, props);
+    }
+
     async set(...args) {
         let settingsKey = this.getKey('settings');
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@postalsys/certs",
-    "version": "1.0.1",
+    "version": "1.0.3",
     "description": "Manage Let's Encrypt certificates",
     "main": "lib/certs.js",
     "scripts": {
@@ -15,17 +15,17 @@
     "devDependencies": {
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "8.5.0",
-        "express": "4.18.1",
-        "ioredis": "5.1.0"
+        "express": "4.18.2",
+        "ioredis": "5.2.4"
     },
     "dependencies": {
         "@root/acme": "3.1.0",
         "ioredfour": "1.2.0-ioredis-06",
-        "joi": "17.6.0",
-        "msgpack5": "6.0.1",
+        "joi": "17.7.0",
+        "msgpack5": "6.0.2",
         "pem-jwk": "2.0.0",
-        "pino": "8.1.0",
+        "pino": "8.7.0",
         "punycode": "2.1.1",
-        "uuid": "8.3.2"
+        "uuid": "9.0.0"
     }
 }