perf: ssh支持ppk格式私钥

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

@@ -31,9 +31,28 @@ export const directory = {
     sslcom:{
       staging: 'https://acme.ssl.com/sslcom-dv-rsa',
       production: 'https://acme.ssl.com/sslcom-dv-rsa',
+      ec: 'https://acme.ssl.com/sslcom-dv-ecc',
     }
 };
 
+export function getDirectoryUrl(opts) {
+  const {sslProvider, pkType} = opts
+  const list= directory[sslProvider]
+  if (!list) {
+    throw new Error(`sslProvider ${sslProvider} not found`)
+  }
+  let pkTypePrefix = pkType || 'rsa'
+  if (pkType) {
+   pkTypePrefix = pkType.toLowerCase().split("_")[0]
+  }
+
+  if (pkTypePrefix && list[pkTypePrefix]) {
+    return list[pkTypePrefix]
+  }
+
+  return list.production
+}
+
 /**
  * Crypto
  */

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

@@ -117,6 +117,8 @@ export const directory: {
     }
 };
 
+export function getDirectoryUrl(opts:{sslProvider:string, pkType: string}): string;
+
 /**
  * Crypto
  */

packages/core/basic/package.json

@@ -17,6 +17,7 @@
     "compile": "tsc --skipLibCheck --watch"
   },
   "dependencies": {
+    "async-lock": "^1.4.1",
     "axios": "^1.7.2",
     "dayjs": "^1.11.7",
     "http-proxy-agent": "^7.0.2",

packages/core/basic/src/utils/util.lock.ts

@@ -1,46 +1,16 @@
-import { logger, utils } from './index.js';
+// @ts-ignore
+import AsyncLock from "async-lock";
 
 export class Locker {
-  locked: Record<string, any> = {};
+  private asyncLocker: AsyncLock;
 
-  async execute(lockStr: string, callback: any) {
-    await this.lock(lockStr);
-    const timeoutId = setTimeout(() => {
-      logger.warn('Lock timeout,自动解锁', lockStr);
-      this.unlock(lockStr);
-    }, 20000);
-    try {
-      return await callback();
-    } finally {
-      clearTimeout(timeoutId);
-      this.unlock(lockStr);
-    }
+  constructor() {
+    this.asyncLocker = new AsyncLock();
   }
 
-  async lock(str: string) {
-    const isLocked = this.isLocked(str);
-    if (isLocked) {
-      let count = 0;
-      while (true) {
-        await utils.sleep(100);
-        if (!this.isLocked(str)) {
-          break;
-        }
-        count++;
-        if (count > 20) {
-          throw new Error('Lock timeout');
-        }
-      }
-    }
-    this.locked[str] = true;
-  }
-
-  unlock(str: string) {
-    delete this.locked[str];
-  }
-
-  isLocked(str: string) {
-    return this.locked[str] ?? false;
+  async execute(lockStr: string, callback: any, options?: { timeout?: number }) {
+    const timeout = options?.timeout ?? 20000;
+    return this.asyncLocker.acquire(lockStr, callback, { timeout });
   }
 }
 

packages/core/basic/test.mjs

@@ -0,0 +1,14 @@
+import { random } from "lodash-es";
+import { locker } from "./dist/utils/util.lock.js";
+
+async function testLocker() {
+  for (let i = 0; i < 10; i++) {
+    await locker.execute("test", async () => {
+      console.log("test", i);
+      await new Promise(resolve => setTimeout(resolve, Math.random() * 1000));
+      throw new Error("test error");
+    });
+  }
+}
+
+await testLocker();

packages/libs/lib-jdcloud/package.json

@@ -6,8 +6,6 @@
   "module": "./dist/bundle.js",
   "types": "./dist/d/index.d.ts",
   "scripts": {
-    "test": "cross-env NODE_CONFIG_DIR=./test/config  mocha --recursive --require babel-register",
-    "dev": "babel src --out-dir babel -w",
     "build": "rollup -c ",
     "dev-build": "npm run build",
     "pub": "npm publish"
@@ -15,7 +13,6 @@
   "author": "",
   "license": "Apache",
   "dependencies": {
-    "babel-register": "^6.26.0",
     "buffer": "^5.0.8",
     "create-hash": "^1.1.3",
     "create-hmac": "^1.1.6",
@@ -30,8 +27,6 @@
     "@rollup/plugin-typescript": "^11.0.0",
     "@typescript-eslint/eslint-plugin": "^8.26.1",
     "@typescript-eslint/parser": "^8.26.1",
-    "babel-cli": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
     "chai": "^4.1.2",
     "config": "^1.30.0",
     "cross-env": "^5.1.4",

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

@@ -128,7 +128,7 @@ export class AcmeService {
       await this.saveAccountConfig(email, conf);
       this.logger.info(`创建新的Accountkey:${email}`);
     }
-    const directoryUrl = acme.directory[this.sslProvider].production;
+    const directoryUrl = acme.getDirectoryUrl({ sslProvider: this.sslProvider, pkType: this.options.privateKeyType });
     if (this.options.useMappingProxy) {
       urlMapping.enabled = true;
     } else {

packages/plugins/plugin-lib/package.json

@@ -35,7 +35,7 @@
     "rimraf": "^5.0.5",
     "socks": "^2.8.3",
     "socks-proxy-agent": "^8.0.4",
-    "ssh2": "^1.15.0",
+    "ssh2": "1.17.0",
     "strip-ansi": "^7.1.0",
     "tencentcloud-sdk-nodejs": "^4.0.1005"
   },

packages/ui/Dockerfile

@@ -19,6 +19,8 @@ RUN apk add --no-cache openjdk8
 WORKDIR /app/
 COPY --from=builder /workspace/certd-server/ /app/
 
+COPY ./patch/ssh2/*.js /app/node_modules/.pnpm/node_modules/ssh2/lib/protocol/
+
 ENV LEGO_VERSION=4.22.2
 ENV LEGO_DOWNLOAD_DIR=/app/tools/lego
 RUN mkdir -p $LEGO_DOWNLOAD_DIR

pnpm-lock.yaml

@@ -46,7 +46,7 @@ importers:
   packages/core/acme-client:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../basic
       '@peculiar/x509':
         specifier: ^1.11.0
@@ -124,6 +124,9 @@ importers:
 
   packages/core/basic:
     dependencies:
+      async-lock:
+        specifier: ^1.4.1
+        version: 1.4.1
       axios:
         specifier: ^1.7.2
         version: 1.9.0(debug@4.4.1)
@@ -207,11 +210,11 @@ importers:
   packages/core/pipeline:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../basic
       '@certd/plus-core':
-        specifier: ^1.37.4
-        version: 1.37.4
+        specifier: ^1.37.10
+        version: link:../../pro/plus-core
       dayjs:
         specifier: ^1.11.7
         version: 1.11.13
@@ -415,7 +418,7 @@ importers:
   packages/libs/lib-k8s:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/basic
       '@kubernetes/client-node':
         specifier: 0.21.0
@@ -455,20 +458,20 @@ importers:
   packages/libs/lib-server:
     dependencies:
       '@certd/acme-client':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/pipeline
       '@certd/plugin-lib':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../plugins/plugin-lib
       '@certd/plus-core':
-        specifier: ^1.37.4
-        version: 1.37.4
+        specifier: ^1.37.10
+        version: link:../../pro/plus-core
       '@midwayjs/cache':
         specifier: 3.14.0
         version: 3.14.0
@@ -613,16 +616,16 @@ importers:
   packages/plugins/plugin-cert:
     dependencies:
       '@certd/acme-client':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/pipeline
       '@certd/plugin-lib':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../plugin-lib
       '@google-cloud/publicca':
         specifier: ^1.3.0
@@ -701,10 +704,10 @@ importers:
         specifier: ^3.787.0
         version: 3.810.0(aws-crt@1.26.2)
       '@certd/basic':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/pipeline
       '@kubernetes/client-node':
         specifier: 0.21.0
@@ -789,19 +792,19 @@ importers:
   packages/pro/commercial-core:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/basic
       '@certd/lib-server':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../libs/lib-server
       '@certd/pipeline':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/pipeline
       '@certd/plugin-plus':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../plugin-plus
       '@certd/plus-core':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../plus-core
       '@midwayjs/core':
         specifier: 3.20.11
@@ -886,22 +889,22 @@ importers:
         specifier: ^1.0.2
         version: 1.0.3
       '@certd/basic':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/basic
       '@certd/lib-k8s':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../libs/lib-k8s
       '@certd/pipeline':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/pipeline
       '@certd/plugin-cert':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../plugins/plugin-cert
       '@certd/plugin-lib':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../plugins/plugin-lib
       '@certd/plus-core':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../plus-core
       ali-oss:
         specifier: ^6.21.0
@@ -1004,7 +1007,7 @@ importers:
   packages/pro/plus-core:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/basic
       dayjs:
         specifier: ^1.11.7
@@ -1300,10 +1303,10 @@ importers:
         version: 0.1.3(zod@3.24.4)
     devDependencies:
       '@certd/lib-iframe':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../libs/lib-iframe
       '@certd/pipeline':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/pipeline
       '@rollup/plugin-commonjs':
         specifier: ^25.0.7
@@ -1486,47 +1489,47 @@ importers:
         specifier: ^3.705.0
         version: 3.810.0(aws-crt@1.26.2)
       '@certd/acme-client':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/basic
       '@certd/commercial-core':
-        specifier: ^1.37.4
-        version: 1.37.4(better-sqlite3@11.10.0)(encoding@0.1.13)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.8.3))
+        specifier: ^1.37.10
+        version: link:../../pro/commercial-core
       '@certd/cv4pve-api-javascript':
         specifier: ^8.4.2
         version: 8.4.2
       '@certd/jdcloud':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../libs/lib-jdcloud
       '@certd/lib-huawei':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../libs/lib-huawei
       '@certd/lib-k8s':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../libs/lib-k8s
       '@certd/lib-server':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../libs/lib-server
       '@certd/midway-flyway-js':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../libs/midway-flyway-js
       '@certd/pipeline':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../core/pipeline
       '@certd/plugin-cert':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../plugins/plugin-cert
       '@certd/plugin-lib':
-        specifier: ^1.37.4
+        specifier: ^1.37.10
         version: link:../../plugins/plugin-lib
       '@certd/plugin-plus':
-        specifier: ^1.37.4
-        version: 1.37.4(encoding@0.1.13)
+        specifier: ^1.37.10
+        version: link:../../pro/plugin-plus
       '@certd/plus-core':
-        specifier: ^1.37.4
-        version: 1.37.4
+        specifier: ^1.37.10
+        version: link:../../pro/plus-core
       '@huaweicloud/huaweicloud-sdk-cdn':
         specifier: ^3.1.120
         version: 3.1.149
@@ -1569,6 +1572,9 @@ importers:
       '@midwayjs/validate':
         specifier: 3.20.13
         version: 3.20.13
+      '@peculiar/x509':
+        specifier: ^1.11.0
+        version: 1.12.3
       '@volcengine/openapi':
         specifier: ^1.28.1
         version: 1.30.1(buffer@6.0.3)
@@ -2769,18 +2775,9 @@ packages:
   '@better-scroll/zoom@2.5.1':
     resolution: {integrity: sha512-aGvFY5ooeZWS4RcxQLD+pGLpQHQxpPy0sMZV3yadcd2QK53PK9gS4Dp+BYfRv8lZ4/P2LoNEhr6Wq1DN6+uPlA==}
 
-  '@certd/commercial-core@1.37.4':
-    resolution: {integrity: sha512-Axx1yBekqPy6D9LjjrijVbmO8Ck6E9Fv0+Jcy8cuua269sSpME8k3nj0U8Y4ec0JwfE6GbQYF9gaUE0kSSNexg==}
-
   '@certd/cv4pve-api-javascript@8.4.2':
     resolution: {integrity: sha512-udGce7ewrVl4DmZvX+17PjsnqsdDIHEDatr8QP0AVrY2p+8JkaSPW4mXCKiLGf82C9K2+GXgT+qNIqgW7tfF9Q==}
 
-  '@certd/plugin-plus@1.37.4':
-    resolution: {integrity: sha512-h3oSqMBSBYAz8dPcZ4fexrUk32Y2pJcixZMycOZi5onaM9Q5skkWqW3X625B7kdyYaIsojWQzETerXmwJzTBxQ==}
-
-  '@certd/plus-core@1.37.4':
-    resolution: {integrity: sha512-7RFOBjZW98hgsTqoq2T8E6ANhWkuNP7Yi3Y1rZ7m5aXAOgn2H1Aci/Jz9bmD6MZgawfU7j2MLoBXFLEPLpwruQ==}
-
   '@certd/vue-js-cron-core@6.0.3':
     resolution: {integrity: sha512-kqzoAMhYz9j6FGNWEODRYtt4NpUEUwjpkU89z5WVg2tCtOcI5VhwyUGOd8AxiBCRfd6PtXvzuqw85PaOps9wrQ==}
 
@@ -5744,6 +5741,9 @@ packages:
     resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==}
     engines: {node: '>= 0.4'}
 
+  async-lock@1.4.1:
+    resolution: {integrity: sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==}
+
   async-validator@4.2.5:
     resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
 
@@ -15385,84 +15385,12 @@ snapshots:
     dependencies:
       '@better-scroll/core': 2.5.1
 
-  '@certd/commercial-core@1.37.4(better-sqlite3@11.10.0)(encoding@0.1.13)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.8.3))':
-    dependencies:
-      '@certd/basic': link:packages/core/basic
-      '@certd/lib-server': link:packages/libs/lib-server
-      '@certd/pipeline': link:packages/core/pipeline
-      '@certd/plugin-plus': 1.37.4(encoding@0.1.13)
-      '@certd/plus-core': 1.37.4
-      '@midwayjs/core': 3.20.11
-      '@midwayjs/koa': 3.20.13
-      '@midwayjs/logger': 3.4.2
-      '@midwayjs/typeorm': 3.20.11
-      alipay-sdk: 4.14.0
-      dayjs: 1.11.13
-      typeorm: 0.3.24(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.8.3))
-      wechatpay-node-v3: 2.2.1
-    transitivePeerDependencies:
-      - '@google-cloud/spanner'
-      - '@sap/hana-client'
-      - babel-plugin-macros
-      - better-sqlite3
-      - encoding
-      - hdb-pool
-      - ioredis
-      - mongodb
-      - mssql
-      - mysql2
-      - oracledb
-      - pg
-      - pg-native
-      - pg-query-stream
-      - proxy-agent
-      - redis
-      - reflect-metadata
-      - sql.js
-      - sqlite3
-      - supports-color
-      - ts-node
-      - typeorm-aurora-data-api-driver
-
   '@certd/cv4pve-api-javascript@8.4.2':
     dependencies:
       debug: 4.4.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@certd/plugin-plus@1.37.4(encoding@0.1.13)':
-    dependencies:
-      '@alicloud/pop-core': 1.8.0
-      '@baiducloud/sdk': 1.0.3
-      '@certd/basic': link:packages/core/basic
-      '@certd/lib-k8s': link:packages/libs/lib-k8s
-      '@certd/pipeline': link:packages/core/pipeline
-      '@certd/plugin-cert': link:packages/plugins/plugin-cert
-      '@certd/plugin-lib': link:packages/plugins/plugin-lib
-      '@certd/plus-core': 1.37.4
-      ali-oss: 6.23.0
-      baidu-aip-sdk: 4.16.16
-      basic-ftp: 5.0.5
-      cos-nodejs-sdk-v5: 2.14.7
-      crypto-js: 4.2.0
-      dayjs: 1.11.13
-      form-data: 4.0.2
-      https-proxy-agent: 7.0.6
-      js-yaml: 4.1.0
-      jsencrypt: 3.3.2
-      jsrsasign: 11.1.0
-      qiniu: 7.14.0
-      tencentcloud-sdk-nodejs: 4.1.112(encoding@0.1.13)
-    transitivePeerDependencies:
-      - encoding
-      - proxy-agent
-      - supports-color
-
-  '@certd/plus-core@1.37.4':
-    dependencies:
-      '@certd/basic': link:packages/core/basic
-      dayjs: 1.11.13
-
   '@certd/vue-js-cron-core@6.0.3':
     dependencies:
       mustache: 4.2.0
@@ -19206,6 +19134,8 @@ snapshots:
 
   async-function@1.0.0: {}
 
+  async-lock@1.4.1: {}
+
   async-validator@4.2.5: {}
 
   async@3.2.3: {}