@certd/acme-client 1.39.11 → 1.39.13

package/dist/api.d.ts

@@ -0,0 +1,151 @@
+/**
+ * AcmeApi
+ *
+ * @class
+ * @param {HttpClient} httpClient
+ */
+declare class AcmeApi {
+    constructor(httpClient: any, accountUrl?: any);
+    getLocationFromHeader(resp: any): any;
+    /**
+     * Get account URL
+     *
+     * @private
+     * @returns {string} Account URL
+     */
+    getAccountUrl(): any;
+    /**
+     * ACME API request
+     *
+     * @private
+     * @param {string} url Request URL
+     * @param {object} [payload] Request payload, default: `null`
+     * @param {number[]} [validStatusCodes] Array of valid HTTP response status codes, default: `[]`
+     * @param {object} [opts]
+     * @param {boolean} [opts.includeJwsKid] Include KID instead of JWK in JWS header, default: `true`
+     * @param {boolean} [opts.includeExternalAccountBinding] Include EAB in request, default: `false`
+     * @returns {Promise<object>} HTTP response
+     */
+    apiRequest(url: any, payload?: any, validStatusCodes?: any[], { includeJwsKid, includeExternalAccountBinding }?: {
+        includeJwsKid?: boolean;
+        includeExternalAccountBinding?: boolean;
+    }): Promise<any>;
+    /**
+     * ACME API request by resource name helper
+     *
+     * @private
+     * @param {string} resource Request resource name
+     * @param {object} [payload] Request payload, default: `null`
+     * @param {number[]} [validStatusCodes] Array of valid HTTP response status codes, default: `[]`
+     * @param {object} [opts]
+     * @param {boolean} [opts.includeJwsKid] Include KID instead of JWK in JWS header, default: `true`
+     * @param {boolean} [opts.includeExternalAccountBinding] Include EAB in request, default: `false`
+     * @returns {Promise<object>} HTTP response
+     */
+    apiResourceRequest(resource: any, payload?: any, validStatusCodes?: any[], { includeJwsKid, includeExternalAccountBinding }?: {
+        includeJwsKid?: boolean;
+        includeExternalAccountBinding?: boolean;
+    }): Promise<any>;
+    /**
+     * Get Terms of Service URL if available
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.1.1
+     *
+     * @returns {Promise<string|null>} ToS URL
+     */
+    getTermsOfServiceUrl(): Promise<any>;
+    /**
+     * Create new account
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.3
+     *
+     * @param {object} data Request payload
+     * @returns {Promise<object>} HTTP response
+     */
+    createAccount(data: any): Promise<any>;
+    /**
+     * Update account
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.3.2
+     *
+     * @param {object} data Request payload
+     * @returns {Promise<object>} HTTP response
+     */
+    updateAccount(data: any): Promise<any>;
+    /**
+     * Update account key
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.3.5
+     *
+     * @param {object} data Request payload
+     * @returns {Promise<object>} HTTP response
+     */
+    updateAccountKey(data: any): Promise<any>;
+    /**
+     * Create new order
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.4
+     *
+     * @param {object} data Request payload
+     * @returns {Promise<object>} HTTP response
+     */
+    createOrder(data: any): Promise<any>;
+    /**
+     * Get order
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.4
+     *
+     * @param {string} url Order URL
+     * @returns {Promise<object>} HTTP response
+     */
+    getOrder(url: any): Promise<any>;
+    /**
+     * Finalize order
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.4
+     *
+     * @param {string} url Finalization URL
+     * @param {object} data Request payload
+     * @returns {Promise<object>} HTTP response
+     */
+    finalizeOrder(url: any, data: any): Promise<any>;
+    /**
+     * Get identifier authorization
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.5
+     *
+     * @param {string} url Authorization URL
+     * @returns {Promise<object>} HTTP response
+     */
+    getAuthorization(url: any): Promise<any>;
+    /**
+     * Update identifier authorization
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.5.2
+     *
+     * @param {string} url Authorization URL
+     * @param {object} data Request payload
+     * @returns {Promise<object>} HTTP response
+     */
+    updateAuthorization(url: any, data: any): Promise<any>;
+    /**
+     * Complete challenge
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.5.1
+     *
+     * @param {string} url Challenge URL
+     * @param {object} data Request payload
+     * @returns {Promise<object>} HTTP response
+     */
+    completeChallenge(url: any, data: any): Promise<any>;
+    /**
+     * Revoke certificate
+     *
+     * https://datatracker.ietf.org/doc/html/rfc8555#section-7.6
+     *
+     * @param {object} data Request payload
+     * @returns {Promise<object>} HTTP response
+     */
+    revokeCert(data: any): Promise<any>;
+}
+export default AcmeApi;

