@abtnode/certificate-manager 1.7.8 → 1.7.11

package/libs/acme-manager.js

@@ -31,24 +31,16 @@ class Manager extends EventEmitter {
     this.maintainerEmail = maintainerEmail;
     this.renewalOffsetInDay = renewalOffsetInDay;
     this.dataDir = dataDir;
+    this.getJobId = (job) => (job ? md5(`${job.domain}-${job.challenge}`) : '');
     this.queue = createQueue({
       name: 'create-cert-queue',
       dataDir,
-      onJob: async ({ domain }) => {
-        const data = await states.certificate.findOne({ domain });
-        if (data) {
-          await this._createOrRenewCert({
-            domain: data.domain,
-            subscriberEmail: this.subscriberEmail,
-            challenges: { 'http-01': http01 },
-          });
-        }
-      },
+      onJob: (data) => this._createOrRenewCert(data),
       options: {
-        maxRetries: 3,
+        maxRetries: 0,
         retryDelay: 60 * 1000,
         maxTimeout: 60 * 1000, // throw timeout error after 1 minutes
-        id: (job) => (job ? md5(`${job.domain}-${job.challenge}`) : ''),
+        id: (job) => this.getJobId(job),
       },
     });
   }
@@ -67,19 +59,39 @@ class Manager extends EventEmitter {
       throw new Error('domain is required when add domain');
     }
 
-    const existed = await states.certificate.findOne({ domain });
-    if (existed) {
-      return existed;
+    let cert = await states.certificate.findOne({ domain });
+    if (!cert) {
+      cert = await states.certificate.insert({
+        domain,
+        source: CERT_SOURCE.letsEncrypt,
+        status: CERT_STATUS.waiting,
+      });
     }
 
-    const result = await states.certificate.insert({
+    const getJob = (id) =>
+      new Promise((resolve, reject) => {
+        this.queue.store.getJob(id, (error, job) => {
+          if (error) {
+            return reject(error);
+          }
+
+          return resolve(job);
+        });
+      });
+
+    const jobData = {
       domain,
-      source: CERT_SOURCE.letsEncrypt,
-      status: CERT_STATUS.waiting,
-    });
+      subscriberEmail: this.subscriberEmail,
+      challenges: { 'http-01': http01 },
+    };
+
+    const job = await getJob(jobData);
+
+    if (!job) {
+      this.queue.push(jobData);
+    }
 
-    this.queue.push({ domain });
-    return result;
+    return cert;
   }
 
   getCertState(domain) {
@@ -148,17 +160,8 @@ class Manager extends EventEmitter {
   async checkRenewalCerts() {
     logger.info('run generate certificate job');
     const certs = await states.certificate.find({
-      $or: [
-        {
-          source: CERT_SOURCE.letsEncrypt,
-          status: { $in: [CERT_STATUS.waiting, CERT_STATUS.error] },
-        },
-        {
-          source: CERT_SOURCE.letsEncrypt,
-          status: CERT_STATUS.generated,
-          'meta.validTo': { $lte: moment().add(this.renewalOffsetInDay, 'days').unix() * 1000 },
-        },
-      ],
+      source: CERT_SOURCE.letsEncrypt,
+      'meta.validTo': { $exists: true, $lte: moment().add(this.renewalOffsetInDay, 'days').unix() * 1000 },
     });
 
     certs.forEach(({ domain }) => this.queue.push({ domain }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/certificate-manager",
-  "version": "1.7.8",
+  "version": "1.7.11",
   "description": "Manage ABT Node SSL certificates",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -31,11 +31,11 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/cron": "1.7.8",
-    "@abtnode/db": "1.7.8",
-    "@abtnode/logger": "1.7.8",
-    "@abtnode/queue": "1.7.8",
-    "@abtnode/util": "1.7.8",
+    "@abtnode/cron": "1.7.11",
+    "@abtnode/db": "1.7.11",
+    "@abtnode/logger": "1.7.11",
+    "@abtnode/queue": "1.7.11",
+    "@abtnode/util": "1.7.11",
     "@fidm/x509": "^1.2.1",
     "@greenlock/manager": "^3.1.0",
     "@nedb/core": "^1.1.0",
@@ -55,5 +55,5 @@
     "punycode": "^2.1.1",
     "ursa-optional": "^0.10.2"
   },
-  "gitHead": "ae75dd20b4750a31dc53c88b75ed1d95c8f15397"
+  "gitHead": "84e741e6b37e47d52bf834ce3ace8ed601d0896c"
 }