@abtnode/certificate-manager 1.7.9 → 1.7.12

package/libs/acme-manager.js

@@ -31,24 +31,23 @@ 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: async (data) => {
+        if (process.env.NODE_ENV === 'test') {
+          logger.info('skip in test environment');
+          return;
         }
+
+        await 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),
       },
     });
   }
@@ -56,30 +55,39 @@ class Manager extends EventEmitter {
   getJobSchedular() {
     return {
       name: 'check-renewal-cert-job',
-      time: process.env.NODE_ENV === 'development' ? '0 * * * * *' : '0 */10 * * * *', // every 3 minutes
+      time: '0 0 9 * * *', // 每天执行一次
       fn: this.checkRenewalCerts.bind(this),
       options: { runOnInit: false },
     };
   }
 
+  async pushToJobQueue(domain) {
+    const jobData = { domain, subscriberEmail: this.maintainerEmail, challenges: { 'http-01': http01 } };
+
+    const job = await this.queue.getJob(this.getJobId(jobData));
+
+    if (!job) {
+      this.queue.push(jobData);
+    }
+  }
+
   async add(domain) {
     if (!domain) {
       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({
-      domain,
-      source: CERT_SOURCE.letsEncrypt,
-      status: CERT_STATUS.waiting,
-    });
+    await this.pushToJobQueue(domain);
 
-    this.queue.push({ domain });
-    return result;
+    return cert;
   }
 
   getCertState(domain) {
@@ -146,22 +154,16 @@ class Manager extends EventEmitter {
   }
 
   async checkRenewalCerts() {
-    logger.info('run generate certificate job');
+    logger.info('run renewal 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 }));
+    for (const cert of certs) {
+      // eslint-disable-next-line no-await-in-loop
+      await this.pushToJobQueue(cert.domain);
+    }
   }
 }
 

package/libs/queue.js

@@ -8,5 +8,16 @@ module.exports = ({ name, dataDir, onJob, options = {} }) => {
     options,
   });
 
+  queue.getJob = (id) =>
+    new Promise((resolve, reject) => {
+      queue.store.getJob(id, (error, job) => {
+        if (error) {
+          return reject(error);
+        }
+
+        return resolve(job);
+      });
+    });
+
   return queue;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/certificate-manager",
-  "version": "1.7.9",
+  "version": "1.7.12",
   "description": "Manage ABT Node SSL certificates",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -23,19 +23,20 @@
     "url": "git+https://github.com/ArcBlock/blocklet-server.git"
   },
   "scripts": {
-    "test": "echo \"Error: run tests from root\"",
     "lint": "eslint libs routes sdk states validators index.js",
-    "lint:fix": "eslint --fix tests lib"
+    "lint:fix": "eslint --fix tests lib",
+    "test": "node tools/jest.js",
+    "coverage": "npm run test -- --coverage"
   },
   "bugs": {
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/cron": "1.7.9",
-    "@abtnode/db": "1.7.9",
-    "@abtnode/logger": "1.7.9",
-    "@abtnode/queue": "1.7.9",
-    "@abtnode/util": "1.7.9",
+    "@abtnode/cron": "1.7.12",
+    "@abtnode/db": "1.7.12",
+    "@abtnode/logger": "1.7.12",
+    "@abtnode/queue": "1.7.12",
+    "@abtnode/util": "1.7.12",
     "@fidm/x509": "^1.2.1",
     "@greenlock/manager": "^3.1.0",
     "@nedb/core": "^1.1.0",
@@ -55,5 +56,5 @@
     "punycode": "^2.1.1",
     "ursa-optional": "^0.10.2"
   },
-  "gitHead": "285f4fedd41fcb8e1814ce5d8250ac10616e67e0"
+  "gitHead": "afc78b9cb92448676149262fb02432bc256a5524"
 }

package/sdk/manager.js

@@ -34,6 +34,7 @@ class Manager extends EventEmitter {
       daysBeforeExpireToRenewal: this.daysBeforeExpireToRenewal,
       baseDataDir: this.dataDir,
     });
+
     this.acmeManager = acmeManager;
 
     acmeManager.on('cert.issued', (...args) => {