package/{src → dist}/api.js

@@ -1,21 +1,19 @@
+// @ts-nocheck
 /**
  * ACME API client
  */
-import  * as util  from './util.js';
-
+import * as util from './util.js';
 /**
  * AcmeApi
  *
  * @class
  * @param {HttpClient} httpClient
  */
-
 class AcmeApi {
     constructor(httpClient, accountUrl = null) {
         this.http = httpClient;
         this.accountUrl = accountUrl;
     }
-
     getLocationFromHeader(resp) {
         let locationUrl = resp.headers.location;
         const mapping = this.http.urlMapping;
@@ -30,22 +28,18 @@ class AcmeApi {
         }
         return locationUrl;
     }
-
     /**
      * Get account URL
      *
      * @private
      * @returns {string} Account URL
      */
-
     getAccountUrl() {
         if (!this.accountUrl) {
             throw new Error('No account URL found, register account first');
         }
-
         return this.accountUrl;
     }
-
     /**
      * ACME API request
      *
@@ -58,18 +52,14 @@ class AcmeApi {
      * @param {boolean} [opts.includeExternalAccountBinding] Include EAB in request, default: `false`
      * @returns {Promise<object>} HTTP response
      */
-
     async apiRequest(url, payload = null, validStatusCodes = [], { includeJwsKid = true, includeExternalAccountBinding = false } = {}) {
         const kid = includeJwsKid ? this.getAccountUrl() : null;
         const resp = await this.http.signedRequest(url, payload, { kid, includeExternalAccountBinding });
-
         if (validStatusCodes.length && (validStatusCodes.indexOf(resp.status) === -1)) {
             throw new Error(util.formatResponseError(resp));
         }
-
         return resp;
     }
-
     /**
      * ACME API request by resource name helper
      *
@@ -82,12 +72,10 @@ class AcmeApi {
      * @param {boolean} [opts.includeExternalAccountBinding] Include EAB in request, default: `false`
      * @returns {Promise<object>} HTTP response
      */
-
     async apiResourceRequest(resource, payload = null, validStatusCodes = [], { includeJwsKid = true, includeExternalAccountBinding = false } = {}) {
         const resourceUrl = await this.http.getResourceUrl(resource);
         return this.apiRequest(resourceUrl, payload, validStatusCodes, { includeJwsKid, includeExternalAccountBinding });
     }
-
     /**
      * Get Terms of Service URL if available
      *
@@ -95,11 +83,9 @@ class AcmeApi {
      *
      * @returns {Promise<string|null>} ToS URL
      */
-
     async getTermsOfServiceUrl() {
         return this.http.getMetaField('termsOfService');
     }
-
     /**
      * Create new account
      *
@@ -108,21 +94,17 @@ class AcmeApi {
      * @param {object} data Request payload
      * @returns {Promise<object>} HTTP response
      */
-
     async createAccount(data) {
         const resp = await this.apiResourceRequest('newAccount', data, [200, 201], {
             includeJwsKid: false,
             includeExternalAccountBinding: (data.onlyReturnExisting !== true),
         });
-
         /* Set account URL */
         if (resp.headers.location) {
             this.accountUrl = this.getLocationFromHeader(resp);
         }
-
         return resp;
     }
-
     /**
      * Update account
      *
@@ -131,11 +113,9 @@ class AcmeApi {
      * @param {object} data Request payload
      * @returns {Promise<object>} HTTP response
      */
-
     updateAccount(data) {
         return this.apiRequest(this.getAccountUrl(), data, [200, 202]);
     }
-
     /**
      * Update account key
      *
@@ -144,11 +124,9 @@ class AcmeApi {
      * @param {object} data Request payload
      * @returns {Promise<object>} HTTP response
      */
-
     updateAccountKey(data) {
         return this.apiResourceRequest('keyChange', data, [200]);
     }
-
     /**
      * Create new order
      *
@@ -157,11 +135,9 @@ class AcmeApi {
      * @param {object} data Request payload
      * @returns {Promise<object>} HTTP response
      */
-
     createOrder(data) {
         return this.apiResourceRequest('newOrder', data, [201]);
     }
-
     /**
      * Get order
      *
@@ -170,11 +146,9 @@ class AcmeApi {
      * @param {string} url Order URL
      * @returns {Promise<object>} HTTP response
      */
-
     getOrder(url) {
         return this.apiRequest(url, null, [200]);
     }
-
     /**
      * Finalize order
      *
@@ -184,11 +158,9 @@ class AcmeApi {
      * @param {object} data Request payload
      * @returns {Promise<object>} HTTP response
      */
-
     finalizeOrder(url, data) {
         return this.apiRequest(url, data, [200]);
     }
-
     /**
      * Get identifier authorization
      *
@@ -197,11 +169,9 @@ class AcmeApi {
      * @param {string} url Authorization URL
      * @returns {Promise<object>} HTTP response
      */
-
     getAuthorization(url) {
         return this.apiRequest(url, null, [200]);
     }
-
     /**
      * Update identifier authorization
      *
@@ -211,11 +181,9 @@ class AcmeApi {
      * @param {object} data Request payload
      * @returns {Promise<object>} HTTP response
      */
-
     updateAuthorization(url, data) {
         return this.apiRequest(url, data, [200]);
     }
-
     /**
      * Complete challenge
      *
@@ -225,11 +193,9 @@ class AcmeApi {
      * @param {object} data Request payload
      * @returns {Promise<object>} HTTP response
      */
-
     completeChallenge(url, data) {
         return this.apiRequest(url, data, [200]);
     }
-
     /**
      * Revoke certificate
      *
@@ -238,11 +204,9 @@ class AcmeApi {
      * @param {object} data Request payload
      * @returns {Promise<object>} HTTP response
      */
-
     revokeCert(data) {
         return this.apiResourceRequest('revokeCert', data, [200]);
     }
 }
