lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-04-16 05:50:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复自定义插件name丢失author导致找不到插件的bug

Browse Source
This commit is contained in:
xiaojunnuo
2026-01-15 23:43:07 +08:00
parent d5d7d73440
commit 2fbb58eb2b
22 changed files with 73 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/pipeline/src/core/executor.ts
View File

@@ -276,7 +276,10 @@ export class Executor {
const lastStatus = this.lastStatusMap.get(step.id);
//执行任务
const plugin: RegistryItem<AbstractTaskPlugin> = pluginRegistry.get(step.type);
if (!plugin) {
currentLogger.error(`未找到插件${step.type}`);
throw new Error(`未找到插件${step.type}`);
}
//@ts-ignore
let instance: ITaskPlugin = null;
try {
@@ -285,7 +288,7 @@ export class Executor {
//@ts-ignore
instance = new pluginCls();
} catch (e: any) {
currentLogger.error(`实例化插件失败:${e.message}`);
currentLogger.error(`实例化插件失败:${step.type}:${e.message}`);
throw new Error(`实例化插件失败`, e);
}

17
packages/plugins/plugin-lib/src/lib/check.ts
View File

@@ -1,17 +0,0 @@
import { AbstractTaskPlugin, TaskInstanceContext } from "@certd/pipeline";
import { isPlus } from "@certd/plus-core";
export function mustPlus() {
if (!isPlus()) {
throw new Error("此插件仅供专业版中使用");
}
}
export abstract class AbstractPlusTaskPlugin extends AbstractTaskPlugin {
setCtx(ctx: TaskInstanceContext) {
super.setCtx(ctx);
mustPlus();
}
abstract execute(): Promise<void>;
}

1
packages/plugins/plugin-lib/src/lib/index.ts
View File

@@ -1,2 +1 @@
export * from "./ocr-api.js";
export * from "./check.js";

12
packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts
View File

@@ -262,7 +262,7 @@ export class PluginService extends BaseService<PluginEntity> {
return;
}
let name = item.name;
if (item.author){
if (item.author && !item.name.startsWith( `${item.author}/`)){
name = `${item.author}/${item.name}`
}
if (item.pluginType === "access"){
@@ -331,7 +331,6 @@ export class PluginService extends BaseService<PluginEntity> {
});
if (info && info.length > 0) {
const plugin = info[0];
try {
const AsyncFunction = Object.getPrototypeOf(async () => {
}).constructor;
@@ -399,12 +398,11 @@ export class PluginService extends BaseService<PluginEntity> {
delete item.metadata;
delete item.content;
delete item.extra;
let name = item.name
if (item.author) {
name = item.author + "/" + name;
if (item.author) {
item.name = item.author + "/" + item.name;
}
if(item.addonType){
let name = item.name
if(item.addonType){
name = item.addonType + ":" + name;
}
let registry = null;

2
packages/ui/certd-server/src/plugins/plugin-admin/plugin-db-backup.ts
View File

@@ -2,7 +2,7 @@ import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipel
import fs from "fs";
import path from "path";
import dayjs from "dayjs";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import JSZip from "jszip";
import * as os from "node:os";
import { OssClientContext, ossClientFactory, OssClientRemoveByOpts} from "../plugin-lib/oss/index.js";

4
packages/ui/certd-server/src/plugins/plugin-apisix/plugins/plugin-refresh-cert.ts
View File

@@ -1,8 +1,8 @@
import {IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput} from "@certd/pipeline";
import {CertApplyPluginNames, CertInfo} from "@certd/plugin-cert";
import {AbstractPlusTaskPlugin, createCertDomainGetterInputDefine, createRemoteSelectInputDefine} from "@certd/plugin-lib";
import {createCertDomainGetterInputDefine, createRemoteSelectInputDefine} from "@certd/plugin-lib";
import {ApisixAccess} from "../access.js";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
@IsTaskPlugin({
//命名规范，插件类型+功能（就是目录plugin-demo中的demo），大写字母开头，驼峰命名
name: "ApisixRefreshCert",

2
packages/ui/certd-server/src/plugins/plugin-cmcc/plugin-deploy-to-cdn.ts
View File

@@ -7,7 +7,7 @@ import {
} from "@certd/pipeline";
import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import { CmccAccess } from "./access.js";
@IsTaskPlugin({

2
packages/ui/certd-server/src/plugins/plugin-host/plugin/plugin-deploy-to-iis.ts
View File

@@ -1,6 +1,6 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
import { CertInfo } from "@certd/plugin-cert";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib";
import { tmpdir } from "node:os";
import path from "node:path";

2
packages/ui/certd-server/src/plugins/plugin-plus/baota/plugins/plugin-delete-expiring-cert.ts
View File

@@ -1,6 +1,6 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
import { BaotaClient } from "../lib/client.js";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import dayjs from "dayjs";
@IsTaskPlugin({
name: "BaotaDeleteExpiringCert",

2
packages/ui/certd-server/src/plugins/plugin-plus/baota/plugins/plugin-deploy-to-panel.ts
View File

@@ -1,7 +1,7 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
import { CertInfo } from "@certd/plugin-cert";
import { BaotaClient } from "../lib/client.js";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import { CertApplyPluginNames } from "@certd/plugin-cert";
@IsTaskPlugin({
name: "BaotaDeployPanelCert",

3
packages/ui/certd-server/src/plugins/plugin-plus/exsi/plugin-deploy-to-exsi.ts
View File

@@ -1,8 +1,9 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
import { AbstractPlusTaskPlugin, CertReader } from "@certd/plugin-lib";
import { CertReader } from "@certd/plugin-lib";
import { SshAccess } from "../../plugin-lib/ssh/ssh-access.js";
import { SshClient } from "../../plugin-lib/ssh/ssh.js";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
@IsTaskPlugin({
name: "ExsiDeployCert",
title: "Exsi-部署证书到Exsi",

2
packages/ui/certd-server/src/plugins/plugin-plus/k8s/plugins/plugin-apply.ts
View File

@@ -4,7 +4,7 @@ import { CertApplyPluginNames, CertInfo, CertReader } from "@certd/plugin-cert";
import dayjs from "dayjs";
import { get } from "lodash-es";
import { K8sAccess } from "../access.js";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
@IsTaskPlugin({
name: "K8sApply",
title: "K8S-Apply自定义yaml",

2
packages/ui/certd-server/src/plugins/plugin-plus/lucky/plugins/plugin-upload.ts
View File

@@ -2,7 +2,7 @@ import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipel
import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
import { LuckyAccess } from "../access.js";
import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import { isArray } from "lodash-es";
@IsTaskPlugin({

2
packages/ui/certd-server/src/plugins/plugin-plus/maoyun/plugins/plugin-deploy-to-cdn.ts
View File

@@ -1,7 +1,7 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import { MaoyunAccess } from "../access.js";
import { MaoyunClient } from "../client.js";

3
packages/ui/certd-server/src/plugins/plugin-plus/openwrt/plugin-deploy-to-openwrt.ts
View File

@@ -1,8 +1,9 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
import { AbstractPlusTaskPlugin, CertReader } from "@certd/plugin-lib";
import { CertReader } from "@certd/plugin-lib";
import { SshAccess } from "../../plugin-lib/ssh/ssh-access.js";
import { SshClient } from "../../plugin-lib/ssh/ssh.js";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
@IsTaskPlugin({
name: "OpenwrtDeployCert",
title: "Openwrt-部署证书到Openwrt",

2
packages/ui/certd-server/src/plugins/plugin-plus/plesk/plugins/plugin-deploy-cert.ts
View File

@@ -1,6 +1,6 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import { PleskAccess } from "../access.js";
import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib";
import FormData from "form-data";

2
packages/ui/certd-server/src/plugins/plugin-plus/plesk/plugins/plugin-refresh-cert.ts
View File

@@ -1,6 +1,6 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
import { CertApplyPluginNames, CertInfo, CertReader } from "@certd/plugin-cert";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import { PleskAccess } from "../access.js";
import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib";
import FormData from "form-data";

2
packages/ui/certd-server/src/plugins/plugin-plus/synology/plugins/plugin-deploy-to-panel.ts
View File

@@ -1,6 +1,6 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
import { CertInfo } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-lib";
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import { SynologyClient } from "@certd/plugin-plus";
import { SynologyAccess } from "../access.js";
import { CertApplyPluginNames } from "@certd/plugin-lib";

2
packages/ui/certd-server/src/plugins/plugin-proxmox/plugins/plugin-upload.ts
View File

@@ -1,6 +1,6 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
import { CertInfo } from '@certd/plugin-cert';
import { AbstractPlusTaskPlugin } from '@certd/plugin-lib';
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import { ProxmoxAccess } from '../access.js';
import { createRemoteSelectInputDefine } from '@certd/plugin-lib';
import { CertApplyPluginNames} from '@certd/plugin-cert';

2
packages/ui/certd-server/src/plugins/plugin-qnap/plugins/plugin-qnap.ts
View File

@@ -1,6 +1,6 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
import { CertInfo } from '@certd/plugin-cert';
import { AbstractPlusTaskPlugin } from '@certd/plugin-lib';
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import { tmpdir } from 'node:os';
import fs from 'fs';
import { SshAccess, SshClient } from '../../plugin-lib/ssh/index.js';

2
packages/ui/certd-server/src/plugins/plugin-tencent/plugin/delete-expiring-cert/index.ts
View File

@@ -1,5 +1,5 @@
import { IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
import { AbstractPlusTaskPlugin } from '@certd/plugin-lib';
import { AbstractPlusTaskPlugin } from "@certd/plugin-plus";
import dayjs from 'dayjs';
import { remove } from 'lodash-es';
import { TencentAccess, TencentSslClient } from '../../../plugin-lib/tencent/index.js';