diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 99f7bdf91..8e14e80c3 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -41,8 +41,6 @@ "lint1": "eslint --fix" }, "dependencies": { - "@azure/arm-dns": "^5.1.0", - "@azure/identity": "^4.13.1", "@certd/acme-client": "^1.41.4", "@certd/basic": "^1.41.4", "@certd/commercial-core": "^1.41.4", @@ -57,12 +55,6 @@ "@certd/plugin-lib": "^1.41.4", "@certd/plugin-plus": "^1.41.4", "@certd/plus-core": "^1.41.4", - "@google-cloud/dns": "^5.3.1", - "@google-cloud/publicca": "^1.3.0", - "@huaweicloud/huaweicloud-sdk-cdn": "3.1.185", - "@huaweicloud/huaweicloud-sdk-core": "3.1.185", - "@huaweicloud/huaweicloud-sdk-elb": "3.1.185", - "@huaweicloud/huaweicloud-sdk-iam": "3.1.185", "@koa/cors": "^5.0.0", "@midwayjs/bootstrap": "3.20.11", "@midwayjs/cache": "3.14.0", @@ -79,19 +71,14 @@ "@peculiar/x509": "^1.11.0", "@simplewebauthn/browser": "^13.2.2", "@simplewebauthn/server": "^13.2.3", - "@ucloud-sdks/ucloud-sdk-js": "^0.2.4", - "@volcengine/openapi": "^1.28.1", - "@volcengine/tos-sdk": "^2.9.1", "alipay-sdk": "^4.13.0", "axios": "^1.9.0", - "basic-ftp": "^5.0.5", "bcryptjs": "^2.4.3", "better-sqlite3": "^11.1.2", "cache-manager": "^6.1.0", "cron-parser": "^4.9.0", "crypto-js": "^4.2.0", "dayjs": "^1.11.7", - "esdk-obs-nodejs": "^3.25.6", "form-data": "^4.0.0", "glob": "^11.0.0", "https-proxy-agent": "^7.0.5", @@ -115,7 +102,6 @@ "pg": "^8.12.0", "psl": "^1.15.0", "punycode.js": "^2.3.1", - "qiniu": "^7.12.0", "qrcode": "^1.5.4", "qs": "^6.13.1", "querystring": "^0.2.1", @@ -148,7 +134,21 @@ "@aws-sdk/client-sts": "^3.990.0", "ali-oss": "^6.21.0", "tencentcloud-sdk-nodejs": "^4.1.112", - "cos-nodejs-sdk-v5": "^2.14.6" + "cos-nodejs-sdk-v5": "^2.14.6", + "@azure/arm-dns": "^5.1.0", + "@azure/identity": "^4.13.1", + "@huaweicloud/huaweicloud-sdk-cdn": "3.1.185", + "@huaweicloud/huaweicloud-sdk-core": "3.1.185", + "@huaweicloud/huaweicloud-sdk-elb": "3.1.185", + "@huaweicloud/huaweicloud-sdk-iam": "3.1.185", + "@ucloud-sdks/ucloud-sdk-js": "^0.2.4", + "@volcengine/openapi": "^1.28.1", + "@volcengine/tos-sdk": "^2.9.1", + "@google-cloud/dns": "^5.3.1", + "@google-cloud/publicca": "^1.3.0", + "basic-ftp": "^5.0.5", + "esdk-obs-nodejs": "^3.25.6", + "qiniu": "^7.12.0" }, "devDependencies": { "mwts": "^1.3.0", diff --git a/packages/ui/certd-server/src/plugins/plugin-azure/access.ts b/packages/ui/certd-server/src/plugins/plugin-azure/access.ts index 094a33b2d..4e31b96b6 100644 --- a/packages/ui/certd-server/src/plugins/plugin-azure/access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-azure/access.ts @@ -75,7 +75,7 @@ export class AzureAccess extends BaseAccess { this.ctx.logger.info("开始测试 Azure 认证..."); // 1. 先测试身份认证,获取访问令牌 - const { ClientSecretCredential } = await import("@azure/identity"); + const { ClientSecretCredential } = await this.importRuntime("@azure/identity"); const credential = new ClientSecretCredential(this.tenantId, this.clientId, this.clientSecret); @@ -88,8 +88,8 @@ export class AzureAccess extends BaseAccess { } async getDnsManagementClient() { - const { DnsManagementClient } = await import("@azure/arm-dns"); - const { ClientSecretCredential } = await import("@azure/identity"); + const { DnsManagementClient } = await this.importRuntime("@azure/arm-dns"); + const { ClientSecretCredential } = await this.importRuntime("@azure/identity"); const credential = new ClientSecretCredential(this.tenantId, this.clientId, this.clientSecret); diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/libs/google.ts b/packages/ui/certd-server/src/plugins/plugin-cert/libs/google.ts index 8fea2f68d..a9bc6f8c5 100644 --- a/packages/ui/certd-server/src/plugins/plugin-cert/libs/google.ts +++ b/packages/ui/certd-server/src/plugins/plugin-cert/libs/google.ts @@ -10,7 +10,7 @@ export class GoogleClient { } async getEab() { // https://cloud.google.com/docs/authentication/api-keys-use#using-with-client-libs - const { v1 } = await import("@google-cloud/publicca"); + const { v1 } = await this.access.importRuntime("@google-cloud/publicca"); // process.env.HTTPS_PROXY = "http://127.0.0.1:10811"; const access = this.access; if (!access.serviceAccountSecret) { diff --git a/packages/ui/certd-server/src/plugins/plugin-google/dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-google/dns-provider.ts index 032a2b188..645b4956b 100644 --- a/packages/ui/certd-server/src/plugins/plugin-google/dns-provider.ts +++ b/packages/ui/certd-server/src/plugins/plugin-google/dns-provider.ts @@ -52,7 +52,7 @@ export class GoogleCloudDnsProvider extends AbstractDnsProvider(this.accessId); - const { BasicCredentials } = await import("@huaweicloud/huaweicloud-sdk-core"); - const cdn = await import("@huaweicloud/huaweicloud-sdk-cdn/v2/public-api.js"); + const { BasicCredentials } = await this.importRuntime("@huaweicloud/huaweicloud-sdk-core"); + const cdn = await this.importRuntime("@huaweicloud/huaweicloud-sdk-cdn/v2/public-api.js"); //恢复华为云把log4j的config改了的问题 resetLogConfigure(); const credentials = new BasicCredentials().withAk(access.accessKeyId).withSk(access.accessKeySecret); diff --git a/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-elb/index.ts b/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-elb/index.ts index ec83ac2a9..cbfcb8180 100644 --- a/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-elb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-elb/index.ts @@ -103,8 +103,8 @@ export class HauweiDeployCertToELB extends AbstractTaskPlugin { throw new Error("项目ID不能为空"); } const access = await this.getAccess(this.accessId); - const { BasicCredentials } = await import("@huaweicloud/huaweicloud-sdk-core"); - const elb = await import("@huaweicloud/huaweicloud-sdk-elb/v3/public-api.js"); + const { BasicCredentials } = await this.importRuntime("@huaweicloud/huaweicloud-sdk-core"); + const elb = await this.importRuntime("@huaweicloud/huaweicloud-sdk-elb/v3/public-api.js"); //恢复华为云把log4j的config改了的问题 resetLogConfigure(); const projectArr = this.projectId.split("_"); diff --git a/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-obs/index.ts b/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-obs/index.ts index 147c4c656..02e1dc672 100644 --- a/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-obs/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-obs/index.ts @@ -91,7 +91,7 @@ export class HauweiDeployCertToOBS extends AbstractTaskPlugin { const regionStr = region ? `${region}.` : "cn-north-4."; const bucketStr = bucket ? `${bucket}.` : ""; const access = await this.getAccess(this.accessId); - const sdk = await import("esdk-obs-nodejs"); + const sdk = await this.importRuntime("esdk-obs-nodejs"); const obsClient = new sdk.default({ // 推荐通过环境变量获取AKSK,这里也可以使用其他外部引入方式传入,如果使用硬编码可能会存在泄露风险 // 您可以登录访问管理控制台获取访问密钥AK/SK,获取方式请参见https://support.huaweicloud.com/usermanual-ca/ca_01_0003.html diff --git a/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/upload-to-ccm/index.ts b/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/upload-to-ccm/index.ts index b180639d3..7b6bc10f3 100644 --- a/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/upload-to-ccm/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/upload-to-ccm/index.ts @@ -62,8 +62,8 @@ export class HauweiUploadToCCM extends AbstractTaskPlugin { async getCcmClient() { const access = await this.getAccess(this.accessId); - const { BasicCredentials } = await import("@huaweicloud/huaweicloud-sdk-core"); - const { ClientBuilder } = await import("@huaweicloud/huaweicloud-sdk-core/ClientBuilder.js"); + const { BasicCredentials } = await this.importRuntime("@huaweicloud/huaweicloud-sdk-core"); + const { ClientBuilder } = await this.importRuntime("@huaweicloud/huaweicloud-sdk-core/ClientBuilder.js"); //@ts-ignore const { HuaweiCcmClient } = await import("./ccm-client.js"); diff --git a/packages/ui/certd-server/src/plugins/plugin-lib/ftp/client.ts b/packages/ui/certd-server/src/plugins/plugin-lib/ftp/client.ts index cf6955e85..09851eb17 100644 --- a/packages/ui/certd-server/src/plugins/plugin-lib/ftp/client.ts +++ b/packages/ui/certd-server/src/plugins/plugin-lib/ftp/client.ts @@ -12,7 +12,7 @@ export class FtpClient { } async connect(callback: (client: FtpClient) => Promise) { - const ftp = await import("basic-ftp"); + const ftp = await this.access.importRuntime("basic-ftp"); const Client = ftp.Client; const client = new Client(); client.ftp.verbose = true; diff --git a/packages/ui/certd-server/src/plugins/plugin-lib/qiniu/lib/sdk.ts b/packages/ui/certd-server/src/plugins/plugin-lib/qiniu/lib/sdk.ts index f6cd04b37..1d44e7c43 100644 --- a/packages/ui/certd-server/src/plugins/plugin-lib/qiniu/lib/sdk.ts +++ b/packages/ui/certd-server/src/plugins/plugin-lib/qiniu/lib/sdk.ts @@ -43,7 +43,7 @@ export class QiniuClient { } async doRequest(url: string, method: string, body?: any) { - const { generateAccessToken } = await import("qiniu/qiniu/util.js"); + const { generateAccessToken } = await this.access.importRuntime("qiniu/qiniu/util.js"); const token = generateAccessToken(this.access, url); const res = await this.http.request({ url, @@ -65,8 +65,8 @@ export class QiniuClient { } async doRequestV2(opts: { url: string; method: string; body?: any; contentType: string }) { - const { HttpClient } = await import("qiniu/qiniu/httpc/client.js"); - const { QiniuAuthMiddleware } = await import("qiniu/qiniu/httpc/middleware/qiniuAuth.js"); + const { HttpClient } = await this.access.importRuntime("qiniu/qiniu/httpc/client.js"); + const { QiniuAuthMiddleware } = await this.access.importRuntime("qiniu/qiniu/httpc/middleware/qiniuAuth.js"); // X-Qiniu-Date: 20060102T150405Z const auth = new QiniuAuthMiddleware({ mac: { @@ -100,7 +100,7 @@ export class QiniuClient { } async uploadFile(bucket: string, key: string, content: Buffer | string) { - const sdk = await import("qiniu"); + const sdk = await this.access.importRuntime("qiniu"); const qiniu = sdk.default; const mac = new qiniu.auth.digest.Mac(this.access.accessKey, this.access.secretKey); const options = { @@ -161,7 +161,7 @@ export class QiniuClient { } private async getBucketManager() { - const sdk = await import("qiniu"); + const sdk = await this.access.importRuntime("qiniu"); const qiniu = sdk.default; const mac = new qiniu.auth.digest.Mac(this.access.accessKey, this.access.secretKey); const config = new qiniu.conf.Config(); diff --git a/packages/ui/certd-server/src/plugins/plugin-ucloud/access.ts b/packages/ui/certd-server/src/plugins/plugin-ucloud/access.ts index 0571b9a8e..bff0e90b6 100644 --- a/packages/ui/certd-server/src/plugins/plugin-ucloud/access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-ucloud/access.ts @@ -73,7 +73,7 @@ export class UCloudAccess extends BaseAccess { if (this.client) { return this.client; } - const { Client } = await import("@ucloud-sdks/ucloud-sdk-js"); + const { Client } = await this.importRuntime("@ucloud-sdks/ucloud-sdk-js"); const client = new Client({ config: { region: region || "cn-bj2", @@ -197,7 +197,7 @@ export class UCloudAccess extends BaseAccess { } async invoke(req: { Action: string; [key: string]: any }) { - const { Request } = await import("@ucloud-sdks/ucloud-sdk-js"); + const { Request } = await this.importRuntime("@ucloud-sdks/ucloud-sdk-js"); const client = await this.getClient(); const resp = await client.invoke( new Request({ diff --git a/packages/ui/certd-server/src/plugins/plugin-volcengine/cdn-client.ts b/packages/ui/certd-server/src/plugins/plugin-volcengine/cdn-client.ts index 5e3b2f4d1..148f7185c 100644 --- a/packages/ui/certd-server/src/plugins/plugin-volcengine/cdn-client.ts +++ b/packages/ui/certd-server/src/plugins/plugin-volcengine/cdn-client.ts @@ -14,7 +14,7 @@ export class VolcengineCdnClient { if (this.service) { return this.service; } - const { cdn } = await import("@volcengine/openapi"); + const { cdn } = await this.opts.access.importRuntime("@volcengine/openapi"); const service = new cdn.CdnService(); // 设置ak、sk service.setAccessKeyId(this.opts.access.accessKeyId); diff --git a/packages/ui/certd-server/src/plugins/plugin-volcengine/dns-client.ts b/packages/ui/certd-server/src/plugins/plugin-volcengine/dns-client.ts index f99fb694e..7d604ad54 100644 --- a/packages/ui/certd-server/src/plugins/plugin-volcengine/dns-client.ts +++ b/packages/ui/certd-server/src/plugins/plugin-volcengine/dns-client.ts @@ -21,7 +21,7 @@ export class VolcengineDnsClient { } async doRequest(req: VolcengineReq) { - const { Signer } = await import("@volcengine/openapi"); + const { Signer } = await this.opts.access.importRuntime("@volcengine/openapi"); // http request data const openApiRequestData: any = { diff --git a/packages/ui/certd-server/src/plugins/plugin-volcengine/ve-client.ts b/packages/ui/certd-server/src/plugins/plugin-volcengine/ve-client.ts index e3049e3c1..82fd34623 100644 --- a/packages/ui/certd-server/src/plugins/plugin-volcengine/ve-client.ts +++ b/packages/ui/certd-server/src/plugins/plugin-volcengine/ve-client.ts @@ -1,4 +1,4 @@ -import { VolcengineAccess } from "./access.js"; +import { VolcengineAccess } from "./access.js"; import { HttpClient, ILogger } from "@certd/basic"; export type VolcengineOpts = { @@ -140,7 +140,7 @@ export class VolcengineClient { } async getTOSService(opts: { region?: string }) { - const { TosClient } = await import("@volcengine/tos-sdk"); + const { TosClient } = await this.opts.access.importRuntime("@volcengine/tos-sdk"); const client = new TosClient({ accessKeyId: this.opts.access.accessKeyId, @@ -169,7 +169,7 @@ export class VolcengineClient { if (this.CommonService) { return this.CommonService; } - const { Service } = await import("@volcengine/openapi"); + const { Service } = await this.opts.access.importRuntime("@volcengine/openapi"); class CommonService extends Service { Generic: any;