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

packages/core/pipeline/src/core/executor.ts

@@ -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);
     }
 

packages/plugins/plugin-lib/src/lib/check.ts

@@ -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>;
-}

packages/plugins/plugin-lib/src/lib/index.ts

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

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

@@ -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) {
-
+       item.name = item.author + "/" +  item.name;
-    if (item.author) {
-      name = item.author + "/" + name;
     }
-     if(item.addonType){
+    let name = item.name
+    if(item.addonType){
       name = item.addonType + ":" + name;
     }
     let registry = null;

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

@@ -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";

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

@@ -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",

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

@@ -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({

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

@@ -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";

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

@@ -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",

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

@@ -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",

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

@@ -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",

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

@@ -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",

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

@@ -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({

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

@@ -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";
 

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

@@ -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",

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

@@ -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";

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

@@ -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";

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

@@ -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";

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

@@ -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';

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

@@ -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';

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

@@ -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';

pnpm-lock.yaml

@@ -49,7 +49,7 @@ importers:
   packages/core/acme-client:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../basic
       '@peculiar/x509':
         specifier: ^1.11.0
@@ -213,10 +213,10 @@ importers:
   packages/core/pipeline:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../basic
       '@certd/plus-core':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../pro/plus-core
       dayjs:
         specifier: ^1.11.7
@@ -412,7 +412,7 @@ importers:
   packages/libs/lib-k8s:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/basic
       '@kubernetes/client-node':
         specifier: 0.21.0
@@ -452,19 +452,19 @@ importers:
   packages/libs/lib-server:
     dependencies:
       '@certd/acme-client':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/pipeline
       '@certd/plugin-lib':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../plugins/plugin-lib
       '@certd/plus-core':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../pro/plus-core
       '@midwayjs/cache':
         specifier: 3.14.0
@@ -610,16 +610,16 @@ importers:
   packages/plugins/plugin-cert:
     dependencies:
       '@certd/acme-client':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/pipeline
       '@certd/plugin-lib':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../plugin-lib
       psl:
         specifier: ^1.9.0
@@ -683,16 +683,16 @@ importers:
         specifier: ^3.964.0
         version: 3.964.0(aws-crt@1.26.2)
       '@certd/acme-client':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/pipeline
       '@certd/plus-core':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../pro/plus-core
       '@kubernetes/client-node':
         specifier: 0.21.0
@@ -783,16 +783,16 @@ importers:
   packages/pro/commercial-core:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/basic
       '@certd/lib-server':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../libs/lib-server
       '@certd/pipeline':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/pipeline
       '@certd/plus-core':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../plus-core
       '@midwayjs/core':
         specifier: 3.20.11
@@ -865,14 +865,17 @@ importers:
   packages/pro/plugin-plus:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/basic
       '@certd/pipeline':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/pipeline
       '@certd/plugin-lib':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../plugins/plugin-lib
+      '@certd/plus-core':
+        specifier: ^1.38.0
+        version: link:../plus-core
       crypto-js:
         specifier: ^4.2.0
         version: 4.2.0
@@ -944,7 +947,7 @@ importers:
   packages/pro/plus-core:
     dependencies:
       '@certd/basic':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/basic
       dayjs:
         specifier: ^1.11.7
@@ -1240,10 +1243,10 @@ importers:
         version: 0.1.3(zod@3.24.4)
     devDependencies:
       '@certd/lib-iframe':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../libs/lib-iframe
       '@certd/pipeline':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/pipeline
       '@rollup/plugin-commonjs':
         specifier: ^25.0.7
@@ -1432,46 +1435,46 @@ importers:
         specifier: ^3.964.0
         version: 3.964.0(aws-crt@1.26.2)
       '@certd/acme-client':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/acme-client
       '@certd/basic':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/basic
       '@certd/commercial-core':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../pro/commercial-core
       '@certd/cv4pve-api-javascript':
         specifier: ^8.4.2
         version: 8.4.2
       '@certd/jdcloud':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../libs/lib-jdcloud
       '@certd/lib-huawei':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../libs/lib-huawei
       '@certd/lib-k8s':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../libs/lib-k8s
       '@certd/lib-server':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../libs/lib-server
       '@certd/midway-flyway-js':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../libs/midway-flyway-js
       '@certd/pipeline':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../core/pipeline
       '@certd/plugin-cert':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../plugins/plugin-cert
       '@certd/plugin-lib':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../plugins/plugin-lib
       '@certd/plugin-plus':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../pro/plugin-plus
       '@certd/plus-core':
-        specifier: ^1.37.17
+        specifier: ^1.38.0
         version: link:../../pro/plus-core
       '@google-cloud/publicca':
         specifier: ^1.3.0