@certd/acme-client 1.33.7 → 1.34.0

package/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.33.7",
+    "version": "1.34.0",
     "type": "module",
     "module": "scr/index.js",
     "main": "src/index.js",
@@ -18,7 +18,7 @@
         "types"
     ],
     "dependencies": {
-        "@certd/basic": "^1.33.7",
+        "@certd/basic": "^1.34.0",
         "@peculiar/x509": "^1.11.0",
         "asn1js": "^3.0.5",
         "axios": "^1.7.2",
@@ -26,7 +26,8 @@
         "http-proxy-agent": "^7.0.2",
         "https-proxy-agent": "^7.0.5",
         "lodash-es": "^4.17.21",
-        "node-forge": "^1.3.1"
+        "node-forge": "^1.3.1",
+        "punycode": "^2.3.1"
     },
     "devDependencies": {
         "@types/node": "^20.14.10",
@@ -67,5 +68,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "a188385817e8dbd270dbdbf7f86a5b812884cf59"
+    "gitHead": "9749fc817d3cfd435e8cb3f2f86edc81d69e2310"
 }

package/src/auto.js

@@ -117,12 +117,12 @@ export default async (client, userOpts) => {
 
         log(`[auto] [${d}] Trigger challengeCreateFn()`);
         try {
-            const { recordReq, recordRes, dnsProvider, challenge, keyAuthorization } = 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);
+                    await opts.challengeRemoveFn(authz, challenge, keyAuthorization, recordReq, recordRes, dnsProvider,httpUploader);
                 } catch (e) {
                     log(`[auto] [${d}] challengeRemoveFn threw error: ${e.message}`);
                 }

package/src/index.js

@@ -46,3 +46,5 @@ export *  from './axios.js'
 export * from './logger.js'
 export * from './verify.js'
 export * from './error.js'
+
+export * from './util.js'

package/src/util.js

@@ -340,5 +340,6 @@ export {
     formatResponseError,
     getAuthoritativeDnsResolver,
     retrieveTlsAlpnCertificate,
+    resolveDomainBySoaRecord
 };
 

package/types/dist/index.test-d.js

