v1.22.4

修复可选链问题导致的响应错误输出报错

.github/workflows/build-image.yml

@@ -0,0 +1,58 @@
+name: build-image
+on:
+  push:
+    branches: ['v2']
+    paths:
+      - "build.trigger"
+
+#  schedule:
+#    - # 国际时间 19:17 执行，北京时间3:17  ↙↙↙ 改成你想要每天自动执行的时间
+#    - cron: '17 19 * * *'
+permissions:
+  contents: read
+
+jobs:
+  build-certd-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: get_certd_version
+        id: get_certd_version
+        uses: actions/github-script@v6
+        with:
+          result-encoding: string
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+            const pnpmWorkspace = "./pnpm-workspace.yaml";
+            fs.unlinkSync(pnpmWorkspace)
+            const jsonFilePath = "./packages/ui/certd-server/package.json";
+            const jsonContent = fs.readFileSync(jsonFilePath, 'utf-8');
+            const pkg = JSON.parse(jsonContent)
+            console.log("certd_version:",pkg.version);
+            return pkg.version
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to aliyun container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: registry.cn-shenzhen.aliyuncs.com
+          username: ${{ secrets.aliyun_cs_username }}
+          password: ${{ secrets.aliyun_cs_password }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6.5.0
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          context: ./packages/ui/
+          tags: |
+            registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
+            registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${{steps.get_certd_version.outputs.result}}

.github/workflows/sync-to-gitee.yml

@@ -2,8 +2,6 @@ name: sync-to-gitee
 on:
   push:
     branches: ['v2']
-  pull_request:
-    branches: ['v2']
 #  schedule:
 #    - # 国际时间 19:17 执行，北京时间3:17  ↙↙↙ 改成你想要每天自动执行的时间
 #    - cron: '17 19 * * *'

CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.4](https://github.com/certd/certd/compare/v1.22.3...v1.22.4) (2024-07-26)
+
+### Performance Improvements
+
+* 证书申请支持反向代理，letsencrypt无法访问时的备用方案 ([b7b5df0](https://github.com/certd/certd/commit/b7b5df0587e0f7ea288c1b2af6f87211f207395f))
+* 支持arm64 ([fa14f87](https://github.com/certd/certd/commit/fa14f87a8093ef3addc5e5f3315ce1bfc9982782))
+
+## [1.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25)
+
+### Bug Fixes
+
+* lege 无执行权限问题 ([338eb3b](https://github.com/certd/certd/commit/338eb3bdfeb461e9b3bc7eee97b97a59f5642ffe))
+
+## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23)
+
+### Bug Fixes
+
+* 修复创建流水线时，无法根据dns类型默认正确的dns授权的bug ([a2c43b5](https://github.com/certd/certd/commit/a2c43b50a6069ed48958fd142844a8568c2af452))
+
 ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20)
 
 ### Performance Improvements

README.md

@@ -8,16 +8,14 @@ CertD 是一个免费全自动申请和自动部署更新SSL证书的工具。
 ## 一、特性
 本项目不仅支持证书申请过程自动化，还可以自动化部署更新证书，让你的证书永不过期。     
 
-* 全自动申请证书（支持阿里云、腾讯云、华为云、Cloudflare注册的域名）
-* 全自动部署更新证书（目前支持服务器上传部署、部署到阿里云、腾讯云等）
-* 支持通配符域名
-* 支持多个域名打到一个证书上
+* 全自动申请证书（支持阿里云、腾讯云、华为云、Cloudflare等各种途径注册的域名）
+* 全自动部署更新证书（目前支持部署到主机、部署到阿里云、腾讯云等）
+* 支持通配符域名/泛域名，支持多个域名打到一个证书上
 * 邮件通知
-* 证书自动更新
+* 私有化部署，保障安全
 * 免费、免费、免费（[阿里云单个通配符域名证书最便宜也要1800/年](https://yundun.console.aliyun.com/?p=cas#/certExtend/buy/cn-hangzhou)）
 
 
-
 ## 二、在线体验
 
 官方Demo地址，自助注册后体验    
@@ -40,7 +38,9 @@ https://certd.handsfree.work/
 -------> [点我查看详细使用步骤演示](./step.md)   <--------      
 ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑     
 
-## 四、本地docker部署
+## 四、私有化部署
+
+由于证书、授权信息等属于高度敏感数据，请务必私有化部署，保障数据安全
 
 ### 1. 安装docker、docker-compose
 
@@ -49,61 +49,71 @@ https://certd.handsfree.work/
 * 【腾讯云】云服务器2核2G，新老用户同享，99元/年，续费同价！【 [立即购买](https://cloud.tencent.com/act/cps/redirect?redirect=6094&cps_key=b3ef73330335d7a6efa4a4bbeeb6b2c9&from=console)】
   
 
-1.2 安装docker    
-https://docs.docker.com/engine/install/
-选择对应的操作系统，按照官方文档执行命令即可
+1.2 安装docker      
 
+https://docs.docker.com/engine/install/   
+选择对应的操作系统，按照官方文档执行命令即可   
 
-### 2. 下载docker-compose.yaml文件
+### 2. 运行certd
 
-[docker-compose.yaml下载](https://gitee.com/certd/certd/raw/v2/docker/run/docker-compose.yaml)
+[docker-compose.yaml 下载](https://gitee.com/certd/certd/raw/v2/docker/run/docker-compose.yaml)
+
+当前版本号： ![](https://img.shields.io/npm/v/%40certd%2Fpipeline)
 
 ```bash
+# 随便创建一个目录
 mkdir certd
+# 进入目录
 cd certd
-# wget下载docker-compose.yaml文件
-wget https://raw.githubusercontent.com/certd/certd/v2/docker/run/docker-compose.yaml
-# 或者使用gitee地址
+# 下载docker-compose.yaml文件，或者手动下载放到certd目录下
 wget https://gitee.com/certd/certd/raw/v2/docker/run/docker-compose.yaml
 
 # 可以根据需要修改里面的配置
 # 1.修改镜像版本号【可选】
 # 2.配置数据保存路径【可选】
 # 3.修改端口号【可选】
-vi docker-compose.yaml
-
-
-```
-
-### 3. 运行
-当前版本号： ![](https://img.shields.io/npm/v/%40certd%2Fpipeline)
-
-```bash
-# 设置镜像版本号环境变量，如果docker-compose.yaml中已经修改，请忽略这条命令
-export CERTD_VERSION=latest  # <---建议设置成固定版本号
+vi docker-compose.yaml # 【可选】
 
 # 启动certd
 docker compose up -d
+
 ```
-如果提示 没有compose命令,请安装docker-compose   
-https://docs.docker.com/compose/install/linux/
+> 如果提示 没有compose命令,请安装docker-compose   
+> https://docs.docker.com/compose/install/linux/
+
+#### 镜像说明：
+* certd镜像地址:
+  * `registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest`
+
+* 镜像构建通过`Actions`自动执行，过程公开透明，请放心使用
+  * [点我查看镜像构建日志](https://github.com/certd/certd/actions/workflows/build-image.yml) 
+
+![](./doc/images/action-build.jpg)
 
 
-
-### 4. 访问
+### 3. 访问
 
 http://your_server_ip:7001    
 默认账号密码：admin/123456    
 记得修改密码   
 
 
-### 5. 升级
+## 五、 升级
+如果使用固定版本号
+1. 修改`docker-compose.yaml`中的镜像版本号
+2. 运行 `docker compose up -d` 即可
 
-* 修改版本号，重新运行 `docker compose up -d` 即可
-* 数据存在`/data/certd`目录下，不用担心数据丢失
+如果使用`latest`版本
+1. 重新拉取镜像 `docker pull registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest` 
+2. 重新启动容器 `docker compose restart`
+
+> 数据默认存在`/data/certd`目录下，不用担心数据丢失   
 
 
-## 五、一些说明
+更新日志： [CHANGELOG](./CHANGELOG.md)
+
+
+## 六、一些说明
 * 本项目ssl证书提供商为letencrypt
 * 申请过程遵循acme协议
 * 需要验证域名所有权，一般有两种方式（目前本项目仅支持dns-01）
@@ -115,14 +125,15 @@ http://your_server_ip:7001
 * 免费证书过期时间90天，以后可能还会缩短，所以自动化部署必不可少
 * 设置每天自动运行，当证书过期前20天，会自动重新申请证书并部署
 
-## 六、不同平台的设置说明
+
+## 七、不同平台的设置说明
 
 * [Cloudflare](./doc/cf/cf.md)
 * [腾讯云](./doc/tencent/tencent.md)
 * [windows主机](./doc/host/host.md)
 
 
-## 七、问题处理
+## 八、问题处理
 ### 7.1 忘记管理员密码   
 解决方法如下：
 1. 修改docker-compose.yaml文件，将环境变量`certd_system_resetAdminPassword`改为`true`
@@ -143,9 +154,9 @@ docker logs -f --tail 500 certd
 ```shell
 docker compose up -d
 ```
-5. 使用admin/123456登录系统，请及时修改管理员密码
+5. 使用`admin/123456`登录系统，请及时修改管理员密码
 
-## 八、联系作者
+## 九、联系作者
 如有疑问，欢迎加入群聊（请备注certd）
 * QQ群：141236433
 * 微信群：   
@@ -157,7 +168,7 @@ docker compose up -d
 <img height="230" src="./doc/images/me.png">
 </p>
 
-## 九、捐赠
+## 十、捐赠
 媳妇儿说：“一天到晚搞开源，也不管管老婆孩子！😡😡😡”        
 拜托各位捐赠支持一下，让媳妇儿开心开心，我也能有更多时间进行开源项目，感谢🙏🙏🙏
 <p align="center">
@@ -165,16 +176,20 @@ docker compose up -d
 </p>
 
 
-## 十、贡献代码
+## 十一、贡献代码
 
 [贡献插件教程](./plugin.md)
 
 
-## 十一、我的其他项目（求Star）
+## 十二、我的其他项目（求Star）
 * [袖手GPT](https://ai.handsfree.work/) ChatGPT，国内可用，无需FQ，每日免费额度
 * [fast-crud](https://gitee.com/fast-crud/fast-crud/) 基于vue3的crud快速开发框架
 * [dev-sidecar](https://github.com/docmirror/dev-sidecar/) 直连访问github工具，无需FQ，解决github无法访问的问题
 
 
-## 十二、版本更新日志
-https://github.com/certd/certd/blob/v2/CHANGELOG.md
+
+## 十三、更新日志
+
+更新日志：[CHANGELOG](./CHANGELOG.md)
+
+

build.trigger

@@ -0,0 +1 @@
+7

docker/image/Dockerfile

@@ -1,25 +0,0 @@
-FROM registry.cn-shenzhen.aliyuncs.com/handsfree/node:18-alpine
-EXPOSE 7001
-WORKDIR /app/
-ENV node_sqlite3_binary_host_mirror https://registry.npmmirror.com/-/binary/sqlite3
-RUN npm install -g pnpm@8.15.7 --registry=https://registry.npmmirror.com
-RUN pnpm config set registry https://registry.npmmirror.com/
-
-#RUN npm install cross-env -g  --registry=https://registry.npmmirror.com
-#RUN npm install pm2 -g  --registry=https://registry.npmmirror.com
-#RUN pm2 install pm2-logrotate
-ADD ./workspace/certd-server/ /app/
-RUN sed -i "s/workspace://g" "/app/package.json"
-#RUN yarn install  --registry=https://registry.npmmirror.com
-#RUN yarn install --production
-RUN pnpm install
-RUN node ./before-build.js
-RUN npm run build
-ENV NODE_ENV production
-ENV MIDWAY_SERVER_ENV production
-#CMD ["pm2-runtime", "start", "./bootstrap.js","--name", "certd","-i","1"]
-CMD ["npm", "run","start"]
-
-
-
-

docker/image/build.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-set -e
-echo "请先输入一个版本号："
-read version
-
-echo "您输入的版本号是： $version"
-echo "登录aliyun镜像仓库"
-sudo docker login --username=252959493@qq.com registry.cn-shenzhen.aliyuncs.com
-
-build=$(pwd)
-cd ../../
-root=$(pwd)
-echo "安装依赖"
-#pnpm install --registry=https://registry.npmmirror.com
-pnpm install
-
-
-echo "packages build"
-
-lerna run build
-echo "packages build success"
-
-echo "server build"
-cd $root/packages/ui/certd-server
-pnpm run build
-echo "server build success"
-
-echo "rm node_modules"
-rm ./node_modules -rf
-
-echo "copy to workspace"
-mkdir -p $build/workspace/certd-server
-\cp ./* $build/workspace/certd-server -rf
-\cp ../certd-client/dist/* $build/workspace/certd-server/public/ -rf
-
-#export TAG=$version
-#sudo -E docker compose build
-#sudo -E docker compose push

docker/image/docker-compose.yaml

@@ -1,15 +0,0 @@
-version: '3.3' # 指定docker-compose 版本
-services: # 要拉起的服务们
-  certd:
-    build:
-      context: ./
-      dockerfile: Dockerfile
-    image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${TAG}
-    container_name: certd # 容器名
-    restart: unless-stopped # 重启
-    ports: # 端口映射
-      - "7001:7001"
-    environment:
-      - TZ=Asia/Shanghai
-      - node_sqlite3_binary_host_mirror=https://registry.npmmirror.com/-/binary/sqlite3
-

docker/run/docker-compose.yaml

@@ -1,8 +1,8 @@
 version: '3.3'
 services:
   certd:
-    # 镜像                                                  #  ↓↓↓↓↓ --- 1、 修改镜像版本号，或者干脆写成latest（不推荐）， 如果设置了环境变量 export CERTD_VERSION=xxx，这里可以不修改
-    image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${CERTD_VERSION}
+    # 镜像                                                  #  ↓↓↓↓↓ --- 1、 镜像版本号，建议改成固定版本号【可选】
+    image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
     container_name: certd # 容器名
     restart: unless-stopped # 自动重启
     volumes:

docker/run/run.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-# 判断$CERTD_VERSION 是否存在
-if [ -n "$CERTD_VERSION" ]; then
-    echo "CERTD_VERSION is set = $CERTD_VERSION"
-else
-    echo "CERTD_VERSION is not set"
-    echo "请先输入一个版本号(如 1.0.6)："
-    read CERTD_VERSION
-fi
-
-echo "您输入的版本号是： $CERTD_VERSION"
-sudo -E docker compose up -d

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.22.1"
+  "version": "1.22.4"
 }

package.json

@@ -12,7 +12,7 @@
   "scripts": {
     "start": "lerna bootstrap --hoist",
     "i-all": "lerna link && lerna exec npm install  ",
-    "publish": "npm run prepublishOnly1  && lerna publish --conventional-commits && npm run afterpublishOnly && npm run deploy1",
+    "publish": "npm run prepublishOnly1  && lerna publish --conventional-commits --create-release github && npm run afterpublishOnly",
     "afterpublishOnly": "",
     "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\"",

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.4](https://github.com/publishlab/node-acme-client/compare/v1.22.3...v1.22.4) (2024-07-26)
+
+### Performance Improvements
+
+* 证书申请支持反向代理，letsencrypt无法访问时的备用方案 ([b7b5df0](https://github.com/publishlab/node-acme-client/commit/b7b5df0587e0f7ea288c1b2af6f87211f207395f))
+
+## [1.22.3](https://github.com/publishlab/node-acme-client/compare/v1.22.2...v1.22.3) (2024-07-25)
+
+**Note:** Version bump only for package @certd/acme-client
+
+## [1.22.2](https://github.com/publishlab/node-acme-client/compare/v1.22.1...v1.22.2) (2024-07-23)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.22.1](https://github.com/publishlab/node-acme-client/compare/v1.22.0...v1.22.1) (2024-07-20)
 
 **Note:** Version bump only for package @certd/acme-client

packages/core/acme-client/build.md

@@ -1 +1 @@
-03:10
+20:55

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.22.1",
+    "version": "1.22.4",
     "main": "src/index.js",
     "types": "types/index.d.ts",
     "license": "MIT",
@@ -59,5 +59,5 @@
     "bugs": {
         "url": "https://github.com/publishlab/node-acme-client/issues"
     },
-    "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88"
+    "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41"
 }

packages/core/acme-client/src/client.js

@@ -100,7 +100,7 @@ class AcmeClient {
             max: this.opts.backoffMax,
         };
 
-        this.http = new HttpClient(this.opts.directoryUrl, this.opts.accountKey, this.opts.externalAccountBinding);
+        this.http = new HttpClient(this.opts.directoryUrl, this.opts.accountKey, this.opts.externalAccountBinding, this.opts.urlMapping);
         this.api = new AcmeApi(this.http, this.opts.accountUrl);
     }
 

packages/core/acme-client/src/http.js

@@ -12,10 +12,11 @@ const httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy;
 let httpsAgent = null;
 if (httpsProxy) {
     httpsAgent = new HttpsProxyAgent(httpsProxy);
+    log(`use https_proxy:${httpsProxy}`);
 }
 const axios = axios1.create({
     proxy: false,
-    httpsAgent
+    httpsAgent,
 });
 
 /**
@@ -30,7 +31,7 @@ const axios = axios1.create({
  */
 
 class HttpClient {
-    constructor(directoryUrl, accountKey, externalAccountBinding = {}) {
+    constructor(directoryUrl, accountKey, externalAccountBinding = {}, urlMapping = {}) {
         this.directoryUrl = directoryUrl;
         this.accountKey = accountKey;
         this.externalAccountBinding = externalAccountBinding;
@@ -41,6 +42,7 @@ class HttpClient {
         this.directoryCache = null;
         this.directoryMaxAge = 86400;
         this.directoryTimestamp = 0;
+        this.urlMapping = urlMapping;
     }
 
     /**
@@ -53,6 +55,16 @@ class HttpClient {
      */
 
     async request(url, method, opts = {}) {
+        if (this.urlMapping && this.urlMapping.enabled === true && this.urlMapping.mappings) {
+            // eslint-disable-next-line no-restricted-syntax
+            for (const key in this.urlMapping.mappings) {
+                if (url.includes(key)) {
+                    const newUrl = url.replace(key, this.urlMapping.mappings[key]);
+                    log(`use reverse proxy: ${newUrl}`);
+                    url = newUrl;
+                }
+            }
+        }
         opts.url = url;
         opts.method = method;
         opts.validateStatus = null;

packages/core/acme-client/tsconfig.json

@@ -1,4 +1,5 @@
 {
+    "compileOnSave": false,
     "compilerOptions": {
         "module": "commonjs",
         "lib": ["es6"],

packages/core/acme-client/types/index.d.ts

@@ -27,6 +27,11 @@ export interface Authorization extends rfc8555.Authorization {
     url: string;
 }
 
+export type UrlMapping={
+    enabled: boolean
+    mappings: Record<string, string>
+}
+
 /**
  * Client
  */
@@ -39,6 +44,7 @@ export interface ClientOptions {
     backoffAttempts?: number;
     backoffMin?: number;
     backoffMax?: number;
+    urlMapping?: UrlMapping;
 }
 
 export interface ClientExternalAccountBindingOptions {

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25)
+
+**Note:** Version bump only for package @certd/pipeline
+
+## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20)
 
 ### Performance Improvements

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.22.1",
+  "version": "1.22.3",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -55,5 +55,5 @@
     "vite": "^4.3.8",
     "vue-tsc": "^1.6.5"
   },
-  "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88"
+  "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41"
 }

packages/core/pipeline/src/core/executor.ts

@@ -283,7 +283,7 @@ export class Executor {
       }
       if (notification.type === "email") {
         try {
-          this.options.emailService?.send({
+          await this.options.emailService?.send({
             userId: this.pipeline.userId,
             subject,
             content,

packages/core/pipeline/src/utils/util.request.ts

@@ -50,7 +50,7 @@ export function createAxiosService({ logger }: { logger: Logger }) {
       //   case 505: error.message = 'HTTP版本不受支持'; break
       //   default: break
       // }
-      logger.error(`请求出错：url:${error?.response?.config.url},method:${error.response.config.method},status:${error?.response?.status}`);
+      logger.error(`请求出错：url:${error?.response?.config.url},method:${error?.response?.config?.method},status:${error?.response?.status}`);
       logger.info("返回数据:", JSON.stringify(error?.response?.data));
       delete error.config;
       delete error.response;

packages/libs/lib-k8s/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
+## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23)
+
+**Note:** Version bump only for package @certd/lib-k8s
+
 ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20)
 
 **Note:** Version bump only for package @certd/lib-k8s

packages/libs/lib-k8s/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/lib-k8s",
   "private": false,
-  "version": "1.22.1",
+  "version": "1.22.3",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,7 +17,7 @@
     "shelljs": "^0.8.5"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.22.1",
+    "@certd/pipeline": "^1.22.3",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -38,5 +38,5 @@
     "tslib": "^2.5.2",
     "typescript": "^4.8.4"
   },
-  "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88"
+  "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41"
 }

packages/libs/midway-flyway-js/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
+## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23)
+
+**Note:** Version bump only for package @certd/midway-flyway-js
+
 ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20)
 
 **Note:** Version bump only for package @certd/midway-flyway-js

packages/libs/midway-flyway-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/midway-flyway-js",
-  "version": "1.22.1",
+  "version": "1.22.3",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -53,5 +53,5 @@
     "typeorm": "^0.3.11",
     "typescript": "~5.1.0"
   },
-  "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88"
+  "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41"
 }

packages/libs/midway-flyway-js/src/flyway.ts

@@ -227,8 +227,10 @@ export class Flyway {
       if (history.hash !== hash && this.allowHashNotMatch === false) {
         throw new Error(file + `hash conflict ,old: ${history.hash} != new: ${hash}`);
       }
+      this.logger.info('[ midfly ] script<' + file + '> already executed');
       return true;
     }
+    this.logger.info('[ midfly ] script<' + file + '> not yet execute');
     return false;
   }
 

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.4](https://github.com/certd/certd/compare/v1.22.3...v1.22.4) (2024-07-26)
+
+### Performance Improvements
+
+* 证书申请支持反向代理，letsencrypt无法访问时的备用方案 ([b7b5df0](https://github.com/certd/certd/commit/b7b5df0587e0f7ea288c1b2af6f87211f207395f))
+
+## [1.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
+## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
 ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20)
 
 ### Performance Improvements

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.22.1",
+  "version": "1.22.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,8 +13,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.22.1",
-    "@certd/pipeline": "^1.22.1",
+    "@certd/acme-client": "^1.22.4",
+    "@certd/pipeline": "^1.22.3",
     "jszip": "^3.10.1",
     "node-forge": "^0.10.0",
     "psl": "^1.9.0"
@@ -53,5 +53,5 @@
     "vite": "^3.1.0",
     "vue-tsc": "^0.38.9"
   },
-  "gitHead": "47fe3d5826661f678d081ab53e67c847a3239d88"
+  "gitHead": "e5da46cfc31b2e30a4903bcb2251b1851265ef41"
 }

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

@@ -6,7 +6,7 @@ import { Logger } from "log4js";
 import { IContext } from "@certd/pipeline";
 import { IDnsProvider } from "../../dns-provider/index.js";
 import psl from "psl";
-import { ClientExternalAccountBindingOptions } from "@certd/acme-client";
+import { ClientExternalAccountBindingOptions, UrlMapping } from "@certd/acme-client";
 
 export type CertInfo = {
   crt: string;
@@ -14,19 +14,24 @@ export type CertInfo = {
   csr: string;
 };
 export type SSLProvider = "letsencrypt" | "buypass" | "zerossl";
+type AcmeServiceOptions = {
+  userContext: IContext;
+  logger: Logger;
+  sslProvider: SSLProvider;
+  eab?: ClientExternalAccountBindingOptions;
+  skipLocalVerify?: boolean;
+  useMappingProxy?: boolean;
+};
+
 export class AcmeService {
+  options: AcmeServiceOptions;
   userContext: IContext;
   logger: Logger;
   sslProvider: SSLProvider;
   skipLocalVerify = true;
   eab?: ClientExternalAccountBindingOptions;
-  constructor(options: {
-    userContext: IContext;
-    logger: Logger;
-    sslProvider: SSLProvider;
-    eab?: ClientExternalAccountBindingOptions;
-    skipLocalVerify?: boolean;
-  }) {
+  constructor(options: AcmeServiceOptions) {
+    this.options = options;
     this.userContext = options.userContext;
     this.logger = options.logger;
     this.sslProvider = options.sslProvider || "letsencrypt";
@@ -61,6 +66,13 @@ export class AcmeService {
     } else {
       directoryUrl = acme.directory[this.sslProvider].production;
     }
+    const urlMapping: UrlMapping = { enabled: false, mappings: {} };
+    if (this.options.useMappingProxy) {
+      urlMapping.enabled = true;
+      urlMapping.mappings = {
+        "acme-v02.api.letsencrypt.org": "letsencrypt.proxy.handsfree.work",
+      };
+    }
     const client = new acme.Client({
       directoryUrl: directoryUrl,
       accountKey: conf.key,
@@ -69,6 +81,7 @@ export class AcmeService {
       backoffAttempts: 30,
       backoffMin: 5000,
       backoffMax: 10000,
+      urlMapping,
     });
 
     if (conf.accountUrl == null) {

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

@@ -33,6 +33,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
       vModel: "value",
       options: [
         { value: "letsencrypt", label: "Let's Encrypt" },
+        // { value: "letsencrypt-proxy", label: "Let's Encrypt代理，letsencrypt.org无法访问时使用" },
         // { value: "buypass", label: "Buypass" },
         { value: "zerossl", label: "ZeroSSL" },
       ],
@@ -79,6 +80,17 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
   })
   dnsProviderAccess!: string;
 
+  @TaskInput({
+    title: "使用代理",
+    default: false,
+    component: {
+      name: "a-switch",
+      vModel: "checked",
+    },
+    helper: "如果acme-v02.api.letsencrypt.org被墙无法连接访问，请尝试开启此选项",
+  })
+  useProxy = false;
+
   @TaskInput({
     title: "跳过本地校验DNS",
     default: false,
@@ -103,6 +115,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin {
       sslProvider: this.sslProvider,
       eab,
       skipLocalVerify: this.skipLocalVerify,
+      useMappingProxy: this.useProxy,
     });
   }
 

packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/dns.ts

@@ -0,0 +1 @@
+export const dnsList = [];

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

@@ -1,9 +1,9 @@
 import { IsTaskPlugin, pluginGroups, RunStrategy, sp, Step, TaskInput } from "@certd/pipeline";
-import type { CertInfo } from "./acme.js";
-import { CertReader } from "./cert-reader.js";
-import { CertApplyBasePlugin } from "./base.js";
+import type { CertInfo } from "../acme.js";
+import { CertReader } from "../cert-reader.js";
+import { CertApplyBasePlugin } from "../base.js";
 import fs from "fs";
-import { EabAccess } from "../../access";
+import { EabAccess } from "../../../access/index.js";
 import path from "path";
 
 export { CertReader };
@@ -25,6 +25,21 @@ export type { CertInfo };
   },
 })
 export class CertApplyLegoPlugin extends CertApplyBasePlugin {
+  // @TaskInput({
+  //   title: "ACME服务端点",
+  //   default: "https://acme-v02.api.letsencrypt.org/directory",
+  //   component: {
+  //     name: "a-select",
+  //     vModel: "value",
+  //     options: [
+  //       { value: "https://acme-v02.api.letsencrypt.org/directory", label: "Let's Encrypt" },
+  //       { value: "https://letsencrypt.proxy.handsfree.work/directory", label: "Let's Encrypt代理，letsencrypt.org无法访问时使用" },
+  //     ],
+  //   },
+  //   required: true,
+  // })
+  acmeServer!: string;
+
   @TaskInput({
     title: "DNS类型",
     component: {
@@ -110,8 +125,14 @@ export class CertApplyLegoPlugin extends CertApplyBasePlugin {
     const savePathArgs = `--path "${saveDir}"`;
     const os_type = process.platform === "win32" ? "windows" : "linux";
     const legoPath = path.resolve("./tools", os_type, "lego");
+    let serverArgs = "";
+    if (this.acmeServer) {
+      serverArgs = ` --server ${this.acmeServer}`;
+    }
     const cmds = [
-      `${legoPath} -a --email "${this.email}" --dns ${this.dnsType} ${keyType} ${domainArgs} ${eabArgs} ${savePathArgs}  ${this.customArgs || ""} run`,
+      `${legoPath} -a --email "${this.email}" --dns ${this.dnsType} ${keyType} ${domainArgs} ${serverArgs} ${eabArgs} ${savePathArgs}  ${
+        this.customArgs || ""
+      } run`,
     ];
 
     await sp.spawn({

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

@@ -1,2 +1,2 @@
 export * from "./cert-plugin/index.js";
-export * from "./cert-plugin/lego.js";
+export * from "./cert-plugin/lego/index.js";

packages/ui/Dockerfile

@@ -1,21 +1,21 @@
-FROM registry.cn-shenzhen.aliyuncs.com/handsfree/node:18-alpine as builder
+FROM node:18-alpine AS builder
 EXPOSE 7001
 WORKDIR /workspace/
-RUN npm install -g pnpm@8.15.7 --registry=https://registry.npmmirror.com
-RUN pnpm config set registry https://registry.npmmirror.com/
+COPY . /workspace/
+RUN npm install -g pnpm@8.15.7
 
 RUN cd /workspace/certd-client && pnpm install && npm run build
 RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker
 
 RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf
 
-
-FROM registry.cn-shenzhen.aliyuncs.com/handsfree/node:18-alpine
+FROM node:18-alpine
 WORKDIR /app/
 COPY --from=builder /workspace/certd-server/ /app/
-ENV TZ Asia/Shanghai
-ENV NODE_ENV production
-ENV MIDWAY_SERVER_ENV production
+RUN chmod +x /app/tools/linux/*
+ENV TZ=Asia/Shanghai
+ENV NODE_ENV=production
+ENV MIDWAY_SERVER_ENV=production
 CMD ["npm", "run","start"]
 
 

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25)
+
+**Note:** Version bump only for package @certd/ui-client
+
+## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23)
+
+### Bug Fixes
+
+* 修复创建流水线时，无法根据dns类型默认正确的dns授权的bug ([a2c43b5](https://github.com/certd/certd/commit/a2c43b50a6069ed48958fd142844a8568c2af452))
+
 ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20)
 
 ### Performance Improvements

packages/ui/certd-client/package.json

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

packages/ui/certd-client/src/use/use-refrence.ts

@@ -0,0 +1,19 @@
+import _ from "lodash-es";
+import { compute } from "@fast-crud/fast-crud";
+
+export function useReference(form: any) {
+  if (!form.reference) {
+    return;
+  }
+  for (const reference of form.reference) {
+    debugger;
+    _.set(
+      form,
+      reference.dest,
+      compute<any>((scope) => {
+        debugger;
+        return _.get(scope, reference.src);
+      })
+    );
+  }
+}

packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx

@@ -1,5 +1,7 @@
 import { compute, CreateCrudOptionsRet, dict } from "@fast-crud/fast-crud";
 import { PluginGroup } from "@certd/pipeline";
+import { useReference } from "/@/use/use-refrence";
+import _ from "lodash-es";
 
 export default function (certPluginGroup: PluginGroup, formWrapperRef: any): CreateCrudOptionsRet {
   const inputs: any = {};
@@ -10,10 +12,11 @@ export default function (certPluginGroup: PluginGroup, formWrapperRef: any): Cre
         inputs[inputKey].form.show = true;
         continue;
       }
-      const inputDefine = plugin.input[inputKey];
+      const inputDefine = _.cloneDeep(plugin.input[inputKey]);
       if (!inputDefine.required && !inputDefine.maybeNeed) {
         continue;
       }
+      useReference(inputDefine);
       inputs[inputKey] = {
         title: inputDefine.title,
         form: {

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.22.4](https://github.com/certd/certd/compare/v1.22.3...v1.22.4) (2024-07-26)
+
+**Note:** Version bump only for package @certd/ui-server
+
+## [1.22.3](https://github.com/certd/certd/compare/v1.22.2...v1.22.3) (2024-07-25)
+
+**Note:** Version bump only for package @certd/ui-server
+
+## [1.22.2](https://github.com/certd/certd/compare/v1.22.1...v1.22.2) (2024-07-23)
+
+### Bug Fixes
+
+* 修复创建流水线时，无法根据dns类型默认正确的dns授权的bug ([a2c43b5](https://github.com/certd/certd/commit/a2c43b50a6069ed48958fd142844a8568c2af452))
+
 ## [1.22.1](https://github.com/certd/certd/compare/v1.22.0...v1.22.1) (2024-07-20)
 
 ### Performance Improvements

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.22.1",
+  "version": "1.22.4",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -21,12 +21,12 @@
     "@alicloud/cs20151215": "^3.0.3",
     "@alicloud/openapi-client": "^0.4.0",
     "@alicloud/pop-core": "^1.7.10",
-    "@certd/acme-client": "^1.22.1",
+    "@certd/acme-client": "^1.22.4",
     "@certd/lib-huawei": "^1.22.1",
-    "@certd/lib-k8s": "^1.22.1",
-    "@certd/midway-flyway-js": "^1.22.1",
-    "@certd/pipeline": "^1.22.1",
-    "@certd/plugin-cert": "^1.22.1",
+    "@certd/lib-k8s": "^1.22.3",
+    "@certd/midway-flyway-js": "^1.22.3",
+    "@certd/pipeline": "^1.22.3",
+    "@certd/plugin-cert": "^1.22.4",
     "@koa/cors": "^3.4.3",
     "@midwayjs/bootstrap": "^3.16.2",
     "@midwayjs/cache": "^3.14.0",

packages/ui/certd-server/src/config/config.default.ts

@@ -59,7 +59,7 @@ const development = {
         type: 'better-sqlite3',
         database: './data/db.sqlite',
         synchronize: false, // 如果第一次使用，不存在表，有同步的需求可以写 true
-        logging: true,
+        logging: false,
 
         // 配置实体模型 或者 entities: '/entity',
         entities: ['**/modules/*/entity/*.ts', '**/entity/*.js', '**/entity/*.d.ts', PipelineEntity, FlywayHistory, UserEntity],

packages/ui/certd-server/src/config/config.preview.ts

@@ -8,6 +8,13 @@ const preview = {
   preview: {
     enabled: true,
   },
+  typeorm: {
+    dataSource: {
+      default: {
+        logging: false,
+      },
+    },
+  },
 } as MidwayConfig;
 
 mergeConfig(preview, 'preview');

packages/ui/certd-server/src/config/config.production.ts

@@ -8,6 +8,13 @@ const production = {
   preview: {
     enabled: false,
   },
+  typeorm: {
+    dataSource: {
+      default: {
+        logging: false,
+      },
+    },
+  },
 } as MidwayConfig;
 
 mergeConfig(production, 'production');

publish-check.js

@@ -1,5 +1,6 @@
 
 import fs from 'fs'
+import childProcess from 'child_process';
 function check(){
     const gitAdd =  fs.readFileSync("./node_modules/@lerna-lite/version/dist/lib/git-add.js","utf-8")
     if(gitAdd.indexOf("('git', ['add', '.']") > -1){
@@ -8,6 +9,14 @@ function check(){
         console.error("git-add 没有修改过")
         throw new Error("git-add 还没修改过")
     }
+
+    //GH_TOKEN
+    console.log("检查 GH_TOKEN")
+    if(!process.env.GH_TOKEN){
+        // setx  /M GH_TOKEN xxxxx
+        console.error("GH_TOKEN 未设置")
+        throw new Error("GH_TOKEN 未设置")
+    }
 }
 
-check()
+check()