@certd/pipeline 1.24.0 → 1.24.2
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 +16 -0
- package/build.md +1 -1
- package/dist/access/api.d.ts +1 -0
- package/dist/core/executor.d.ts +3 -1
- package/dist/core/executor.js +59 -44
- package/dist/core/license.d.ts +2 -20
- package/dist/core/license.js +7 -107
- package/dist/core/run-history.d.ts +1 -0
- package/dist/core/run-history.js +11 -5
- package/dist/dt/pipeline.d.ts +1 -1
- package/dist/index.d.ts +0 -1
- package/dist/plugin/api.d.ts +2 -0
- package/dist/plugin/api.js +1 -1
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.js +2 -1
- package/dist/utils/util.hash.d.ts +5 -0
- package/dist/utils/util.hash.js +8 -0
- package/dist/utils/util.request.d.ts +13 -0
- package/dist/utils/util.request.js +29 -30
- package/dist/utils/util.sp.d.ts +1 -1
- package/dist/utils/util.sp.js +4 -1
- package/package.json +3 -2
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,22 @@
|
|
|
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.24.2](https://github.com/certd/certd/compare/v1.24.1...v1.24.2) (2024-09-06)
|
|
7
|
+
|
|
8
|
+
### Performance Improvements
|
|
9
|
+
|
|
10
|
+
* 优化跳过处理逻辑 ([b80210f](https://github.com/certd/certd/commit/b80210f24bf5db1c958d06ab27c9e5d3db452eda))
|
|
11
|
+
* 支持pfx、der ([fbeaed2](https://github.com/certd/certd/commit/fbeaed203519f59b6d9396c4e8953353ccb5e723))
|
|
12
|
+
|
|
13
|
+
## [1.24.1](https://github.com/certd/certd/compare/v1.24.0...v1.24.1) (2024-09-02)
|
|
14
|
+
|
|
15
|
+
### Performance Improvements
|
|
16
|
+
|
|
17
|
+
* 部署插件支持宝塔、易盾云等 ([ee61709](https://github.com/certd/certd/commit/ee617095efa1171548cf52fd45f0f98a368555a3))
|
|
18
|
+
* 授权配置支持加密 ([42a56b5](https://github.com/certd/certd/commit/42a56b581d754c3e5f9838179d19ab0d004ef2eb))
|
|
19
|
+
* 支持阿里云 DCDN ([98b77f8](https://github.com/certd/certd/commit/98b77f80843834616fb26f83b4c42245326abd06))
|
|
20
|
+
* 支持已跳过的步骤重新运行 ([ea775ad](https://github.com/certd/certd/commit/ea775adae18d57a04470cfba6b9460d761d74035))
|
|
21
|
+
|
|
6
22
|
# [1.24.0](https://github.com/certd/certd/compare/v1.23.1...v1.24.0) (2024-08-25)
|
|
7
23
|
|
|
8
24
|
### Bug Fixes
|
package/build.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
22:33
|
package/dist/access/api.d.ts
CHANGED
package/dist/core/executor.d.ts
CHANGED
|
@@ -25,16 +25,18 @@ export declare class Executor {
|
|
|
25
25
|
lastRuntime: RunHistory;
|
|
26
26
|
options: ExecutorOptions;
|
|
27
27
|
abort: AbortController;
|
|
28
|
+
_inited: boolean;
|
|
28
29
|
onChanged: (history: RunHistory) => Promise<void>;
|
|
29
30
|
constructor(options: ExecutorOptions);
|
|
30
31
|
init(): Promise<void>;
|
|
31
32
|
cancel(): Promise<void>;
|
|
32
33
|
run(runtimeId: any, triggerType: string): Promise<void>;
|
|
33
|
-
runWithHistory(runnable: Runnable, runnableType: string, run: () => Promise<void>): Promise<ResultType.success | ResultType.canceled | ResultType.skip>;
|
|
34
|
+
runWithHistory(runnable: Runnable, runnableType: string, run: () => Promise<ResultType | void>): Promise<ResultType.success | ResultType.canceled | ResultType.skip>;
|
|
34
35
|
private runStages;
|
|
35
36
|
runStage(stage: Stage): Promise<ResultType.success | ResultType.error>;
|
|
36
37
|
compositionResultType(resList: ResultType[]): ResultType.success | ResultType.error;
|
|
37
38
|
private runTask;
|
|
38
39
|
private runStep;
|
|
39
40
|
notification(when: NotificationWhen, error?: any): Promise<void>;
|
|
41
|
+
clearLastStatus(stepId: string): void;
|
|
40
42
|
}
|
package/dist/core/executor.js
CHANGED
|
@@ -7,6 +7,7 @@ import { logger } from "../utils/util.log.js";
|
|
|
7
7
|
import { createAxiosService } from "../utils/util.request.js";
|
|
8
8
|
import { Decorator } from "../decorator/index.js";
|
|
9
9
|
import { FileStore } from "./file-store.js";
|
|
10
|
+
import { hashUtils } from "../utils/index.js";
|
|
10
11
|
export class Executor {
|
|
11
12
|
pipeline;
|
|
12
13
|
runtime;
|
|
@@ -18,6 +19,7 @@ export class Executor {
|
|
|
18
19
|
lastRuntime;
|
|
19
20
|
options;
|
|
20
21
|
abort = new AbortController();
|
|
22
|
+
_inited = false;
|
|
21
23
|
onChanged;
|
|
22
24
|
constructor(options) {
|
|
23
25
|
this.options = options;
|
|
@@ -31,6 +33,10 @@ export class Executor {
|
|
|
31
33
|
this.pipelineContext = this.contextFactory.getContext("pipeline", this.pipeline.id);
|
|
32
34
|
}
|
|
33
35
|
async init() {
|
|
36
|
+
if (this._inited) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
this._inited = true;
|
|
34
40
|
const lastRuntime = await this.pipelineContext.getObj(`lastRuntime`);
|
|
35
41
|
this.lastRuntime = lastRuntime;
|
|
36
42
|
this.lastStatusMap = new RunnableCollection(lastRuntime?.pipeline);
|
|
@@ -42,6 +48,7 @@ export class Executor {
|
|
|
42
48
|
await this.onChanged(this.runtime);
|
|
43
49
|
}
|
|
44
50
|
async run(runtimeId = 0, triggerType) {
|
|
51
|
+
let intervalFlushLogId = undefined;
|
|
45
52
|
try {
|
|
46
53
|
await this.init();
|
|
47
54
|
const trigger = { type: triggerType };
|
|
@@ -49,8 +56,12 @@ export class Executor {
|
|
|
49
56
|
this.runtime = new RunHistory(runtimeId, trigger, this.pipeline);
|
|
50
57
|
this.logger.info(`pipeline.${this.pipeline.id} start`);
|
|
51
58
|
await this.notification("start");
|
|
59
|
+
this.runtime.start(this.pipeline);
|
|
60
|
+
intervalFlushLogId = setInterval(async () => {
|
|
61
|
+
await this.onChanged(this.runtime);
|
|
62
|
+
}, 5000);
|
|
52
63
|
await this.runWithHistory(this.pipeline, "pipeline", async () => {
|
|
53
|
-
await this.runStages(this.pipeline);
|
|
64
|
+
return await this.runStages(this.pipeline);
|
|
54
65
|
});
|
|
55
66
|
if (this.lastRuntime && this.lastRuntime.pipeline.status?.status === ResultType.error) {
|
|
56
67
|
await this.notification("turnToSuccess");
|
|
@@ -59,9 +70,11 @@ export class Executor {
|
|
|
59
70
|
}
|
|
60
71
|
catch (e) {
|
|
61
72
|
await this.notification("error", e);
|
|
62
|
-
this.logger.error("pipeline 执行失败", e);
|
|
73
|
+
this.logger.error("pipeline 执行失败", e.stack);
|
|
63
74
|
}
|
|
64
75
|
finally {
|
|
76
|
+
clearInterval(intervalFlushLogId);
|
|
77
|
+
await this.onChanged(this.runtime);
|
|
65
78
|
await this.pipelineContext.setObj("lastRuntime", this.runtime);
|
|
66
79
|
this.logger.info(`pipeline.${this.pipeline.id} end`);
|
|
67
80
|
}
|
|
@@ -69,43 +82,22 @@ export class Executor {
|
|
|
69
82
|
async runWithHistory(runnable, runnableType, run) {
|
|
70
83
|
runnable.runnableType = runnableType;
|
|
71
84
|
this.runtime.start(runnable);
|
|
72
|
-
await this.onChanged(this.runtime);
|
|
73
|
-
if (runnable.strategy?.runStrategy === RunStrategy.SkipWhenSucceed) {
|
|
74
|
-
//如果是成功后跳过策略
|
|
75
|
-
const lastNode = this.lastStatusMap.get(runnable.id);
|
|
76
|
-
const lastResult = lastNode?.status?.status;
|
|
77
|
-
const lastInput = JSON.stringify(lastNode?.status?.input);
|
|
78
|
-
let inputChanged = false;
|
|
79
|
-
if (runnableType === "step") {
|
|
80
|
-
const step = runnable;
|
|
81
|
-
const input = JSON.stringify(step.input);
|
|
82
|
-
if (input != null && lastInput !== input) {
|
|
83
|
-
//参数有变化
|
|
84
|
-
inputChanged = true;
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
if (lastResult != null && lastResult === ResultType.success && !inputChanged) {
|
|
88
|
-
runnable.status.output = lastNode?.status?.output;
|
|
89
|
-
runnable.status.files = lastNode?.status?.files;
|
|
90
|
-
this.runtime.skip(runnable);
|
|
91
|
-
await this.onChanged(this.runtime);
|
|
92
|
-
return ResultType.skip;
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
const intervalFlushLogId = setInterval(async () => {
|
|
96
|
-
await this.onChanged(this.runtime);
|
|
97
|
-
}, 5000);
|
|
98
85
|
// const timeout = runnable.timeout ?? 20 * 60 * 1000;
|
|
86
|
+
await this.onChanged(this.runtime);
|
|
99
87
|
try {
|
|
100
88
|
if (this.abort.signal.aborted) {
|
|
101
89
|
this.runtime.cancel(runnable);
|
|
102
90
|
return ResultType.canceled;
|
|
103
91
|
}
|
|
104
|
-
await run();
|
|
92
|
+
const resultType = await run();
|
|
105
93
|
if (this.abort.signal.aborted) {
|
|
106
94
|
this.runtime.cancel(runnable);
|
|
107
95
|
return ResultType.canceled;
|
|
108
96
|
}
|
|
97
|
+
if (resultType == ResultType.skip) {
|
|
98
|
+
this.runtime.skip(runnable);
|
|
99
|
+
return resultType;
|
|
100
|
+
}
|
|
109
101
|
this.runtime.success(runnable);
|
|
110
102
|
return ResultType.success;
|
|
111
103
|
}
|
|
@@ -115,7 +107,6 @@ export class Executor {
|
|
|
115
107
|
}
|
|
116
108
|
finally {
|
|
117
109
|
this.runtime.finally(runnable);
|
|
118
|
-
clearInterval(intervalFlushLogId);
|
|
119
110
|
await this.onChanged(this.runtime);
|
|
120
111
|
}
|
|
121
112
|
}
|
|
@@ -123,7 +114,7 @@ export class Executor {
|
|
|
123
114
|
const resList = [];
|
|
124
115
|
for (const stage of pipeline.stages) {
|
|
125
116
|
const res = await this.runWithHistory(stage, "stage", async () => {
|
|
126
|
-
await this.runStage(stage);
|
|
117
|
+
return await this.runStage(stage);
|
|
127
118
|
});
|
|
128
119
|
resList.push(res);
|
|
129
120
|
}
|
|
@@ -135,6 +126,7 @@ export class Executor {
|
|
|
135
126
|
const runner = async () => {
|
|
136
127
|
return this.runWithHistory(task, "task", async () => {
|
|
137
128
|
await this.runTask(task);
|
|
129
|
+
return ResultType.success;
|
|
138
130
|
});
|
|
139
131
|
};
|
|
140
132
|
runnerList.push(runner);
|
|
@@ -175,7 +167,7 @@ export class Executor {
|
|
|
175
167
|
for (const step of task.steps) {
|
|
176
168
|
step.runnableType = "step";
|
|
177
169
|
const res = await this.runWithHistory(step, "step", async () => {
|
|
178
|
-
await this.runStep(step);
|
|
170
|
+
return await this.runStep(step);
|
|
179
171
|
});
|
|
180
172
|
resList.push(res);
|
|
181
173
|
}
|
|
@@ -192,18 +184,38 @@ export class Executor {
|
|
|
192
184
|
// @ts-ignore
|
|
193
185
|
const define = plugin.define;
|
|
194
186
|
//从outputContext读取输入参数
|
|
195
|
-
|
|
187
|
+
const input = _.cloneDeep(step.input);
|
|
188
|
+
Decorator.inject(define.input, instance, input, (item, key) => {
|
|
196
189
|
if (item.component?.name === "pi-output-selector") {
|
|
197
|
-
const contextKey =
|
|
190
|
+
const contextKey = input[key];
|
|
198
191
|
if (contextKey != null) {
|
|
199
192
|
// "cert": "step.-BNFVPMKPu2O-i9NiOQxP.cert",
|
|
200
193
|
const arr = contextKey.split(".");
|
|
201
194
|
const id = arr[1];
|
|
202
195
|
const outputKey = arr[2];
|
|
203
|
-
|
|
196
|
+
input[key] = this.currentStatusMap.get(id)?.status?.output[outputKey] ?? this.lastStatusMap.get(id)?.status?.output[outputKey];
|
|
204
197
|
}
|
|
205
198
|
}
|
|
206
199
|
});
|
|
200
|
+
const newInputHash = hashUtils.md5(JSON.stringify(input));
|
|
201
|
+
step.status.inputHash = newInputHash;
|
|
202
|
+
//判断是否需要跳过
|
|
203
|
+
const lastNode = this.lastStatusMap.get(step.id);
|
|
204
|
+
const lastResult = lastNode?.status?.status;
|
|
205
|
+
if (step.strategy?.runStrategy === RunStrategy.SkipWhenSucceed) {
|
|
206
|
+
//如果是成功后跳过策略
|
|
207
|
+
let inputChanged = true;
|
|
208
|
+
const lastInputHash = lastNode?.status?.inputHash;
|
|
209
|
+
if (lastInputHash && newInputHash && lastInputHash === newInputHash) {
|
|
210
|
+
//参数有变化
|
|
211
|
+
inputChanged = false;
|
|
212
|
+
}
|
|
213
|
+
if (lastResult != null && lastResult === ResultType.success && !inputChanged) {
|
|
214
|
+
step.status.output = lastNode?.status?.output;
|
|
215
|
+
step.status.files = lastNode?.status?.files;
|
|
216
|
+
return ResultType.skip;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
207
219
|
const http = createAxiosService({ logger: currentLogger });
|
|
208
220
|
const taskCtx = {
|
|
209
221
|
pipeline: this.pipeline,
|
|
@@ -252,20 +264,20 @@ export class Executor {
|
|
|
252
264
|
let subject = "";
|
|
253
265
|
let content = "";
|
|
254
266
|
if (when === "start") {
|
|
255
|
-
subject = `【CertD
|
|
256
|
-
content =
|
|
267
|
+
subject = `【CertD】开始执行，【${this.pipeline.id}】${this.pipeline.title}`;
|
|
268
|
+
content = `buildId:${this.runtime.id}`;
|
|
257
269
|
}
|
|
258
270
|
else if (when === "success") {
|
|
259
|
-
subject = `【CertD
|
|
260
|
-
content =
|
|
271
|
+
subject = `【CertD】执行成功，【${this.pipeline.id}】${this.pipeline.title}`;
|
|
272
|
+
content = `buildId:${this.runtime.id}`;
|
|
261
273
|
}
|
|
262
274
|
else if (when === "turnToSuccess") {
|
|
263
|
-
subject = `【CertD
|
|
264
|
-
content =
|
|
275
|
+
subject = `【CertD】执行成功（错误转成功），【${this.pipeline.id}】${this.pipeline.title}`;
|
|
276
|
+
content = `buildId:${this.runtime.id}`;
|
|
265
277
|
}
|
|
266
278
|
else if (when === "error") {
|
|
267
|
-
subject = `【CertD
|
|
268
|
-
content =
|
|
279
|
+
subject = `【CertD】执行失败，【${this.pipeline.id}】${this.pipeline.title}`;
|
|
280
|
+
content = `buildId:${this.runtime.id}\nerror:${error.message}`;
|
|
269
281
|
}
|
|
270
282
|
else {
|
|
271
283
|
return;
|
|
@@ -289,5 +301,8 @@ export class Executor {
|
|
|
289
301
|
}
|
|
290
302
|
}
|
|
291
303
|
}
|
|
304
|
+
clearLastStatus(stepId) {
|
|
305
|
+
this.lastStatusMap.clearById(stepId);
|
|
306
|
+
}
|
|
292
307
|
}
|
|
293
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/core/executor.ts"],"names":[],"mappings":"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"}
|
|
308
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/core/executor.ts"],"names":[],"mappings":"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"}
|
package/dist/core/license.d.ts
CHANGED
|
@@ -1,20 +1,2 @@
|
|
|
1
|
-
export
|
|
2
|
-
export
|
|
3
|
-
subjectId: string;
|
|
4
|
-
license: string;
|
|
5
|
-
};
|
|
6
|
-
export declare function isPlus(): boolean;
|
|
7
|
-
export declare function isCommercial(): boolean;
|
|
8
|
-
export declare function getPlusInfo(): {
|
|
9
|
-
isPlus: boolean;
|
|
10
|
-
vipType: string;
|
|
11
|
-
expireTime: number;
|
|
12
|
-
secret: string | undefined;
|
|
13
|
-
};
|
|
14
|
-
export declare function verify(req: LicenseVerifyReq): Promise<{
|
|
15
|
-
isPlus: boolean;
|
|
16
|
-
expireTime: number;
|
|
17
|
-
vipType: string;
|
|
18
|
-
message?: string | undefined;
|
|
19
|
-
secret?: string | undefined;
|
|
20
|
-
}>;
|
|
1
|
+
export * from "@certd/plus";
|
|
2
|
+
export declare function checkPlus(): void;
|
package/dist/core/license.js
CHANGED
|
@@ -1,110 +1,10 @@
|
|
|
1
|
-
import { createVerify } from "node:crypto";
|
|
2
1
|
import { logger } from "../utils/index.js";
|
|
3
|
-
import
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
"
|
|
9
|
-
appKey = "z4nXOeTeSnnpUpnmsV1";
|
|
10
|
-
}
|
|
11
|
-
export const AppKey = appKey;
|
|
12
|
-
class LicenseHolder {
|
|
13
|
-
isPlus = false;
|
|
14
|
-
expireTime = 0;
|
|
15
|
-
vipType = "";
|
|
16
|
-
message = undefined;
|
|
17
|
-
secret = undefined;
|
|
18
|
-
}
|
|
19
|
-
const holder = new LicenseHolder();
|
|
20
|
-
holder.isPlus = false;
|
|
21
|
-
class LicenseVerifier {
|
|
22
|
-
checked = false;
|
|
23
|
-
licenseReq = undefined;
|
|
24
|
-
async reVerify(req) {
|
|
25
|
-
this.checked = false;
|
|
26
|
-
return await this.verify(req);
|
|
27
|
-
}
|
|
28
|
-
setPlus(value, info = {}) {
|
|
29
|
-
if (value && info) {
|
|
30
|
-
holder.isPlus = true;
|
|
31
|
-
holder.expireTime = info.expireTime;
|
|
32
|
-
holder.secret = info.secret;
|
|
33
|
-
holder.vipType = info.vipType;
|
|
34
|
-
}
|
|
35
|
-
else {
|
|
36
|
-
holder.isPlus = false;
|
|
37
|
-
holder.expireTime = 0;
|
|
38
|
-
holder.vipType = "";
|
|
39
|
-
holder.message = info.message;
|
|
40
|
-
holder.secret = undefined;
|
|
41
|
-
}
|
|
42
|
-
return {
|
|
43
|
-
...holder,
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
async verify(req) {
|
|
47
|
-
this.licenseReq = req;
|
|
48
|
-
if (this.checked) {
|
|
49
|
-
return this.setPlus(false);
|
|
50
|
-
}
|
|
51
|
-
const license = req?.license;
|
|
52
|
-
if (!license) {
|
|
53
|
-
this.checked = true;
|
|
54
|
-
return this.setPlus(false);
|
|
55
|
-
}
|
|
56
|
-
const licenseJson = Buffer.from(license, "base64").toString();
|
|
57
|
-
const json = JSON.parse(licenseJson);
|
|
58
|
-
if (json.expireTime < Date.now()) {
|
|
59
|
-
logger.warn("授权已过期");
|
|
60
|
-
return this.setPlus(false, { message: "授权已过期" });
|
|
61
|
-
}
|
|
62
|
-
const content = `${appKey},${this.licenseReq.subjectId},${json.code},${json.secret},${json.vipType},${json.activeTime},${json.duration},${json.expireTime},${json.version}`;
|
|
63
|
-
// content := fmt.Sprintf("%s,%s,%s,%s,%d,%d,%d,%d,%d", entity.AppKey, entity.SubjectId, entity.Code, entity.Secret, entity.Level, entity.ActiveTime, entity.Duration, entity.ExpireTime, entity.Version)
|
|
64
|
-
//z4nXOeTeSnnpUpnmsV,_m9jFTdNHktdaEN4xBDw_,HZz7rAAR3h3zGlDMhScO1wGBYPjXpZ9S_1,uUpr9I8p6K3jWSzu2Wh5NECvgG2FNynU,0,1724199847470,365,1787271324416,1
|
|
65
|
-
logger.debug("content:", content);
|
|
66
|
-
const publicKey = Buffer.from(SecreteKey, "base64").toString();
|
|
67
|
-
const res = this.verifySignature(content, json.signature, publicKey);
|
|
68
|
-
this.checked = true;
|
|
69
|
-
if (!res) {
|
|
70
|
-
logger.warn("授权校验失败");
|
|
71
|
-
return this.setPlus(false, { message: "授权校验失败" });
|
|
72
|
-
}
|
|
73
|
-
logger.info(`授权校验成功，到期时间：${dayjs(json.expireTime).format("YYYY-MM-DD HH:mm:ss")}`);
|
|
74
|
-
return this.setPlus(true, {
|
|
75
|
-
expireTime: json.expireTime,
|
|
76
|
-
vipType: json.vipType || "plus",
|
|
77
|
-
secret: json.secret,
|
|
78
|
-
});
|
|
79
|
-
}
|
|
80
|
-
verifySignature(content, signature, publicKey) {
|
|
81
|
-
const verify = createVerify("RSA-SHA256");
|
|
82
|
-
verify.update(content);
|
|
83
|
-
return verify.verify(publicKey, signature, "base64");
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
const verifier = new LicenseVerifier();
|
|
87
|
-
export function isPlus() {
|
|
88
|
-
return holder.isPlus && holder.expireTime > Date.now();
|
|
89
|
-
}
|
|
90
|
-
export function isCommercial() {
|
|
91
|
-
return holder.isPlus && holder.vipType === "comm" && holder.expireTime > Date.now();
|
|
92
|
-
}
|
|
93
|
-
export function getPlusInfo() {
|
|
94
|
-
return {
|
|
95
|
-
isPlus: holder.isPlus,
|
|
96
|
-
vipType: holder.vipType,
|
|
97
|
-
expireTime: holder.expireTime,
|
|
98
|
-
secret: holder.secret,
|
|
99
|
-
};
|
|
100
|
-
}
|
|
101
|
-
export async function verify(req) {
|
|
102
|
-
try {
|
|
103
|
-
return await verifier.reVerify(req);
|
|
104
|
-
}
|
|
105
|
-
catch (e) {
|
|
106
|
-
logger.error(e);
|
|
107
|
-
return verifier.setPlus(false, { message: "授权校验失败" });
|
|
2
|
+
import { setLogger, isPlus } from "@certd/plus";
|
|
3
|
+
setLogger(logger);
|
|
4
|
+
export * from "@certd/plus";
|
|
5
|
+
export function checkPlus() {
|
|
6
|
+
if (!isPlus()) {
|
|
7
|
+
throw new Error("此为专业版功能，请升级到专业版");
|
|
108
8
|
}
|
|
109
9
|
}
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGljZW5zZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb3JlL2xpY2Vuc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ2hELFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUNsQixjQUFjLGFBQWEsQ0FBQztBQUU1QixNQUFNLFVBQVUsU0FBUztJQUN2QixJQUFJLENBQUMsTUFBTSxFQUFFLEVBQUU7UUFDYixNQUFNLElBQUksS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7S0FDcEM7QUFDSCxDQUFDIn0=
|
package/dist/core/run-history.js
CHANGED
|
@@ -24,10 +24,8 @@ export class RunHistory {
|
|
|
24
24
|
this._loggers[runnable.id] = buildLogger((text) => {
|
|
25
25
|
this.logs[runnable.id].push(text);
|
|
26
26
|
});
|
|
27
|
-
const input = runnable.input;
|
|
28
27
|
const status = {
|
|
29
28
|
output: {},
|
|
30
|
-
input: _.cloneDeep(input),
|
|
31
29
|
status: ResultType.start,
|
|
32
30
|
startTime: now,
|
|
33
31
|
result: ResultType.start,
|
|
@@ -80,11 +78,12 @@ export class RunHistory {
|
|
|
80
78
|
}
|
|
81
79
|
log(runnable, text) {
|
|
82
80
|
// @ts-ignore
|
|
83
|
-
this._loggers[runnable.id].info(`[${runnable.title}]<id:${runnable.id}>
|
|
81
|
+
this._loggers[runnable.id].info(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> ：`, text);
|
|
84
82
|
}
|
|
85
83
|
logError(runnable, e) {
|
|
86
84
|
// @ts-ignore
|
|
87
|
-
|
|
85
|
+
const errorInfo = runnable.runnableType == "step" ? e.stack : e.message;
|
|
86
|
+
this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> ：${errorInfo}`);
|
|
88
87
|
}
|
|
89
88
|
finally(runnable) {
|
|
90
89
|
//
|
|
@@ -136,8 +135,15 @@ export class RunnableCollection {
|
|
|
136
135
|
item.status = undefined;
|
|
137
136
|
});
|
|
138
137
|
}
|
|
138
|
+
clearById(id) {
|
|
139
|
+
const runnable = this.collection[id];
|
|
140
|
+
if (runnable?.status) {
|
|
141
|
+
runnable.status.status = ResultType.none;
|
|
142
|
+
runnable.status.result = ResultType.none;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
139
145
|
add(runnable) {
|
|
140
146
|
this.collection[runnable.id] = runnable;
|
|
141
147
|
}
|
|
142
148
|
}
|
|
143
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVuLWhpc3RvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29yZS9ydW4taGlzdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTJCLFVBQVUsRUFBNEMsTUFBTSxnQkFBZ0IsQ0FBQztBQUMvRyxPQUFPLENBQUMsTUFBTSxXQUFXLENBQUM7QUFDMUIsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBWW5ELE1BQU0sVUFBVSxhQUFhLENBQUMsR0FBUTtJQUNwQyxNQUFNLE9BQU8sR0FBRyxJQUFJLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLEdBQUcsQ0FBQyxPQUFPLEVBQUUsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2xFLE9BQU8sQ0FBQyxJQUFJLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQztJQUN4QixPQUFPLENBQUMsUUFBUSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUM7SUFDL0IsT0FBTyxPQUFPLENBQUM7QUFDakIsQ0FBQztBQUNELE1BQU0sT0FBTyxVQUFVO0lBQ3JCLEVBQUUsQ0FBVTtJQUNaLFFBQVEsQ0FBWTtJQUNwQixJQUFJLEdBRUEsRUFBRSxDQUFDO0lBQ1AsUUFBUSxHQUVKLEVBQUUsQ0FBQztJQUNQLE9BQU8sQ0FBYztJQUVyQixZQUFZLFNBQWMsRUFBRSxPQUFtQixFQUFFLFFBQWtCO1FBQ2pFLElBQUksQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDO1FBQ3BCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBa0I7UUFDdEIsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNqQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFF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
|
package/dist/dt/pipeline.d.ts
CHANGED
package/dist/index.d.ts
CHANGED
package/dist/plugin/api.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ export declare enum ContextScope {
|
|
|
16
16
|
export type TaskOutputDefine = {
|
|
17
17
|
title: string;
|
|
18
18
|
value?: any;
|
|
19
|
+
type?: string;
|
|
19
20
|
};
|
|
20
21
|
export type TaskInputDefine = FormItemProps;
|
|
21
22
|
export type PluginDefine = Registrable & {
|
|
@@ -35,6 +36,7 @@ export type PluginDefine = Registrable & {
|
|
|
35
36
|
dest: string;
|
|
36
37
|
type: "computed";
|
|
37
38
|
}[];
|
|
39
|
+
needPlus?: boolean;
|
|
38
40
|
};
|
|
39
41
|
export type ITaskPlugin = {
|
|
40
42
|
onInstance(): Promise<void>;
|
package/dist/plugin/api.js
CHANGED
|
@@ -49,4 +49,4 @@ export class AbstractTaskPlugin {
|
|
|
49
49
|
return;
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3BsdWdpbi9hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUUEsT0FBTyxFQUFXLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXBELE1BQU0sQ0FBTixJQUFZLFlBSVg7QUFKRCxXQUFZLFlBQVk7SUFDdEIsbURBQU0sQ0FBQTtJQUNOLHVEQUFRLENBQUE7SUFDUixxREFBTyxDQUFBO0FBQ1QsQ0FBQyxFQUpXLFlBQVksS0FBWixZQUFZLFFBSXZCO0FBMERELE1BQU0sT0FBZ0Isa0JBQWtCO0lBQ3RDLE9BQU8sR0FBZSxFQUFFLGVBQWUsRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxZQUFZLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFDOUUsR0FBRyxDQUF1QjtJQUMxQixNQUFNLENBQVc7SUFDakIsYUFBYSxDQUFrQjtJQUUvQixlQUFlO1FBQ2IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLEdBQUcsSUFBSSxDQUFDO0lBQ3RDLENBQUM7SUFFRCxRQUFRO1FBQ04sT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQztJQUM1QixDQUFDO0lBRUQsTUFBTSxDQUFDLEdBQXdCO1FBQzdCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2YsSUFBSSxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxhQUFhLEdBQUcsR0FBRyxDQUFDLGFBQWEsQ0FBQztJQUN6QyxDQUFDO0lBRUQsWUFBWTtRQUNWLE9BQU8sSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFDRCxRQUFRLENBQUMsUUFBZ0IsRUFBRSxJQUFZO1FBQ3JDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDOUQsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDcEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDO1lBQ3ZCLEVBQUUsRUFBRSxJQUFJLENBQUMsWUFBWSxFQUFFO1lBQ3ZCLFFBQVE7WUFDUixJQUFJLEVBQUUsUUFBUTtTQUNmLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxZQUFZO1FBQ1YsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssSUFBSSxJQUFJLEVBQUU7WUFDOUIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEdBQUcsRUFBRSxDQUFDO1NBQ3pCO1FBQ0QsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDekUsQ0FBQztJQUVELElBQUksUUFBUTtRQUNWLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7SUFDM0IsQ0FBQztJQUVELElBQUksSUFBSTtRQUNOLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUM7SUFDdkIsQ0FBQztJQUVELEtBQUssQ0FBQyxVQUFVO1FBQ2QsT0FBTztJQUNULENBQUM7Q0FHRiJ9
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export * from "./util.log.js";
|
|
|
3
3
|
export * from "./util.file.js";
|
|
4
4
|
export * from "./util.sp.js";
|
|
5
5
|
export * as promises from "./util.promise.js";
|
|
6
|
+
export * from "./util.hash.js";
|
|
6
7
|
export declare const utils: {
|
|
7
8
|
sleep: typeof sleep;
|
|
8
9
|
http: import("axios").AxiosInstance;
|
package/dist/utils/index.js
CHANGED
|
@@ -4,8 +4,9 @@ export * from "./util.log.js";
|
|
|
4
4
|
export * from "./util.file.js";
|
|
5
5
|
export * from "./util.sp.js";
|
|
6
6
|
export * as promises from "./util.promise.js";
|
|
7
|
+
export * from "./util.hash.js";
|
|
7
8
|
export const utils = {
|
|
8
9
|
sleep,
|
|
9
10
|
http: request,
|
|
10
11
|
};
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE1BQU0saUJBQWlCLENBQUM7QUFDcEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzVDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxjQUFjLENBQUM7QUFDN0IsT0FBTyxLQUFLLFFBQVEsTUFBTSxtQkFBbUIsQ0FBQztBQUM5QyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRztJQUNuQixLQUFLO0lBQ0wsSUFBSSxFQUFFLE9BQU87Q0FDZCxDQUFDIn0=
|