@abtnode/certificate-manager 1.16.13-beta-d17a7de4 → 1.16.13-beta-90ded76f
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 +2 -2
- package/package.json +7 -8
- package/states/certificate.js +2 -2
package/libs/acme-manager.js
CHANGED
|
@@ -2,7 +2,7 @@ const { EventEmitter } = require('events');
|
|
|
2
2
|
const fs = require('fs');
|
|
3
3
|
const path = require('path');
|
|
4
4
|
const { Certificate } = require('@fidm/x509');
|
|
5
|
-
const
|
|
5
|
+
const dayjs = require('@abtnode/util/lib/dayjs');
|
|
6
6
|
const md5 = require('@abtnode/util/lib/md5');
|
|
7
7
|
|
|
8
8
|
const pkg = require('../package.json');
|
|
@@ -127,7 +127,7 @@ class Manager extends EventEmitter {
|
|
|
127
127
|
|
|
128
128
|
if (cert.certificate) {
|
|
129
129
|
const info = Certificate.fromPEM(cert.certificate);
|
|
130
|
-
const days =
|
|
130
|
+
const days = dayjs(info.validTo).diff(dayjs(), 'days');
|
|
131
131
|
|
|
132
132
|
if (force === false && days > this.renewalOffsetInDay) {
|
|
133
133
|
logger.info(`no need to renewal ${cert.domain}, the certificate will expires more than ${days} days`);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abtnode/certificate-manager",
|
|
3
|
-
"version": "1.16.13-beta-
|
|
3
|
+
"version": "1.16.13-beta-90ded76f",
|
|
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.13-beta-
|
|
36
|
-
"@abtnode/logger": "1.16.13-beta-
|
|
37
|
-
"@abtnode/models": "1.16.13-beta-
|
|
38
|
-
"@abtnode/queue": "1.16.13-beta-
|
|
39
|
-
"@abtnode/util": "1.16.13-beta-
|
|
35
|
+
"@abtnode/cron": "1.16.13-beta-90ded76f",
|
|
36
|
+
"@abtnode/logger": "1.16.13-beta-90ded76f",
|
|
37
|
+
"@abtnode/models": "1.16.13-beta-90ded76f",
|
|
38
|
+
"@abtnode/queue": "1.16.13-beta-90ded76f",
|
|
39
|
+
"@abtnode/util": "1.16.13-beta-90ded76f",
|
|
40
40
|
"@fidm/x509": "^1.2.1",
|
|
41
41
|
"@greenlock/manager": "^3.1.0",
|
|
42
42
|
"@root/acme": "^3.1.0",
|
|
@@ -47,8 +47,7 @@
|
|
|
47
47
|
"express": "^4.18.2",
|
|
48
48
|
"joi": "17.7.0",
|
|
49
49
|
"lodash.get": "^4.4.2",
|
|
50
|
-
"moment": "^2.29.4",
|
|
51
50
|
"punycode": "^2.1.1"
|
|
52
51
|
},
|
|
53
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "e6d4b88fe2cb45e00e5d745e1cd148dc76a019a4"
|
|
54
53
|
}
|
package/states/certificate.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const get = require('lodash.get');
|
|
2
2
|
const { BaseState } = require('@abtnode/models');
|
|
3
|
-
const
|
|
3
|
+
const dayjs = require('@abtnode/util/lib/dayjs');
|
|
4
4
|
|
|
5
5
|
const { CERT_STATUS, CERT_SOURCE } = require('../libs/constant');
|
|
6
6
|
const { getCertInfo } = require('../libs/util');
|
|
@@ -40,7 +40,7 @@ class Certificate extends BaseState {
|
|
|
40
40
|
return certs
|
|
41
41
|
.filter((cert) => cert.meta?.validTo)
|
|
42
42
|
.filter((cert) => {
|
|
43
|
-
const tmp =
|
|
43
|
+
const tmp = dayjs().add(renewalOffsetInDay, 'days').unix() * 1000;
|
|
44
44
|
return cert.meta.validTo <= tmp;
|
|
45
45
|
});
|
|
46
46
|
}
|