@abtnode/certificate-manager 1.16.47-beta-20250721-025348-9ccb2d62 → 1.16.47-beta-20250721-130532-61549a96

package/libs/util.js

@@ -1,6 +1,5 @@
 const crypto = require('crypto');
 const fs = require('fs');
-const get = require('lodash.get');
 const { Certificate, PrivateKey } = require('@fidm/x509');
 
 const ensureDir = (dir) => {
@@ -27,16 +26,16 @@ const validateCertificate = (cert, domain) => {
     throw new Error('Invalid certificate: signature verify failed');
   }
 
-  const certDomain = get(certificate, 'subject.commonName', '');
+  const certDomain = certificate?.subject?.commonName || '';
   if (domain && domain !== certDomain) {
     throw new Error('Invalid certificate: domain does not match');
   }
 
-  const validFrom = get(certificate, 'validFrom', '');
+  const validFrom = certificate?.validFrom || '';
   if (!validFrom || new Date(validFrom).getTime() > Date.now()) {
     throw new Error('Invalid certificate: not in valid period');
   }
-  const validTo = get(certificate, 'validTo', '');
+  const validTo = certificate?.validTo || '';
   if (!validTo || new Date(validTo).getTime() < Date.now()) {
     throw new Error('Invalid certificate: not in valid period');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/certificate-manager",
-  "version": "1.16.47-beta-20250721-025348-9ccb2d62",
+  "version": "1.16.47-beta-20250721-130532-61549a96",
   "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.47-beta-20250721-025348-9ccb2d62",
-    "@abtnode/logger": "1.16.47-beta-20250721-025348-9ccb2d62",
-    "@abtnode/models": "1.16.47-beta-20250721-025348-9ccb2d62",
-    "@abtnode/queue": "1.16.47-beta-20250721-025348-9ccb2d62",
-    "@abtnode/util": "1.16.47-beta-20250721-025348-9ccb2d62",
+    "@abtnode/cron": "1.16.47-beta-20250721-130532-61549a96",
+    "@abtnode/logger": "1.16.47-beta-20250721-130532-61549a96",
+    "@abtnode/models": "1.16.47-beta-20250721-130532-61549a96",
+    "@abtnode/queue": "1.16.47-beta-20250721-130532-61549a96",
+    "@abtnode/util": "1.16.47-beta-20250721-130532-61549a96",
     "@blocklet/error": "^0.2.5",
     "@fidm/x509": "^1.2.1",
     "@greenlock/manager": "^3.1.0",
@@ -47,8 +47,7 @@
     "debug": "^4.4.1",
     "express": "^4.18.2",
     "joi": "17.12.2",
-    "lodash.get": "^4.4.2",
     "punycode": "^2.3.1"
   },
-  "gitHead": "e51fdc32b26511dd1d2297659e9aa5fa83768c40"
+  "gitHead": "78041763148c9b98245c28ff176ff0fc9acbd071"
 }

package/sdk/manager.js

@@ -1,6 +1,5 @@
 const { EventEmitter } = require('events');
 const { Certificate } = require('@fidm/x509');
-const get = require('lodash.get');
 const Cron = require('@abtnode/cron');
 
 const AcmeManager = require('../libs/acme-manager');
@@ -120,7 +119,7 @@ class Manager extends EventEmitter {
     }
 
     const info = Certificate.fromPEM(data.certificate);
-    data.domain = get(info, 'subject.commonName', '');
+    data.domain = info?.subject?.commonName || '';
     if (!data.domain && Array.isArray(info.dnsNames) && info.dnsNames.length) {
       [data.domain] = info.dnsNames;
     }

package/states/certificate.js

@@ -1,4 +1,3 @@
-const get = require('lodash.get');
 const { BaseState } = require('@abtnode/models');
 const dayjs = require('@abtnode/util/lib/dayjs');
 
@@ -36,8 +35,8 @@ class Certificate extends BaseState {
   update(condition, data) {
     if (data.certificate) {
       data.meta = getCertInfo(data.certificate);
-    } else if (get(data, '$set.certificate')) {
-      data.$set.meta = getCertInfo(get(data, '$set.certificate'));
+    } else if (data?.$set?.certificate) {
+      data.$set.meta = getCertInfo(data.$set.certificate);
     }
 
     return super.update(condition, data);