@certd/pipeline 1.0.2 → 1.0.3

package/package.json

@@ -1,56 +1,53 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.0.2",
-  "main": "./dist/pipeline.umd.js",
+  "version": "1.0.3",
+  "main": "./dist/bundle.js",
   "module": "./dist/pipeline.mjs",
   "types": "./dist/d/index.d.ts",
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc --noEmit && vite build",
+    "build": "rollup -c",
+    "build2": "vue-tsc --noEmit && vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.0.2",
-    "axios": "^0.21.1",
-    "dayjs": "^1.11.6",
-    "lodash": "^4.17.21",
-    "log4js": "^6.3.0",
-    "node-forge": "^0.10.0",
-    "qs": "^6.9.4",
-    "reflect-metadata": "^0.1.13"
+    "axios": "^1.4.0",
+    "node-forge": "^1.3.1",
+    "qs": "^6.11.2"
   },
   "devDependencies": {
-    "@alicloud/cs20151215": "^3.0.3",
-    "@alicloud/openapi-client": "^0.4.0",
-    "@alicloud/pop-core": "^1.7.10",
-    "@midwayjs/bootstrap": "^3.9.1",
-    "@midwayjs/cache": "^3.9.0",
-    "@midwayjs/cli": "^1.3.21",
-    "@midwayjs/core": "^3.0.0",
-    "@midwayjs/decorator": "^3.0.0",
-    "@midwayjs/koa": "^3.9.0",
-    "@midwayjs/logger": "^2.17.0",
-    "@midwayjs/typeorm": "^3.9.0",
-    "@midwayjs/validate": "^3.9.0",
+    "@certd/acme-client": "^1.0.3",
+    "@rollup/plugin-commonjs": "^23.0.4",
+    "@rollup/plugin-json": "^6.0.0",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-terser": "^0.4.3",
     "@rollup/plugin-typescript": "^11.0.0",
-    "@types/chai": "^4.3.3",
+    "@types/chai": "^4.3.5",
     "@types/lodash": "^4.14.194",
-    "@types/mocha": "^10.0.0",
-    "@types/node-forge": "^1.3.0",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
-    "chai": "^4.3.6",
-    "eslint": "^8.24.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.26.0",
+    "@types/mocha": "^10.0.1",
+    "@types/node-forge": "^1.3.2",
+    "@typescript-eslint/eslint-plugin": "^5.59.7",
+    "@typescript-eslint/parser": "^5.59.7",
+    "chai": "^4.3.7",
+    "dayjs": "^1.11.7",
+    "eslint": "^8.41.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "mocha": "^10.1.0",
+    "lodash": "^4.17.21",
+    "log4js": "^6.9.1",
+    "mocha": "^10.2.0",
+    "reflect-metadata": "^0.1.13",
+    "rollup": "^3.7.4",
+    "rollup-plugin-typescript2": "^0.34.1",
+    "rollup-plugin-visualizer": "^5.8.2",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4",
-    "vite": "^3.1.0",
-    "vue-tsc": "^0.38.9"
+    "tslib": "^2.5.2",
+    "typescript": "^5.0.4",
+    "vite": "^4.3.8",
+    "vue-tsc": "^1.6.5"
   },
-  "gitHead": "1a738403fcb2732c0797b51cba15ad2b18b66523"
+  "gitHead": "a43c5b0824d2cb19a731c16f62c5e7464f6635d6"
 }

package/rollup.config.js

@@ -0,0 +1,39 @@
+const resolve = require("@rollup/plugin-node-resolve");
+const commonjs = require("@rollup/plugin-commonjs");
+const rollupTypescript = require("rollup-plugin-typescript2");
+const json = require("@rollup/plugin-json");
+const terser = require("@rollup/plugin-terser");
+module.exports = {
+  input: "src/index.ts",
+  output: {
+    file: "dist/bundle.js",
+    format: "cjs",
+  },
+  plugins: [
+    // 解析第三方依赖
+    resolve(),
+    // 识别 commonjs 模式第三方依赖
+    commonjs(),
+    rollupTypescript(),
+    json(),
+    terser(),
+  ],
+  external: [
+    "vue",
+    "lodash",
+    "dayjs",
+    "@certd/acme-client",
+    "@certd/pipeline",
+    "@certd/plugin-cert",
+    "@certd/plugin-aliyun",
+    "@certd/plugin-tencent",
+    "@certd/plugin-huawei",
+    "@certd/plugin-host",
+    "@certd/plugin-tencent",
+    "@certd/plugin-util",
+    "log4js",
+    "@midwayjs/core",
+    "@midwayjs/decorator",
+    "reflect-metadata",
+  ],
+};

