@certd/acme-client 1.38.7 → 1.38.9

package/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.38.7",
+    "version": "1.38.9",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.38.7",
+        "@certd/basic": "^1.38.9",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.9.0",
@@ -70,5 +70,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
+    "gitHead": "b30cb5d7dc8311af4863da7dc8781f7264ba0545"
 }

package/src/client.js

@@ -601,7 +601,10 @@ class AcmeClient {
         };
 
         this.log(`[${d}] Waiting for valid status （等待valid状态）: ${item.url}`, JSON.stringify(this.backoffOpts));
-        return util.retry(verifyFn, this.backoffOpts);
+        const log = (...args)=>{
+            this.logger.info(...args)
+        }
+        return util.retry(verifyFn, this.backoffOpts,log);
     }
 
     /**

package/src/http.js

@@ -74,8 +74,9 @@ class HttpClient {
         if (this.urlMapping && this.urlMapping.enabled && this.urlMapping.mappings) {
             // eslint-disable-next-line no-restricted-syntax
             for (const key in this.urlMapping.mappings) {
+                const value = this.urlMapping.mappings[key];
                 if (url.includes(key)) {
-                    const newUrl = url.replace(key, this.urlMapping.mappings[key]);
+                    const newUrl = url.replace(key, value);
                     this.log(`use reverse proxy: ${newUrl}`);
                     url = newUrl;
                 }
@@ -193,7 +194,7 @@ class HttpClient {
         const dir = await this.getDirectory();
 
         if (!dir[resource]) {
-            throw new Error(`Unable to locate API resource URL in ACME directory: "${resource}"`);
+            throw new Error(`Unable to locate API resource URL in ACME directory: "${resource}"，获取ACME接口地址信息失败，可能网络不稳定或该证书颁发机构服务器崩溃，目录地址：${this.directoryUrl}，请测试地址是否可以正常访问并显示json格式的URL地址列表`);
         }
 
         return dir[resource];

package/src/index.js

@@ -57,6 +57,32 @@ export function getDirectoryUrl(opts) {
   return list.production
 }
 
+
+export function getAllSslProviderDomains() {
+  const list = Object.values(directory).map((item) => {
+    let url =  item.production.replace('https://', '')
+    url = url.substring(0, url.indexOf('/'))
+    return url
+  })
+  return list
+}
+
+let sslProviderReverseProxies = {}
+
+function initSslProviderReverseProxies() {
+  for (const sslProvider of getAllSslProviderDomains()) {
+    sslProviderReverseProxies[sslProvider] = ""
+  }
+}
+initSslProviderReverseProxies()
+
+export function getSslProviderReverseProxies() {
+  return sslProviderReverseProxies
+}
+export function setSslProviderReverseProxies(reverseProxies) {
+  Object.assign(sslProviderReverseProxies, reverseProxies)
+}
+
 /**
  * Crypto
  */

package/src/util.js

@@ -52,11 +52,17 @@ async function retryPromise(fn, attempts, backoff, logger = log) {
     let aborted = false;
 
     try {
-        const data = await fn(() => { aborted = true; });
+        const setAbort = () => { aborted = true; }
+        const data = await fn(setAbort);
         return data;
     }
     catch (e) {
-        if (aborted || ((backoff.attempts + 1) >= attempts)) {
+        if (aborted){
+            logger(`用户取消重试`);
+            throw e;
+        }
+        if ( ((backoff.attempts + 1) >= attempts)) {
+            logger(`重试次数超过${attempts}次`);
             throw e;
         }
 

package/types/index.d.ts

@@ -118,6 +118,9 @@ export const directory: {
 };
 
 export function getDirectoryUrl(opts:{sslProvider:string, pkType: string}): string;
+export function getAllSslProviderDomains(): string[];
+export function getSslProviderReverseProxies(): Record<string, string>;
+export function setSslProviderReverseProxies(reverseProxies: Record<string, string>): void;
 
 /**
  * Crypto