@abtnode/certificate-manager 1.16.9 → 1.16.10-beta-9dc61102
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/libs/acme-manager.js +1 -5
- package/package.json +7 -7
- package/states/certificate.js +12 -1
package/libs/acme-manager.js
CHANGED
|
@@ -151,11 +151,7 @@ class Manager extends EventEmitter {
|
|
|
151
151
|
|
|
152
152
|
async checkRenewalCerts() {
|
|
153
153
|
logger.info('run renewal certificate job');
|
|
154
|
-
const certs = await states.certificate.
|
|
155
|
-
source: CERT_SOURCE.letsEncrypt,
|
|
156
|
-
'meta.validTo': { $exists: true, $lte: moment().add(this.renewalOffsetInDay, 'days').unix() * 1000 },
|
|
157
|
-
});
|
|
158
|
-
|
|
154
|
+
const certs = await states.certificate.findRenewCerts(this.renewalOffsetInDay);
|
|
159
155
|
for (const cert of certs) {
|
|
160
156
|
// eslint-disable-next-line no-await-in-loop
|
|
161
157
|
await this.pushToJobQueue(cert.domain);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abtnode/certificate-manager",
|
|
3
|
-
"version": "1.16.
|
|
3
|
+
"version": "1.16.10-beta-9dc61102",
|
|
4
4
|
"description": "Manage ABT Node SSL certificates",
|
|
5
5
|
"author": "polunzh <polunzh@gmail.com>",
|
|
6
6
|
"homepage": "https://github.com/ArcBlock/blocklet-server#readme",
|
|
@@ -32,11 +32,11 @@
|
|
|
32
32
|
"url": "https://github.com/ArcBlock/blocklet-server/issues"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@abtnode/cron": "1.16.
|
|
36
|
-
"@abtnode/logger": "1.16.
|
|
37
|
-
"@abtnode/models": "1.16.
|
|
38
|
-
"@abtnode/queue": "1.16.
|
|
39
|
-
"@abtnode/util": "1.16.
|
|
35
|
+
"@abtnode/cron": "1.16.10-beta-9dc61102",
|
|
36
|
+
"@abtnode/logger": "1.16.10-beta-9dc61102",
|
|
37
|
+
"@abtnode/models": "1.16.10-beta-9dc61102",
|
|
38
|
+
"@abtnode/queue": "1.16.10-beta-9dc61102",
|
|
39
|
+
"@abtnode/util": "1.16.10-beta-9dc61102",
|
|
40
40
|
"@fidm/x509": "^1.2.1",
|
|
41
41
|
"@greenlock/manager": "^3.1.0",
|
|
42
42
|
"@root/acme": "^3.1.0",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"moment": "^2.29.4",
|
|
51
51
|
"punycode": "^2.1.1"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "23942434de21a7638a81994f12655968f2a9a79c"
|
|
54
54
|
}
|
package/states/certificate.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
const get = require('lodash.get');
|
|
2
2
|
const { BaseState } = require('@abtnode/models');
|
|
3
|
+
const moment = require('moment');
|
|
3
4
|
|
|
4
|
-
const { CERT_STATUS } = require('../libs/constant');
|
|
5
|
+
const { CERT_STATUS, CERT_SOURCE } = require('../libs/constant');
|
|
5
6
|
const { getCertInfo } = require('../libs/util');
|
|
6
7
|
|
|
7
8
|
/**
|
|
@@ -33,6 +34,16 @@ class Certificate extends BaseState {
|
|
|
33
34
|
|
|
34
35
|
return super.update(condition, data);
|
|
35
36
|
}
|
|
37
|
+
|
|
38
|
+
async findRenewCerts(renewalOffsetInDay) {
|
|
39
|
+
const certs = await super.find({ source: CERT_SOURCE.letsEncrypt });
|
|
40
|
+
return certs
|
|
41
|
+
.filter((cert) => cert.meta?.validTo)
|
|
42
|
+
.filter((cert) => {
|
|
43
|
+
const tmp = moment().add(renewalOffsetInDay, 'days').unix() * 1000;
|
|
44
|
+
return cert.meta.validTo <= tmp;
|
|
45
|
+
});
|
|
46
|
+
}
|
|
36
47
|
}
|
|
37
48
|
|
|
38
49
|
module.exports = Certificate;
|