package/test/echo-plugin.ts

@@ -1,4 +1,4 @@
-import { Autowire, ILogger, IsTaskPlugin, ITaskPlugin, TaskInput, TaskOutput } from "../src";
+import { Autowire, IsTaskPlugin, ITaskPlugin, TaskInput, TaskOutput } from "../src";
 
 @IsTaskPlugin({
   name: "EchoPlugin",
@@ -14,9 +14,6 @@ export class EchoPlugin implements ITaskPlugin {
   })
   cert!: any;
 
-  @Autowire()
-  logger!: ILogger;
-
   @TaskOutput({
     title: "cert info",
   })

package/tsconfig.json

@@ -1,8 +1,9 @@
 {
   "compilerOptions": {
+    "importHelpers": false,
     "target": "ESNext",
     "useDefineForClassFields": true,
-    "module": "commonjs",
+    "module": "ESNext",
     "moduleResolution": "Node",
     "strict": true,
     "jsx": "preserve",
@@ -13,8 +14,10 @@
     "lib": ["ESNext", "DOM"],
     "skipLibCheck": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "outDir": "./dist/ts"
+    "paths": {
+      "tslib" : ["./node_modules/tslib/tslib.d.ts"]
+    }
   },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue","test/**/*.ts"],
+
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue","test/**/*.ts","rollup.config.ts"],
 }

package/vite.config.js

@@ -1,17 +1,20 @@
 import { defineConfig } from "vite";
+import visualizer from "rollup-plugin-visualizer";
 import typescript from "@rollup/plugin-typescript";
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [],
   build: {
+    target: "es2015",
     lib: {
       entry: "src/index.ts",
-      name: "pipeline",
+      name: "CertdPipeline",
     },
     rollupOptions: {
       plugins: [
+        visualizer(),
         typescript({
-          target: "esnext",
+          target: "es2015",
           rootDir: "src",
           declaration: true,
           declarationDir: "dist/d",
@@ -19,15 +22,36 @@ export default defineConfig({
           allowSyntheticDefaultImports: true,
         }),
       ],
-      external: ["vue", "lodash", "dayjs", "@fast-crud/fast-crud"],
+      external: [
+        "vue",
+        "lodash",
+        "dayjs",
+        "@certd/acme-client",
+        "@certd/plugin-cert",
+        "@certd/plugin-aliyun",
+        "@certd/plugin-tencent",
+        "@certd/plugin-huawei",
+        "@certd/plugin-host",
+        "@certd/plugin-tencent",
+        "@certd/plugin-util",
+        "log4js",
+        "@midwayjs/core",
+        "@midwayjs/decorator",
+      ],
       output: {
-        // Provide global variables to use in the UMD build
-        // for externalized deps
         globals: {
           vue: "Vue",
           lodash: "_",
           dayjs: "dayjs",
-          "@fast-crud/fast-crud": "FastCrud",
+          "@certd/plugin-cert": "CertdPluginCert",
+          "@certd/acme-client": "CertdAcmeClient",
+          "@certd/plugin-aliyun": "CertdPluginAliyun",
+          "@certd/plugin-host": "CertdPluginHost",
+          "@certd/plugin-huawei": "CertdPluginHuawei",
+          "@certd/plugin-util": "CertdPluginUtil",
+          log4js: "log4js",
+          "@midwayjs/core": "MidwayjsCore",
+          "@midwayjs/decorator": "MidwayjsDecorator",
         },
       },
     },

package/src/access/api.ts

@@ -1,18 +0,0 @@
-import { Registrable } from "../registry";
-import { FormItemProps } from "../d.ts";
-
-export type AccessInputDefine = FormItemProps & {
-  title: string;
-  required?: boolean;
-};
-export type AccessDefine = Registrable & {
-  input?: {
-    [key: string]: AccessInputDefine;
-  };
-};
-export interface IAccessService {
-  getById(id: any): Promise<any>;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface IAccess {}

package/src/access/decorator.ts

@@ -1,39 +0,0 @@
-// src/decorator/memoryCache.decorator.ts
-import { AccessDefine, AccessInputDefine } from "./api";
-import { Decorator } from "../decorator";
-import _ from "lodash";
-import { accessRegistry } from "./registry";
-
-// 提供一个唯一 key
-export const ACCESS_CLASS_KEY = "pipeline:access";
-export const ACCESS_INPUT_KEY = "pipeline:access:input";
-
-export function IsAccess(define: AccessDefine): ClassDecorator {
-  return (target: any) => {
-    target = Decorator.target(target);
-
-    const inputs: any = {};
-    const properties = Decorator.getClassProperties(target);
-    for (const property in properties) {
-      const input = Reflect.getMetadata(ACCESS_INPUT_KEY, target, property);
-      if (input) {
-        inputs[property] = input;
-      }
-    }
-    _.merge(define, { input: inputs });
-    Reflect.defineMetadata(ACCESS_CLASS_KEY, define, target);
-    target.define = define;
-    accessRegistry.register(define.name, {
-      define,
-      target,
-    });
-  };
-}
-
-export function AccessInput(input?: AccessInputDefine): PropertyDecorator {
-  return (target, propertyKey) => {
-    target = Decorator.target(target, propertyKey);
-    // const _type = Reflect.getMetadata("design:type", target, propertyKey);
-    Reflect.defineMetadata(ACCESS_INPUT_KEY, input, target, propertyKey);
-  };
-}

package/src/access/registry.ts

@@ -1,4 +0,0 @@
-import { Registry } from "../registry";
-
-// @ts-ignore
-export const accessRegistry = new Registry();

package/src/core/context.ts

@@ -1,88 +0,0 @@
-import { IStorage, MemoryStorage } from "./storage";
-const CONTEXT_VERSION_KEY = "contextVersion";
-export interface IContext {
-  getInt(key: string): Promise<number>;
-  get(key: string): Promise<string | null>;
-  set(key: string, value: string): Promise<void>;
-  getObj<T = any>(key: string): Promise<T | null>;
-  setObj<T = any>(key: string, value: T): Promise<void>;
-  updateVersion(): Promise<void>;
-  initVersion(): Promise<void>;
-}
-
-export class ContextFactory {
-  storage: IStorage;
-  memoryStorage: IStorage;
-
-  constructor(storage: IStorage) {
-    this.storage = storage;
-    this.memoryStorage = new MemoryStorage();
-  }
-
-  getContext(scope: string, namespace: string): IContext {
-    const context = new StorageContext(scope, namespace, this.storage);
-    return context;
-  }
-
-  getMemoryContext(scope: string, namespace: string): IContext {
-    const context = new StorageContext(scope, namespace, this.memoryStorage);
-    return context;
-  }
-}
-
-export class StorageContext implements IContext {
-  storage: IStorage;
-  namespace: string;
-  scope: string;
-
-  _version = 0;
-  _initialVersion = 0;
-  constructor(scope: string, namespace: string, storage: IStorage) {
-    this.storage = storage;
-    this.scope = scope;
-    this.namespace = namespace;
-  }
-
-  async initVersion() {
-    const version = await this.getInt(CONTEXT_VERSION_KEY);
-    this._initialVersion = version;
-    this._version = version;
-  }
-
-  async updateVersion() {
-    if (this._version === this._initialVersion) {
-      this._version++;
-    }
-
-    await this.set(CONTEXT_VERSION_KEY, this._version.toString());
-  }
-
-  async get(key: string) {
-    const version = key === CONTEXT_VERSION_KEY ? 0 : this._version;
-    return await this.storage.get(this.scope, this.namespace, version.toString(), key);
-  }
-  async set(key: string, value: string) {
-    const version = key === CONTEXT_VERSION_KEY ? 0 : this._version;
-    return await this.storage.set(this.scope, this.namespace, version.toString(), key, value);
-  }
-
-  async getInt(key: string): Promise<number> {
-    const str = await this.get(key);
-    if (str) {
-      return parseInt(str);
-    }
-    return 0;
-  }
-  async getObj<T = any>(key: string): Promise<T | null> {
-    const str = await this.get(key);
-    if (str) {
-      const store = JSON.parse(str);
-      return store.value;
-    }
-    return null;
-  }
-
-  async setObj<T = any>(key: string, value: T) {
-    await this.set(key, JSON.stringify({ value }));
-  }
-}

package/src/core/executor.ts

@@ -1,207 +0,0 @@
-import { ConcurrencyStrategy, Pipeline, ResultType, Runnable, RunStrategy, Stage, Step, Task } from "../d.ts";
-import _ from "lodash";
-import { RunHistory, RunnableCollection } from "./run-history";
-import { AbstractTaskPlugin, PluginDefine, pluginRegistry } from "../plugin";
-import { ContextFactory, IContext } from "./context";
-import { IStorage } from "./storage";
-import { logger } from "../utils/util.log";
-import { Logger } from "log4js";
-import { request } from "../utils/util.request";
-import { IAccessService } from "../access";
-import { RegistryItem } from "../registry";
-import { Decorator } from "../decorator";
-
-export class Executor {
-  userId: any;
-  pipeline: Pipeline;
-  runtime!: RunHistory;
-  accessService: IAccessService;
-  contextFactory: ContextFactory;
-  logger: Logger;
-  pipelineContext!: IContext;
-  lastStatusMap!: RunnableCollection;
-  onChanged: (history: RunHistory) => void;
-  constructor(options: {
-    userId: any;
-    pipeline: Pipeline;
-    storage: IStorage;
-    onChanged: (history: RunHistory) => Promise<void>;
-    accessService: IAccessService;
-  }) {
-    this.pipeline = _.cloneDeep(options.pipeline);
-    this.onChanged = async (history: RunHistory) => {
-      await options.onChanged(history);
-    };
-    this.accessService = options.accessService;
-    this.userId = options.userId;
-    this.pipeline.userId = this.userId;
-    this.contextFactory = new ContextFactory(options.storage);
-    this.logger = logger;
-    this.pipelineContext = this.contextFactory.getContext("pipeline", this.pipeline.id);
-  }
-
-  async init() {
-    const lastRuntime = await this.pipelineContext.getObj(`lastRuntime`);
-    this.lastStatusMap = new RunnableCollection(lastRuntime?.pipeline);
-  }
-
-  async run(runtimeId: any = 0, triggerType: string) {
-    try {
-      await this.init();
-      const trigger = { type: triggerType };
-      // 读取last
-      this.runtime = new RunHistory(runtimeId, trigger, this.pipeline);
-      this.logger.info(`pipeline.${this.pipeline.id}  start`);
-      await this.runWithHistory(this.pipeline, "pipeline", async () => {
-        await this.runStages(this.pipeline);
-      });
-    } catch (e) {
-      this.logger.error("pipeline 执行失败", e);
-    } finally {
-      await this.pipelineContext.setObj("lastRuntime", this.runtime);
-      this.logger.info(`pipeline.${this.pipeline.id}  end`);
-    }
-  }
-
-  async runWithHistory(runnable: Runnable, runnableType: string, run: () => Promise<void>) {
-    runnable.runnableType = runnableType;
-    this.runtime.start(runnable);
-    await this.onChanged(this.runtime);
-
-    if (runnable.strategy?.runStrategy === RunStrategy.SkipWhenSucceed) {
-      //如果是成功后跳过策略
-      const lastNode = this.lastStatusMap.get(runnable.id);
-      const lastResult = lastNode?.status?.status;
-      const lastInput = JSON.stringify(lastNode?.status?.input);
-      let inputChanged = false;
-      if (runnableType === "step") {
-        const step = runnable as Step;
-        const input = JSON.stringify(step.input);
-        if (input != null && lastInput !== input) {
-          //参数有变化
-          inputChanged = true;
-        }
-      }
-      if (lastResult != null && lastResult === ResultType.success && !inputChanged) {
-        this.runtime.skip(runnable);
-        await this.onChanged(this.runtime);
-        return ResultType.skip;
-      }
-    }
-    try {
-      await run();
-      this.runtime.success(runnable);
-      await this.onChanged(this.runtime);
-      return ResultType.success;
-    } catch (e: any) {
-      this.runtime.error(runnable, e);
-      await this.onChanged(this.runtime);
-      throw e;
-    } finally {
-      this.runtime.finally(runnable);
-    }
-  }
-
-  private async runStages(pipeline: Pipeline) {
-    const resList: ResultType[] = [];
-    for (const stage of pipeline.stages) {
-      const res: ResultType = await this.runWithHistory(stage, "stage", async () => {
-        await this.runStage(stage);
-      });
-      resList.push(res);
-    }
-    return this.compositionResultType(resList);
-  }
-
-  async runStage(stage: Stage) {
-    const runnerList = [];
-    for (const task of stage.tasks) {
-      const runner = this.runWithHistory(task, "task", async () => {
-        await this.runTask(task);
-      });
-      runnerList.push(runner);
-    }
-
-    let resList: ResultType[] = [];
-    if (stage.concurrency === ConcurrencyStrategy.Parallel) {
-      resList = await Promise.all(runnerList);
-    } else {
-      for (let i = 0; i < runnerList.length; i++) {
-        const runner = runnerList[i];
-        resList[i] = await runner;
-      }
-    }
-    return this.compositionResultType(resList);
-  }
-
-  compositionResultType(resList: ResultType[]) {
-    let hasSuccess = false;
-    for (const type of resList) {
-      if (type === ResultType.error) {
-        return ResultType.error;
-      }
-      if (type === ResultType.success) {
-        hasSuccess = true;
-      }
-    }
-    if (hasSuccess) {
-      return ResultType.success;
-    }
-    return ResultType.error;
-  }
-
-  private async runTask(task: Task) {
-    const resList: ResultType[] = [];
-    for (const step of task.steps) {
-      step.runnableType = "step";
-      const res: ResultType = await this.runWithHistory(step, "step", async () => {
-        await this.runStep(step);
-      });
-      resList.push(res);
-    }
-    return this.compositionResultType(resList);
-  }
-
-  private async runStep(step: Step) {
-    const lastStatus = this.lastStatusMap.get(step.id);
-    //执行任务
-    const plugin: RegistryItem<AbstractTaskPlugin> = pluginRegistry.get(step.type);
-
-    // @ts-ignore
-    const instance: ITaskPlugin = new plugin.target();
-    // @ts-ignore
-    const define: PluginDefine = plugin.define;
-    //从outputContext读取输入参数
-    Decorator.inject(define.input, instance, step.input, (item, key) => {
-      if (item.component?.name === "pi-output-selector") {
-        const contextKey = step.input[key];
-        if (contextKey != null) {
-          step.input[key] = this.runtime.context[contextKey];
-        }
-      }
-    });
-
-    const context: any = {
-      logger: this.runtime._loggers[step.id],
-      accessService: this.accessService,
-      pipelineContext: this.pipelineContext,
-      lastStatus,
-      userContext: this.contextFactory.getContext("user", this.userId),
-      http: request,
-    };
-    Decorator.inject(define.autowire, instance, context);
-
-    await instance.onInstance();
-    await instance.execute();
-
-    if (instance.result.clearLastStatus) {
-      this.lastStatusMap.clear();
-    }
-    //输出到output context
-    _.forEach(define.output, (item, key) => {
-      step!.status!.output[key] = instance[key];
-      const stepOutputKey = `step.${step.id}.${key}`;
-      this.runtime.context[stepOutputKey] = instance[key];
-    });
-  }
-}