v1.21.2

CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.2](https://github.com/certd/certd/compare/v1.21.1...v1.21.2) (2024-07-08)
+
+### Performance Improvements
+
+* 申请证书时可以选择跳过本地dns校验 ([fe91d94](https://github.com/certd/certd/commit/fe91d94090d22ed0a3ea753ba74dfaa1bf057c17))
+
 ## [1.21.1](https://github.com/certd/certd/compare/v1.21.0...v1.21.1) (2024-07-08)
 
 ### Performance Improvements

deploy.js

@@ -6,17 +6,6 @@ import {default as packageJson} from './packages/core/pipeline/package.json' ass
 const certdVersion = packageJson.version
 console.log("certdVersion", certdVersion)
 
-
-const gitAdd = fs.readAsText("./node_modules/@lerna-lite/version/dist/lib/git-add.js")
-if(gitAdd.indexOf("('git', ['add', '.']") > -1){
-    console.log("git-add 已经修改过了")
-}else{
-    console.log("git-add 没有修改过")
-    fs.writeTextFile("./node_modules/@lerna-lite/version/dist/lib/git-add.js", gitAdd.replace("('git', ['add', '--', ...files]", "('git', ['add', '.']"))
-    console.log("git-add 修改成功")
-}
-
-
 // 同步npmmirror的包
 async function getPackages(directoryPath) {
     return new Promise((resolve, reject) => {

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.21.1"
+  "version": "1.21.2"
 }

package.json

@@ -14,9 +14,10 @@
     "i-all": "lerna link && lerna exec npm install  ",
     "publish": "npm run prepublishOnly1  && lerna publish --conventional-commits && npm run afterpublishOnly && npm run deploy1",
     "afterpublishOnly": "",
-    "prepublishOnly1": "npm run before-build && lerna run build ",
+    "prepublishOnly1": "npm run check && npm run before-build && lerna run build ",
     "before-build": "cd ./packages/core/acme-client && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"",
-    "deploy1": "node --experimental-json-modules deploy.js "
+    "deploy1": "node --experimental-json-modules deploy.js ",
+    "check": "node --experimental-json-modules publish-check.js"
   },
   "license": "AGPL-3.0",
   "dependencies": {

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.2](https://github.com/publishlab/node-acme-client/compare/v1.21.1...v1.21.2) (2024-07-08)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.21.1](https://github.com/publishlab/node-acme-client/compare/v1.21.0...v1.21.1) (2024-07-08)
 
 **Note:** Version bump only for package @certd/acme-client

packages/core/acme-client/build.md

@@ -1 +1 @@
-11:46
+15:57

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.21.1",
+    "version": "1.21.2",
     "main": "src/index.js",
     "types": "types/index.d.ts",
     "license": "MIT",

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.2](https://github.com/certd/certd/compare/v1.21.1...v1.21.2) (2024-07-08)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.21.1](https://github.com/certd/certd/compare/v1.21.0...v1.21.1) (2024-07-08)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.21.1",
+  "version": "1.21.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -23,7 +23,7 @@
     "qs": "^6.11.2"
   },
   "devDependencies": {
-    "@certd/acme-client": "workspace:^1.21.1",
+    "@certd/acme-client": "workspace:^1.21.2",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.2](https://github.com/certd/certd/compare/v1.21.1...v1.21.2) (2024-07-08)
+
+### Performance Improvements
+
+* 申请证书时可以选择跳过本地dns校验 ([fe91d94](https://github.com/certd/certd/commit/fe91d94090d22ed0a3ea753ba74dfaa1bf057c17))
+
 ## [1.21.1](https://github.com/certd/certd/compare/v1.21.0...v1.21.1) (2024-07-08)
 
 ### Performance Improvements

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.21.1",
+  "version": "1.21.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -17,8 +17,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "workspace:^1.21.1",
-    "@certd/pipeline": "workspace:^1.21.1",
+    "@certd/acme-client": "workspace:^1.21.2",
+    "@certd/pipeline": "workspace:^1.21.2",
     "jszip": "^3.10.1",
     "node-forge": "^0.10.0",
     "psl": "^1.9.0"

packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts

@@ -18,12 +18,20 @@ export class AcmeService {
   userContext: IContext;
   logger: Logger;
   sslProvider: SSLProvider;
+  skipLocalVerify = true;
   eab?: ClientExternalAccountBindingOptions;
-  constructor(options: { userContext: IContext; logger: Logger; sslProvider: SSLProvider; eab?: ClientExternalAccountBindingOptions }) {
+  constructor(options: {
+    userContext: IContext;
+    logger: Logger;
+    sslProvider: SSLProvider;
+    eab?: ClientExternalAccountBindingOptions;
+    skipLocalVerify?: boolean;
+  }) {
     this.userContext = options.userContext;
     this.logger = options.logger;
     this.sslProvider = options.sslProvider || "letsencrypt";
     this.eab = options.eab;
+    this.skipLocalVerify = options.skipLocalVerify ?? false;
     acme.setLogger((text: string) => {
       this.logger.info(text);
     });
@@ -192,7 +200,7 @@ export class AcmeService {
       csr,
       email: email,
       termsOfServiceAgreed: true,
-      skipChallengeVerification: false,
+      skipChallengeVerification: this.skipLocalVerify,
       challengePriority: ["dns-01"],
       challengeCreateFn: async (authz: acme.Authorization, challenge: Challenge, keyAuthorization: string): Promise<any> => {
         return await this.challengeCreateFn(authz, challenge, keyAuthorization, dnsProvider);

packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts

@@ -38,10 +38,10 @@ export class CertApplyPlugin extends AbstractTaskPlugin {
       span: 24,
     },
     helper:
-      "支持通配符域名，例如： *.foo.com、foo.com、*.test.handsfree.work\n" +
-      "支持多个域名、多个子域名、多个通配符域名打到一个证书上（域名必须是在同一个DNS提供商解析）\n" +
-      "多级子域名要分成多个域名输入（*.foo.com的证书不能用于xxx.yyy.foo.com、foo.com）\n" +
-      "输入一个回车之后，再输入下一个",
+      "1、支持通配符域名，例如： *.foo.com、foo.com、*.test.handsfree.work\n" +
+      "2、支持多个域名、多个子域名、多个通配符域名打到一个证书上（域名必须是在同一个DNS提供商解析）\n" +
+      "3、多级子域名要分成多个域名输入（*.foo.com的证书不能用于xxx.yyy.foo.com、foo.com）\n" +
+      "4、输入一个回车之后，再输入下一个",
   })
   domains!: string;
 
@@ -109,6 +109,17 @@ export class CertApplyPlugin extends AbstractTaskPlugin {
   })
   dnsProviderAccess!: string;
 
+  @TaskInput({
+    title: "跳过本地校验DNS",
+    default: false,
+    component: {
+      name: "a-switch",
+      vModel: "checked",
+    },
+    helper: "如果重试多次出现Authorization not found TXT record，导致无法申请成功，请尝试开启此选项",
+  })
+  skipLocalVerify = false;
+
   @TaskInput({
     title: "更新天数",
     component: {
@@ -165,7 +176,13 @@ export class CertApplyPlugin extends AbstractTaskPlugin {
     if (this.eabAccessId) {
       eab = await this.ctx.accessService.getById(this.eabAccessId);
     }
-    this.acme = new AcmeService({ userContext: this.userContext, logger: this.logger, sslProvider: this.sslProvider, eab });
+    this.acme = new AcmeService({
+      userContext: this.userContext,
+      logger: this.logger,
+      sslProvider: this.sslProvider,
+      eab,
+      skipLocalVerify: this.skipLocalVerify,
+    });
   }
 
   async execute(): Promise<void> {

packages/plugins/plugin-util/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.2](https://github.com/certd/certd/compare/v1.21.1...v1.21.2) (2024-07-08)
+
+**Note:** Version bump only for package @certd/plugin-util
+
 ## [1.21.1](https://github.com/certd/certd/compare/v1.21.0...v1.21.1) (2024-07-08)
 
 **Note:** Version bump only for package @certd/plugin-util

packages/plugins/plugin-util/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-util",
   "private": false,
-  "version": "1.21.1",
+  "version": "1.21.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -21,7 +21,7 @@
     "shelljs": "^0.8.5"
   },
   "devDependencies": {
-    "@certd/pipeline": "workspace:^1.21.1",
+    "@certd/pipeline": "workspace:^1.21.2",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.2](https://github.com/certd/certd/compare/v1.21.1...v1.21.2) (2024-07-08)
+
+**Note:** Version bump only for package @certd/ui-client
+
 ## [1.21.1](https://github.com/certd/certd/compare/v1.21.0...v1.21.1) (2024-07-08)
 
 ### Performance Improvements

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.21.1",
+  "version": "1.21.2",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -59,7 +59,7 @@
     "vuedraggable": "^2.24.3"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.21.1",
+    "@certd/pipeline": "^1.21.2",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.2](https://github.com/fast-crud/fast-server-js/compare/v1.21.1...v1.21.2) (2024-07-08)
+
+**Note:** Version bump only for package @certd/ui-server
+
 ## [1.21.1](https://github.com/fast-crud/fast-server-js/compare/v1.21.0...v1.21.1) (2024-07-08)
 
 ### Performance Improvements

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.21.1",
+  "version": "1.21.2",
   "description": "fast-server base midway",
   "private": true,
   "scripts": {
@@ -24,10 +24,10 @@
     "@alicloud/cs20151215": "^3.0.3",
     "@alicloud/openapi-client": "^0.4.0",
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/acme-client": "^1.21.1",
-    "@certd/pipeline": "^1.21.1",
-    "@certd/plugin-cert": "^1.21.1",
-    "@certd/plugin-util": "^1.21.1",
+    "@certd/acme-client": "^1.21.2",
+    "@certd/pipeline": "^1.21.2",
+    "@certd/plugin-cert": "^1.21.2",
+    "@certd/plugin-util": "^1.21.2",
     "@koa/cors": "^3.4.3",
     "@midwayjs/bootstrap": "^3.15.0",
     "@midwayjs/cache": "^3.14.0",

publish-check.js

@@ -0,0 +1,13 @@
+
+import fs from 'fs'
+function check(){
+    const gitAdd =  fs.readFileSync("./node_modules/@lerna-lite/version/dist/lib/git-add.js","utf-8")
+    if(gitAdd.indexOf("('git', ['add', '.']") > -1){
+        console.log("git-add 已经修改过了")
+    }else{
+        console.error("git-add 没有修改过")
+        throw new Error("git-add 还没修改过")
+    }
+}
+
+check()