@certd/acme-client 0.3.0 → 1.0.0

package/package.json

@@ -1,8 +1,9 @@
 {
     "name": "@certd/acme-client",
     "description": "Simple and unopinionated ACME client",
+    "private": false,
     "author": "nmorsman",
-    "version": "0.3.0",
+    "version": "1.0.0",
     "main": "src/index.js",
     "types": "types",
     "license": "MIT",
@@ -31,7 +32,7 @@
         "jsdoc-to-markdown": "^7.1.1",
         "mocha": "^10.0.0",
         "nock": "^13.2.4",
-        "typescript": "^4.6.2",
+        "typescript": "^4.8.4",
         "uuid": "^8.3.2"
     },
     "scripts": {
@@ -56,5 +57,6 @@
     ],
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
-    }
+    },
+    "gitHead": "5950e1cae7cf30ebfc5128c15c7d1b0d101cbbb8"
 }

package/src/auto.js

@@ -4,6 +4,7 @@
 
 const { readCsrDomains } = require('./crypto');
 const { log } = require('./logger');
+
 const defaultOpts = {
     csr: null,
     email: null,
@@ -83,7 +84,7 @@ module.exports = async function(client, userOpts) {
 
     log('[auto] Resolving and satisfying authorization challenges');
 
-    const challengePromises = authorizations.map(async (authz) => {
+    const challengeFunc = async (authz) => {
         const d = authz.identifier.value;
         let challengeCompleted = false;
 
@@ -113,9 +114,9 @@ module.exports = async function(client, userOpts) {
             /* Trigger challengeCreateFn() */
             log(`[auto] [${d}] Trigger challengeCreateFn()`);
             const keyAuthorization = await client.getChallengeKeyAuthorization(challenge);
-
+            let recordItem = null;
             try {
-                await opts.challengeCreateFn(authz, challenge, keyAuthorization);
+                recordItem = await opts.challengeCreateFn(authz, challenge, keyAuthorization);
 
                 /* Challenge verification */
                 if (opts.skipChallengeVerification === true) {
@@ -133,12 +134,16 @@ module.exports = async function(client, userOpts) {
 
                 await client.waitForValidStatus(challenge);
             }
+            catch (e) {
+                log(`[auto] [${d}] challengeCreateFn threw error: ${e.message}`);
+                throw e;
+            }
             finally {
                 /* Trigger challengeRemoveFn(), suppress errors */
                 log(`[auto] [${d}] Trigger challengeRemoveFn()`);
 
                 try {
-                    await opts.challengeRemoveFn(authz, challenge, keyAuthorization);
+                    await opts.challengeRemoveFn(authz, challenge, keyAuthorization, recordItem);
                 }
                 catch (e) {
                     log(`[auto] [${d}] challengeRemoveFn threw error: ${e.message}`);
@@ -162,16 +167,28 @@ module.exports = async function(client, userOpts) {
 
             throw e;
         }
+    };
+
+    const challengePromises = authorizations.map((authz) => async () => {
+        await challengeFunc(authz);
     });
 
-    log('[auto] Waiting for challenge valid status');
+    log('开始challenge');
+    let promise = Promise.resolve();
+    function runPromisesSerially(tasks) {
+        tasks.forEach((task) => {
+            promise = promise.then(task);
+        });
+        return promise;
+    }
+
+    await runPromisesSerially(challengePromises);
+    log('challenge结束');
+
+    // log('[auto] Waiting for challenge valid status');
     // await Promise.all(challengePromises);
 
-    log("开始challenge")
-    for (let challenge of challengePromises) {
-        await challenge
-    }
-    log("challenge结束")
+
     /**
      * Finalize order and download certificate
      */

package/src/crypto/forge.js

@@ -74,7 +74,8 @@ function parseDomains(obj) {
 
     if (rootAltNames && rootAltNames.altNames && rootAltNames.altNames.length) {
         altNamesDict = rootAltNames.altNames;
-    } else if (rootExtensions && rootExtensions.extensions && rootExtensions.extensions.length) {
+    }
+    else if (rootExtensions && rootExtensions.extensions && rootExtensions.extensions.length) {
         const extAltNames = rootExtensions.extensions.find((e) => 'altNames' in e);
 
         if (extAltNames && extAltNames.altNames && extAltNames.altNames.length) {
@@ -115,21 +116,11 @@ function parseDomains(obj) {
  */
 
 async function createPrivateKey(size = 2048) {
-    const keyPair = await generateKeyPair({bits: size});
-    // const privateKey = forge.pki.privateKeyToPem(keyPair.privateKey);
-
-    // convert a Forge private key to an ASN.1 RSAPrivateKey
-    var rsaPrivateKey = forge.pki.privateKeyToAsn1(keyPair.privateKey);
-
-// wrap an RSAPrivateKey ASN.1 object in a PKCS#8 ASN.1 PrivateKeyInfo
-    var privateKeyInfo = forge.pki.wrapRsaPrivateKey(rsaPrivateKey);
-
-// convert a PKCS#8 ASN.1 PrivateKeyInfo to PEM
-    var pemKey = forge.pki.privateKeyInfoToPem(privateKeyInfo);
+    const keyPair = await generateKeyPair({ bits: size });
+    const pemKey = forge.pki.privateKeyToPem(keyPair.privateKey);
     return Buffer.from(pemKey);
 }
 
-
 exports.createPrivateKey = createPrivateKey;
 
 
@@ -145,7 +136,7 @@ exports.createPrivateKey = createPrivateKey;
  * ```
  */
 
-exports.createPublicKey = async function (key) {
+exports.createPublicKey = async function(key) {
     const privateKey = forge.pki.privateKeyFromPem(key);
     const publicKey = forge.pki.rsa.setPublicKey(privateKey.n, privateKey.e);
     const pemKey = forge.pki.publicKeyToPem(publicKey);
@@ -191,7 +182,7 @@ exports.splitPemChain = (str) => forge.pem.decode(str).map(forge.pem.encode);
  * ```
  */
 
-exports.getModulus = async function (input) {
+exports.getModulus = async function(input) {
     if (!Buffer.isBuffer(input)) {
         input = Buffer.from(input);
     }
@@ -215,7 +206,7 @@ exports.getModulus = async function (input) {
  * ```
  */
 
-exports.getPublicExponent = async function (input) {
+exports.getPublicExponent = async function(input) {
     if (!Buffer.isBuffer(input)) {
         input = Buffer.from(input);
     }
@@ -240,7 +231,7 @@ exports.getPublicExponent = async function (input) {
  * ```
  */
 
-exports.readCsrDomains = async function (csr) {
+exports.readCsrDomains = async function(csr) {
     if (!Buffer.isBuffer(csr)) {
         csr = Buffer.from(csr);
     }
@@ -269,7 +260,7 @@ exports.readCsrDomains = async function (csr) {
  * ```
  */
 
-exports.readCertificateInfo = async function (cert) {
+exports.readCertificateInfo = async function(cert) {
     if (!Buffer.isBuffer(cert)) {
         cert = Buffer.from(cert);
     }
@@ -321,7 +312,7 @@ function createCsrSubject(subjectObj) {
     return Object.entries(subjectObj).reduce((result, [shortName, value]) => {
         if (value) {
             const valueTagClass = getCsrValueTagClass(shortName);
-            result.push({shortName, value, valueTagClass});
+            result.push({ shortName, value, valueTagClass });
         }
 
         return result;
@@ -341,7 +332,7 @@ function createCsrSubject(subjectObj) {
 function formatCsrAltNames(altNames) {
     return altNames.map((value) => {
         const type = net.isIP(value) ? 7 : 2;
-        return {type, value};
+        return { type, value };
     });
 }
 
@@ -400,10 +391,11 @@ function formatCsrAltNames(altNames) {
  * }, certificateKey);
  */
 
-exports.createCsr = async function (data, key = null) {
+exports.createCsr = async function(data, key = null) {
     if (!key) {
         key = await createPrivateKey(data.keySize);
-    } else if (!Buffer.isBuffer(key)) {
+    }
+    else if (!Buffer.isBuffer(key)) {
         key = Buffer.from(key);
     }
 

package/types/index.d.ts

@@ -51,7 +51,7 @@ export interface ClientExternalAccountBindingOptions {
 export interface ClientAutoOptions {
     csr: CsrBuffer | CsrString;
     challengeCreateFn: (authz: Authorization, challenge: rfc8555.Challenge, keyAuthorization: string) => Promise<any>;
-    challengeRemoveFn: (authz: Authorization, challenge: rfc8555.Challenge, keyAuthorization: string) => Promise<any>;
+    challengeRemoveFn: (authz: Authorization, challenge: rfc8555.Challenge, keyAuthorization: string, recordRes:any) => Promise<any>;
     email?: string;
     termsOfServiceAgreed?: boolean;
     skipChallengeVerification?: boolean;