-
 /* Export API */
 export default AcmeApi;

package/dist/auto.d.ts

@@ -0,0 +1,9 @@
+/**
+ * ACME client auto mode
+ *
+ * @param {AcmeClient} client ACME client
+ * @param {object} userOpts Options
+ * @returns {Promise<buffer>} Certificate
+ */
+declare const _default: (client: any, userOpts: any) => Promise<any>;
+export default _default;

package/{src → dist}/auto.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 /**
  * ACME auto helper
  */
@@ -5,10 +6,6 @@ import { readCsrDomains } from "./crypto/index.js";
 import { wait } from "./wait.js";
 import { CancelError } from "./error.js";
 import { domainUtils } from '@certd/basic';
-
-
-
-
 const defaultOpts = {
     csr: null,
     email: null,
@@ -24,7 +21,6 @@ const defaultOpts = {
     },
     waitDnsDiffuseTime: 30,
 };
-
 /**
  * ACME client auto mode
  *
@@ -32,161 +28,139 @@ const defaultOpts = {
  * @param {object} userOpts Options
  * @returns {Promise<buffer>} Certificate
  */
-
 export default async (client, userOpts) => {
     const opts = { ...defaultOpts, ...userOpts };
     const accountPayload = { termsOfServiceAgreed: opts.termsOfServiceAgreed };
-
     if (!Buffer.isBuffer(opts.csr)) {
         opts.csr = Buffer.from(opts.csr);
     }
-
     if (opts.email) {
         accountPayload.contact = [`mailto:${opts.email}`];
     }
     if (opts.externalAccountBinding) {
         accountPayload.externalAccountBinding = opts.externalAccountBinding;
     }
-
-    const log = (...args)=>{
+    const log = (...args) => {
         return client.logger.info(...args);
-    }
+    };
     /**
      * Register account
      */
-
     log("[auto] Checking account");
-
     try {
         client.getAccountUrl();
         log("[auto] Account URL already exists, skipping account registration（ 证书申请账户已存在，跳过注册 ）");
-    } catch (e) {
+    }
+    catch (e) {
         log("[auto] Registering account （注册证书申请账户）");
         await client.createAccount(accountPayload);
     }
-
     /**
      * Parse domains from CSR
      */
-
     log("[auto] Parsing domains from Certificate Signing Request");
     const { commonName, altNames } = readCsrDomains(opts.csr);
     const uniqueDomains = Array.from(new Set([commonName].concat(altNames).filter((d) => d)));
-
     log(`[auto] Resolved ${uniqueDomains.length} unique domains from parsing the Certificate Signing Request`);
-
     /**
      * Place order
      */
-
     log("[auto] Placing new certificate order with ACME provider");
-
-    let hasIp = false
-    const orderPayload = { identifiers: uniqueDomains.map((d) =>{
-        // 判断是否为IP（v4或v6），否则按域名处理
-        const type = domainUtils.isIp(d) ? 'ip' : 'dns';
-        if(type === 'ip'){
-            hasIp = true
-        }
-        return { type, value: d }
-    }) };
-    if (opts.profile && client.sslProvider.startsWith("letsencrypt") ){
+    let hasIp = false;
+    const orderPayload = { identifiers: uniqueDomains.map((d) => {
+            // 判断是否为IP（v4或v6），否则按域名处理
+            const type = domainUtils.isIp(d) ? 'ip' : 'dns';
+            if (type === 'ip') {
+                hasIp = true;
+            }
+            return { type, value: d };
+        }) };
+    if (opts.profile && client.sslProvider.startsWith("letsencrypt")) {
         orderPayload.profile = opts.profile;
-        if(hasIp){
-            orderPayload.profile = "shortlived"
+        if (hasIp) {
+            orderPayload.profile = "shortlived";
         }
     }
     const order = await client.createOrder(orderPayload);
     const authorizations = await client.getAuthorizations(order);
-
     log(`[auto] Placed certificate order successfully, received ${authorizations.length} identity authorizations`);
-
     /**
      * Resolve and satisfy challenges
      */
-
     log("[auto] Resolving and satisfying authorization challenges");
-
     const clearTasks = [];
     const localVerifyTasks = [];
     const completeChallengeTasks = [];
-
     const challengeFunc = async (authz) => {
         const d = authz.identifier.value;
         let challengeCompleted = false;
-
         /* Skip authz that already has valid status */
         if (authz.status === "valid") {
             log(`[auto] [${d}] Authorization already has valid status, no need to complete challenges`);
             return;
         }
-
         const keyAuthorizationGetter = async (challenge) => {
             return await client.getChallengeKeyAuthorization(challenge);
         };
-
         async function deactivateAuth(e) {
             log(`[auto] [${d}] Unable to complete challenge: ${e.message}`);
             try {
                 log(`[auto] [${d}] Deactivating failed authorization`);
                 await client.deactivateAuthorization(authz);
-            } catch (f) {
+            }
+            catch (f) {
                 /* Suppress deactivateAuthorization() errors */
                 log(`[auto] [${d}] Authorization deactivation threw error: ${f.message}`);
             }
         }
-
         log(`[auto] [${d}] Trigger challengeCreateFn()`);
         try {
-            const { recordReq, recordRes, dnsProvider, challenge, keyAuthorization ,httpUploader} = await opts.challengeCreateFn(authz, keyAuthorizationGetter);
+            const { recordReq, recordRes, dnsProvider, challenge, keyAuthorization, httpUploader } = await opts.challengeCreateFn(authz, keyAuthorizationGetter);
             clearTasks.push(async () => {
                 /* Trigger challengeRemoveFn(), suppress errors */
                 log(`[auto] [${d}] Trigger challengeRemoveFn()`);
                 try {
-                    await opts.challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider,httpUploader);
-                } catch (e) {
+                    await opts.challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider, httpUploader);
+                }
+                catch (e) {
                     log(`[auto] [${d}] challengeRemoveFn threw error: ${e.message}`);
                 }
             });
-
             localVerifyTasks.push(async () => {
                 /* Challenge verification */
                 log(`[auto] [${d}] 开始本地验证, type = ${challenge.type}`);
                 try {
                     await client.verifyChallenge(authz, challenge);
-                } catch (e) {
+                }
+                catch (e) {
                     log(`[auto] [${d}] 本地验证失败，尝试请求ACME提供商获取状态: ${e.message}`);
                 }
             });
-
             completeChallengeTasks.push(async () => {
                 /* Complete challenge and wait for valid status */
                 log(`[auto] [${d}] 请求ACME提供商完成验证`);
-                try{
+                try {
                     await client.completeChallenge(challenge);
-                }catch (e) {
+                }
+                catch (e) {
                     await deactivateAuth(e);
                     throw e;
                 }
                 challengeCompleted = true;
                 log(`[auto] [${d}] 等待返回valid状态`);
-                await client.waitForValidStatus(challenge,d);
+                await client.waitForValidStatus(challenge, d);
             });
-
-
-        } catch (e) {
+        }
+        catch (e) {
             log(`[auto] [${d}] challengeCreateFn threw error: ${e.message || e}`);
             await deactivateAuth(e);
             throw e;
         }
-
     };
     const domainSets = [];
-
     authorizations.forEach((authz) => {
         const d = authz.identifier.value;
         log(`authorization:domain = ${d}, value = ${JSON.stringify(authz)}`);
-
         if (authz.status === "valid") {
             log(`[auto] [${d}] Authorization already has valid status, no need to complete challenges`);
             return;
@@ -206,9 +180,7 @@ export default async (client, userOpts) => {
             domainSets.push(group);
         }
     });
-
     // log(`domainSets:${JSON.stringify(domainSets)}`);
-
     const allChallengePromises = [];
     // eslint-disable-next-line no-restricted-syntax
     const challengePromises = [];
@@ -223,9 +195,7 @@ export default async (client, userOpts) => {
             });
         }
     }