@@ -0,0 +1,58 @@
+/**
+ * acme-client type definition tests
+ */
+import * as acme from 'acme-client';
+(async () => {
+    /* Client */
+    const accountKey = await acme.crypto.createPrivateKey();
+    const client = new acme.Client({
+        accountKey,
+        directoryUrl: acme.directory.letsencrypt.staging
+    });
+    /* Account */
+    await client.createAccount({
+        termsOfServiceAgreed: true,
+        contact: ['mailto:test@example.com']
+    });
+    /* Order */
+    const order = await client.createOrder({
+        identifiers: [
+            { type: 'dns', value: 'example.com' },
+            { type: 'dns', value: '*.example.com' },
+        ]
+    });
+    await client.getOrder(order);
+    /* Authorizations / Challenges */
+    const authorizations = await client.getAuthorizations(order);
+    const authorization = authorizations[0];
+    const challenge = authorization.challenges[0];
+    await client.getChallengeKeyAuthorization(challenge);
+    await client.verifyChallenge(authorization, challenge);
+    await client.completeChallenge(challenge);
+    await client.waitForValidStatus(challenge);
+    /* Finalize */
+    const [certKey, certCsr] = await acme.crypto.createCsr({
+        commonName: 'example.com',
+        altNames: ['example.com', '*.example.com']
+    });
+    await client.finalizeOrder(order, certCsr);
+    await client.getCertificate(order);
+    await client.getCertificate(order, 'DST Root CA X3');
+    /* Auto */
+    await client.auto({
+        csr: certCsr,
+        challengeCreateFn: async (authz, challenge, keyAuthorization) => { },
+        challengeRemoveFn: async (authz, challenge, keyAuthorization) => { }
+    });
+    await client.auto({
+        csr: certCsr,
+        email: 'test@example.com',
+        termsOfServiceAgreed: false,
+        skipChallengeVerification: false,
+        challengePriority: ['http-01', 'dns-01'],
+        preferredChain: 'DST Root CA X3',
+        challengeCreateFn: async (authz, challenge, keyAuthorization) => { },
+        challengeRemoveFn: async (authz, challenge, keyAuthorization) => { }
+    });
+})();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXgudGVzdC1kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vaW5kZXgudGVzdC1kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBRUgsT0FBTyxLQUFLLElBQUksTUFBTSxhQUFhLENBQUM7QUFFcEMsQ0FBQyxLQUFLLElBQUksRUFBRTtJQUNSLFlBQVk7SUFDWixNQUFNLFVBQVUsR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztJQUV4RCxNQUFNLE1BQU0sR0FBRyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDM0IsVUFBVTtRQUNWLFlBQVksRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxPQUFPO0tBQ25ELENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixNQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUM7UUFDdkIsb0JBQW9CLEVBQUUsSUFBSTtRQUMxQixPQUFPLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQztLQUN2QyxDQUFDLENBQUM7SUFFSCxXQUFXO0lBQ1gsTUFBTSxLQUFLLEdBQUcsTUFBTSxNQUFNLENBQUMsV0FBVyxDQUFDO1FBQ25DLFdBQVcsRUFBRTtZQUNULEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsYUFBYSxFQUFFO1lBQ3JDLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsZUFBZSxFQUFFO1NBQzFDO0tBQ0osQ0FBQyxDQUFDO0lBRUgsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRTdCLGlDQUFpQztJQUNqQyxNQUFNLGNBQWMsR0FBRyxNQUFNLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUM3RCxNQUFNLGFBQWEsR0FBRyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDeEMsTUFBTSxTQUFTLEdBQUcsYUFBYSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUU5QyxNQUFNLE1BQU0sQ0FBQyw0QkFBNEIsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNyRCxNQUFNLE1BQU0sQ0FBQyxlQUFlLENBQUMsYUFBYSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3ZELE1BQU0sTUFBTSxDQUFDLGlCQUFpQixDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzFDLE1BQU0sTUFBTSxDQUFDLGtCQUFrQixDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBRTNDLGNBQWM7SUFDZCxNQUFNLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7UUFDbkQsVUFBVSxFQUFFLGFBQWE7UUFDekIsUUFBUSxFQUFFLENBQUMsYUFBYSxFQUFFLGVBQWUsQ0FBQztLQUM3QyxDQUFDLENBQUM7SUFFSCxNQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzNDLE1BQU0sTUFBTSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNuQyxNQUFNLE1BQU0sQ0FBQyxjQUFjLENBQUMsS0FBSyxFQUFFLGdCQUFnQixDQUFDLENBQUM7SUFFckQsVUFBVTtJQUNWLE1BQU0sTUFBTSxDQUFDLElBQUksQ0FBQztRQUNkLEdBQUcsRUFBRSxPQUFPO1FBQ1osaUJBQWlCLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsRUFBRSxHQUFFLENBQUM7UUFDbkUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsRUFBRSxHQUFFLENBQUM7S0FDdEUsQ0FBQyxDQUFDO0lBRUgsTUFBTSxNQUFNLENBQUMsSUFBSSxDQUFDO1FBQ2QsR0FBRyxFQUFFLE9BQU87UUFDWixLQUFLLEVBQUUsa0JBQWtCO1FBQ3pCLG9CQUFvQixFQUFFLEtBQUs7UUFDM0IseUJBQXlCLEVBQUUsS0FBSztRQUNoQyxpQkFBaUIsRUFBRSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUM7UUFDeEMsY0FBYyxFQUFFLGdCQUFnQjtRQUNoQyxpQkFBaUIsRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxFQUFFLEdBQUUsQ0FBQztRQUNuRSxpQkFBaUIsRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxnQkFBZ0IsRUFBRSxFQUFFLEdBQUUsQ0FBQztLQUN0RSxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsRUFBRSxDQUFDIn0=

package/types/index.d.ts

