@certd/pipeline 1.25.5 → 1.25.7
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/core/executor.d.ts +2 -1
- package/dist/core/executor.js +4 -3
- package/dist/core/file-store.d.ts +1 -0
- package/dist/core/handler.d.ts +13 -7
- package/dist/core/handler.js +2 -2
- package/dist/plugin/api.d.ts +12 -8
- package/dist/plugin/api.js +28 -1
- package/dist/plugin/group.d.ts +1 -0
- package/dist/plugin/group.js +3 -2
- package/dist/registry/registry.d.ts +2 -0
- package/dist/registry/registry.js +4 -1
- package/dist/utils/index.d.ts +7 -0
- package/dist/utils/index.js +7 -1
- package/dist/utils/util.cache.d.ts +2 -0
- package/dist/utils/util.cache.js +7 -0
- package/dist/utils/util.merge.d.ts +11 -0
- package/dist/utils/util.merge.js +59 -0
- package/dist/utils/util.request.d.ts +1 -0
- package/dist/utils/util.request.js +2 -1
- package/package.json +5 -4
- package/stats.html +6177 -0
- package/test/index.test.js +18 -18
- package/test/pipeline/access-service-test.js +65 -65
- package/test/user.secret.ts +4 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/plugin/test/echo-plugin.d.ts +0 -6
- package/dist/plugin/test/echo-plugin.js +0 -37
- package/test/cert.fake.test.js +0 -4
- package/test/echo-plugin.ts +0 -27
- package/test/pipeline/init.test.js +0 -16
- package/test/pipeline/license.test.spec.js +0 -63
- package/test/pipeline/license.test.spec.ts +0 -16
- package/test/pipeline/pipeline.define.js +0 -68
- package/test/pipeline/pipeline.test.js +0 -70
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.25.7](https://github.com/certd/certd/compare/v1.25.6...v1.25.7) (2024-09-29)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* 修复某些地区被屏蔽无法激活专业版的bug ([7532a96](https://github.com/certd/certd/commit/7532a960851b84d4f2cc3dba02353c5235e1a364))
|
|
11
|
+
|
|
12
|
+
## [1.25.6](https://github.com/certd/certd/compare/v1.25.5...v1.25.6) (2024-09-29)
|
|
13
|
+
|
|
14
|
+
### Performance Improvements
|
|
15
|
+
|
|
16
|
+
* 部署支持1Panel ([d047234](https://github.com/certd/certd/commit/d047234d98d31504f2e5a472b66e1b75806af26e))
|
|
17
|
+
|
|
6
18
|
## [1.25.5](https://github.com/certd/certd/compare/v1.25.4...v1.25.5) (2024-09-26)
|
|
7
19
|
|
|
8
20
|
**Note:** Version bump only for package @certd/pipeline
|
package/dist/core/executor.d.ts
CHANGED
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
import { NotificationWhen, Pipeline, ResultType, Runnable, Stage } from "../dt/index.js";
|
|
2
2
|
import { RunHistory, RunnableCollection } from "./run-history.js";
|
|
3
|
+
import { UserInfo } from "../plugin/index.js";
|
|
3
4
|
import { ContextFactory, IContext } from "./context.js";
|
|
4
5
|
import { IStorage } from "./storage.js";
|
|
5
6
|
import { Logger } from "log4js";
|
|
6
7
|
import { IAccessService } from "../access/index.js";
|
|
7
8
|
import { IEmailService } from "../service/index.js";
|
|
8
9
|
export type ExecutorOptions = {
|
|
9
|
-
userId: any;
|
|
10
10
|
pipeline: Pipeline;
|
|
11
11
|
storage: IStorage;
|
|
12
12
|
onChanged: (history: RunHistory) => Promise<void>;
|
|
13
13
|
accessService: IAccessService;
|
|
14
14
|
emailService: IEmailService;
|
|
15
15
|
fileRootDir?: string;
|
|
16
|
+
user: UserInfo;
|
|
16
17
|
};
|
|
17
18
|
export declare class Executor {
|
|
18
19
|
pipeline: Pipeline;
|
package/dist/core/executor.js
CHANGED
|
@@ -27,7 +27,7 @@ export class Executor {
|
|
|
27
27
|
this.onChanged = async (history) => {
|
|
28
28
|
await options.onChanged(history);
|
|
29
29
|
};
|
|
30
|
-
this.pipeline.userId = options.
|
|
30
|
+
this.pipeline.userId = options.user.id;
|
|
31
31
|
this.contextFactory = new ContextFactory(options.storage);
|
|
32
32
|
this.logger = logger;
|
|
33
33
|
this.pipelineContext = this.contextFactory.getContext("pipeline", this.pipeline.id);
|
|
@@ -236,7 +236,7 @@ export class Executor {
|
|
|
236
236
|
accessService: this.options.accessService,
|
|
237
237
|
emailService: this.options.emailService,
|
|
238
238
|
pipelineContext: this.pipelineContext,
|
|
239
|
-
userContext: this.contextFactory.getContext("user", this.options.
|
|
239
|
+
userContext: this.contextFactory.getContext("user", this.options.user.id),
|
|
240
240
|
fileStore: new FileStore({
|
|
241
241
|
scope: this.pipeline.id,
|
|
242
242
|
parent: this.runtime.id,
|
|
@@ -244,6 +244,7 @@ export class Executor {
|
|
|
244
244
|
}),
|
|
245
245
|
signal: this.abort.signal,
|
|
246
246
|
utils,
|
|
247
|
+
user: this.options.user,
|
|
247
248
|
};
|
|
248
249
|
instance.setCtx(taskCtx);
|
|
249
250
|
await instance.onInstance();
|
|
@@ -316,4 +317,4 @@ export class Executor {
|
|
|
316
317
|
this.lastStatusMap.clearById(stepId);
|
|
317
318
|
}
|
|
318
319
|
}
|
|
319
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/core/executor.ts"],"names":[],"mappings":"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"}
|
|
320
|
+
//# 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/handler.d.ts
CHANGED
|
@@ -1,15 +1,21 @@
|
|
|
1
|
-
import { HttpClient, ILogger } from "../utils";
|
|
2
|
-
export type
|
|
3
|
-
type: "plugin" | "access";
|
|
1
|
+
import { HttpClient, ILogger, utils } from "../utils";
|
|
2
|
+
export type PluginRequestHandleReq<T = any> = {
|
|
4
3
|
typeName: string;
|
|
5
4
|
action: string;
|
|
6
|
-
input:
|
|
5
|
+
input: T;
|
|
7
6
|
data: any;
|
|
8
7
|
};
|
|
9
|
-
export type
|
|
8
|
+
export type AccessRequestHandleReqInput<T = any> = {
|
|
9
|
+
id?: number;
|
|
10
|
+
title?: string;
|
|
11
|
+
access: T;
|
|
12
|
+
};
|
|
13
|
+
export type AccessRequestHandleReq<T = any> = PluginRequestHandleReq<AccessRequestHandleReqInput<T>>;
|
|
14
|
+
export type AccessRequestHandleContext = {
|
|
10
15
|
http: HttpClient;
|
|
11
16
|
logger: ILogger;
|
|
17
|
+
utils: typeof utils;
|
|
12
18
|
};
|
|
13
|
-
export declare class
|
|
14
|
-
onRequest(req:
|
|
19
|
+
export declare class AccessRequestHandler<T = any> {
|
|
20
|
+
onRequest(req: AccessRequestHandleReq<T>, ctx: AccessRequestHandleContext): Promise<any>;
|
|
15
21
|
}
|
package/dist/core/handler.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _ from "lodash-es";
|
|
2
|
-
export class
|
|
2
|
+
export class AccessRequestHandler {
|
|
3
3
|
async onRequest(req, ctx) {
|
|
4
4
|
if (!req.action) {
|
|
5
5
|
throw new Error("action is required");
|
|
@@ -14,4 +14,4 @@ export class RequestHandler {
|
|
|
14
14
|
throw new Error(`action ${req.action} not found`);
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb3JlL2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxDQUFDLE1BQU0sV0FBVyxDQUFDO0FBdUIxQixNQUFNLE9BQU8sb0JBQW9CO0lBQy9CLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBOEIsRUFBRSxHQUErQjtRQUM3RSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2hCLE1BQU0sSUFBSSxLQUFLLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUN4QyxDQUFDO1FBRUQsTUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1FBRW5ELGFBQWE7UUFDYixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDaEMsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLGFBQWE7WUFDYixPQUFPLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDL0MsQ0FBQztRQUNELE1BQU0sSUFBSSxLQUFLLENBQUMsVUFBVSxHQUFHLENBQUMsTUFBTSxZQUFZLENBQUMsQ0FBQztJQUNwRCxDQUFDO0NBQ0YifQ==
|
package/dist/plugin/api.d.ts
CHANGED
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
2
3
|
import { Registrable } from "../registry/index.js";
|
|
3
4
|
import { FileItem, FormItemProps, Pipeline, Runnable, Step } from "../dt/index.js";
|
|
4
5
|
import { FileStore } from "../core/file-store.js";
|
|
5
6
|
import { Logger } from "log4js";
|
|
6
7
|
import { IAccessService } from "../access/index.js";
|
|
7
8
|
import { IEmailService } from "../service/index.js";
|
|
8
|
-
import { IContext } from "../core/index.js";
|
|
9
|
-
import { ILogger } from "../utils/index.js";
|
|
9
|
+
import { IContext, PluginRequestHandleReq } from "../core/index.js";
|
|
10
|
+
import { ILogger, utils } from "../utils/index.js";
|
|
10
11
|
import { HttpClient } from "../utils/util.request";
|
|
11
|
-
|
|
12
|
+
export type UserInfo = {
|
|
13
|
+
role: "admin" | "user";
|
|
14
|
+
id: any;
|
|
15
|
+
};
|
|
12
16
|
export declare enum ContextScope {
|
|
13
17
|
global = 0,
|
|
14
18
|
pipeline = 1,
|
|
@@ -33,16 +37,12 @@ export type PluginDefine = Registrable & {
|
|
|
33
37
|
autowire?: {
|
|
34
38
|
[key: string]: any;
|
|
35
39
|
};
|
|
36
|
-
reference?: {
|
|
37
|
-
src: string;
|
|
38
|
-
dest: string;
|
|
39
|
-
type: "computed";
|
|
40
|
-
}[];
|
|
41
40
|
needPlus?: boolean;
|
|
42
41
|
};
|
|
43
42
|
export type ITaskPlugin = {
|
|
44
43
|
onInstance(): Promise<void>;
|
|
45
44
|
execute(): Promise<void>;
|
|
45
|
+
onRequest(req: PluginRequestHandleReq<any>): Promise<any>;
|
|
46
46
|
[key: string]: any;
|
|
47
47
|
};
|
|
48
48
|
export type TaskResult = {
|
|
@@ -64,6 +64,7 @@ export type TaskInstanceContext = {
|
|
|
64
64
|
lastStatus?: Runnable;
|
|
65
65
|
signal: AbortSignal;
|
|
66
66
|
utils: typeof utils;
|
|
67
|
+
user: UserInfo;
|
|
67
68
|
};
|
|
68
69
|
export declare abstract class AbstractTaskPlugin implements ITaskPlugin {
|
|
69
70
|
_result: TaskResult;
|
|
@@ -73,6 +74,7 @@ export declare abstract class AbstractTaskPlugin implements ITaskPlugin {
|
|
|
73
74
|
clearLastStatus(): void;
|
|
74
75
|
getFiles(): FileItem[] | undefined;
|
|
75
76
|
setCtx(ctx: TaskInstanceContext): void;
|
|
77
|
+
getAccess(accessId: string): Promise<any>;
|
|
76
78
|
randomFileId(): string;
|
|
77
79
|
saveFile(filename: string, file: Buffer): void;
|
|
78
80
|
extendsFiles(): void;
|
|
@@ -81,6 +83,8 @@ export declare abstract class AbstractTaskPlugin implements ITaskPlugin {
|
|
|
81
83
|
onInstance(): Promise<void>;
|
|
82
84
|
abstract execute(): Promise<void>;
|
|
83
85
|
appendTimeSuffix(name?: string): string;
|
|
86
|
+
onRequest(req: PluginRequestHandleReq<any>): Promise<any>;
|
|
87
|
+
isAdmin(): boolean;
|
|
84
88
|
}
|
|
85
89
|
export type OutputVO = {
|
|
86
90
|
key: string;
|
package/dist/plugin/api.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { logger } from "../utils/index.js";
|
|
2
2
|
import dayjs from "dayjs";
|
|
3
|
+
import _ from "lodash-es";
|
|
3
4
|
export var ContextScope;
|
|
4
5
|
(function (ContextScope) {
|
|
5
6
|
ContextScope[ContextScope["global"] = 0] = "global";
|
|
@@ -22,6 +23,16 @@ export class AbstractTaskPlugin {
|
|
|
22
23
|
this.logger = ctx.logger;
|
|
23
24
|
this.accessService = ctx.accessService;
|
|
24
25
|
}
|
|
26
|
+
async getAccess(accessId) {
|
|
27
|
+
if (accessId == null) {
|
|
28
|
+
throw new Error("您还没有配置授权");
|
|
29
|
+
}
|
|
30
|
+
const res = await this.ctx.accessService.getById(accessId);
|
|
31
|
+
if (res == null) {
|
|
32
|
+
throw new Error("授权不存在,可能已被删除,请前往任务配置里面重新选择授权");
|
|
33
|
+
}
|
|
34
|
+
return res;
|
|
35
|
+
}
|
|
25
36
|
randomFileId() {
|
|
26
37
|
return Math.random().toString(36).substring(2, 9);
|
|
27
38
|
}
|
|
@@ -55,5 +66,21 @@ export class AbstractTaskPlugin {
|
|
|
55
66
|
}
|
|
56
67
|
return name + "_" + dayjs().format("YYYYMMDDHHmmss");
|
|
57
68
|
}
|
|
69
|
+
async onRequest(req) {
|
|
70
|
+
if (!req.action) {
|
|
71
|
+
throw new Error("action is required");
|
|
72
|
+
}
|
|
73
|
+
const methodName = `on${_.upperFirst(req.action)}`;
|
|
74
|
+
// @ts-ignore
|
|
75
|
+
const method = this[methodName];
|
|
76
|
+
if (method) {
|
|
77
|
+
// @ts-ignore
|
|
78
|
+
return await this[methodName](req.data);
|
|
79
|
+
}
|
|
80
|
+
throw new Error(`action ${req.action} not found`);
|
|
81
|
+
}
|
|
82
|
+
isAdmin() {
|
|
83
|
+
return this.ctx.user.role === "admin";
|
|
84
|
+
}
|
|
58
85
|
}
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3BsdWdpbi9hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0EsT0FBTyxFQUFXLE1BQU0sRUFBUyxNQUFNLG1CQUFtQixDQUFDO0FBRTNELE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQztBQUMxQixPQUFPLENBQUMsTUFBTSxXQUFXLENBQUM7QUFLMUIsTUFBTSxDQUFOLElBQVksWUFJWDtBQUpELFdBQVksWUFBWTtJQUN0QixtREFBTSxDQUFBO0lBQ04sdURBQVEsQ0FBQTtJQUNSLHFEQUFPLENBQUE7QUFDVCxDQUFDLEVBSlcsWUFBWSxLQUFaLFlBQVksUUFJdkI7QUF1RUQsTUFBTSxPQUFnQixrQkFBa0I7SUFDdEMsT0FBTyxHQUFlLEVBQUUsZUFBZSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsQ0FBQztJQUM5RSxHQUFHLENBQXVCO0lBQzFCLE1BQU0sQ0FBVztJQUNqQixhQUFhLENBQWtCO0lBRS9CLGVBQWU7UUFDYixJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUM7SUFDdEMsQ0FBQztJQUVELFFBQVE7UUFDTixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDO0lBQzVCLENBQUM7SUFFRCxNQUFNLENBQUMsR0FBd0I7UUFDN0IsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsTUFBTSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUM7UUFDekIsSUFBSSxDQUFDLGFBQWEsR0FBRyxHQUFHLENBQUMsYUFBYSxDQUFDO0lBQ3pDLENBQUM7SUFFRCxLQUFLLENBQUMsU0FBUyxDQUFDLFFBQWdCO1FBQzlCLElBQUksUUFBUSxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3JCLE1BQU0sSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDOUIsQ0FB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
|
package/dist/plugin/group.d.ts
CHANGED
package/dist/plugin/group.js
CHANGED
|
@@ -19,6 +19,7 @@ export const pluginGroups = {
|
|
|
19
19
|
tencent: new PluginGroup("tencent", "腾讯云", 4),
|
|
20
20
|
host: new PluginGroup("host", "主机", 5),
|
|
21
21
|
cdn: new PluginGroup("cdn", "CDN", 6),
|
|
22
|
-
|
|
22
|
+
panel: new PluginGroup("panel", "面板", 7),
|
|
23
|
+
other: new PluginGroup("other", "其他", 8),
|
|
23
24
|
};
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3JvdXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcGx1Z2luL2dyb3VwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sT0FBTyxXQUFXO0lBQ3RCLEdBQUcsQ0FBUztJQUNaLEtBQUssQ0FBUztJQUNkLElBQUksQ0FBVTtJQUNkLEtBQUssQ0FBUztJQUNkLE9BQU8sQ0FBaUI7SUFDeEIsWUFBWSxHQUFXLEVBQUUsS0FBYSxFQUFFLEtBQUssR0FBRyxDQUFDLEVBQUUsSUFBSSxHQUFHLEVBQUU7UUFDMUQsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztRQUNuQixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztRQUNuQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLENBQUMsTUFBTSxZQUFZLEdBQUc7SUFDMUIsSUFBSSxFQUFFLElBQUksV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQ3hDLE1BQU0sRUFBRSxJQUFJLFdBQVcsQ0FBQyxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUMzQyxNQUFNLEVBQUUsSUFBSSxXQUFXLENBQUMsUUFBUSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDM0MsT0FBTyxFQUFFLElBQUksV0FBVyxDQUFDLFNBQVMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQzdDLElBQUksRUFBRSxJQUFJLFdBQVcsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN0QyxHQUFHLEVBQUUsSUFBSSxXQUFXLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDckMsS0FBSyxFQUFFLElBQUksV0FBVyxDQUFDLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ3hDLEtBQUssRUFBRSxJQUFJLFdBQVcsQ0FBQyxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztDQUN6QyxDQUFDIn0=
|
|
@@ -3,6 +3,7 @@ export type Registrable = {
|
|
|
3
3
|
title: string;
|
|
4
4
|
desc?: string;
|
|
5
5
|
group?: string;
|
|
6
|
+
deprecated?: string;
|
|
6
7
|
};
|
|
7
8
|
export type RegistryItem<T> = {
|
|
8
9
|
define: Registrable;
|
|
@@ -32,6 +33,7 @@ export declare class Registry<T> {
|
|
|
32
33
|
title: string;
|
|
33
34
|
desc?: string | undefined;
|
|
34
35
|
group?: string | undefined;
|
|
36
|
+
deprecated?: string | undefined;
|
|
35
37
|
}[];
|
|
36
38
|
getDefine(key: string): Registrable | undefined;
|
|
37
39
|
}
|
|
@@ -39,6 +39,9 @@ export class Registry {
|
|
|
39
39
|
for (const key in this.storage) {
|
|
40
40
|
const define = this.getDefine(key);
|
|
41
41
|
if (define) {
|
|
42
|
+
if (define?.deprecated) {
|
|
43
|
+
continue;
|
|
44
|
+
}
|
|
42
45
|
list.push({ ...define, key });
|
|
43
46
|
}
|
|
44
47
|
}
|
|
@@ -52,4 +55,4 @@ export class Registry {
|
|
|
52
55
|
return item.define;
|
|
53
56
|
}
|
|
54
57
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaXN0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcmVnaXN0cnkvcmVnaXN0cnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBcUIzQyxNQUFNLE9BQU8sUUFBUTtJQUNuQixJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ1YsT0FBTyxHQUVILEVBQUUsQ0FBQztJQUVQLFVBQVUsQ0FBaUI7SUFFM0IsWUFBWSxJQUFZLEVBQUUsVUFBMEI7UUFDbEQsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFDakIsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7SUFDL0IsQ0FBQztJQUVELFFBQVEsQ0FBQyxHQUFXLEVBQUUsS0FBc0I7UUFDMUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxLQUFLLElBQUksSUFBSSxFQUFFLENBQUM7WUFDMUIsT0FBTztRQUNULENBQUM7UUFDRCxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEtBQUssQ0FBQztRQUMxQixJQUFJLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNwQixJQUFJLENBQUMsVUFBVSxDQUFDO2dCQUNkLFFBQVEsRUFBRSxJQUFJO2dCQUNkLEdBQUc7Z0JBQ0gsS0FBSzthQUNOLENBQUMsQ0FBQztRQUNMLENBQUM7UUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsSUFBSSxDQUFDLElBQUksSUFBSSxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFFRCxHQUFHLENBQUMsSUFBWTtRQUNkLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNWLE1BQU0sSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDOUIsQ0FBQztRQUVELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbEMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ1osTUFBTSxJQUFJLEtBQUssQ0FBQyxLQUFLLElBQUksTUFBTSxDQUFDLENBQUM7UUFDbkMsQ0FBQztRQUNELE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3RCLENBQUM7SUFFRCxhQUFhO1FBQ1gsTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQ2hCLEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQy9CLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDbkMsSUFBSSxNQUFNLEVBQUUsQ0FBQztnQkFDWCxJQUFJLE1BQU0sRUFBRSxVQUFVLEVBQUUsQ0FBQztvQkFDdkIsU0FBUztnQkFDWCxDQUFDO2dCQUNELElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDO1lBQ2hDLENBQUM7UUFDSCxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsU0FBUyxDQUFDLEdBQVc7UUFDbkIsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUMvQixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDVixPQUFPO1FBQ1QsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUNyQixDQUFDO0NBQ0YifQ==
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -5,6 +5,8 @@ export * from "./util.file.js";
|
|
|
5
5
|
export * from "./util.sp.js";
|
|
6
6
|
export * from "./util.promise.js";
|
|
7
7
|
export * from "./util.hash.js";
|
|
8
|
+
export * from "./util.merge.js";
|
|
9
|
+
export * from "./util.cache.js";
|
|
8
10
|
import _ from "lodash-es";
|
|
9
11
|
export declare const utils: {
|
|
10
12
|
sleep: typeof sleep;
|
|
@@ -24,4 +26,9 @@ export declare const utils: {
|
|
|
24
26
|
getFileRootDir: (rootDir?: string | undefined) => string;
|
|
25
27
|
};
|
|
26
28
|
_: typeof _;
|
|
29
|
+
mergeUtils: {
|
|
30
|
+
merge: (target: any, ...sources: any) => any;
|
|
31
|
+
cloneDeep: (target: any) => any;
|
|
32
|
+
};
|
|
33
|
+
cache: import("lru-cache").LRUCache<string, any, unknown>;
|
|
27
34
|
};
|
package/dist/utils/index.js
CHANGED
|
@@ -6,11 +6,15 @@ export * from "./util.file.js";
|
|
|
6
6
|
export * from "./util.sp.js";
|
|
7
7
|
export * from "./util.promise.js";
|
|
8
8
|
export * from "./util.hash.js";
|
|
9
|
+
export * from "./util.merge.js";
|
|
10
|
+
export * from "./util.cache.js";
|
|
11
|
+
import { mergeUtils } from "./util.merge.js";
|
|
9
12
|
import { sp } from "./util.sp.js";
|
|
10
13
|
import { hashUtils } from "./util.hash.js";
|
|
11
14
|
import { promises } from "./util.promise.js";
|
|
12
15
|
import { fileUtils } from "./util.file.js";
|
|
13
16
|
import _ from "lodash-es";
|
|
17
|
+
import { cache } from "./util.cache.js";
|
|
14
18
|
export const utils = {
|
|
15
19
|
sleep,
|
|
16
20
|
http,
|
|
@@ -19,5 +23,7 @@ export const utils = {
|
|
|
19
23
|
promises,
|
|
20
24
|
file: fileUtils,
|
|
21
25
|
_,
|
|
26
|
+
mergeUtils,
|
|
27
|
+
cache,
|
|
22
28
|
};
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE1BQU0saUJBQWlCLENBQUM7QUFDcEMsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM3QyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ2xDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUMzQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDN0MsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzNDLE9BQU8sQ0FBQyxNQUFNLFdBQVcsQ0FBQztBQUMxQixPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDeEMsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHO0lBQ25CLEtBQUs7SUFDTCxJQUFJO0lBQ0osRUFBRTtJQUNGLElBQUksRUFBRSxTQUFTO0lBQ2YsUUFBUTtJQUNSLElBQUksRUFBRSxTQUFTO0lBQ2YsQ0FBQztJQUNELFVBQVU7SUFDVixLQUFLO0NBQ04sQ0FBQyJ9
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
// LRUCache
|
|
2
|
+
import { LRUCache } from "lru-cache";
|
|
3
|
+
export const cache = new LRUCache({
|
|
4
|
+
max: 1000,
|
|
5
|
+
ttl: 1000 * 60 * 10,
|
|
6
|
+
});
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5jYWNoZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy91dGlsLmNhY2hlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLFdBQVc7QUFFWCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRXJDLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxJQUFJLFFBQVEsQ0FBYztJQUM3QyxHQUFHLEVBQUUsSUFBSTtJQUNULEdBQUcsRUFBRSxJQUFJLEdBQUcsRUFBRSxHQUFHLEVBQUU7Q0FDcEIsQ0FBQyxDQUFDIn0=
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
declare function merge(target: any, ...sources: any): any;
|
|
2
|
+
declare function cloneDeep(target: any): any;
|
|
3
|
+
export declare class UnMergeable {
|
|
4
|
+
cloneable: boolean;
|
|
5
|
+
setCloneable(cloneable: any): void;
|
|
6
|
+
}
|
|
7
|
+
export declare const mergeUtils: {
|
|
8
|
+
merge: typeof merge;
|
|
9
|
+
cloneDeep: typeof cloneDeep;
|
|
10
|
+
};
|
|
11
|
+
export {};
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import _ from "lodash-es";
|
|
2
|
+
function isUnMergeable(srcValue) {
|
|
3
|
+
return srcValue != null && srcValue instanceof UnMergeable;
|
|
4
|
+
}
|
|
5
|
+
function isUnCloneable(value) {
|
|
6
|
+
return isUnMergeable(value) && !value.cloneable;
|
|
7
|
+
}
|
|
8
|
+
function merge(target, ...sources) {
|
|
9
|
+
/**
|
|
10
|
+
* 如果目标为不可合并对象,比如array、unMergeable、ref,则直接覆盖不合并
|
|
11
|
+
* @param objValue 被合并对象
|
|
12
|
+
* @param srcValue 来源对象
|
|
13
|
+
*/
|
|
14
|
+
function customizer(objValue, srcValue) {
|
|
15
|
+
if (srcValue == null) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
// 如果被合并对象为数组,则直接被覆盖对象覆盖,只要覆盖对象不为空
|
|
19
|
+
if (_.isArray(objValue)) {
|
|
20
|
+
//原对象如果是数组
|
|
21
|
+
return srcValue; //来源对象
|
|
22
|
+
}
|
|
23
|
+
if (isUnMergeable(srcValue)) {
|
|
24
|
+
return srcValue;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
let found = null;
|
|
28
|
+
for (const item of sources) {
|
|
29
|
+
if (isUnMergeable(item)) {
|
|
30
|
+
found = item;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
if (found) {
|
|
34
|
+
return found;
|
|
35
|
+
}
|
|
36
|
+
return _.mergeWith(target, ...sources, customizer);
|
|
37
|
+
}
|
|
38
|
+
function cloneDeep(target) {
|
|
39
|
+
if (isUnCloneable(target)) {
|
|
40
|
+
return target;
|
|
41
|
+
}
|
|
42
|
+
function customizer(value) {
|
|
43
|
+
if (isUnCloneable(value)) {
|
|
44
|
+
return value;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return _.cloneDeepWith(target, customizer);
|
|
48
|
+
}
|
|
49
|
+
export class UnMergeable {
|
|
50
|
+
cloneable = false;
|
|
51
|
+
setCloneable(cloneable) {
|
|
52
|
+
this.cloneable = cloneable;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
export const mergeUtils = {
|
|
56
|
+
merge,
|
|
57
|
+
cloneDeep,
|
|
58
|
+
};
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5tZXJnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy91dGlsLm1lcmdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sQ0FBQyxNQUFNLFdBQVcsQ0FBQztBQUMxQixTQUFTLGFBQWEsQ0FBQyxRQUFhO0lBQ2xDLE9BQU8sUUFBUSxJQUFJLElBQUksSUFBSSxRQUFRLFlBQVksV0FBVyxDQUFDO0FBQzdELENBQUM7QUFDRCxTQUFTLGFBQWEsQ0FBQyxLQUFVO0lBQy9CLE9BQU8sYUFBYSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQztBQUNsRCxDQUFDO0FBQ0QsU0FBUyxLQUFLLENBQUMsTUFBVyxFQUFFLEdBQUcsT0FBWTtJQUN6Qzs7OztPQUlHO0lBQ0gsU0FBUyxVQUFVLENBQUMsUUFBYSxFQUFFLFFBQWE7UUFDOUMsSUFBSSxRQUFRLElBQUksSUFBSSxFQUFFLENBQUM7WUFDckIsT0FBTztRQUNULENBQUM7UUFDRCxrQ0FBa0M7UUFDbEMsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7WUFDeEIsVUFBVTtZQUNWLE9BQU8sUUFBUSxDQUFDLENBQUMsTUFBTTtRQUN6QixDQUFDO1FBRUQsSUFBSSxhQUFhLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztZQUM1QixPQUFPLFFBQVEsQ0FBQztRQUNsQixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksS0FBSyxHQUFRLElBQUksQ0FBQztJQUN0QixLQUFLLE1BQU0sSUFBSSxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQzNCLElBQUksYUFBYSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDeEIsS0FBSyxHQUFHLElBQUksQ0FBQztRQUNmLENBQUM7SUFDSCxDQUFDO0lBQ0QsSUFBSSxLQUFLLEVBQUUsQ0FBQztRQUNWLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUNELE9BQU8sQ0FBQyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsR0FBRyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7QUFDckQsQ0FBQztBQUVELFNBQVMsU0FBUyxDQUFDLE1BQVc7SUFDNUIsSUFBSSxhQUFhLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztRQUMxQixPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBQ0QsU0FBUyxVQUFVLENBQUMsS0FBVTtRQUM1QixJQUFJLGFBQWEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ3pCLE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPLENBQUMsQ0FBQyxhQUFhLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQzdDLENBQUM7QUFDRCxNQUFNLE9BQU8sV0FBVztJQUN0QixTQUFTLEdBQUcsS0FBSyxDQUFDO0lBRWxCLFlBQVksQ0FBQyxTQUFjO1FBQ3pCLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDO0lBQzdCLENBQUM7Q0FDRjtBQUVELE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixLQUFLO0lBQ0wsU0FBUztDQUNWLENBQUMifQ==
|
|
@@ -20,6 +20,7 @@ export class HttpError extends Error {
|
|
|
20
20
|
this.status = error.response?.status;
|
|
21
21
|
this.statusText = error.response?.statusText;
|
|
22
22
|
this.request = {
|
|
23
|
+
baseURL: error.config?.baseURL,
|
|
23
24
|
url: error.config?.url,
|
|
24
25
|
method: error.config?.method,
|
|
25
26
|
params: error.config?.params,
|
|
@@ -134,4 +135,4 @@ export function createAgent(opts = {}) {
|
|
|
134
135
|
httpsAgent,
|
|
135
136
|
};
|
|
136
137
|
}
|
|
137
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5yZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3V0aWwucmVxdWVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQTZCLE1BQU0sT0FBTyxDQUFDO0FBQ2xELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFdkMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVwRCxNQUFNLE9BQU8sU0FBVSxTQUFRLEtBQUs7SUFDbEMsTUFBTSxDQUFVO0lBQ2hCLFVBQVUsQ0FBVTtJQUNwQixJQUFJLENBQVU7SUFDZCxPQUFPLENBQThFO0lBQ3JGLFFBQVEsQ0FBaUI7SUFDekIsS0FBSyxDQUFPO0lBQ1osWUFBWSxLQUFVO1FBQ3BCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNYLE9BQU87UUFDVCxDQUFDO1FBQ0QsS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNyQixJQUFJLENBQUMsSUFBSSxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUM7UUFDdkIsSUFBSSxDQUFDLElBQUksR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQztRQUV6QixJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDO1FBQ3JDLElBQUksQ0FBQyxVQUFVLEdBQUcsS0FBSyxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUM7UUFDN0MsSUFBSSxDQUFDLE9BQU8sR0FBRztZQUNiLE9BQU8sRUFBRSxLQUFLLENBQUMsTUFBTSxFQUFFLE9BQU87WUFDOUIsR0FBRyxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsR0FBRztZQUN0QixNQUFNLEVBQUUsS0FBSyxDQUFDLE1B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
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@certd/pipeline",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "1.25.
|
|
4
|
+
"version": "1.25.7",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
7
7
|
"types": "./dist/index.d.ts",
|
|
@@ -15,12 +15,13 @@
|
|
|
15
15
|
"test": "mocha --loader=ts-node/esm"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@certd/plus-core": "^1.25.
|
|
18
|
+
"@certd/plus-core": "^1.25.6",
|
|
19
19
|
"axios": "^1.7.2",
|
|
20
20
|
"fix-path": "^4.0.0",
|
|
21
21
|
"http-proxy-agent": "^7.0.2",
|
|
22
22
|
"https-proxy-agent": "^7.0.5",
|
|
23
23
|
"lodash-es": "^4.17.21",
|
|
24
|
+
"lru-cache": "^10.0.0",
|
|
24
25
|
"node-forge": "^1.3.1",
|
|
25
26
|
"nodemailer": "^6.9.3",
|
|
26
27
|
"proxy-agent": "^6.4.0",
|
|
@@ -58,9 +59,9 @@
|
|
|
58
59
|
"ts-node": "^10.9.1",
|
|
59
60
|
"tsc-esm-fix": "^3.0.0",
|
|
60
61
|
"tslib": "^2.5.2",
|
|
61
|
-
"typescript": "^5.
|
|
62
|
+
"typescript": "^5.4.2",
|
|
62
63
|
"vite": "^4.3.8",
|
|
63
64
|
"vue-tsc": "^1.6.5"
|
|
64
65
|
},
|
|
65
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "a7ecda9b36e318d169fe1a198fee8455941f44f1"
|
|
66
67
|
}
|