-
     log(`[auto] challengeGroups:${allChallengePromises.length}`);
-
     async function runAllPromise(tasks) {
         let promise = Promise.resolve();
         tasks.forEach((task) => {
@@ -233,22 +203,20 @@ export default async (client, userOpts) => {
         });
         return promise;
     }
-
     async function runPromisePa(tasks, waitTime = 8000) {
         const results = [];
-        let j = 0
+        let j = 0;
         // eslint-disable-next-line no-await-in-loop,no-restricted-syntax
         for (const task of tasks) {
-            j++
+            j++;
             log(`开始第${j}个任务`);
             results.push(task());
             // eslint-disable-next-line no-await-in-loop
-            log(`wait ${Math.floor(waitTime/1000)}s`)
+            log(`wait ${Math.floor(waitTime / 1000)}s`);
             await wait(waitTime);
         }
         return Promise.all(results);
     }
-
     log(`开始challenge，共${allChallengePromises.length}组`);
     let i = 0;
     // eslint-disable-next-line no-restricted-syntax
@@ -258,7 +226,6 @@ export default async (client, userOpts) => {
         if (opts.signal && opts.signal.aborted) {
             throw new CancelError("用户取消");
         }
-
         const waitDnsDiffuseTime = opts.waitDnsDiffuseTime || 30;
         try {
             // eslint-disable-next-line no-await-in-loop
@@ -266,41 +233,40 @@ export default async (client, userOpts) => {
             if (opts.skipChallengeVerification === true) {
                 log(`跳过本地验证（skipChallengeVerification=true），等待 60s`);
                 await wait(60 * 1000);
-            } else {
-                log("开始本地校验")
+            }
+            else {
+                log("开始本地校验");
                 await runPromisePa(localVerifyTasks, 1000);
-                log(`本地校验完成，等待${waitDnsDiffuseTime}s`)
-                await wait(waitDnsDiffuseTime * 1000)
+                log(`本地校验完成，等待${waitDnsDiffuseTime}s`);
+                await wait(waitDnsDiffuseTime * 1000);
             }
-
             log("开始向提供商请求检查验证");
             await runPromisePa(completeChallengeTasks, 1000);
-        } catch (e) {
+        }
+        catch (e) {
             log(`证书申请失败${e.message}`);
             throw e;
-        } finally {
+        }
+        finally {
             // letsencrypt 如果同时检出两个TXT记录，会以第一个为准，就会校验失败，所以需要提前删除
             // zerossl 此方式测试无问题
             log(`清理challenge痕迹，length:${clearTasks.length}`);
             try {
                 // eslint-disable-next-line no-await-in-loop
                 await runAllPromise(clearTasks);
-            } catch (e) {
+            }
+            catch (e) {
                 log("清理challenge失败");
                 log(e);
             }
         }
     }
-
-
     log("challenge结束");
-
     // log('[auto] Waiting for challenge valid status');
     // await Promise.all(challengePromises);
     /**
      * Finalize order and download certificate
      */
-
     log("[auto] Finalizing order and downloading certificate");
     const finalized = await client.finalizeOrder(order, opts.csr);
     const res = await client.getCertificate(finalized, opts.preferredChain);