@@ -59,7 +59,7 @@ export interface ClientExternalAccountBindingOptions {
 export interface ClientAutoOptions {
     csr: CsrBuffer | CsrString;
     challengeCreateFn: (authz: Authorization, keyAuthorization: (challenge:rfc8555.Challenge)=>Promise<string>) => Promise<{recordReq?:any,recordRes?:any,dnsProvider?:any,challenge: rfc8555.Challenge,keyAuthorization:string}>;
-    challengeRemoveFn: (authz: Authorization, challenge: rfc8555.Challenge, keyAuthorization: string,recordReq:any, recordRes:any,dnsProvider:any) => Promise<any>;
+    challengeRemoveFn: (authz: Authorization, challenge: rfc8555.Challenge, keyAuthorization: string,recordReq:any, recordRes:any,dnsProvider:any,httpUploader:any) => Promise<any>;
     email?: string;
     termsOfServiceAgreed?: boolean;
     skipChallengeVerification?: boolean;
@@ -204,4 +204,6 @@ export function setLogger(fn: (message: any, ...args: any[]) => void): void;
 
 export function walkTxtRecord(record: any): Promise<string[]>;
 
-export const CancelError: typeof CancelError;
+export const CancelError: typeof CancelError;
+
+export function resolveDomainBySoaRecord(domain: string): Promise<string>;

package/types/index.test-d.js

@@ -1,137 +0,0 @@
-"use strict";
-/**
- * acme-client type definition tests
- */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var acme = require("acme-client");
-(function () { return __awaiter(void 0, void 0, void 0, function () {
-    var accountKey, client, order, authorizations, authorization, challenge, _a, certKey, certCsr;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, acme.crypto.createPrivateKey()];
-            case 1:
-                accountKey = _b.sent();
-                client = new acme.Client({
-                    accountKey: accountKey,
-                    directoryUrl: acme.directory.letsencrypt.staging
-                });
-                /* Account */
-                return [4 /*yield*/, client.createAccount({
-                        termsOfServiceAgreed: true,
-                        contact: ['mailto:test@example.com']
-                    })];
-            case 2:
-                /* Account */
-                _b.sent();
-                return [4 /*yield*/, client.createOrder({
-                        identifiers: [
-                            { type: 'dns', value: 'example.com' },
-                            { type: 'dns', value: '*.example.com' },
-                        ]
-                    })];
-            case 3:
-                order = _b.sent();
-                return [4 /*yield*/, client.getOrder(order)];
-            case 4:
-                _b.sent();
-                return [4 /*yield*/, client.getAuthorizations(order)];
-            case 5:
-                authorizations = _b.sent();
-                authorization = authorizations[0];
-                challenge = authorization.challenges[0];
-                return [4 /*yield*/, client.getChallengeKeyAuthorization(challenge)];
-            case 6:
-                _b.sent();
-                return [4 /*yield*/, client.verifyChallenge(authorization, challenge)];
-            case 7:
-                _b.sent();
-                return [4 /*yield*/, client.completeChallenge(challenge)];
-            case 8:
-                _b.sent();
-                return [4 /*yield*/, client.waitForValidStatus(challenge)];
-            case 9:
-                _b.sent();
-                return [4 /*yield*/, acme.crypto.createCsr({
-                        commonName: 'example.com',
-                        altNames: ['example.com', '*.example.com']
-                    })];
-            case 10:
-                _a = _b.sent(), certKey = _a[0], certCsr = _a[1];
-                return [4 /*yield*/, client.finalizeOrder(order, certCsr)];
-            case 11:
-                _b.sent();
-                return [4 /*yield*/, client.getCertificate(order)];
-            case 12:
-                _b.sent();
-                return [4 /*yield*/, client.getCertificate(order, 'DST Root CA X3')];
-            case 13:
-                _b.sent();
-                /* Auto */
-                return [4 /*yield*/, client.auto({
-                        csr: certCsr,
-                        challengeCreateFn: function (authz, challenge, keyAuthorization) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-                            return [2 /*return*/];
-                        }); }); },
-                        challengeRemoveFn: function (authz, challenge, keyAuthorization) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-                            return [2 /*return*/];
-                        }); }); }
-                    })];
-            case 14:
-                /* Auto */
-                _b.sent();
-                return [4 /*yield*/, client.auto({
-                        csr: certCsr,
-                        email: 'test@example.com',
-                        termsOfServiceAgreed: false,
-                        skipChallengeVerification: false,
-                        challengePriority: ['http-01', 'dns-01'],
-                        preferredChain: 'DST Root CA X3',
-                        challengeCreateFn: function (authz, challenge, keyAuthorization) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-                            return [2 /*return*/];
-                        }); }); },
-                        challengeRemoveFn: function (authz, challenge, keyAuthorization) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-                            return [2 /*return*/];
-                        }); }); }
-                    })];
-            case 15:
-                _b.sent();
-                return [2 /*return*/];
-        }
-    });
-}); })();