mirror of
https://github.com/certd/certd.git
synced 2026-07-13 17:07:32 +08:00
fix(pipeline): 重构运行时依赖加载逻辑,修复火山引擎DNS解析报runtimeDepsService未初始化的bug
This commit is contained in:
@@ -2,6 +2,7 @@ import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
|
||||
import { logger } from "@certd/basic";
|
||||
import { PluginService } from "../plugin/service/plugin-service.js";
|
||||
import { registerPaymentProviders } from "../suite/payments/index.js";
|
||||
import { RuntimeDepsService } from "../runtime-deps/runtime-deps-service.js";
|
||||
|
||||
@Provide()
|
||||
@Scope(ScopeEnum.Request, { allowDowngrade: true })
|
||||
@@ -9,6 +10,9 @@ export class AutoLoadPlugins {
|
||||
@Inject()
|
||||
pluginService: PluginService;
|
||||
|
||||
@Inject()
|
||||
runtimeDepsService: RuntimeDepsService;
|
||||
|
||||
async init() {
|
||||
logger.info(`加载插件开始,加载模式:${process.env.certd_plugin_loadmode}`);
|
||||
if (process.env.certd_plugin_loadmode === "metadata") {
|
||||
@@ -30,5 +34,8 @@ export class AutoLoadPlugins {
|
||||
|
||||
await registerPaymentProviders();
|
||||
logger.info(`加载插件完成,加载模式:${process.env.certd_plugin_loadmode}`);
|
||||
|
||||
// 收集插件 dependPackages 并安装
|
||||
await this.runtimeDepsService.refreshPluginDeps();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,9 +66,8 @@ export class TaskServiceGetter implements IServiceGetter {
|
||||
|
||||
async getAccessService(): Promise<AccessGetter> {
|
||||
const accessService: AccessService = await this.appCtx.getAsync("accessService");
|
||||
const runtimeDepsService = await this.getRuntimeDepsService();
|
||||
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> {
|
||||
|
||||
@@ -270,6 +270,7 @@ export class PluginService extends BaseService<PluginEntity> {
|
||||
return;
|
||||
}
|
||||
await this.registerPlugin(item);
|
||||
await this.runtimeDepsService.refreshPluginDeps();
|
||||
}
|
||||
|
||||
async unRegisterById(id: any) {
|
||||
@@ -297,6 +298,7 @@ export class PluginService extends BaseService<PluginEntity> {
|
||||
} else {
|
||||
logger.warn(`不支持的插件类型:${item.pluginType}`);
|
||||
}
|
||||
await this.runtimeDepsService.refreshPluginDeps();
|
||||
}
|
||||
|
||||
async update(param: any) {
|
||||
|
||||
@@ -150,6 +150,11 @@ export class RuntimeDepsService {
|
||||
@Config("runtimeDeps.lazyDependencies")
|
||||
lazyDependencies: Record<string, string> = {};
|
||||
|
||||
/**
|
||||
* 从插件 registry 收集到的懒加载依赖,键为包名,值为版本范围
|
||||
*/
|
||||
pluginLazyDependencies: Record<string, string> = {};
|
||||
|
||||
@Inject()
|
||||
registryResolver!: NpmRegistryResolver;
|
||||
|
||||
@@ -339,7 +344,8 @@ export class RuntimeDepsService {
|
||||
|
||||
private async resolveMissingRuntimeSpecifier(specifier: string, runtimeError: any, logger?: ILogger) {
|
||||
const packageName = this.parsePackageName(specifier);
|
||||
const lazyRange = this.lazyDependencies?.[packageName];
|
||||
const mergedDeps = this.getMergedLazyDependencies();
|
||||
const lazyRange = mergedDeps[packageName];
|
||||
if (!lazyRange) {
|
||||
try {
|
||||
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 {
|
||||
if (!fs.existsSync(statePath)) {
|
||||
return null;
|
||||
|
||||
Reference in New Issue
Block a user