diff --git a/package.json b/package.json index 1cc8dc84..798fcc19 100644 --- a/package.json +++ b/package.json @@ -4,18 +4,18 @@ "private": true, "type": "module", "devDependencies": { - "@lerna-lite/cli": "^3.2.1", - "@lerna-lite/publish": "^3.2.1", - "@lerna-lite/run": "^3.2.1", - "@lerna-lite/version": "^3.2.1" + "@lerna-lite/cli": "^3.9.3", + "@lerna-lite/publish": "^3.9.3", + "@lerna-lite/run": "^3.9.3", + "@lerna-lite/version": "^3.9.3" }, "scripts": { "start": "lerna bootstrap --hoist", "i-all": "lerna link && lerna exec npm install ", "publish": "npm run prepublishOnly2 && lerna publish --force-publish=pro/plus-core --conventional-commits --create-release github && npm run afterpublishOnly && npm run commitAll", "afterpublishOnly": "time /t >build.trigger && git add ./build.trigger && git commit -m \"build: trigger build image\" && TIMEOUT /T 10 && git push", - "commitAll" : "git add . && git commit -m \"build: publish\" && git push && npm run commitPro", - "commitPro" : "cd ./packages/core/ && git add . && git commit -m \"build: publish\" && git push", + "commitAll": "git add . && git commit -m \"build: publish\" && git push && npm run commitPro", + "commitPro": "cd ./packages/core/ && git add . && git commit -m \"build: publish\" && git push", "prepublishOnly1": "npm run check && lerna run build ", "prepublishOnly2": "npm run check && npm run before-build && lerna run build ", "before-build": "cd ./packages/core/basic && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"", @@ -25,7 +25,7 @@ }, "license": "AGPL-3.0", "dependencies": { - "axios": "^1.7.2", + "axios": "^1.7.7", "lodash-es": "^4.17.21" }, "workspaces": [ diff --git a/packages/core/basic/package.json b/packages/core/basic/package.json index 136d53a8..f773662f 100644 --- a/packages/core/basic/package.json +++ b/packages/core/basic/package.json @@ -4,6 +4,7 @@ "version": "1.25.9", "type": "module", "main": "./dist/index.js", + "module": "./dist/index.js", "types": "./dist/index.d.ts", "scripts": { "dev": "vite", diff --git a/packages/core/basic/src/index.ts b/packages/core/basic/src/index.ts index 56336917..3ac870a7 100644 --- a/packages/core/basic/src/index.ts +++ b/packages/core/basic/src/index.ts @@ -1 +1 @@ -export * from './utils/index.js' \ No newline at end of file +export * from './utils/index.js'; diff --git a/packages/core/basic/src/utils/index.ts b/packages/core/basic/src/utils/index.ts index ae5bf08c..d3b9c001 100644 --- a/packages/core/basic/src/utils/index.ts +++ b/packages/core/basic/src/utils/index.ts @@ -1,21 +1,21 @@ -import sleep from "./util.sleep.js"; -import { http } from "./util.request.js"; -export * from "./util.request.js"; -export * from "./util.log.js"; -export * from "./util.file.js"; -export * from "./util.sp.js"; -export * from "./util.promise.js"; -export * from "./util.hash.js"; -export * from "./util.merge.js"; -export * from "./util.cache.js"; -import { nanoid } from "nanoid"; -import { mergeUtils } from "./util.merge.js"; -import { sp } from "./util.sp.js"; -import { hashUtils } from "./util.hash.js"; -import { promises } from "./util.promise.js"; -import { fileUtils } from "./util.file.js"; -import _ from "lodash-es"; -import { cache } from "./util.cache.js"; +export * from './util.request.js'; +export * from './util.log.js'; +export * from './util.file.js'; +export * from './util.sp.js'; +export * from './util.promise.js'; +export * from './util.hash.js'; +export * from './util.merge.js'; +export * from './util.cache.js'; +import sleep from './util.sleep.js'; +import { http } from './util.request.js'; +import { nanoid } from 'nanoid'; +import { mergeUtils } from './util.merge.js'; +import { sp } from './util.sp.js'; +import { hashUtils } from './util.hash.js'; +import { promises } from './util.promise.js'; +import { fileUtils } from './util.file.js'; +import * as _ from 'lodash-es'; +import { cache } from './util.cache.js'; import dayjs from 'dayjs'; export const utils = { @@ -29,5 +29,5 @@ export const utils = { mergeUtils, cache, nanoid, - dayjs + dayjs, }; diff --git a/packages/core/pipeline/src/index.ts b/packages/core/pipeline/src/index.ts index 06788a90..e1fa81a7 100644 --- a/packages/core/pipeline/src/index.ts +++ b/packages/core/pipeline/src/index.ts @@ -1,4 +1,3 @@ -import "util"; export * from "./core/index.js"; export * from "./dt/index.js"; export * from "./access/index.js"; diff --git a/packages/libs/lib-server/package.json b/packages/libs/lib-server/package.json index 9b4041c4..79a3009e 100644 --- a/packages/libs/lib-server/package.json +++ b/packages/libs/lib-server/package.json @@ -25,19 +25,21 @@ ], "license": "AGPL", "dependencies": { + "@certd/basic": "^1.25.9", "@certd/pipeline": "^1.25.9", - "@midwayjs/core": "^3", - "@midwayjs/i18n": "^3", - "@midwayjs/info": "^3", - "@midwayjs/koa": "^3", - "@midwayjs/logger": "^3", - "@midwayjs/typeorm": "^3", - "@midwayjs/cache": "^3", + "@midwayjs/core": "~3.17.1", + "@midwayjs/i18n": "~3.17.3", + "@midwayjs/info": "~3.17.3", + "@midwayjs/koa": "~3.17.1", + "@midwayjs/logger": "~3.4.2", + "@midwayjs/typeorm": "~3.17.1", + "@midwayjs/cache": "~3.14.0", + "@midwayjs/upload": "^3.17.3", "better-sqlite3": "^11.1.2", "typeorm": "^0.3.20", "lodash-es": "^4.17.21", - "dayjs": "^1.11.7", - "@midwayjs/upload": "^3.16.4" + "dayjs": "^1.11.7" + }, "devDependencies": { "mwts": "^1.3.0", diff --git a/packages/libs/lib-server/src/system/basic/service/plus-service.ts b/packages/libs/lib-server/src/system/basic/service/plus-service.ts index 42bd1257..1c288860 100644 --- a/packages/libs/lib-server/src/system/basic/service/plus-service.ts +++ b/packages/libs/lib-server/src/system/basic/service/plus-service.ts @@ -1,6 +1,6 @@ import { Config, Init, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core'; -import { AppKey, http, PlusRequestService, verify } from '@certd/pipeline'; -import { logger } from '@certd/pipeline'; +import { AppKey, PlusRequestService, verify } from '@certd/pipeline'; +import { logger } from '@certd/basic'; import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from '../../settings/index.js'; @Provide() @@ -18,8 +18,6 @@ export class PlusService { const installInfo: SysInstallInfo = await this.sysSettingsService.getSetting(SysInstallInfo); this.plusRequestService = new PlusRequestService({ plusServerBaseUrls: this.plusServerBaseUrls, - http: http, - logger, subjectId: installInfo.siteId, }); } diff --git a/packages/libs/midway-flyway-js/package.json b/packages/libs/midway-flyway-js/package.json index a4e4d042..4cbb397d 100644 --- a/packages/libs/midway-flyway-js/package.json +++ b/packages/libs/midway-flyway-js/package.json @@ -25,9 +25,9 @@ ], "license": "MIT", "devDependencies": { - "@midwayjs/core": "^3", - "@midwayjs/logger": "^3", - "@midwayjs/typeorm": "^3", + "@midwayjs/core": "~3.17.1", + "@midwayjs/logger": "~3.4.2", + "@midwayjs/typeorm": "~3.17.1", "@rollup/plugin-commonjs": "^23.0.4", "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-node-resolve": "^15.0.1", diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index c88f9e63..79e19a1b 100644 --- a/packages/plugins/plugin-cert/package.json +++ b/packages/plugins/plugin-cert/package.json @@ -14,6 +14,7 @@ "preview": "vite preview" }, "dependencies": { + "@certd/basic": "^1.25.9", "@certd/acme-client": "^1.25.9", "@certd/pipeline": "^1.25.9", "dayjs": "^1.11.7", @@ -23,7 +24,6 @@ "rimraf": "^5.0.5" }, "devDependencies": { - "@alicloud/cs20151215": "^3.0.3", "@alicloud/openapi-client": "^0.4.0", "@alicloud/pop-core": "^1.7.10", "@rollup/plugin-commonjs": "^23.0.4", diff --git a/packages/plugins/plugin-cert/src/dns-provider/base.ts b/packages/plugins/plugin-cert/src/dns-provider/base.ts index 03cdaf50..9be6a523 100644 --- a/packages/plugins/plugin-cert/src/dns-provider/base.ts +++ b/packages/plugins/plugin-cert/src/dns-provider/base.ts @@ -1,5 +1,7 @@ -import { CreateRecordOptions, DnsProviderContext, IDnsProvider, RemoveRecordOptions } from "./api.js"; +import { CreateRecordOptions, DnsProviderContext, DnsProviderDefine, IDnsProvider, RemoveRecordOptions } from "./api.js"; import psl from "psl"; +import { dnsProviderRegistry } from "./registry.js"; +import { Decorator } from "@certd/pipeline"; export abstract class AbstractDnsProvider implements IDnsProvider { ctx!: DnsProviderContext; @@ -22,3 +24,20 @@ export function parseDomain(fullDomain: string) { } return parsed.domain as string; } + +export async function createDnsProvider(opts: { dnsProviderType: string; context: DnsProviderContext }): Promise { + const { dnsProviderType, context } = opts; + const dnsProviderPlugin = dnsProviderRegistry.get(dnsProviderType); + const DnsProviderClass = dnsProviderPlugin.target; + const dnsProviderDefine = dnsProviderPlugin.define as DnsProviderDefine; + if (dnsProviderDefine.deprecated) { + throw new Error(dnsProviderDefine.deprecated); + } + // @ts-ignore + const dnsProvider: IDnsProvider = new DnsProviderClass(); + + Decorator.inject(dnsProviderDefine.autowire, dnsProvider, context); + dnsProvider.setCtx(context); + await dnsProvider.onInstance(); + return dnsProvider; +} diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts index 832215ed..d9c8c7ee 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts @@ -1,8 +1,8 @@ -import { Decorator, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, utils } from "@certd/pipeline"; +import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, utils } from "@certd/pipeline"; import type { CertInfo, CnameVerifyPlan, DomainsVerifyPlan, PrivateKeyType, SSLProvider } from "./acme.js"; import { AcmeService } from "./acme.js"; import _ from "lodash-es"; -import { DnsProviderContext, DnsProviderDefine, dnsProviderRegistry, IDnsProvider } from "../../dns-provider/index.js"; +import { createDnsProvider, DnsProviderContext, IDnsProvider } from "../../dns-provider/index.js"; import { CertReader } from "./cert-reader.js"; import { CertApplyBasePlugin } from "./base.js"; @@ -271,21 +271,12 @@ export class CertApplyPlugin extends CertApplyBasePlugin { } async createDnsProvider(dnsProviderType: string, dnsProviderAccessId: number): Promise { - const dnsProviderPlugin = dnsProviderRegistry.get(dnsProviderType); - const DnsProviderClass = dnsProviderPlugin.target; - const dnsProviderDefine = dnsProviderPlugin.define as DnsProviderDefine; - if (dnsProviderDefine.deprecated) { - throw new Error(dnsProviderDefine.deprecated); - } const access = await this.accessService.getById(dnsProviderAccessId); - - // @ts-ignore - const dnsProvider: IDnsProvider = new DnsProviderClass(); - const context: DnsProviderContext = { access, logger: this.logger, http: this.http, utils }; - Decorator.inject(dnsProviderDefine.autowire, dnsProvider, context); - dnsProvider.setCtx(context); - await dnsProvider.onInstance(); - return dnsProvider; + const context: DnsProviderContext = { access, logger: this.logger, http: this.ctx.http, utils }; + return await createDnsProvider({ + dnsProviderType, + context, + }); } async createDomainsVerifyPlan(): Promise { diff --git a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/api.ts b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/api.ts index 184ecf36..85394285 100644 --- a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/api.ts +++ b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/api.ts @@ -24,3 +24,13 @@ export async function GetByDomain(domain: string) { } }); } + +export async function DoVerify(id: number) { + return await request({ + url: apiPrefix + "/verify", + method: "post", + data: { + id + } + }); +} diff --git a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue index 2196bb0b..6ce9b58f 100644 --- a/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue +++ b/packages/ui/certd-client/src/components/plugins/cert/domains-verify-plan-editor/cname-record-info.vue @@ -1,34 +1,34 @@