@certd/pipeline 1.21.1 → 1.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/{d/access → access}/api.d.ts +2 -2
- package/dist/access/api.js +2 -0
- package/dist/{d/access → access}/decorator.d.ts +1 -1
- package/dist/access/decorator.js +34 -0
- package/dist/access/index.d.ts +3 -0
- package/dist/access/index.js +4 -0
- package/dist/{d/access → access}/registry.d.ts +1 -1
- package/dist/access/registry.js +4 -0
- package/dist/{d/context → context}/index.d.ts +1 -1
- package/dist/context/index.js +2 -0
- package/dist/{d/core → core}/context.d.ts +1 -1
- package/dist/core/context.js +66 -0
- package/dist/{d/core → core}/executor.d.ts +8 -8
- package/dist/core/executor.js +273 -0
- package/dist/{d/core → core}/file-store.d.ts +6 -1
- package/dist/core/file-store.js +41 -0
- package/dist/core/index.d.ts +5 -0
- package/dist/core/index.js +6 -0
- package/dist/{d/core → core}/run-history.d.ts +1 -1
- package/dist/core/run-history.js +143 -0
- package/dist/core/storage.js +120 -0
- package/dist/d.ts/fast-crud.js +2 -0
- package/dist/d.ts/index.js +3 -0
- package/dist/d.ts/pipeline.d.ts +123 -0
- package/dist/d.ts/pipeline.js +31 -0
- package/dist/decorator/common.js +12 -0
- package/dist/decorator/index.d.ts +2 -0
- package/dist/decorator/index.js +3 -0
- package/dist/decorator/utils.js +43 -0
- package/dist/dt/fast-crud.d.ts +107 -0
- package/dist/dt/fast-crud.js +2 -0
- package/dist/dt/index.d.ts +2 -0
- package/dist/dt/index.js +3 -0
- package/dist/dt/pipeline.js +31 -0
- package/dist/index.d.ts +11 -0
- package/dist/index.js +11 -0
- package/dist/{d/plugin → plugin}/api.d.ts +7 -6
- package/dist/plugin/api.js +54 -0
- package/dist/{d/plugin → plugin}/decorator.d.ts +1 -1
- package/dist/plugin/decorator.js +74 -0
- package/dist/plugin/index.d.ts +3 -0
- package/dist/plugin/index.js +4 -0
- package/dist/plugin/registry.d.ts +3 -0
- package/dist/plugin/registry.js +3 -0
- package/dist/{d/plugin → plugin}/test/echo-plugin.d.ts +1 -1
- package/dist/plugin/test/echo-plugin.js +37 -0
- package/dist/registry/index.d.ts +1 -0
- package/dist/registry/index.js +2 -0
- package/dist/registry/registry.js +46 -0
- package/dist/service/email.js +2 -0
- package/dist/service/index.d.ts +1 -0
- package/dist/service/index.js +2 -0
- package/dist/utils/index.d.ts +9 -0
- package/dist/utils/index.js +11 -0
- package/dist/utils/util.file.js +15 -0
- package/dist/utils/util.log.js +32 -0
- package/dist/utils/util.promise.d.ts +2 -0
- package/dist/utils/util.promise.js +26 -0
- package/dist/utils/util.request.js +56 -0
- package/dist/utils/util.shell.d.ts +23 -0
- package/dist/utils/util.shell.js +136 -0
- package/dist/utils/util.sleep.js +8 -0
- package/dist/utils/util.sp.d.ts +22 -0
- package/dist/utils/util.sp.js +91 -0
- package/fix-esm-import-paths.js +96 -0
- package/package.json +15 -12
- package/tsconfig.json +32 -14
- package/tsconfig.tsbuildinfo +1 -0
- package/dist/bundle.js +0 -23
- package/dist/d/access/index.d.ts +0 -3
- package/dist/d/core/index.d.ts +0 -5
- package/dist/d/decorator/index.d.ts +0 -2
- package/dist/d/index.d.ts +0 -11
- package/dist/d/plugin/index.d.ts +0 -3
- package/dist/d/plugin/registry.d.ts +0 -3
- package/dist/d/registry/index.d.ts +0 -1
- package/dist/d/service/index.d.ts +0 -1
- package/dist/d/utils/index.d.ts +0 -7
- package/dist/d/utils/util.promise.d.ts +0 -1
- package/rollup.config.js +0 -43
- package/vite.config.js +0 -59
- /package/dist/{d/core → core}/storage.d.ts +0 -0
- /package/dist/{d/d.ts → d.ts}/fast-crud.d.ts +0 -0
- /package/dist/{d/d.ts → d.ts}/index.d.ts +0 -0
- /package/dist/{d/decorator → decorator}/common.d.ts +0 -0
- /package/dist/{d/decorator → decorator}/utils.d.ts +0 -0
- /package/dist/{d/d.ts → dt}/pipeline.d.ts +0 -0
- /package/dist/{d/registry → registry}/registry.d.ts +0 -0
- /package/dist/{d/service → service}/email.d.ts +0 -0
- /package/dist/{d/utils → utils}/util.file.d.ts +0 -0
- /package/dist/{d/utils → utils}/util.log.d.ts +0 -0
- /package/dist/{d/utils → utils}/util.request.d.ts +0 -0
- /package/dist/{d/utils → utils}/util.sleep.d.ts +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.22.0](https://github.com/certd/certd/compare/v1.21.2...v1.22.0) (2024-07-19)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* 升级midway,支持esm ([485e603](https://github.com/certd/certd/commit/485e603b5165c28bc08694997726eaf2a585ebe7))
|
|
11
|
+
* 支持lego,海量DNS提供商 ([0bc6d0a](https://github.com/certd/certd/commit/0bc6d0a211920fb0084d705e1db67ee1e7262c44))
|
|
12
|
+
* 支持postgresql ([3b19bfb](https://github.com/certd/certd/commit/3b19bfb4291e89064b3b407a80dae092d54747d5))
|
|
13
|
+
|
|
14
|
+
## [1.21.2](https://github.com/certd/certd/compare/v1.21.1...v1.21.2) (2024-07-08)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @certd/pipeline
|
|
17
|
+
|
|
6
18
|
## [1.21.1](https://github.com/certd/certd/compare/v1.21.0...v1.21.1) (2024-07-08)
|
|
7
19
|
|
|
8
20
|
**Note:** Version bump only for package @certd/pipeline
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Registrable } from "../registry";
|
|
2
|
-
import { FormItemProps } from "../
|
|
1
|
+
import { Registrable } from "../registry/index.js";
|
|
2
|
+
import { FormItemProps } from "../dt/index.js";
|
|
3
3
|
export type AccessInputDefine = FormItemProps & {
|
|
4
4
|
title: string;
|
|
5
5
|
required?: boolean;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AccessDefine, AccessInputDefine } from "./api";
|
|
1
|
+
import { AccessDefine, AccessInputDefine } from "./api.js";
|
|
2
2
|
export declare const ACCESS_CLASS_KEY = "pipeline:access";
|
|
3
3
|
export declare const ACCESS_INPUT_KEY = "pipeline:access:input";
|
|
4
4
|
export declare function IsAccess(define: AccessDefine): ClassDecorator;
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { Decorator } from "../decorator/index.js";
|
|
2
|
+
import _ from "lodash-es";
|
|
3
|
+
import { accessRegistry } from "./registry.js";
|
|
4
|
+
// 提供一个唯一 key
|
|
5
|
+
export const ACCESS_CLASS_KEY = "pipeline:access";
|
|
6
|
+
export const ACCESS_INPUT_KEY = "pipeline:access:input";
|
|
7
|
+
export function IsAccess(define) {
|
|
8
|
+
return (target) => {
|
|
9
|
+
target = Decorator.target(target);
|
|
10
|
+
const inputs = {};
|
|
11
|
+
const properties = Decorator.getClassProperties(target);
|
|
12
|
+
for (const property in properties) {
|
|
13
|
+
const input = Reflect.getMetadata(ACCESS_INPUT_KEY, target, property);
|
|
14
|
+
if (input) {
|
|
15
|
+
inputs[property] = input;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
_.merge(define, { input: inputs });
|
|
19
|
+
Reflect.defineMetadata(ACCESS_CLASS_KEY, define, target);
|
|
20
|
+
target.define = define;
|
|
21
|
+
accessRegistry.register(define.name, {
|
|
22
|
+
define,
|
|
23
|
+
target,
|
|
24
|
+
});
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
export function AccessInput(input) {
|
|
28
|
+
return (target, propertyKey) => {
|
|
29
|
+
target = Decorator.target(target, propertyKey);
|
|
30
|
+
// const _type = Reflect.getMetadata("design:type", target, propertyKey);
|
|
31
|
+
Reflect.defineMetadata(ACCESS_INPUT_KEY, input, target, propertyKey);
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjb3JhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjY2Vzcy9kZWNvcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2xELE9BQU8sQ0FBQyxNQUFNLFdBQVcsQ0FBQztBQUMxQixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRS9DLGFBQWE7QUFDYixNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxpQkFBaUIsQ0FBQztBQUNsRCxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyx1QkFBdUIsQ0FBQztBQUV4RCxNQUFNLFVBQVUsUUFBUSxDQUFDLE1BQW9CO0lBQzNDLE9BQU8sQ0FBQyxNQUFXLEVBQUUsRUFBRTtRQUNyQixNQUFNLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUVsQyxNQUFNLE1BQU0sR0FBUSxFQUFFLENBQUM7UUFDdkIsTUFBTSxVQUFVLEdBQUcsU0FBUyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3hELEtBQUssTUFBTSxRQUFRLElBQUksVUFBVSxFQUFFLENBQUM7WUFDbEMsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUM7WUFDdEUsSUFBSSxLQUFLLEVBQUUsQ0FBQztnQkFDVixNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsS0FBSyxDQUFDO1lBQzNCLENBQUM7UUFDSCxDQUFDO1FBQ0QsQ0FBQyxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUNuQyxPQUFPLENBQUMsY0FBYyxDQUFDLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztRQUN6RCxNQUFNLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztRQUN2QixjQUFjLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7WUFDbkMsTUFBTTtZQUNOLE1BQU07U0FDUCxDQUFDLENBQUM7SUFDTCxDQUFDLENBQUM7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLFdBQVcsQ0FBQyxLQUF5QjtJQUNuRCxPQUFPLENBQUMsTUFBTSxFQUFFLFdBQVcsRUFBRSxFQUFFO1FBQzdCLE1BQU0sR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxXQUFXLENBQUMsQ0FBQztRQUMvQyx5RUFBeUU7UUFDekUsT0FBTyxDQUFDLGNBQWMsQ0FBQyxnQkFBZ0IsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3ZFLENBQUMsQ0FBQztBQUNKLENBQUMifQ==
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export * from "./api.js";
|
|
2
|
+
export * from "./registry.js";
|
|
3
|
+
export * from "./decorator.js";
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWNjZXNzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsVUFBVSxDQUFDO0FBQ3pCLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsZ0JBQWdCLENBQUMifQ==
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { Registry } from "../registry";
|
|
1
|
+
import { Registry } from "../registry/index.js";
|
|
2
2
|
export declare const accessRegistry: Registry<unknown>;
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { Registry } from "../registry/index.js";
|
|
2
|
+
// @ts-ignore
|
|
3
|
+
export const accessRegistry = new Registry("access");
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaXN0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWNjZXNzL3JlZ2lzdHJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVoRCxhQUFhO0FBQ2IsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLElBQUksUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDIn0=
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { MemoryStorage } from "./storage.js";
|
|
2
|
+
const CONTEXT_VERSION_KEY = "contextVersion";
|
|
3
|
+
export class ContextFactory {
|
|
4
|
+
storage;
|
|
5
|
+
memoryStorage;
|
|
6
|
+
constructor(storage) {
|
|
7
|
+
this.storage = storage;
|
|
8
|
+
this.memoryStorage = new MemoryStorage();
|
|
9
|
+
}
|
|
10
|
+
getContext(scope, namespace) {
|
|
11
|
+
return new StorageContext(scope, namespace, this.storage);
|
|
12
|
+
}
|
|
13
|
+
getMemoryContext(scope, namespace) {
|
|
14
|
+
return new StorageContext(scope, namespace, this.memoryStorage);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export class StorageContext {
|
|
18
|
+
storage;
|
|
19
|
+
namespace;
|
|
20
|
+
scope;
|
|
21
|
+
_version = 0;
|
|
22
|
+
_initialVersion = 0;
|
|
23
|
+
constructor(scope, namespace, storage) {
|
|
24
|
+
this.storage = storage;
|
|
25
|
+
this.scope = scope;
|
|
26
|
+
this.namespace = namespace;
|
|
27
|
+
}
|
|
28
|
+
async initVersion() {
|
|
29
|
+
const version = await this.getInt(CONTEXT_VERSION_KEY);
|
|
30
|
+
this._initialVersion = version;
|
|
31
|
+
this._version = version;
|
|
32
|
+
}
|
|
33
|
+
async updateVersion() {
|
|
34
|
+
if (this._version === this._initialVersion) {
|
|
35
|
+
this._version++;
|
|
36
|
+
}
|
|
37
|
+
await this.set(CONTEXT_VERSION_KEY, this._version.toString());
|
|
38
|
+
}
|
|
39
|
+
async get(key) {
|
|
40
|
+
const version = key === CONTEXT_VERSION_KEY ? 0 : this._version;
|
|
41
|
+
return await this.storage.get(this.scope, this.namespace, version.toString(), key);
|
|
42
|
+
}
|
|
43
|
+
async set(key, value) {
|
|
44
|
+
const version = key === CONTEXT_VERSION_KEY ? 0 : this._version;
|
|
45
|
+
return await this.storage.set(this.scope, this.namespace, version.toString(), key, value);
|
|
46
|
+
}
|
|
47
|
+
async getInt(key) {
|
|
48
|
+
const str = await this.get(key);
|
|
49
|
+
if (str) {
|
|
50
|
+
return parseInt(str);
|
|
51
|
+
}
|
|
52
|
+
return 0;
|
|
53
|
+
}
|
|
54
|
+
async getObj(key) {
|
|
55
|
+
const str = await this.get(key);
|
|
56
|
+
if (str) {
|
|
57
|
+
const store = JSON.parse(str);
|
|
58
|
+
return store.value;
|
|
59
|
+
}
|
|
60
|
+
return null;
|
|
61
|
+
}
|
|
62
|
+
async setObj(key, value) {
|
|
63
|
+
await this.set(key, JSON.stringify({ value }));
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb3JlL2NvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFZLGFBQWEsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUV2RCxNQUFNLG1CQUFtQixHQUFHLGdCQUFnQixDQUFDO0FBVzdDLE1BQU0sT0FBTyxjQUFjO0lBQ3pCLE9BQU8sQ0FBVztJQUNsQixhQUFhLENBQVc7SUFFeEIsWUFBWSxPQUFpQjtRQUMzQixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztRQUN2QixJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksYUFBYSxFQUFFLENBQUM7SUFDM0MsQ0FBQztJQUVELFVBQVUsQ0FBQyxLQUFhLEVBQUUsU0FBaUI7UUFDekMsT0FBTyxJQUFJLGNBQWMsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUM1RCxDQUFDO0lBRUQsZ0JBQWdCLENBQUMsS0FBYSxFQUFFLFNBQWlCO1FBQy9DLE9BQU8sSUFBSSxjQUFjLENBQUMsS0FBSyxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDbEUsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLGNBQWM7SUFDekIsT0FBTyxDQUFXO0lBQ2xCLFNBQVMsQ0FBUztJQUNsQixLQUFLLENBQVM7SUFFZCxRQUFRLEdBQUcsQ0FBQyxDQUFDO0lBQ2IsZUFBZSxHQUFHLENBQUMsQ0FBQztJQUNwQixZQUFZLEtBQWEsRUFBRSxTQUFpQixFQUFFLE9BQWlCO1FBQzdELElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDO0lBQzdCLENBQUM7SUFFRCxLQUFLLENBQUMsV0FBVztRQUNmLE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO1FBQ3ZELElBQUksQ0FBQyxlQUFlLEdBQUcsT0FBTyxDQUFDO1FBQy9CLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDO0lBQzFCLENBQUM7SUFFRCxLQUFLLENBQUMsYUFBYTtRQUNqQixJQUFJLElBQUksQ0FBQyxRQUFRLEtBQUssSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQzNDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNsQixDQUFDO1FBRUQsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLG1CQUFtQixFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUNoRSxDQUFDO0lBRUQsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFXO1FBQ25CLE1BQU0sT0FBTyxHQUFHLEdBQUcsS0FBSyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ2hFLE9BQU8sTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3JGLENBQUM7SUFDRCxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQVcsRUFBRSxLQUFhO1FBQ2xDLE1BQU0sT0FBTyxHQUFHLEdBQUcsS0FBSyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ2hFLE9BQU8sTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUM1RixDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFXO1FBQ3RCLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNoQyxJQUFJLEdBQUcsRUFBRSxDQUFDO1lBQ1IsT0FBTyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDdkIsQ0FBQztRQUNELE9BQU8sQ0FBQyxDQUFDO0lBQ1gsQ0FBQztJQUNELEtBQUssQ0FBQyxNQUFNLENBQVUsR0FBVztRQUMvQixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDaEMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNSLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDOUIsT0FBTyxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQ3JCLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFVLEdBQVcsRUFBRSxLQUFRO1FBQ3pDLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQztJQUNqRCxDQUFDO0NBQ0YifQ==
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { NotificationWhen, Pipeline, ResultType, Runnable, Stage } from "../
|
|
2
|
-
import { RunHistory, RunnableCollection } from "./run-history";
|
|
3
|
-
import { ContextFactory, IContext } from "./context";
|
|
4
|
-
import { IStorage } from "./storage";
|
|
1
|
+
import { NotificationWhen, Pipeline, ResultType, Runnable, Stage } from "../dt/index.js";
|
|
2
|
+
import { RunHistory, RunnableCollection } from "./run-history.js";
|
|
3
|
+
import { ContextFactory, IContext } from "./context.js";
|
|
4
|
+
import { IStorage } from "./storage.js";
|
|
5
5
|
import { Logger } from "log4js";
|
|
6
|
-
import { IAccessService } from "../access";
|
|
7
|
-
import { IEmailService } from "../service";
|
|
6
|
+
import { IAccessService } from "../access/index.js";
|
|
7
|
+
import { IEmailService } from "../service/index.js";
|
|
8
8
|
export type ExecutorOptions = {
|
|
9
9
|
userId: any;
|
|
10
10
|
pipeline: Pipeline;
|
|
@@ -24,12 +24,12 @@ export declare class Executor {
|
|
|
24
24
|
lastRuntime: RunHistory;
|
|
25
25
|
options: ExecutorOptions;
|
|
26
26
|
canceled: boolean;
|
|
27
|
-
onChanged: (history: RunHistory) => void
|
|
27
|
+
onChanged: (history: RunHistory) => Promise<void>;
|
|
28
28
|
constructor(options: ExecutorOptions);
|
|
29
29
|
init(): Promise<void>;
|
|
30
30
|
cancel(): Promise<void>;
|
|
31
31
|
run(runtimeId: any, triggerType: string): Promise<void>;
|
|
32
|
-
runWithHistory(runnable: Runnable, runnableType: string, run: () => Promise<void>): Promise<ResultType.success | ResultType.skip>;
|
|
32
|
+
runWithHistory(runnable: Runnable, runnableType: string, run: () => Promise<void>): Promise<ResultType.success | ResultType.canceled | ResultType.skip>;
|
|
33
33
|
private runStages;
|
|
34
34
|
runStage(stage: Stage): Promise<ResultType.success | ResultType.error>;
|
|
35
35
|
compositionResultType(resList: ResultType[]): ResultType.success | ResultType.error;
|
|
@@ -0,0 +1,273 @@
|
|
|
1
|
+
import { ConcurrencyStrategy, ResultType, RunStrategy } from "../dt/index.js";
|
|
2
|
+
import _ from "lodash-es";
|
|
3
|
+
import { RunHistory, RunnableCollection } from "./run-history.js";
|
|
4
|
+
import { pluginRegistry } from "../plugin/index.js";
|
|
5
|
+
import { ContextFactory } from "./context.js";
|
|
6
|
+
import { logger } from "../utils/util.log.js";
|
|
7
|
+
import { createAxiosService } from "../utils/util.request.js";
|
|
8
|
+
import { Decorator } from "../decorator/index.js";
|
|
9
|
+
import { FileStore } from "./file-store.js";
|
|
10
|
+
export class Executor {
|
|
11
|
+
pipeline;
|
|
12
|
+
runtime;
|
|
13
|
+
contextFactory;
|
|
14
|
+
logger;
|
|
15
|
+
pipelineContext;
|
|
16
|
+
lastStatusMap;
|
|
17
|
+
lastRuntime;
|
|
18
|
+
options;
|
|
19
|
+
canceled = false;
|
|
20
|
+
onChanged;
|
|
21
|
+
constructor(options) {
|
|
22
|
+
this.options = options;
|
|
23
|
+
this.pipeline = _.cloneDeep(options.pipeline);
|
|
24
|
+
this.onChanged = async (history) => {
|
|
25
|
+
await options.onChanged(history);
|
|
26
|
+
};
|
|
27
|
+
this.pipeline.userId = options.userId;
|
|
28
|
+
this.contextFactory = new ContextFactory(options.storage);
|
|
29
|
+
this.logger = logger;
|
|
30
|
+
this.pipelineContext = this.contextFactory.getContext("pipeline", this.pipeline.id);
|
|
31
|
+
}
|
|
32
|
+
async init() {
|
|
33
|
+
const lastRuntime = await this.pipelineContext.getObj(`lastRuntime`);
|
|
34
|
+
this.lastRuntime = lastRuntime;
|
|
35
|
+
this.lastStatusMap = new RunnableCollection(lastRuntime?.pipeline);
|
|
36
|
+
}
|
|
37
|
+
async cancel() {
|
|
38
|
+
this.canceled = true;
|
|
39
|
+
this.runtime?.cancel(this.pipeline);
|
|
40
|
+
await this.onChanged(this.runtime);
|
|
41
|
+
}
|
|
42
|
+
async run(runtimeId = 0, triggerType) {
|
|
43
|
+
try {
|
|
44
|
+
await this.init();
|
|
45
|
+
const trigger = { type: triggerType };
|
|
46
|
+
// 读取last
|
|
47
|
+
this.runtime = new RunHistory(runtimeId, trigger, this.pipeline);
|
|
48
|
+
this.logger.info(`pipeline.${this.pipeline.id} start`);
|
|
49
|
+
await this.notification("start");
|
|
50
|
+
await this.runWithHistory(this.pipeline, "pipeline", async () => {
|
|
51
|
+
await this.runStages(this.pipeline);
|
|
52
|
+
});
|
|
53
|
+
if (this.lastRuntime && this.lastRuntime.pipeline.status?.status === ResultType.error) {
|
|
54
|
+
await this.notification("turnToSuccess");
|
|
55
|
+
}
|
|
56
|
+
await this.notification("success");
|
|
57
|
+
}
|
|
58
|
+
catch (e) {
|
|
59
|
+
await this.notification("error", e);
|
|
60
|
+
this.logger.error("pipeline 执行失败", e);
|
|
61
|
+
}
|
|
62
|
+
finally {
|
|
63
|
+
await this.pipelineContext.setObj("lastRuntime", this.runtime);
|
|
64
|
+
this.logger.info(`pipeline.${this.pipeline.id} end`);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
async runWithHistory(runnable, runnableType, run) {
|
|
68
|
+
runnable.runnableType = runnableType;
|
|
69
|
+
this.runtime.start(runnable);
|
|
70
|
+
await this.onChanged(this.runtime);
|
|
71
|
+
if (runnable.strategy?.runStrategy === RunStrategy.SkipWhenSucceed) {
|
|
72
|
+
//如果是成功后跳过策略
|
|
73
|
+
const lastNode = this.lastStatusMap.get(runnable.id);
|
|
74
|
+
const lastResult = lastNode?.status?.status;
|
|
75
|
+
const lastInput = JSON.stringify(lastNode?.status?.input);
|
|
76
|
+
let inputChanged = false;
|
|
77
|
+
if (runnableType === "step") {
|
|
78
|
+
const step = runnable;
|
|
79
|
+
const input = JSON.stringify(step.input);
|
|
80
|
+
if (input != null && lastInput !== input) {
|
|
81
|
+
//参数有变化
|
|
82
|
+
inputChanged = true;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
if (lastResult != null && lastResult === ResultType.success && !inputChanged) {
|
|
86
|
+
this.runtime.skip(runnable);
|
|
87
|
+
await this.onChanged(this.runtime);
|
|
88
|
+
return ResultType.skip;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
const intervalFlushLogId = setInterval(async () => {
|
|
92
|
+
await this.onChanged(this.runtime);
|
|
93
|
+
}, 5000);
|
|
94
|
+
// const timeout = runnable.timeout ?? 20 * 60 * 1000;
|
|
95
|
+
try {
|
|
96
|
+
if (this.canceled) {
|
|
97
|
+
return ResultType.canceled;
|
|
98
|
+
}
|
|
99
|
+
await run();
|
|
100
|
+
this.runtime.success(runnable);
|
|
101
|
+
return ResultType.success;
|
|
102
|
+
}
|
|
103
|
+
catch (e) {
|
|
104
|
+
this.runtime.error(runnable, e);
|
|
105
|
+
throw e;
|
|
106
|
+
}
|
|
107
|
+
finally {
|
|
108
|
+
this.runtime.finally(runnable);
|
|
109
|
+
clearInterval(intervalFlushLogId);
|
|
110
|
+
await this.onChanged(this.runtime);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
async runStages(pipeline) {
|
|
114
|
+
const resList = [];
|
|
115
|
+
for (const stage of pipeline.stages) {
|
|
116
|
+
const res = await this.runWithHistory(stage, "stage", async () => {
|
|
117
|
+
await this.runStage(stage);
|
|
118
|
+
});
|
|
119
|
+
resList.push(res);
|
|
120
|
+
}
|
|
121
|
+
return this.compositionResultType(resList);
|
|
122
|
+
}
|
|
123
|
+
async runStage(stage) {
|
|
124
|
+
const runnerList = [];
|
|
125
|
+
for (const task of stage.tasks) {
|
|
126
|
+
const runner = async () => {
|
|
127
|
+
return this.runWithHistory(task, "task", async () => {
|
|
128
|
+
await this.runTask(task);
|
|
129
|
+
});
|
|
130
|
+
};
|
|
131
|
+
runnerList.push(runner);
|
|
132
|
+
}
|
|
133
|
+
let resList = [];
|
|
134
|
+
if (stage.concurrency === ConcurrencyStrategy.Parallel) {
|
|
135
|
+
const pList = [];
|
|
136
|
+
for (const item of runnerList) {
|
|
137
|
+
pList.push(item());
|
|
138
|
+
}
|
|
139
|
+
resList = await Promise.all(pList);
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
for (let i = 0; i < runnerList.length; i++) {
|
|
143
|
+
const runner = runnerList[i];
|
|
144
|
+
resList[i] = await runner();
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
return this.compositionResultType(resList);
|
|
148
|
+
}
|
|
149
|
+
compositionResultType(resList) {
|
|
150
|
+
let hasSuccess = false;
|
|
151
|
+
for (const type of resList) {
|
|
152
|
+
if (type === ResultType.error) {
|
|
153
|
+
return ResultType.error;
|
|
154
|
+
}
|
|
155
|
+
if (type === ResultType.success) {
|
|
156
|
+
hasSuccess = true;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
if (hasSuccess) {
|
|
160
|
+
return ResultType.success;
|
|
161
|
+
}
|
|
162
|
+
return ResultType.error;
|
|
163
|
+
}
|
|
164
|
+
async runTask(task) {
|
|
165
|
+
const resList = [];
|
|
166
|
+
for (const step of task.steps) {
|
|
167
|
+
step.runnableType = "step";
|
|
168
|
+
const res = await this.runWithHistory(step, "step", async () => {
|
|
169
|
+
await this.runStep(step);
|
|
170
|
+
});
|
|
171
|
+
resList.push(res);
|
|
172
|
+
}
|
|
173
|
+
return this.compositionResultType(resList);
|
|
174
|
+
}
|
|
175
|
+
async runStep(step) {
|
|
176
|
+
const currentLogger = this.runtime._loggers[step.id];
|
|
177
|
+
const lastStatus = this.lastStatusMap.get(step.id);
|
|
178
|
+
//执行任务
|
|
179
|
+
const plugin = pluginRegistry.get(step.type);
|
|
180
|
+
// @ts-ignore
|
|
181
|
+
const instance = new plugin.target();
|
|
182
|
+
// @ts-ignore
|
|
183
|
+
const define = plugin.define;
|
|
184
|
+
//从outputContext读取输入参数
|
|
185
|
+
Decorator.inject(define.input, instance, step.input, (item, key) => {
|
|
186
|
+
if (item.component?.name === "pi-output-selector") {
|
|
187
|
+
const contextKey = step.input[key];
|
|
188
|
+
if (contextKey != null) {
|
|
189
|
+
const value = this.runtime.context[contextKey];
|
|
190
|
+
if (value == null) {
|
|
191
|
+
currentLogger.warn(`[step init] input ${define.title} is null`);
|
|
192
|
+
}
|
|
193
|
+
step.input[key] = value;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
});
|
|
197
|
+
const http = createAxiosService({ logger: currentLogger });
|
|
198
|
+
const taskCtx = {
|
|
199
|
+
pipeline: this.pipeline,
|
|
200
|
+
step,
|
|
201
|
+
lastStatus,
|
|
202
|
+
http,
|
|
203
|
+
logger: currentLogger,
|
|
204
|
+
accessService: this.options.accessService,
|
|
205
|
+
emailService: this.options.emailService,
|
|
206
|
+
pipelineContext: this.pipelineContext,
|
|
207
|
+
userContext: this.contextFactory.getContext("user", this.options.userId),
|
|
208
|
+
fileStore: new FileStore({
|
|
209
|
+
scope: this.pipeline.id,
|
|
210
|
+
parent: this.runtime.id,
|
|
211
|
+
rootDir: this.options.fileRootDir,
|
|
212
|
+
}),
|
|
213
|
+
};
|
|
214
|
+
instance.setCtx(taskCtx);
|
|
215
|
+
await instance.onInstance();
|
|
216
|
+
await instance.execute();
|
|
217
|
+
if (instance._result.clearLastStatus) {
|
|
218
|
+
this.lastStatusMap.clear();
|
|
219
|
+
}
|
|
220
|
+
//输出到output context
|
|
221
|
+
_.forEach(define.output, (item, key) => {
|
|
222
|
+
step.status.output[key] = instance[key];
|
|
223
|
+
const stepOutputKey = `step.${step.id}.${key}`;
|
|
224
|
+
this.runtime.context[stepOutputKey] = instance[key];
|
|
225
|
+
});
|
|
226
|
+
step.status.files = instance.getFiles();
|
|
227
|
+
}
|
|
228
|
+
async notification(when, error) {
|
|
229
|
+
if (!this.pipeline.notifications) {
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
232
|
+
let subject = "";
|
|
233
|
+
let content = "";
|
|
234
|
+
if (when === "start") {
|
|
235
|
+
subject = `【CertD】开始执行,${this.pipeline.title}, buildId:${this.runtime.id}`;
|
|
236
|
+
content = subject;
|
|
237
|
+
}
|
|
238
|
+
else if (when === "success") {
|
|
239
|
+
subject = `【CertD】执行成功,${this.pipeline.title}, buildId:${this.runtime.id}`;
|
|
240
|
+
content = subject;
|
|
241
|
+
}
|
|
242
|
+
else if (when === "turnToSuccess") {
|
|
243
|
+
subject = `【CertD】执行成功(错误转成功),${this.pipeline.title}, buildId:${this.runtime.id}`;
|
|
244
|
+
content = subject;
|
|
245
|
+
}
|
|
246
|
+
else if (when === "error") {
|
|
247
|
+
subject = `【CertD】执行失败,${this.pipeline.title}, buildId:${this.runtime.id}`;
|
|
248
|
+
content = `<pre>${error.message}</pre>`;
|
|
249
|
+
}
|
|
250
|
+
else {
|
|
251
|
+
return;
|
|
252
|
+
}
|
|
253
|
+
for (const notification of this.pipeline.notifications) {
|
|
254
|
+
if (!notification.when.includes(when)) {
|
|
255
|
+
continue;
|
|
256
|
+
}
|
|
257
|
+
if (notification.type === "email") {
|
|
258
|
+
try {
|
|
259
|
+
this.options.emailService?.send({
|
|
260
|
+
userId: this.pipeline.userId,
|
|
261
|
+
subject,
|
|
262
|
+
content,
|
|
263
|
+
receivers: notification.options.receivers,
|
|
264
|
+
});
|
|
265
|
+
}
|
|
266
|
+
catch (e) {
|
|
267
|
+
logger.error("send email error", e);
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/core/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,11 @@ export type FileStoreOptions = {
|
|
|
4
4
|
scope: string;
|
|
5
5
|
parent: string;
|
|
6
6
|
};
|
|
7
|
+
export interface IFileStore {
|
|
8
|
+
readFile(filePath: string): Buffer | null;
|
|
9
|
+
writeFile(filename: string, file: Buffer): string;
|
|
10
|
+
deleteByParent(scope: string, parent: string): void;
|
|
11
|
+
}
|
|
7
12
|
export declare class FileStore {
|
|
8
13
|
rootDir: string;
|
|
9
14
|
scope: string;
|
|
@@ -11,6 +16,6 @@ export declare class FileStore {
|
|
|
11
16
|
constructor(options?: FileStoreOptions);
|
|
12
17
|
readFile(filePath: string): Buffer | null;
|
|
13
18
|
writeFile(filename: string, file: Buffer): string;
|
|
14
|
-
|
|
19
|
+
protected buildFilePath(filename: string): string;
|
|
15
20
|
deleteByParent(scope: string, parent: string): void;
|
|
16
21
|
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { fileUtils } from "../utils/index.js";
|
|
2
|
+
import dayjs from "dayjs";
|
|
3
|
+
import path from "path";
|
|
4
|
+
import fs from "fs";
|
|
5
|
+
import { logger } from "../utils/index.js";
|
|
6
|
+
export class FileStore {
|
|
7
|
+
rootDir;
|
|
8
|
+
scope;
|
|
9
|
+
parent;
|
|
10
|
+
constructor(options) {
|
|
11
|
+
this.rootDir = fileUtils.getFileRootDir(options?.rootDir);
|
|
12
|
+
this.scope = options?.scope || "0";
|
|
13
|
+
this.parent = options?.parent || "0";
|
|
14
|
+
}
|
|
15
|
+
readFile(filePath) {
|
|
16
|
+
if (!fs.existsSync(filePath)) {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
return fs.readFileSync(filePath);
|
|
20
|
+
}
|
|
21
|
+
writeFile(filename, file) {
|
|
22
|
+
const localPath = this.buildFilePath(filename);
|
|
23
|
+
fs.writeFileSync(localPath, file);
|
|
24
|
+
logger.info(`写入文件:${localPath}`);
|
|
25
|
+
return localPath;
|
|
26
|
+
}
|
|
27
|
+
buildFilePath(filename) {
|
|
28
|
+
const parentDir = path.join(this.rootDir, this.scope + "", this.parent + "", dayjs().format("YYYY-MM-DD"));
|
|
29
|
+
if (!fs.existsSync(parentDir)) {
|
|
30
|
+
fs.mkdirSync(parentDir, { recursive: true });
|
|
31
|
+
}
|
|
32
|
+
return path.join(parentDir, filename);
|
|
33
|
+
}
|
|
34
|
+
deleteByParent(scope, parent) {
|
|
35
|
+
const dir = path.join(this.rootDir, scope, parent);
|
|
36
|
+
if (fs.existsSync(dir)) {
|
|
37
|
+
fs.unlinkSync(dir);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZS1zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb3JlL2ZpbGUtc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzlDLE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMxQixPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFDeEIsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3BCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQWMzQyxNQUFNLE9BQU8sU0FBUztJQUNwQixPQUFPLENBQVM7SUFDaEIsS0FBSyxDQUFTO0lBQ2QsTUFBTSxDQUFTO0lBQ2YsWUFBWSxPQUEwQjtRQUNwQyxJQUFJLENBQUMsT0FBTyxHQUFHLFNBQVMsQ0FBQyxjQUFjLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQzFELElBQUksQ0FBQyxLQUFLLEdBQUcsT0FBTyxFQUFFLEtBQUssSUFBSSxHQUFHLENBQUM7UUFDbkMsSUFBSSxDQUFDLE1BQU0sR0FBRyxPQUFPLEVBQUUsTUFBTSxJQUFJLEdBQUcsQ0FBQztJQUN2QyxDQUFDO0lBRUQsUUFBUSxDQUFDLFFBQWdCO1FBQ3ZCLElBQUksQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7WUFDN0IsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBQ0QsT0FBTyxFQUFFLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFFRCxTQUFTLENBQUMsUUFBZ0IsRUFBRSxJQUFZO1FBQ3RDLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFL0MsRUFBRSxDQUFDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDbEMsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLFNBQVMsRUFBRSxDQUFDLENBQUM7UUFDakMsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVTLGFBQWEsQ0FBQyxRQUFnQjtRQUN0QyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLEtBQUssR0FBRyxFQUFFLEVBQUUsSUFBSSxDQUFDLE1BQU0sR0FBRyxFQUFFLEVBQUUsS0FBSyxFQUFFLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7UUFDM0csSUFBSSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztZQUM5QixFQUFFLENBQUMsU0FBUyxDQUFDLFNBQVMsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQy9DLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFFRCxjQUFjLENBQUMsS0FBYSxFQUFFLE1BQWM7UUFDMUMsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztRQUNuRCxJQUFJLEVBQUUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUN2QixFQUFFLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3JCLENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export * from "./executor.js";
|
|
2
|
+
export * from "./run-history.js";
|
|
3
|
+
export * from "./context.js";
|
|
4
|
+
export * from "./storage.js";
|
|
5
|
+
export * from "./file-store.js";
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29yZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsaUJBQWlCLENBQUMifQ==
|