@abtnode/certificate-manager 1.16.20-beta-20c7fb25 → 1.16.20-beta-e32e39d7

package/libs/acme-manager.js

@@ -1,4 +1,5 @@
 const { EventEmitter } = require('events');
+const dns = require('dns');
 const fs = require('fs');
 const path = require('path');
 const { Certificate } = require('@fidm/x509');
@@ -11,6 +12,7 @@ const { CERT_STATUS, CERT_SOURCE } = require('./constant');
 const createQueue = require('./queue');
 const logger = require('./logger');
 const states = require('../states');
+const CustomError = require('./error');
 
 const http01 = require('./http-01').create({});
 
@@ -44,7 +46,9 @@ class Manager extends EventEmitter {
         await this.createOrRenewCert({ ...data, challenges: { 'http-01': http01 } });
       },
       options: {
-        maxRetries: process.env.NODE_ENV === 'production' ? 5 : 0,
+        // Let's Encrypt 中对每个账户下的每个域名每个小时只允许有两次失败的 challenge,
+        // 所以这里设置为一个小于5的值
+        maxRetries: process.env.NODE_ENV === 'production' ? 2 : 0,
         retryDelay: 10 * 1000,
         maxTimeout: 60 * 1000, // throw timeout error after 1 minutes
         id: (job) => this.getJobId(job),
@@ -80,7 +84,7 @@ class Manager extends EventEmitter {
           await states.certificate.updateStatus(tmpDomain, CERT_STATUS.error);
         }
 
-        this.emit('cert.error', data.job);
+        this.emit('cert.error', { ...data.job, error: data.error });
         logger.error(`create certificate for ${tmpDomain} job failed`, { domain: tmpDomain, error: data.error });
       });
     }
@@ -101,6 +105,7 @@ class Manager extends EventEmitter {
     }
 
     let cert = await states.certificate.findOne({ domain });
+
     if (!cert) {
       cert = await states.certificate.insert({
         domain,
@@ -138,9 +143,15 @@ class Manager extends EventEmitter {
   async createOrRenewCert({ domain, subscriberEmail, force = false, challenges, metadata }) {
     try {
       if (!domain) {
-        throw new Error('domain is required when create certificate');
+        throw new CustomError('domain is required when generate certificate');
       }
 
+      const { address: ipAddress } = await dns.promises.lookup(domain, { family: 4 }).catch((error) => {
+        throw new CustomError(`DNS lookup failed: ${error.message}`);
+      });
+
+      logger.info('check domain dns success', { domain, ipAddress });
+
       const cert = await states.certificate.findOne({ domain });
       if (!cert) {
         logger.warn(`create certificate failed: the cert ${domain} does not exist`);
@@ -191,8 +202,12 @@ class Manager extends EventEmitter {
       this.emit('cert.issued', { id: cert.id, domain: data.subject, metadata });
       return certs[0];
     } catch (error) {
-      logger.error(`create certificate for ${domain} job failed`, error);
-      throw error;
+      logger.error(`create certificate for ${domain} job failed`, { error });
+      if (error instanceof CustomError) {
+        throw error;
+      }
+
+      throw new Error('certificate manager error');
     }
   }
 

package/libs/error.js

@@ -0,0 +1,11 @@
+class CustomError extends Error {
+  constructor(message) {
+    super(message);
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, this.constructor);
+    }
+  }
+}
+
+module.exports = CustomError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/certificate-manager",
-  "version": "1.16.20-beta-20c7fb25",
+  "version": "1.16.20-beta-e32e39d7",
   "description": "Manage ABT Node SSL certificates",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,11 +32,11 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/cron": "1.16.20-beta-20c7fb25",
-    "@abtnode/logger": "1.16.20-beta-20c7fb25",
-    "@abtnode/models": "1.16.20-beta-20c7fb25",
-    "@abtnode/queue": "1.16.20-beta-20c7fb25",
-    "@abtnode/util": "1.16.20-beta-20c7fb25",
+    "@abtnode/cron": "1.16.20-beta-e32e39d7",
+    "@abtnode/logger": "1.16.20-beta-e32e39d7",
+    "@abtnode/models": "1.16.20-beta-e32e39d7",
+    "@abtnode/queue": "1.16.20-beta-e32e39d7",
+    "@abtnode/util": "1.16.20-beta-e32e39d7",
     "@fidm/x509": "^1.2.1",
     "@greenlock/manager": "^3.1.0",
     "@root/acme": "^3.1.0",
@@ -49,5 +49,5 @@
     "lodash.get": "^4.4.2",
     "punycode": "^2.1.1"
   },
-  "gitHead": "cb9c7d84ca84283ccc6bf21264dfbef705a83abb"
+  "gitHead": "01ff4e9304b150d7c12872d417b81327792ad8e5"
 }