mirror of
https://github.com/certd/certd.git
synced 2026-07-12 16:27:34 +08:00
Compare commits
15 Commits
v2_audit_log
...
v2-dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 584b7b6f45 | |||
| 2312c444ef | |||
| 0373d019f8 | |||
| fe09e75b80 | |||
| 432c9c6cc1 | |||
| 5fc1d55879 | |||
| 268cd6cc9c | |||
| 20ffe31638 | |||
| 02d30067ea | |||
| 0ce7808e08 | |||
| d609ee2b7a | |||
| 083df61fcc | |||
| a524988be6 | |||
| 8517a0b564 | |||
| ec69b8f11b |
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复火山引擎查不到自定义源站域名的问题 ([02dabe1](https://github.com/certd/certd/commit/02dabe11db3e9b13ca4621ce9ddd2b808bfca390))
|
||||||
|
* 修复火山引擎自定义源站域名查询不到的问题 ([e44bf9d](https://github.com/certd/certd/commit/e44bf9d77375d48ac7fd1582e69fae02dfd248fa))
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复火山引擎查不到自定义源站域名的问题 ([02dabe1](https://github.com/certd/certd/commit/02dabe11db3e9b13ca4621ce9ddd2b808bfca390))
|
||||||
|
* 修复火山引擎自定义源站域名查询不到的问题 ([e44bf9d](https://github.com/certd/certd/commit/e44bf9d77375d48ac7fd1582e69fae02dfd248fa))
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
+1
-1
@@ -9,5 +9,5 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npmClient": "pnpm",
|
"npmClient": "pnpm",
|
||||||
"version": "1.42.3"
|
"version": "1.42.4"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/publishlab/node-acme-client/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|
||||||
## [1.42.3](https://github.com/publishlab/node-acme-client/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/publishlab/node-acme-client/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/acme-client
|
**Note:** Version bump only for package @certd/acme-client
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"description": "Simple and unopinionated ACME client",
|
"description": "Simple and unopinionated ACME client",
|
||||||
"private": false,
|
"private": false,
|
||||||
"author": "nmorsman",
|
"author": "nmorsman",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
"types"
|
"types"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@peculiar/x509": "^1.11.0",
|
"@peculiar/x509": "^1.11.0",
|
||||||
"asn1js": "^3.0.5",
|
"asn1js": "^3.0.5",
|
||||||
"axios": "^1.9.0",
|
"axios": "^1.9.0",
|
||||||
@@ -75,5 +75,5 @@
|
|||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/publishlab/node-acme-client/issues"
|
"url": "https://github.com/publishlab/node-acme-client/issues"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/basic
|
**Note:** Version bump only for package @certd/basic
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
23:45
|
02:45
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/basic",
|
"name": "@certd/basic",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -54,5 +54,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,12 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/pipeline
|
**Note:** Version bump only for package @certd/pipeline
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/pipeline",
|
"name": "@certd/pipeline",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -21,8 +21,8 @@
|
|||||||
"lint": "eslint --fix"
|
"lint": "eslint --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@certd/plus-core": "^1.42.3",
|
"@certd/plus-core": "^1.42.4",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"reflect-metadata": "^0.2.2"
|
"reflect-metadata": "^0.2.2"
|
||||||
@@ -51,5 +51,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,9 +62,6 @@ export abstract class BaseAccess implements IAccess {
|
|||||||
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
||||||
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
||||||
}
|
}
|
||||||
if (this.runtimeDepsService && this.ctx.define?.name) {
|
|
||||||
await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `access:${this.ctx.define.name}`, logger: this.ctx.logger });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async onRequest(req: AccessRequestHandleReq) {
|
async onRequest(req: AccessRequestHandleReq) {
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ export function AccessInput(input?: AccessInputDefine): PropertyDecorator {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function newAccess(type: string, input: any, accessService: IAccessService, ctx?: AccessContext) {
|
export async function newAccess(type: string, input: any, accessService: IAccessService, ctx: AccessContext) {
|
||||||
const register = accessRegistry.get(type);
|
const register = accessRegistry.get(type);
|
||||||
if (register == null) {
|
if (register == null) {
|
||||||
throw new Error(`access ${type} not found`);
|
throw new Error(`access ${type} not found`);
|
||||||
|
|||||||
@@ -112,9 +112,6 @@ export abstract class BaseNotification implements INotification {
|
|||||||
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
||||||
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
||||||
}
|
}
|
||||||
if (this.runtimeDepsService && this.ctx.define?.name) {
|
|
||||||
await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `notification:${this.ctx.define.name}`, logger: this.logger });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
setDefine = (define: NotificationDefine) => {
|
setDefine = (define: NotificationDefine) => {
|
||||||
this.define = define;
|
this.define = define;
|
||||||
|
|||||||
@@ -181,9 +181,6 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
|
|||||||
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
||||||
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
||||||
}
|
}
|
||||||
if (this.runtimeDepsService && this.ctx.define?.name) {
|
|
||||||
await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `plugin:${this.ctx.define.name}`, logger: this.logger });
|
|
||||||
}
|
|
||||||
// 将证书加入secret
|
// 将证书加入secret
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
if (this.cert && this.cert.crt && this.cert.key) {
|
if (this.cert && this.cert.crt && this.cert.key) {
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-huawei
|
**Note:** Version bump only for package @certd/lib-huawei
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-huawei",
|
"name": "@certd/lib-huawei",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"main": "./dist/bundle.js",
|
"main": "./dist/bundle.js",
|
||||||
"module": "./dist/bundle.js",
|
"module": "./dist/bundle.js",
|
||||||
"types": "./dist/d/index.d.ts",
|
"types": "./dist/d/index.d.ts",
|
||||||
@@ -30,5 +30,5 @@
|
|||||||
"prettier": "3.3.3",
|
"prettier": "3.3.3",
|
||||||
"tslib": "^2.8.1"
|
"tslib": "^2.8.1"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-iframe
|
**Note:** Version bump only for package @certd/lib-iframe
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-iframe",
|
"name": "@certd/lib-iframe",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -37,5 +37,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/jdcloud
|
**Note:** Version bump only for package @certd/jdcloud
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/jdcloud",
|
"name": "@certd/jdcloud",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"description": "jdcloud openApi sdk",
|
"description": "jdcloud openApi sdk",
|
||||||
"main": "./dist/bundle.js",
|
"main": "./dist/bundle.js",
|
||||||
"module": "./dist/bundle.js",
|
"module": "./dist/bundle.js",
|
||||||
@@ -62,5 +62,5 @@
|
|||||||
"fetch"
|
"fetch"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-k8s
|
**Note:** Version bump only for package @certd/lib-k8s
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-k8s",
|
"name": "@certd/lib-k8s",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"module": "./dist/index.js",
|
"module": "./dist/index.js",
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
"lint": "eslint --fix"
|
"lint": "eslint --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@kubernetes/client-node": "0.21.0"
|
"@kubernetes/client-node": "0.21.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -38,5 +38,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,12 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/lib-server
|
**Note:** Version bump only for package @certd/lib-server
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/lib-server",
|
"name": "@certd/lib-server",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -29,11 +29,11 @@
|
|||||||
],
|
],
|
||||||
"license": "AGPL",
|
"license": "AGPL",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.42.3",
|
"@certd/acme-client": "^1.42.4",
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@certd/pipeline": "^1.42.3",
|
"@certd/pipeline": "^1.42.4",
|
||||||
"@certd/plugin-lib": "^1.42.3",
|
"@certd/plugin-lib": "^1.42.4",
|
||||||
"@certd/plus-core": "^1.42.3",
|
"@certd/plus-core": "^1.42.4",
|
||||||
"@midwayjs/cache": "3.14.0",
|
"@midwayjs/cache": "3.14.0",
|
||||||
"@midwayjs/core": "3.20.11",
|
"@midwayjs/core": "3.20.11",
|
||||||
"@midwayjs/i18n": "3.20.13",
|
"@midwayjs/i18n": "3.20.13",
|
||||||
@@ -69,5 +69,5 @@
|
|||||||
"typeorm": "^0.3.20",
|
"typeorm": "^0.3.20",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -279,7 +279,7 @@ export abstract class BaseService<T> {
|
|||||||
return item != null && item != "";
|
return item != null && item != "";
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
async batchDelete(ids: number[], userId: number, projectId?: number) {
|
async batchDelete(ids: number[], userId: number, projectId?: number): Promise<number> {
|
||||||
ids = this.filterIds(ids);
|
ids = this.filterIds(ids);
|
||||||
if (userId != null) {
|
if (userId != null) {
|
||||||
const userProjectQuery = this.buildUserProjectQuery(userId, projectId);
|
const userProjectQuery = this.buildUserProjectQuery(userId, projectId);
|
||||||
@@ -295,6 +295,7 @@ export abstract class BaseService<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await this.delete(ids);
|
await this.delete(ids);
|
||||||
|
return ids.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
async findOne(options: FindOneOptions<T>) {
|
async findOne(options: FindOneOptions<T>) {
|
||||||
|
|||||||
@@ -1,29 +1,20 @@
|
|||||||
import { IAccessService, IRuntimeDepsService } from "@certd/pipeline";
|
import { IAccessService } from "@certd/pipeline";
|
||||||
|
|
||||||
export type AccessRuntimeDepsService = IRuntimeDepsService;
|
|
||||||
|
|
||||||
export class AccessGetter implements IAccessService {
|
export class AccessGetter implements IAccessService {
|
||||||
userId: number;
|
userId: number;
|
||||||
projectId?: number;
|
projectId?: number;
|
||||||
runtimeDepsService?: AccessRuntimeDepsService;
|
getter: <T>(id: any, userId?: number, projectId?: number, ignorePermission?: boolean) => Promise<T>;
|
||||||
getter: <T>(id: any, userId?: number, projectId?: number, ignorePermission?: boolean, runtimeDepsService?: AccessRuntimeDepsService) => Promise<T>;
|
constructor(userId: number, projectId: number, getter: (id: any, userId: number, projectId?: number, ignorePermission?: boolean) => Promise<any>) {
|
||||||
constructor(
|
|
||||||
userId: number,
|
|
||||||
projectId: number,
|
|
||||||
getter: (id: any, userId: number, projectId?: number, ignorePermission?: boolean, runtimeDepsService?: AccessRuntimeDepsService) => Promise<any>,
|
|
||||||
runtimeDepsService?: AccessRuntimeDepsService
|
|
||||||
) {
|
|
||||||
this.userId = userId;
|
this.userId = userId;
|
||||||
this.projectId = projectId;
|
this.projectId = projectId;
|
||||||
this.getter = getter;
|
this.getter = getter;
|
||||||
this.runtimeDepsService = runtimeDepsService;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getById<T = any>(id: any) {
|
async getById<T = any>(id: any) {
|
||||||
return await this.getter<T>(id, this.userId, this.projectId, false, this.runtimeDepsService);
|
return await this.getter<T>(id, this.userId, this.projectId, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getCommonById<T = any>(id: any) {
|
async getCommonById<T = any>(id: any) {
|
||||||
return await this.getter<T>(id, 0, null, false, this.runtimeDepsService);
|
return await this.getter<T>(id, 0, null, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
|
import { ApplicationContext, Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
|
||||||
|
import type { IMidwayContainer } from "@midwayjs/core";
|
||||||
import { InjectEntityModel } from "@midwayjs/typeorm";
|
import { InjectEntityModel } from "@midwayjs/typeorm";
|
||||||
import { In, Repository } from "typeorm";
|
import { In, Repository } from "typeorm";
|
||||||
import { AccessGetter, BaseService, PageReq, PermissionException, ValidateException } from "../../../index.js";
|
import { AccessGetter, BaseService, PageReq, PermissionException, ValidateException } from "../../../index.js";
|
||||||
import type { AccessRuntimeDepsService } from "./access-getter.js";
|
|
||||||
import { AccessEntity } from "../entity/access.js";
|
import { AccessEntity } from "../entity/access.js";
|
||||||
import { AccessDefine, accessRegistry, newAccess } from "@certd/pipeline";
|
import { AccessDefine, accessRegistry, newAccess } from "@certd/pipeline";
|
||||||
import { EncryptService } from "./encrypt-service.js";
|
import { EncryptService } from "./encrypt-service.js";
|
||||||
@@ -20,6 +20,9 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
@Inject()
|
@Inject()
|
||||||
encryptService: EncryptService;
|
encryptService: EncryptService;
|
||||||
|
|
||||||
|
@ApplicationContext()
|
||||||
|
applicationContext: IMidwayContainer;
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
getRepository() {
|
getRepository() {
|
||||||
@@ -161,7 +164,7 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async getAccessById(id: any, checkUserId: boolean, userId?: number, projectId?: number, runtimeDepsService?: AccessRuntimeDepsService): Promise<any> {
|
async getAccessById(id: any, checkUserId: boolean, userId?: number, projectId?: number): Promise<any> {
|
||||||
const entity = await this.info(id);
|
const entity = await this.info(id);
|
||||||
if (entity == null) {
|
if (entity == null) {
|
||||||
throw new Error(`该授权配置不存在,请确认是否已被删除:id=${id}`);
|
throw new Error(`该授权配置不存在,请确认是否已被删除:id=${id}`);
|
||||||
@@ -184,20 +187,23 @@ export class AccessService extends BaseService<AccessEntity> {
|
|||||||
id: entity.id,
|
id: entity.id,
|
||||||
...setting,
|
...setting,
|
||||||
};
|
};
|
||||||
|
const taskServiceBuilder: any = await this.applicationContext.getAsync("taskServiceBuilder");
|
||||||
|
const serviceGetter = taskServiceBuilder.create({ userId: userId || 0, projectId });
|
||||||
const getAccessById = this.getById.bind(this);
|
const getAccessById = this.getById.bind(this);
|
||||||
const accessGetter = new AccessGetter(userId, projectId, getAccessById, runtimeDepsService);
|
const accessGetter = new AccessGetter(userId, projectId, getAccessById);
|
||||||
const accessContext = {
|
const accessContext = {
|
||||||
logger,
|
logger,
|
||||||
http,
|
http,
|
||||||
utils,
|
utils,
|
||||||
accessService: accessGetter,
|
accessService: accessGetter,
|
||||||
|
serviceGetter,
|
||||||
} as any;
|
} as any;
|
||||||
const access = await newAccess(entity.type, input, accessGetter, accessContext);
|
const access = await newAccess(entity.type, input, accessGetter, accessContext);
|
||||||
return access;
|
return access;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getById(id: any, userId: number, projectId?: number, _ignorePermission?: boolean, runtimeDepsService?: AccessRuntimeDepsService): Promise<any> {
|
async getById(id: any, userId: number, projectId?: number, _ignorePermission?: boolean): Promise<any> {
|
||||||
return await this.getAccessById(id, true, userId, projectId, runtimeDepsService);
|
return await this.getAccessById(id, true, userId, projectId);
|
||||||
}
|
}
|
||||||
|
|
||||||
decryptAccessEntity(entity: AccessEntity): any {
|
decryptAccessEntity(entity: AccessEntity): any {
|
||||||
|
|||||||
@@ -121,9 +121,6 @@ export abstract class BaseAddon implements IAddon {
|
|||||||
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
||||||
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
||||||
}
|
}
|
||||||
if (this.runtimeDepsService && this.define?.addonType && this.define?.name) {
|
|
||||||
await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `addon:${this.define.addonType}:${this.define.name}`, logger: this.logger });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
setDefine = (define:AddonDefine) => {
|
setDefine = (define:AddonDefine) => {
|
||||||
this.define = define;
|
this.define = define;
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/midway-flyway-js
|
**Note:** Version bump only for package @certd/midway-flyway-js
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/midway-flyway-js",
|
"name": "@certd/midway-flyway-js",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"description": "midway with flyway, sql upgrade way ",
|
"description": "midway with flyway, sql upgrade way ",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -52,5 +52,5 @@
|
|||||||
"typeorm": "^0.3.20",
|
"typeorm": "^0.3.20",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/plugin-cert
|
**Note:** Version bump only for package @certd/plugin-cert
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-cert",
|
"name": "@certd/plugin-cert",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
"lint": "eslint --fix"
|
"lint": "eslint --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/plugin-lib": "^1.42.3"
|
"@certd/plugin-lib": "^1.42.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/chai": "^4.3.12",
|
"@types/chai": "^4.3.12",
|
||||||
@@ -38,5 +38,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,12 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/plugin-lib
|
**Note:** Version bump only for package @certd/plugin-lib
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/plugin-lib",
|
"name": "@certd/plugin-lib",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "./dist/index.js",
|
"main": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -17,9 +17,9 @@
|
|||||||
"lint": "eslint --fix"
|
"lint": "eslint --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.42.3",
|
"@certd/acme-client": "^1.42.4",
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@certd/pipeline": "^1.42.3",
|
"@certd/pipeline": "^1.42.4",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
"jszip": "^3.10.1",
|
"jszip": "^3.10.1",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
@@ -45,5 +45,5 @@
|
|||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^5.4.2"
|
"typescript": "^5.4.2"
|
||||||
},
|
},
|
||||||
"gitHead": "a6ef6996c3a68ce0c2a4577a0934ed74a53f0515"
|
"gitHead": "268cd6cc9cb4f1f3d5d5d77859a82f18f0cb6db7"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,9 +45,6 @@ export abstract class AbstractDnsProvider<T = any> implements IDnsProvider<T> {
|
|||||||
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
if (!this.runtimeDepsService && this.ctx.serviceGetter) {
|
||||||
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
this.runtimeDepsService = await this.ctx.serviceGetter.get("runtimeDepsService");
|
||||||
}
|
}
|
||||||
if (this.runtimeDepsService && this.ctx.define?.name) {
|
|
||||||
await this.runtimeDepsService.ensureRuntimeDependencies({ pluginKeys: `dnsProvider:${this.ctx.define.name}`, logger: this.logger });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async parseDomain(fullDomain: string) {
|
async parseDomain(fullDomain: string) {
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
**Note:** Version bump only for package @certd/ui-client
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
**Note:** Version bump only for package @certd/ui-client
|
**Note:** Version bump only for package @certd/ui-client
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-client",
|
"name": "@certd/ui-client",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite --open",
|
"dev": "vite --open",
|
||||||
@@ -105,8 +105,8 @@
|
|||||||
"zod-defaults": "^0.1.3"
|
"zod-defaults": "^0.1.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@certd/lib-iframe": "^1.42.3",
|
"@certd/lib-iframe": "^1.42.4",
|
||||||
"@certd/pipeline": "^1.42.3",
|
"@certd/pipeline": "^1.42.4",
|
||||||
"@rollup/plugin-commonjs": "^25.0.7",
|
"@rollup/plugin-commonjs": "^25.0.7",
|
||||||
"@rollup/plugin-node-resolve": "^15.2.3",
|
"@rollup/plugin-node-resolve": "^15.2.3",
|
||||||
"@types/chai": "^4.3.12",
|
"@types/chai": "^4.3.12",
|
||||||
|
|||||||
@@ -3,6 +3,14 @@
|
|||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||||
|
|
||||||
|
## [1.42.4](https://github.com/certd/certd/compare/v1.42.3...v1.42.4) (2026-07-11)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* 修复火山引擎查不到自定义源站域名的问题 ([02dabe1](https://github.com/certd/certd/commit/02dabe11db3e9b13ca4621ce9ddd2b808bfca390))
|
||||||
|
* 修复火山引擎自定义源站域名查询不到的问题 ([e44bf9d](https://github.com/certd/certd/commit/e44bf9d77375d48ac7fd1582e69fae02dfd248fa))
|
||||||
|
* **pipeline:** 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug ([ec69b8f](https://github.com/certd/certd/commit/ec69b8f11bfd4b20991aef74a72a47182ca79a9d))
|
||||||
|
|
||||||
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
## [1.42.3](https://github.com/certd/certd/compare/v1.42.2...v1.42.3) (2026-07-08)
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|||||||
@@ -96,24 +96,11 @@ input:
|
|||||||
label: 点播加速域名
|
label: 点播加速域名
|
||||||
- value: image
|
- value: image
|
||||||
label: 封面加速域名
|
label: 封面加速域名
|
||||||
|
- value: third
|
||||||
|
label: 自定义源站
|
||||||
value: play
|
value: play
|
||||||
required: true
|
required: true
|
||||||
order: 0
|
order: 0
|
||||||
sourceStationType:
|
|
||||||
title: 源站类型
|
|
||||||
helper: 选择源站类型
|
|
||||||
value: 1
|
|
||||||
component:
|
|
||||||
name: a-select
|
|
||||||
vModel: value
|
|
||||||
options:
|
|
||||||
- value: 1
|
|
||||||
label: 点播源站
|
|
||||||
- value: 2
|
|
||||||
label: 自定义源站
|
|
||||||
helper: 注意:封面加速域名不支持自定义源站
|
|
||||||
required: false
|
|
||||||
order: 0
|
|
||||||
domainList:
|
domainList:
|
||||||
title: 域名
|
title: 域名
|
||||||
component:
|
component:
|
||||||
@@ -132,7 +119,6 @@ input:
|
|||||||
- accessId
|
- accessId
|
||||||
- spaceName
|
- spaceName
|
||||||
- domainType
|
- domainType
|
||||||
- sourceStationType
|
|
||||||
required: true
|
required: true
|
||||||
mergeScript: |2-
|
mergeScript: |2-
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@certd/ui-server",
|
"name": "@certd/ui-server",
|
||||||
"version": "1.42.3",
|
"version": "1.42.4",
|
||||||
"description": "fast-server base midway",
|
"description": "fast-server base midway",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -41,20 +41,20 @@
|
|||||||
"lint1": "eslint --fix"
|
"lint1": "eslint --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@certd/acme-client": "^1.42.3",
|
"@certd/acme-client": "^1.42.4",
|
||||||
"@certd/basic": "^1.42.3",
|
"@certd/basic": "^1.42.4",
|
||||||
"@certd/commercial-core": "^1.42.3",
|
"@certd/commercial-core": "^1.42.4",
|
||||||
"@certd/cv4pve-api-javascript": "^8.4.2",
|
"@certd/cv4pve-api-javascript": "^8.4.2",
|
||||||
"@certd/jdcloud": "^1.42.3",
|
"@certd/jdcloud": "^1.42.4",
|
||||||
"@certd/lib-huawei": "^1.42.3",
|
"@certd/lib-huawei": "^1.42.4",
|
||||||
"@certd/lib-k8s": "^1.42.3",
|
"@certd/lib-k8s": "^1.42.4",
|
||||||
"@certd/lib-server": "^1.42.3",
|
"@certd/lib-server": "^1.42.4",
|
||||||
"@certd/midway-flyway-js": "^1.42.3",
|
"@certd/midway-flyway-js": "^1.42.4",
|
||||||
"@certd/pipeline": "^1.42.3",
|
"@certd/pipeline": "^1.42.4",
|
||||||
"@certd/plugin-cert": "^1.42.3",
|
"@certd/plugin-cert": "^1.42.4",
|
||||||
"@certd/plugin-lib": "^1.42.3",
|
"@certd/plugin-lib": "^1.42.4",
|
||||||
"@certd/plugin-plus": "^1.42.3",
|
"@certd/plugin-plus": "^1.42.4",
|
||||||
"@certd/plus-core": "^1.42.3",
|
"@certd/plus-core": "^1.42.4",
|
||||||
"@koa/cors": "^5.0.0",
|
"@koa/cors": "^5.0.0",
|
||||||
"@midwayjs/bootstrap": "3.20.11",
|
"@midwayjs/bootstrap": "3.20.11",
|
||||||
"@midwayjs/cache": "3.14.0",
|
"@midwayjs/cache": "3.14.0",
|
||||||
@@ -71,7 +71,6 @@
|
|||||||
"@peculiar/x509": "^1.11.0",
|
"@peculiar/x509": "^1.11.0",
|
||||||
"@simplewebauthn/browser": "^13.2.2",
|
"@simplewebauthn/browser": "^13.2.2",
|
||||||
"@simplewebauthn/server": "^13.2.3",
|
"@simplewebauthn/server": "^13.2.3",
|
||||||
"alipay-sdk": "^4.13.0",
|
|
||||||
"axios": "^1.9.0",
|
"axios": "^1.9.0",
|
||||||
"bcryptjs": "^2.4.3",
|
"bcryptjs": "^2.4.3",
|
||||||
"better-sqlite3": "^11.1.2",
|
"better-sqlite3": "^11.1.2",
|
||||||
@@ -96,8 +95,6 @@
|
|||||||
"nanoid": "^5.0.7",
|
"nanoid": "^5.0.7",
|
||||||
"node-forge": "^1.3.1",
|
"node-forge": "^1.3.1",
|
||||||
"nodemailer": "^6.9.16",
|
"nodemailer": "^6.9.16",
|
||||||
"openid-client": "^6.8.1",
|
|
||||||
"otplib": "^12.0.1",
|
|
||||||
"pg": "^8.12.0",
|
"pg": "^8.12.0",
|
||||||
"psl": "^1.15.0",
|
"psl": "^1.15.0",
|
||||||
"punycode.js": "^2.3.1",
|
"punycode.js": "^2.3.1",
|
||||||
@@ -113,7 +110,6 @@
|
|||||||
"svg-captcha": "^1.4.0",
|
"svg-captcha": "^1.4.0",
|
||||||
"typeorm": "^0.3.20",
|
"typeorm": "^0.3.20",
|
||||||
"uuid": "^10.0.0",
|
"uuid": "^10.0.0",
|
||||||
"wechatpay-node-v3": "^2.2.1",
|
|
||||||
"whoiser": "2.0.0-beta.10",
|
"whoiser": "2.0.0-beta.10",
|
||||||
"xml2js": "^0.6.2"
|
"xml2js": "^0.6.2"
|
||||||
},
|
},
|
||||||
@@ -170,7 +166,11 @@
|
|||||||
"@google-cloud/publicca": "^1.3.0",
|
"@google-cloud/publicca": "^1.3.0",
|
||||||
"basic-ftp": "^5.0.5",
|
"basic-ftp": "^5.0.5",
|
||||||
"esdk-obs-nodejs": "^3.25.6",
|
"esdk-obs-nodejs": "^3.25.6",
|
||||||
"qiniu": "^7.12.0"
|
"qiniu": "^7.12.0",
|
||||||
|
"alipay-sdk": "^4.13.0",
|
||||||
|
"wechatpay-node-v3": "^2.2.1",
|
||||||
|
"openid-client": "^6.8.1",
|
||||||
|
"otplib": "^12.0.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=20.0.0"
|
"node": ">=20.0.0"
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { http, logger, utils } from "@certd/basic";
|
|||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
import { CodeService } from "../../../modules/basic/service/code-service.js";
|
||||||
import { EmailService } from "../../../modules/basic/service/email-service.js";
|
import { EmailService } from "../../../modules/basic/service/email-service.js";
|
||||||
|
import { TaskServiceBuilder } from "../../../modules/pipeline/service/getter/task-service-getter.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@@ -40,6 +41,9 @@ export class MineController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
emailService: EmailService;
|
emailService: EmailService;
|
||||||
|
|
||||||
|
@Inject()
|
||||||
|
taskServiceBuilder: TaskServiceBuilder;
|
||||||
|
|
||||||
@Post("/info", { description: Constants.per.authOnly, summary: "查询用户信息" })
|
@Post("/info", { description: Constants.per.authOnly, summary: "查询用户信息" })
|
||||||
public async info() {
|
public async info() {
|
||||||
const userId = this.getUserId();
|
const userId = this.getUserId();
|
||||||
@@ -176,11 +180,13 @@ export class MineController extends BaseController {
|
|||||||
|
|
||||||
const getAccessById = this.accessService.getById.bind(this.accessService);
|
const getAccessById = this.accessService.getById.bind(this.accessService);
|
||||||
const accessGetter = new AccessGetter(userId, undefined, getAccessById);
|
const accessGetter = new AccessGetter(userId, undefined, getAccessById);
|
||||||
|
const serviceGetter = this.taskServiceBuilder.create({ userId });
|
||||||
const accessContext = {
|
const accessContext = {
|
||||||
http,
|
http,
|
||||||
logger,
|
logger,
|
||||||
utils,
|
utils,
|
||||||
accessService: accessGetter,
|
accessService: accessGetter,
|
||||||
|
serviceGetter,
|
||||||
define: undefined,
|
define: undefined,
|
||||||
} as any;
|
} as any;
|
||||||
const access = await newAccess("acmeAccount", { caType: "letsencrypt", email: userEmail }, accessGetter, accessContext);
|
const access = await newAccess("acmeAccount", { caType: "letsencrypt", email: userEmail }, accessGetter, accessContext);
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import { TaskServiceBuilder } from "../../../modules/pipeline/service/getter/tas
|
|||||||
import { cloneDeep } from "lodash-es";
|
import { cloneDeep } from "lodash-es";
|
||||||
import { ApiTags } from "@midwayjs/swagger";
|
import { ApiTags } from "@midwayjs/swagger";
|
||||||
import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
|
import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
|
||||||
import { RuntimeDepsService } from "../../../modules/runtime-deps/runtime-deps-service.js";
|
|
||||||
|
|
||||||
@Provide()
|
@Provide()
|
||||||
@Controller("/api/pi/handle")
|
@Controller("/api/pi/handle")
|
||||||
@@ -29,9 +28,6 @@ export class HandleController extends BaseController {
|
|||||||
@Inject()
|
@Inject()
|
||||||
notificationService: NotificationService;
|
notificationService: NotificationService;
|
||||||
|
|
||||||
@Inject()
|
|
||||||
runtimeDepsService: RuntimeDepsService;
|
|
||||||
|
|
||||||
@Post("/access", { description: Constants.per.authOnly, summary: "处理授权请求" })
|
@Post("/access", { description: Constants.per.authOnly, summary: "处理授权请求" })
|
||||||
async accessRequest(@Body(ALL) body: AccessRequestHandleReq) {
|
async accessRequest(@Body(ALL) body: AccessRequestHandleReq) {
|
||||||
let { projectId, userId } = await this.getProjectUserIdRead();
|
let { projectId, userId } = await this.getProjectUserIdRead();
|
||||||
@@ -64,12 +60,14 @@ export class HandleController extends BaseController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
const getAccessById = this.accessService.getById.bind(this.accessService);
|
const getAccessById = this.accessService.getById.bind(this.accessService);
|
||||||
const accessGetter = new AccessGetter(userId, projectId, getAccessById, this.runtimeDepsService);
|
const accessGetter = new AccessGetter(userId, projectId, getAccessById);
|
||||||
|
const serviceGetter = this.taskServiceBuilder.create({ userId, projectId });
|
||||||
const accessContext = {
|
const accessContext = {
|
||||||
http,
|
http,
|
||||||
logger,
|
logger,
|
||||||
utils,
|
utils,
|
||||||
accessService: accessGetter,
|
accessService: accessGetter,
|
||||||
|
serviceGetter,
|
||||||
define: undefined,
|
define: undefined,
|
||||||
} as any;
|
} as any;
|
||||||
const access = await newAccess(body.typeName, inputAccess, accessGetter, accessContext);
|
const access = await newAccess(body.typeName, inputAccess, accessGetter, accessContext);
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
|
|||||||
import { logger } from "@certd/basic";
|
import { logger } from "@certd/basic";
|
||||||
import { PluginService } from "../plugin/service/plugin-service.js";
|
import { PluginService } from "../plugin/service/plugin-service.js";
|
||||||
import { registerPaymentProviders } from "../suite/payments/index.js";
|
import { registerPaymentProviders } from "../suite/payments/index.js";
|
||||||
|
import { RuntimeDepsService } from "../runtime-deps/runtime-deps-service.js";
|
||||||
|
|
||||||
@Provide()
|
@Provide()
|
||||||
@Scope(ScopeEnum.Request, { allowDowngrade: true })
|
@Scope(ScopeEnum.Request, { allowDowngrade: true })
|
||||||
@@ -9,6 +10,9 @@ export class AutoLoadPlugins {
|
|||||||
@Inject()
|
@Inject()
|
||||||
pluginService: PluginService;
|
pluginService: PluginService;
|
||||||
|
|
||||||
|
@Inject()
|
||||||
|
runtimeDepsService: RuntimeDepsService;
|
||||||
|
|
||||||
async init() {
|
async init() {
|
||||||
logger.info(`加载插件开始,加载模式:${process.env.certd_plugin_loadmode}`);
|
logger.info(`加载插件开始,加载模式:${process.env.certd_plugin_loadmode}`);
|
||||||
if (process.env.certd_plugin_loadmode === "metadata") {
|
if (process.env.certd_plugin_loadmode === "metadata") {
|
||||||
@@ -30,5 +34,8 @@ export class AutoLoadPlugins {
|
|||||||
|
|
||||||
await registerPaymentProviders();
|
await registerPaymentProviders();
|
||||||
logger.info(`加载插件完成,加载模式:${process.env.certd_plugin_loadmode}`);
|
logger.info(`加载插件完成,加载模式:${process.env.certd_plugin_loadmode}`);
|
||||||
|
|
||||||
|
// 收集插件 dependPackages 并安装
|
||||||
|
await this.runtimeDepsService.refreshPluginDeps();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
|
|||||||
import { UserSettingsService } from "./user-settings-service.js";
|
import { UserSettingsService } from "./user-settings-service.js";
|
||||||
import { UserTwoFactorSetting } from "./models.js";
|
import { UserTwoFactorSetting } from "./models.js";
|
||||||
import { UserService } from "../../sys/authority/service/user-service.js";
|
import { UserService } from "../../sys/authority/service/user-service.js";
|
||||||
|
import { RuntimeDepsService } from "../../runtime-deps/runtime-deps-service.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 授权
|
* 授权
|
||||||
@@ -13,13 +14,15 @@ export class TwoFactorService {
|
|||||||
userSettingsService: UserSettingsService;
|
userSettingsService: UserSettingsService;
|
||||||
@Inject()
|
@Inject()
|
||||||
userService: UserService;
|
userService: UserService;
|
||||||
|
@Inject()
|
||||||
|
runtimeDepsService: RuntimeDepsService;
|
||||||
|
|
||||||
async getAuthenticatorQrCode(userId: any) {
|
async getAuthenticatorQrCode(userId: any) {
|
||||||
const setting = await this.getSetting(userId);
|
const setting = await this.getSetting(userId);
|
||||||
|
|
||||||
const authenticatorSetting = setting.authenticator;
|
const authenticatorSetting = setting.authenticator;
|
||||||
if (!authenticatorSetting.secret) {
|
if (!authenticatorSetting.secret) {
|
||||||
const { authenticator } = await import("otplib");
|
const { authenticator } = await this.runtimeDepsService.importRuntime("otplib");
|
||||||
|
|
||||||
authenticatorSetting.secret = authenticator.generateSecret();
|
authenticatorSetting.secret = authenticator.generateSecret();
|
||||||
await this.userSettingsService.saveSetting(userId, null, setting);
|
await this.userSettingsService.saveSetting(userId, null, setting);
|
||||||
@@ -38,7 +41,7 @@ export class TwoFactorService {
|
|||||||
|
|
||||||
async saveAuthenticator(req: { userId: any; verifyCode: any }) {
|
async saveAuthenticator(req: { userId: any; verifyCode: any }) {
|
||||||
const userId = req.userId;
|
const userId = req.userId;
|
||||||
const { authenticator } = await import("otplib");
|
const { authenticator } = await this.runtimeDepsService.importRuntime("otplib");
|
||||||
const setting = await this.getSetting(userId);
|
const setting = await this.getSetting(userId);
|
||||||
|
|
||||||
const authenticatorSetting = setting.authenticator;
|
const authenticatorSetting = setting.authenticator;
|
||||||
@@ -77,7 +80,7 @@ export class TwoFactorService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async verifyAuthenticatorCode(userId: any, verifyCode: string) {
|
async verifyAuthenticatorCode(userId: any, verifyCode: string) {
|
||||||
const { authenticator } = await import("otplib");
|
const { authenticator } = await this.runtimeDepsService.importRuntime("otplib");
|
||||||
const setting = await this.getSetting(userId);
|
const setting = await this.getSetting(userId);
|
||||||
if (!setting.authenticator.enabled) {
|
if (!setting.authenticator.enabled) {
|
||||||
throw new Error("authenticator 未开启");
|
throw new Error("authenticator 未开启");
|
||||||
|
|||||||
@@ -805,11 +805,12 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async batchDelete(ids: number[], userId: number, projectId?: number): Promise<void> {
|
async batchDelete(ids: number[], userId: number, projectId?: number): Promise<number> {
|
||||||
const userProjectQuery = this.buildUserProjectQuery(userId, projectId);
|
const userProjectQuery = this.buildUserProjectQuery(userId, projectId);
|
||||||
await this.repository.delete({
|
await this.repository.delete({
|
||||||
id: In(ids),
|
id: In(ids),
|
||||||
...userProjectQuery,
|
...userProjectQuery,
|
||||||
});
|
});
|
||||||
|
return ids.length;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,9 +66,8 @@ export class TaskServiceGetter implements IServiceGetter {
|
|||||||
|
|
||||||
async getAccessService(): Promise<AccessGetter> {
|
async getAccessService(): Promise<AccessGetter> {
|
||||||
const accessService: AccessService = await this.appCtx.getAsync("accessService");
|
const accessService: AccessService = await this.appCtx.getAsync("accessService");
|
||||||
const runtimeDepsService = await this.getRuntimeDepsService();
|
|
||||||
const getAccessById = accessService.getById.bind(accessService);
|
const getAccessById = accessService.getById.bind(accessService);
|
||||||
return new AccessGetter(this.userId, this.projectId, getAccessById, runtimeDepsService);
|
return new AccessGetter(this.userId, this.projectId, getAccessById);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getCnameProxyService(): Promise<CnameProxyService> {
|
async getCnameProxyService(): Promise<CnameProxyService> {
|
||||||
|
|||||||
@@ -962,7 +962,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
async batchDelete(ids: number[], userId?: number, projectId?: number) {
|
async batchDelete(ids: number[], userId?: number, projectId?: number):Promise<number> {
|
||||||
if (!isPlus()) {
|
if (!isPlus()) {
|
||||||
throw new NeedVIPException("此功能需要升级Certd专业版");
|
throw new NeedVIPException("此功能需要升级Certd专业版");
|
||||||
}
|
}
|
||||||
@@ -974,7 +974,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
|
|||||||
await this.checkUserId(id, projectId, "projectId");
|
await this.checkUserId(id, projectId, "projectId");
|
||||||
}
|
}
|
||||||
await this.delete(id);
|
await this.delete(id);
|
||||||
|
ids.push(id);
|
||||||
}
|
}
|
||||||
|
return ids.length
|
||||||
}
|
}
|
||||||
|
|
||||||
async batchUpdateGroup(ids: number[], groupId: number, userId: any, projectId?: number) {
|
async batchUpdateGroup(ids: number[], groupId: number, userId: any, projectId?: number) {
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ export class TemplateService extends BaseService<TemplateEntity> {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async batchDelete(ids: number[], userId: number, projectId?: number) {
|
async batchDelete(ids: number[], userId: number, projectId?: number): Promise<number> {
|
||||||
const where: any = {
|
const where: any = {
|
||||||
id: In(ids),
|
id: In(ids),
|
||||||
};
|
};
|
||||||
@@ -102,6 +102,7 @@ export class TemplateService extends BaseService<TemplateEntity> {
|
|||||||
const pipelineIds = list.map(item => item.pipelineId);
|
const pipelineIds = list.map(item => item.pipelineId);
|
||||||
await this.delete(ids);
|
await this.delete(ids);
|
||||||
await this.pipelineService.batchDelete(pipelineIds, userId, projectId);
|
await this.pipelineService.batchDelete(pipelineIds, userId, projectId);
|
||||||
|
return ids.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
async createPipelineByTemplate(body: PipelineEntity) {
|
async createPipelineByTemplate(body: PipelineEntity) {
|
||||||
|
|||||||
@@ -270,6 +270,7 @@ export class PluginService extends BaseService<PluginEntity> {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await this.registerPlugin(item);
|
await this.registerPlugin(item);
|
||||||
|
await this.runtimeDepsService.refreshPluginDeps();
|
||||||
}
|
}
|
||||||
|
|
||||||
async unRegisterById(id: any) {
|
async unRegisterById(id: any) {
|
||||||
@@ -297,6 +298,7 @@ export class PluginService extends BaseService<PluginEntity> {
|
|||||||
} else {
|
} else {
|
||||||
logger.warn(`不支持的插件类型:${item.pluginType}`);
|
logger.warn(`不支持的插件类型:${item.pluginType}`);
|
||||||
}
|
}
|
||||||
|
await this.runtimeDepsService.refreshPluginDeps();
|
||||||
}
|
}
|
||||||
|
|
||||||
async update(param: any) {
|
async update(param: any) {
|
||||||
|
|||||||
@@ -150,6 +150,11 @@ export class RuntimeDepsService {
|
|||||||
@Config("runtimeDeps.lazyDependencies")
|
@Config("runtimeDeps.lazyDependencies")
|
||||||
lazyDependencies: Record<string, string> = {};
|
lazyDependencies: Record<string, string> = {};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 从插件 registry 收集到的懒加载依赖,键为包名,值为版本范围
|
||||||
|
*/
|
||||||
|
pluginLazyDependencies: Record<string, string> = {};
|
||||||
|
|
||||||
@Inject()
|
@Inject()
|
||||||
registryResolver!: NpmRegistryResolver;
|
registryResolver!: NpmRegistryResolver;
|
||||||
|
|
||||||
@@ -339,7 +344,8 @@ export class RuntimeDepsService {
|
|||||||
|
|
||||||
private async resolveMissingRuntimeSpecifier(specifier: string, runtimeError: any, logger?: ILogger) {
|
private async resolveMissingRuntimeSpecifier(specifier: string, runtimeError: any, logger?: ILogger) {
|
||||||
const packageName = this.parsePackageName(specifier);
|
const packageName = this.parsePackageName(specifier);
|
||||||
const lazyRange = this.lazyDependencies?.[packageName];
|
const mergedDeps = this.getMergedLazyDependencies();
|
||||||
|
const lazyRange = mergedDeps[packageName];
|
||||||
if (!lazyRange) {
|
if (!lazyRange) {
|
||||||
try {
|
try {
|
||||||
return this.resolveProjectSpecifier(specifier, runtimeError).resolved;
|
return this.resolveProjectSpecifier(specifier, runtimeError).resolved;
|
||||||
@@ -565,6 +571,56 @@ export class RuntimeDepsService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 合并 package.json 的 lazyDependencies 和插件注册表收集到的 dependPackages
|
||||||
|
* 插件依赖优先(同名时使用插件声明的版本)
|
||||||
|
*/
|
||||||
|
getMergedLazyDependencies(): Record<string, string> {
|
||||||
|
return { ...this.lazyDependencies, ...this.pluginLazyDependencies };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 从所有插件注册表中收集 dependPackages,合并到 pluginLazyDependencies
|
||||||
|
*/
|
||||||
|
collectPluginDeps() {
|
||||||
|
const registries: Array<{ registry: Registry<any>; keyFormatter?: (name: string) => string }> = [
|
||||||
|
{ registry: pluginRegistry },
|
||||||
|
{ registry: accessRegistry },
|
||||||
|
{ registry: notificationRegistry },
|
||||||
|
{ registry: dnsProviderRegistry },
|
||||||
|
{ registry: addonRegistry },
|
||||||
|
];
|
||||||
|
|
||||||
|
const deps: Record<string, string> = {};
|
||||||
|
for (const { registry } of registries) {
|
||||||
|
const defineList = registry.getDefineList();
|
||||||
|
for (const define of defineList) {
|
||||||
|
const dependPackages = (define as any).dependPackages as Record<string, string> | undefined;
|
||||||
|
if (!dependPackages) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for (const [pkgName, range] of Object.entries(dependPackages)) {
|
||||||
|
const existing = deps[pkgName];
|
||||||
|
if (existing && !areRangesCompatible(existing, range)) {
|
||||||
|
logger.warn(`懒加载依赖版本冲突: ${pkgName} => ${existing} vs ${range},保留已有版本`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
deps[pkgName] = range;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.pluginLazyDependencies = deps;
|
||||||
|
logger.info(`从插件注册表收集到 ${Object.keys(deps).length} 个懒加载依赖`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 刷新插件懒加载依赖:收集所有插件的 dependPackages 到内存列表,实际安装延迟到 importRuntime 时触发
|
||||||
|
*/
|
||||||
|
async refreshPluginDeps() {
|
||||||
|
this.collectPluginDeps();
|
||||||
|
}
|
||||||
|
|
||||||
private readInstallState(statePath: string): any {
|
private readInstallState(statePath: string): any {
|
||||||
if (!fs.existsSync(statePath)) {
|
if (!fs.existsSync(statePath)) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ export class PaymentAlipay implements IPaymentProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async createAlipaySdk() {
|
private async createAlipaySdk() {
|
||||||
const AlipaySdk = await import("alipay-sdk");
|
const AlipaySdk = await this.access.importRuntime("alipay-sdk");
|
||||||
|
|
||||||
const alipaySdk = new AlipaySdk.AlipaySdk({
|
const alipaySdk = new AlipaySdk.AlipaySdk({
|
||||||
appId: this.access.appId,
|
appId: this.access.appId,
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { IPaymentProvider, TradeEntity, UpdateTrade, UpdateTradeInfo } from "@certd/commercial-core";
|
import { IPaymentProvider, TradeEntity, UpdateTrade, UpdateTradeInfo } from "@certd/commercial-core";
|
||||||
import WxPay from "wechatpay-node-v3";
|
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { logger } from "@certd/basic"; // 支持使用require
|
import { logger } from "@certd/basic";
|
||||||
import { WxpayAccess } from "../../../plugins/plugin-plus/wxpay/access.js";
|
import { WxpayAccess } from "../../../plugins/plugin-plus/wxpay/access.js";
|
||||||
export class PaymentWxpay implements IPaymentProvider {
|
export class PaymentWxpay implements IPaymentProvider {
|
||||||
access: WxpayAccess;
|
access: WxpayAccess;
|
||||||
@@ -26,7 +25,7 @@ export class PaymentWxpay implements IPaymentProvider {
|
|||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const pay = this.createSdk();
|
const pay = await this.createSdk();
|
||||||
|
|
||||||
const result: any = await pay.query({ out_trade_no: tradeNo });
|
const result: any = await pay.query({ out_trade_no: tradeNo });
|
||||||
logger.info(`微信支付查询订单返回:${JSON.stringify(result)}`);
|
logger.info(`微信支付查询订单返回:${JSON.stringify(result)}`);
|
||||||
@@ -58,7 +57,7 @@ export class PaymentWxpay implements IPaymentProvider {
|
|||||||
async createOrder(trade: TradeEntity, opts: { bindUrl: string; clientIp: string }) {
|
async createOrder(trade: TradeEntity, opts: { bindUrl: string; clientIp: string }) {
|
||||||
const notify_url = `${opts.bindUrl}/api/payment/notify/wxpay`;
|
const notify_url = `${opts.bindUrl}/api/payment/notify/wxpay`;
|
||||||
|
|
||||||
const pay = this.createSdk();
|
const pay = await this.createSdk();
|
||||||
|
|
||||||
const params = {
|
const params = {
|
||||||
description: trade.title,
|
description: trade.title,
|
||||||
@@ -83,7 +82,9 @@ export class PaymentWxpay implements IPaymentProvider {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private createSdk() {
|
private async createSdk() {
|
||||||
|
const WxPayLib = await this.access.importRuntime("wechatpay-node-v3");
|
||||||
|
const WxPay = WxPayLib.default;
|
||||||
const pay = new WxPay({
|
const pay = new WxPay({
|
||||||
appid: this.access.appId,
|
appid: this.access.appId,
|
||||||
mchid: this.access.mchid,
|
mchid: this.access.mchid,
|
||||||
@@ -94,7 +95,7 @@ export class PaymentWxpay implements IPaymentProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async onNotify(notifyData: any, updateTrade: UpdateTrade) {
|
async onNotify(notifyData: any, updateTrade: UpdateTrade) {
|
||||||
const pay = this.createSdk();
|
const pay = await this.createSdk();
|
||||||
const { ciphertext, associated_data, nonce } = notifyData.resource;
|
const { ciphertext, associated_data, nonce } = notifyData.resource;
|
||||||
logger.info(`微信支付notify:${JSON.stringify(notifyData)}`);
|
logger.info(`微信支付notify:${JSON.stringify(notifyData)}`);
|
||||||
const key = this.access.key;
|
const key = this.access.key;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
|
import { AccessInput, BaseAccess, IsAccess } from "@certd/pipeline";
|
||||||
import FormData from "form-data";
|
import FormData from "form-data";
|
||||||
import { authenticator } from "otplib";
|
|
||||||
|
|
||||||
export interface ProxyHost {
|
export interface ProxyHost {
|
||||||
id: number;
|
id: number;
|
||||||
@@ -274,6 +273,7 @@ export class NginxProxyManagerAccess extends BaseAccess {
|
|||||||
|
|
||||||
let code: string;
|
let code: string;
|
||||||
try {
|
try {
|
||||||
|
const { authenticator } = await this.importRuntime("otplib");
|
||||||
code = authenticator.generate(this.totpSecret);
|
code = authenticator.generate(this.totpSecret);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw this.describeError(error, "Generating TOTP code");
|
throw this.describeError(error, "Generating TOTP code");
|
||||||
|
|||||||
+9
-6
@@ -57,12 +57,12 @@ input:
|
|||||||
action: TestRequest
|
action: TestRequest
|
||||||
helper: 测试登录并拉取代理主机列表。
|
helper: 测试登录并拉取代理主机列表。
|
||||||
content: |
|
content: |
|
||||||
const { BaseAccess } = await import("@certd/pipeline");
|
const runtimeImport = import;
|
||||||
const httpsModule = await import("node:https");
|
const { BaseAccess } = await runtimeImport("@certd/pipeline");
|
||||||
const { URL } = await import("node:url");
|
const httpsModule = await runtimeImport("node:https");
|
||||||
const axiosModule = await import("axios");
|
const { URL } = await runtimeImport("node:url");
|
||||||
const formDataModule = await import("form-data");
|
const axiosModule = await runtimeImport("axios");
|
||||||
const { authenticator } = await import("otplib");
|
const formDataModule = await runtimeImport("form-data");
|
||||||
|
|
||||||
const https = httpsModule.default ?? httpsModule;
|
const https = httpsModule.default ?? httpsModule;
|
||||||
const axios = axiosModule.default ?? axiosModule;
|
const axios = axiosModule.default ?? axiosModule;
|
||||||
@@ -114,6 +114,7 @@ content: |
|
|||||||
class NginxProxyManagerClient {
|
class NginxProxyManagerClient {
|
||||||
constructor(options) {
|
constructor(options) {
|
||||||
this.options = options;
|
this.options = options;
|
||||||
|
this.importFn = options.importFn;
|
||||||
this.endpoint = normalizeEndpoint(options.endpoint);
|
this.endpoint = normalizeEndpoint(options.endpoint);
|
||||||
this.apiBaseUrl = `${this.endpoint}/api`;
|
this.apiBaseUrl = `${this.endpoint}/api`;
|
||||||
this.token = undefined;
|
this.token = undefined;
|
||||||
@@ -267,6 +268,7 @@ content: |
|
|||||||
|
|
||||||
let code;
|
let code;
|
||||||
try {
|
try {
|
||||||
|
const { authenticator } = await this.importFn("otplib");
|
||||||
code = authenticator.generate(this.options.totpSecret);
|
code = authenticator.generate(this.options.totpSecret);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw describeError(error, "Generating TOTP code");
|
throw describeError(error, "Generating TOTP code");
|
||||||
@@ -327,6 +329,7 @@ content: |
|
|||||||
password: this.password,
|
password: this.password,
|
||||||
totpSecret: this.totpSecret || undefined,
|
totpSecret: this.totpSecret || undefined,
|
||||||
ignoreTls: this.ignoreTls === true,
|
ignoreTls: this.ignoreTls === true,
|
||||||
|
importFn: this.importRuntime.bind(this),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ export class OidcOauthProvider extends BaseAddon implements IOauthProvider {
|
|||||||
issuerUrl = "";
|
issuerUrl = "";
|
||||||
|
|
||||||
async getClient() {
|
async getClient() {
|
||||||
const client = await import("openid-client");
|
const client = await this.importRuntime("openid-client");
|
||||||
const server = new URL(this.issuerUrl); // Authorization Server's Issuer Identifier
|
const server = new URL(this.issuerUrl); // Authorization Server's Issuer Identifier
|
||||||
|
|
||||||
const config = await client.discovery(server, this.clientId, this.clientSecretKey);
|
const config = await client.discovery(server, this.clientId, this.clientSecretKey);
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ export class VolcengineCdnClient {
|
|||||||
if (this.service) {
|
if (this.service) {
|
||||||
return this.service;
|
return this.service;
|
||||||
}
|
}
|
||||||
const { cdn } = await this.opts.access.importRuntime("@volcengine/openapi");
|
const importRuntime = this.opts.importRuntime || this.opts.access.importRuntime.bind(this.opts.access);
|
||||||
|
const { cdn } = await importRuntime("@volcengine/openapi");
|
||||||
const service = new cdn.CdnService();
|
const service = new cdn.CdnService();
|
||||||
// 设置ak、sk
|
// 设置ak、sk
|
||||||
service.setAccessKeyId(this.opts.access.accessKeyId);
|
service.setAccessKeyId(this.opts.access.accessKeyId);
|
||||||
|
|||||||
@@ -21,7 +21,8 @@ export class VolcengineDnsClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async doRequest(req: VolcengineReq) {
|
async doRequest(req: VolcengineReq) {
|
||||||
const { Signer } = await this.opts.access.importRuntime("@volcengine/openapi");
|
const importRuntime = this.opts.importRuntime || this.opts.access.importRuntime.bind(this.opts.access);
|
||||||
|
const { Signer } = await importRuntime("@volcengine/openapi");
|
||||||
|
|
||||||
// http request data
|
// http request data
|
||||||
const openApiRequestData: any = {
|
const openApiRequestData: any = {
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
import { VolcengineAccess } from "./access.js";
|
import { VolcengineAccess } from "./access.js";
|
||||||
import { HttpClient, ILogger } from "@certd/basic";
|
import { HttpClient, ILogger } from "@certd/basic";
|
||||||
|
import { ImportRuntime } from "@certd/pipeline";
|
||||||
|
|
||||||
export type VolcengineOpts = {
|
export type VolcengineOpts = {
|
||||||
access: VolcengineAccess;
|
access: VolcengineAccess;
|
||||||
logger: ILogger;
|
logger: ILogger;
|
||||||
http: HttpClient;
|
http: HttpClient;
|
||||||
|
importRuntime?: ImportRuntime;
|
||||||
};
|
};
|
||||||
|
|
||||||
export class VolcengineClient {
|
export class VolcengineClient {
|
||||||
@@ -140,7 +142,8 @@ export class VolcengineClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async getTOSService(opts: { region?: string }) {
|
async getTOSService(opts: { region?: string }) {
|
||||||
const { TosClient } = await this.opts.access.importRuntime("@volcengine/tos-sdk");
|
const importRuntime = this.opts.importRuntime || this.opts.access.importRuntime.bind(this.opts.access);
|
||||||
|
const { TosClient } = await importRuntime("@volcengine/tos-sdk");
|
||||||
|
|
||||||
const client = new TosClient({
|
const client = new TosClient({
|
||||||
accessKeyId: this.opts.access.accessKeyId,
|
accessKeyId: this.opts.access.accessKeyId,
|
||||||
@@ -169,7 +172,8 @@ export class VolcengineClient {
|
|||||||
if (this.CommonService) {
|
if (this.CommonService) {
|
||||||
return this.CommonService;
|
return this.CommonService;
|
||||||
}
|
}
|
||||||
const { Service } = await this.opts.access.importRuntime("@volcengine/openapi");
|
const importRuntime = this.opts.importRuntime || this.opts.access.importRuntime.bind(this.opts.access);
|
||||||
|
const { Service } = await importRuntime("@volcengine/openapi");
|
||||||
|
|
||||||
class CommonService extends Service {
|
class CommonService extends Service {
|
||||||
Generic: any;
|
Generic: any;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ export class VolcengineDnsProvider extends AbstractDnsProvider {
|
|||||||
access: this.access,
|
access: this.access,
|
||||||
logger: this.logger,
|
logger: this.logger,
|
||||||
http: this.http,
|
http: this.http,
|
||||||
|
importRuntime: this.importRuntime.bind(this),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
23:48
|
02:48
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
00:00
|
03:41
|
||||||
|
|||||||
Reference in New Issue
Block a user