ai-project-manage-cli 2.0.13 → 2.0.14
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/dist/cli/commands/deploy-backend.d.ts.map +1 -1
- package/dist/cli/commands/deploy-backend.js +18 -32
- package/dist/cli/commands/deploy-backend.js.map +1 -1
- package/dist/core/apm-config.d.ts +18 -30
- package/dist/core/apm-config.d.ts.map +1 -1
- package/dist/core/apm-config.js +22 -40
- package/dist/core/apm-config.js.map +1 -1
- package/dist/core/backend-deploy/backend-deploy-workflow.d.ts +8 -5
- package/dist/core/backend-deploy/backend-deploy-workflow.d.ts.map +1 -1
- package/dist/core/backend-deploy/backend-deploy-workflow.js +57 -31
- package/dist/core/backend-deploy/backend-deploy-workflow.js.map +1 -1
- package/dist/core/backend-deploy/command-runner.d.ts +11 -0
- package/dist/core/backend-deploy/command-runner.d.ts.map +1 -0
- package/dist/core/backend-deploy/command-runner.js +47 -0
- package/dist/core/backend-deploy/command-runner.js.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/client.d.ts +18 -0
- package/dist/core/backend-deploy/dockerode-client/client.d.ts.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/client.js +114 -0
- package/dist/core/backend-deploy/dockerode-client/client.js.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/connection-options.d.ts +6 -0
- package/dist/core/backend-deploy/dockerode-client/connection-options.d.ts.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/connection-options.js +52 -0
- package/dist/core/backend-deploy/dockerode-client/connection-options.js.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/container-inspect-format.d.ts +3 -0
- package/dist/core/backend-deploy/dockerode-client/container-inspect-format.d.ts.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/container-inspect-format.js +23 -0
- package/dist/core/backend-deploy/dockerode-client/container-inspect-format.js.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/container-options.d.ts +4 -0
- package/dist/core/backend-deploy/dockerode-client/container-options.d.ts.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/container-options.js +36 -0
- package/dist/core/backend-deploy/dockerode-client/container-options.js.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/env.d.ts +3 -0
- package/dist/core/backend-deploy/dockerode-client/env.d.ts.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/env.js +37 -0
- package/dist/core/backend-deploy/dockerode-client/env.js.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/index.d.ts +8 -0
- package/dist/core/backend-deploy/dockerode-client/index.d.ts.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/index.js +17 -0
- package/dist/core/backend-deploy/dockerode-client/index.js.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/ports.d.ts +9 -0
- package/dist/core/backend-deploy/dockerode-client/ports.d.ts.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/ports.js +35 -0
- package/dist/core/backend-deploy/dockerode-client/ports.js.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/runtime.d.ts +7 -0
- package/dist/core/backend-deploy/dockerode-client/runtime.d.ts.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/runtime.js +26 -0
- package/dist/core/backend-deploy/dockerode-client/runtime.js.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/types.d.ts +62 -0
- package/dist/core/backend-deploy/dockerode-client/types.d.ts.map +1 -0
- package/dist/core/backend-deploy/dockerode-client/types.js +3 -0
- package/dist/core/backend-deploy/dockerode-client/types.js.map +1 -0
- package/dist/core/backend-deploy/image-tag.d.ts +1 -1
- package/dist/core/backend-deploy/image-tag.d.ts.map +1 -1
- package/dist/core/backend-deploy/image-tag.js +2 -2
- package/dist/core/backend-deploy/image-tag.js.map +1 -1
- package/dist/core/backend-deploy/index.d.ts +1 -10
- package/dist/core/backend-deploy/index.d.ts.map +1 -1
- package/dist/core/backend-deploy/index.js +1 -18
- package/dist/core/backend-deploy/index.js.map +1 -1
- package/dist/core/backend-deploy/local-docker-build.d.ts +3 -6
- package/dist/core/backend-deploy/local-docker-build.d.ts.map +1 -1
- package/dist/core/backend-deploy/local-docker-build.js +9 -13
- package/dist/core/backend-deploy/local-docker-build.js.map +1 -1
- package/dist/core/backend-deploy/logger.d.ts +10 -0
- package/dist/core/backend-deploy/logger.d.ts.map +1 -0
- package/dist/core/backend-deploy/logger.js +22 -0
- package/dist/core/backend-deploy/logger.js.map +1 -0
- package/dist/core/backend-deploy/registry-login-push.d.ts +18 -8
- package/dist/core/backend-deploy/registry-login-push.d.ts.map +1 -1
- package/dist/core/backend-deploy/registry-login-push.js +25 -36
- package/dist/core/backend-deploy/registry-login-push.js.map +1 -1
- package/dist/core/backend-deploy/remote-docker-client.d.ts.map +1 -1
- package/dist/core/backend-deploy/remote-docker-client.js +1 -0
- package/dist/core/backend-deploy/remote-docker-client.js.map +1 -1
- package/dist/core/backend-deploy/resolve-dockerfile.d.ts +2 -7
- package/dist/core/backend-deploy/resolve-dockerfile.d.ts.map +1 -1
- package/dist/core/backend-deploy/resolve-dockerfile.js +9 -18
- package/dist/core/backend-deploy/resolve-dockerfile.js.map +1 -1
- package/dist/core/backend-deploy/run-docker-cli.d.ts +3 -8
- package/dist/core/backend-deploy/run-docker-cli.d.ts.map +1 -1
- package/dist/core/backend-deploy/run-docker-cli.js +4 -23
- package/dist/core/backend-deploy/run-docker-cli.js.map +1 -1
- package/dist/core/backend-deploy/types.d.ts +15 -63
- package/dist/core/backend-deploy/types.d.ts.map +1 -1
- package/dist/core/backend-deploy/types.js +0 -3
- package/dist/core/backend-deploy/types.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-backend.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/deploy-backend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBzC;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"deploy-backend.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/deploy-backend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBzC;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAuEpE"}
|
|
@@ -30,36 +30,28 @@ function registerDeployBackendCommands(program) {
|
|
|
30
30
|
process.exit(1);
|
|
31
31
|
}
|
|
32
32
|
const cleanBranch = (0, branch_name_1.sanitizeBranchName)(branchName);
|
|
33
|
-
(0, image_tag_1.assertDeployImageTag)(cleanBranch
|
|
33
|
+
(0, image_tag_1.assertDeployImageTag)(cleanBranch);
|
|
34
34
|
const cfg = (0, apm_config_1.loadApmConfig)();
|
|
35
35
|
const fromApm = (0, apm_config_1.resolveBackendDeployFromApmConfig)(cfg);
|
|
36
|
-
const
|
|
37
|
-
const dockerfilePath = node_path_1.default.join(opts.dir, "Dockerfile");
|
|
36
|
+
const dirAbs = node_path_1.default.resolve(opts.dir);
|
|
38
37
|
const params = {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
keyPath: fromApm.remoteDocker.keyPath,
|
|
54
|
-
},
|
|
55
|
-
remotePullAuth: {
|
|
56
|
-
username: fromApm.remotePullAuth.username,
|
|
57
|
-
password: fromApm.remotePullAuth.password,
|
|
58
|
-
serveraddress: fromApm.remotePullAuth.serveraddress,
|
|
59
|
-
},
|
|
38
|
+
image: fromApm.imageName,
|
|
39
|
+
tag: cleanBranch,
|
|
40
|
+
registryHost: fromApm.registryHost,
|
|
41
|
+
registryNamespace: fromApm.registryNamespace,
|
|
42
|
+
registryUser: fromApm.registryUser,
|
|
43
|
+
registryPassword: fromApm.registryPassword,
|
|
44
|
+
remoteHost: fromApm.remoteHost,
|
|
45
|
+
remotePort: fromApm.remotePort,
|
|
46
|
+
remoteProtocol: fromApm.remoteProtocol,
|
|
47
|
+
remoteCaPath: fromApm.caPath ?? "",
|
|
48
|
+
remoteCertPath: fromApm.certPath ?? "",
|
|
49
|
+
remoteKeyPath: fromApm.keyPath ?? "",
|
|
50
|
+
envFilePath: fromApm.envFilePath,
|
|
51
|
+
containerPortsMappings: fromApm.containerPortsMappings,
|
|
60
52
|
};
|
|
61
53
|
const workflow = new backend_deploy_1.BackendDeployWorkflow(params);
|
|
62
|
-
|
|
54
|
+
await workflow.run(dirAbs);
|
|
63
55
|
const envTag = (0, branch_name_1.resolveEnvTag)(opts.env ?? "测试环境");
|
|
64
56
|
if (opts.requirementId) {
|
|
65
57
|
await client_1.default.cli.resourceEnvironmentCreate({
|
|
@@ -69,13 +61,7 @@ function registerDeployBackendCommands(program) {
|
|
|
69
61
|
type: "BACKEND",
|
|
70
62
|
});
|
|
71
63
|
}
|
|
72
|
-
console.log(
|
|
73
|
-
...result,
|
|
74
|
-
imageTag: cleanBranch,
|
|
75
|
-
containerName: fromApm.containerName,
|
|
76
|
-
imageRepository: fromApm.imageRepository,
|
|
77
|
-
envTag,
|
|
78
|
-
}, null, 2));
|
|
64
|
+
console.log("后端部署成功");
|
|
79
65
|
});
|
|
80
66
|
}
|
|
81
67
|
//# sourceMappingURL=deploy-backend.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-backend.js","sourceRoot":"","sources":["../../../src/cli/commands/deploy-backend.ts"],"names":[],"mappings":";;;;;AAsBA,
|
|
1
|
+
{"version":3,"file":"deploy-backend.js","sourceRoot":"","sources":["../../../src/cli/commands/deploy-backend.ts"],"names":[],"mappings":";;;;;AAsBA,sEAuEC;AA7FD,0DAA6B;AAG7B,8DAAmC;AACnC,8DAAkE;AAClE,mEAA2E;AAE3E,wDAIgC;AAChC,sDAG+B;AAC/B,0CAAkD;AAElD;;;GAGG;AACH,SAAgB,6BAA6B,CAAC,OAAgB;IAC5D,OAAO;SACJ,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CACV,8FAA8F,CAC/F;SACA,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAAC;SACzC,MAAM,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,CAAC;SAC9C,cAAc,CACb,cAAc,EACd,6CAA6C,CAC9C;SACA,MAAM,CACL,mCAAmC,EACnC,yCAAyC,EACzC,wBAAgB,CACjB;SACA,MAAM,CACL,KAAK,EACH,IAAY,EACZ,IAIC,EACD,EAAE;QACF,MAAM,UAAU,GAAG,IAAA,iCAAmB,EAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,WAAW,GAAG,IAAA,gCAAkB,EAAC,UAAU,CAAC,CAAC;QACnD,IAAA,gCAAoB,EAAC,WAAW,CAAC,CAAC;QAElC,MAAM,GAAG,GAAG,IAAA,0BAAa,GAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,IAAA,8CAAiC,EAAC,GAAG,CAAC,CAAC;QAEvD,MAAM,MAAM,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEtC,MAAM,MAAM,GAAwB;YAClC,KAAK,EAAE,OAAO,CAAC,SAAS;YACxB,GAAG,EAAE,WAAW;YAChB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;YAC5C,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,YAAY,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;YAClC,cAAc,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE;YACtC,aAAa,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;YACpC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;SACvD,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,sCAAqB,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE3B,MAAM,MAAM,GAAG,IAAA,2BAAa,EAAC,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC;QACjD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,MAAM,gBAAG,CAAC,GAAG,CAAC,yBAAyB,CAAC;gBACtC,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,IAAI,EAAE,WAAW;gBACjB,GAAG,EAAE,MAAM;gBACX,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC,CACF,CAAC;AACN,CAAC"}
|
|
@@ -3,28 +3,24 @@ export type ApmBackendDeploy = {
|
|
|
3
3
|
registryHost: string;
|
|
4
4
|
registryUser: string;
|
|
5
5
|
registryPassword: string;
|
|
6
|
+
registryNamespace: string;
|
|
6
7
|
remoteHost: string;
|
|
7
8
|
remotePort: number;
|
|
8
|
-
remoteProtocol
|
|
9
|
+
remoteProtocol?: "https" | "http";
|
|
9
10
|
/** 可选;空字符串表示未配置 */
|
|
10
11
|
caPath?: string;
|
|
11
12
|
certPath?: string;
|
|
12
13
|
keyPath?: string;
|
|
13
|
-
/** 远程 pull 的 registry serveraddress;空则使用 `https://{registryHost}` */
|
|
14
|
-
remotePullServeraddress?: string;
|
|
15
|
-
/** 空则使用 registryUser */
|
|
16
|
-
remotePullUser?: string;
|
|
17
|
-
/** 空则使用 registryPassword */
|
|
18
|
-
remotePullPassword?: string;
|
|
19
14
|
/**
|
|
20
15
|
* 镜像仓库完整路径(**不含 tag**),与后续容器名一致时仅 tag 不同。
|
|
21
16
|
* 例:registry.cn-hangzhou.aliyuncs.com/my-ns/my-service
|
|
22
17
|
*/
|
|
23
|
-
|
|
18
|
+
imageName: string;
|
|
24
19
|
/**
|
|
25
20
|
* 与镜像对应的容器名;空则使用 imageRepository 路径最后一段(与镜像「短名」一致)。
|
|
26
21
|
*/
|
|
27
|
-
|
|
22
|
+
containerPortsMappings?: string[];
|
|
23
|
+
envFilePath?: string;
|
|
28
24
|
};
|
|
29
25
|
export type ApmConfig = {
|
|
30
26
|
auth: {
|
|
@@ -52,28 +48,20 @@ export type ApmConfig = {
|
|
|
52
48
|
* 必填项缺失或非法时抛出带说明的 Error。
|
|
53
49
|
*/
|
|
54
50
|
export declare function resolveBackendDeployFromApmConfig(cfg: ApmConfig): {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
certPath?: string;
|
|
66
|
-
keyPath?: string;
|
|
67
|
-
};
|
|
68
|
-
remotePullAuth: {
|
|
69
|
-
username: string;
|
|
70
|
-
password: string;
|
|
71
|
-
serveraddress: string;
|
|
72
|
-
};
|
|
51
|
+
registryHost: string;
|
|
52
|
+
registryNamespace: string;
|
|
53
|
+
registryUser: string;
|
|
54
|
+
registryPassword: string;
|
|
55
|
+
remoteHost: string;
|
|
56
|
+
remotePort: number;
|
|
57
|
+
remoteProtocol: "https" | "http";
|
|
58
|
+
caPath?: string;
|
|
59
|
+
certPath?: string;
|
|
60
|
+
keyPath?: string;
|
|
73
61
|
/** 不含 tag,如 registry.cn-xxx.aliyuncs.com/ns/app */
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
62
|
+
imageName: string;
|
|
63
|
+
containerPortsMappings?: string[];
|
|
64
|
+
envFilePath?: string;
|
|
77
65
|
};
|
|
78
66
|
export declare function loadApmConfig(): ApmConfig;
|
|
79
67
|
export declare function syncApmConfig(options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apm-config.d.ts","sourceRoot":"","sources":["../../src/core/apm-config.ts"],"names":[],"mappings":"AAKA,2EAA2E;AAC3E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"apm-config.d.ts","sourceRoot":"","sources":["../../src/core/apm-config.ts"],"names":[],"mappings":"AAKA,2EAA2E;AAC3E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAClC,mBAAmB;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE;QAEJ,EAAE,EAAE,MAAM,CAAC;QAEX,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,MAAM,EAAE;QAEN,GAAG,EAAE,MAAM,CAAC;QAEZ,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,6EAA6E;IAC7E,cAAc,EAAE;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,OAAO,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,mBAAmB;IACnB,aAAa,CAAC,EAAE,gBAAgB,CAAC;CAClC,CAAC;AAkBF;;;GAGG;AACH,wBAAgB,iCAAiC,CAAC,GAAG,EAAE,SAAS,GAAG;IACjE,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mDAAmD;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CA4EA;AAcD,wBAAgB,aAAa,IAAI,SAAS,CAazC;AAGD,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,iBAYxE;AAMD,wBAAgB,iBAAiB,IAAI,OAAO,CAO3C;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,QAKzC;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,QA4BpE"}
|
package/dist/core/apm-config.js
CHANGED
|
@@ -16,6 +16,7 @@ const client_1 = __importDefault(require("../api/client"));
|
|
|
16
16
|
const DEFAULT_BACKEND_DEPLOY = {
|
|
17
17
|
registryHost: "",
|
|
18
18
|
registryUser: "",
|
|
19
|
+
registryNamespace: "",
|
|
19
20
|
registryPassword: "",
|
|
20
21
|
remoteHost: "",
|
|
21
22
|
remotePort: 2376,
|
|
@@ -23,10 +24,9 @@ const DEFAULT_BACKEND_DEPLOY = {
|
|
|
23
24
|
caPath: "",
|
|
24
25
|
certPath: "",
|
|
25
26
|
keyPath: "",
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
imageRepository: "",
|
|
27
|
+
imageName: "",
|
|
28
|
+
containerPortsMappings: [],
|
|
29
|
+
envFilePath: "",
|
|
30
30
|
};
|
|
31
31
|
/**
|
|
32
32
|
* 读取并校验 `apm.config.json` 中的 `backendDeploy`,供 `deploy-backend` 使用。
|
|
@@ -38,6 +38,7 @@ function resolveBackendDeployFromApmConfig(cfg) {
|
|
|
38
38
|
const registryUser = b.registryUser.trim();
|
|
39
39
|
const registryPassword = b.registryPassword.trim();
|
|
40
40
|
const remoteHost = b.remoteHost.trim();
|
|
41
|
+
const registryNamespace = b.registryNamespace.trim();
|
|
41
42
|
if (!registryHost) {
|
|
42
43
|
throw new Error("请在 .apm/apm.config.json 的 backendDeploy.registryHost 中配置镜像仓库主机名");
|
|
43
44
|
}
|
|
@@ -51,9 +52,7 @@ function resolveBackendDeployFromApmConfig(cfg) {
|
|
|
51
52
|
throw new Error("请在 .apm/apm.config.json 的 backendDeploy.remoteHost 中配置远程 Docker 地址");
|
|
52
53
|
}
|
|
53
54
|
const remotePort = Number(b.remotePort);
|
|
54
|
-
if (!Number.isFinite(remotePort) ||
|
|
55
|
-
remotePort < 1 ||
|
|
56
|
-
remotePort > 65535) {
|
|
55
|
+
if (!Number.isFinite(remotePort) || remotePort < 1 || remotePort > 65535) {
|
|
57
56
|
throw new Error("请在 .apm/apm.config.json 的 backendDeploy.remotePort 中配置合法端口(1–65535)");
|
|
58
57
|
}
|
|
59
58
|
const protocol = b.remoteProtocol === "http"
|
|
@@ -67,46 +66,29 @@ function resolveBackendDeployFromApmConfig(cfg) {
|
|
|
67
66
|
const t = (s ?? "").trim();
|
|
68
67
|
return t.length > 0 ? t : undefined;
|
|
69
68
|
};
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
const remotePullUser = trimOrUndef(b.remotePullUser) ?? registryUser;
|
|
73
|
-
const remotePullPassword = trimOrUndef(b.remotePullPassword) ?? registryPassword;
|
|
74
|
-
const imageRepository = b.imageRepository.trim();
|
|
75
|
-
if (!imageRepository) {
|
|
69
|
+
const imageName = b.imageName.trim();
|
|
70
|
+
if (!imageName) {
|
|
76
71
|
throw new Error("请在 .apm/apm.config.json 的 backendDeploy.imageRepository 中配置镜像名(完整仓库路径,不含 tag)");
|
|
77
72
|
}
|
|
78
|
-
if (
|
|
73
|
+
if (imageName.includes(":")) {
|
|
79
74
|
throw new Error("backendDeploy.imageRepository 不应包含 tag(不能出现 ':'),tag 由 `apm deploy-backend` 的位置参数 `<name>` 指定");
|
|
80
75
|
}
|
|
81
|
-
const containerName = trimOrUndef(b.containerName) ?? repositoryBaseName(imageRepository);
|
|
82
76
|
return {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
remotePullAuth: {
|
|
97
|
-
username: remotePullUser,
|
|
98
|
-
password: remotePullPassword,
|
|
99
|
-
serveraddress: remotePullServeraddress,
|
|
100
|
-
},
|
|
101
|
-
imageRepository,
|
|
102
|
-
containerName,
|
|
77
|
+
registryHost,
|
|
78
|
+
registryNamespace,
|
|
79
|
+
registryUser,
|
|
80
|
+
registryPassword,
|
|
81
|
+
remoteHost,
|
|
82
|
+
remotePort,
|
|
83
|
+
remoteProtocol: protocol,
|
|
84
|
+
caPath: trimOrUndef(b.caPath),
|
|
85
|
+
certPath: trimOrUndef(b.certPath),
|
|
86
|
+
keyPath: trimOrUndef(b.keyPath),
|
|
87
|
+
containerPortsMappings: b.containerPortsMappings,
|
|
88
|
+
envFilePath: b.envFilePath,
|
|
89
|
+
imageName,
|
|
103
90
|
};
|
|
104
91
|
}
|
|
105
|
-
function repositoryBaseName(imageRepositoryWithoutTag) {
|
|
106
|
-
const s = imageRepositoryWithoutTag.trim();
|
|
107
|
-
const i = s.lastIndexOf("/");
|
|
108
|
-
return i >= 0 ? s.slice(i + 1) : s;
|
|
109
|
-
}
|
|
110
92
|
/**
|
|
111
93
|
* 将历史键名 `deploy` 迁到 `frontendDeploy`(读入后删除旧键,下次写回即为新协议)。
|
|
112
94
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apm-config.js","sourceRoot":"","sources":["../../src/core/apm-config.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"apm-config.js","sourceRoot":"","sources":["../../src/core/apm-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
|
-
import type { BackendDeployParams
|
|
1
|
+
import type { BackendDeployParams } from "./types";
|
|
2
2
|
/**
|
|
3
3
|
* 后端镜像部署编排:本地构建 → 推送私有 Registry → 远程 Docker 拉取镜像。
|
|
4
4
|
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
5
|
+
* 与常见「Deployer」脚本对应关系:本地 `docker build` + `docker login` + `docker push`
|
|
6
|
+
* 在这里拆成独立步骤;镜像名在 CLI 侧已拼成完整 `imageRef`(等价于先 build -t 再 tag 成仓库地址)。
|
|
7
|
+
* 远程 `docker pull` 用 dockerode 调用远程引擎 API(参考代码若只操作本机则不会包含这一步)。
|
|
8
|
+
*
|
|
9
|
+
* 配置由 {@link BackendDeployParams} 传入(例如从 `.apm/apm.config.json` 映射)。
|
|
7
10
|
*/
|
|
8
11
|
export declare class BackendDeployWorkflow {
|
|
9
12
|
private readonly params;
|
|
10
13
|
constructor(params: BackendDeployParams);
|
|
11
14
|
/**
|
|
12
|
-
* @param cwd - 解析相对路径时的基准目录(Dockerfile
|
|
15
|
+
* @param cwd - 解析相对路径时的基准目录(Dockerfile)
|
|
13
16
|
*/
|
|
14
|
-
run(cwd
|
|
17
|
+
run(cwd: string): Promise<void>;
|
|
15
18
|
}
|
|
16
19
|
//# sourceMappingURL=backend-deploy-workflow.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend-deploy-workflow.d.ts","sourceRoot":"","sources":["../../../src/core/backend-deploy/backend-deploy-workflow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"backend-deploy-workflow.d.ts","sourceRoot":"","sources":["../../../src/core/backend-deploy/backend-deploy-workflow.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAGnD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,mBAAmB;IAExD;;OAEG;IACG,GAAG,CAAC,GAAG,EAAE,MAAM;CAsDtB"}
|
|
@@ -1,16 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.BackendDeployWorkflow = void 0;
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
|
+
const dockerode_client_1 = require("./dockerode-client");
|
|
9
|
+
const image_tag_1 = require("./image-tag");
|
|
4
10
|
const local_docker_build_1 = require("./local-docker-build");
|
|
11
|
+
const logger_1 = require("./logger");
|
|
5
12
|
const registry_login_push_1 = require("./registry-login-push");
|
|
6
|
-
const remote_docker_client_1 = require("./remote-docker-client");
|
|
7
|
-
const remote_pull_image_1 = require("./remote-pull-image");
|
|
8
13
|
const resolve_dockerfile_1 = require("./resolve-dockerfile");
|
|
14
|
+
const env_1 = require("./dockerode-client/env");
|
|
9
15
|
/**
|
|
10
16
|
* 后端镜像部署编排:本地构建 → 推送私有 Registry → 远程 Docker 拉取镜像。
|
|
11
17
|
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
18
|
+
* 与常见「Deployer」脚本对应关系:本地 `docker build` + `docker login` + `docker push`
|
|
19
|
+
* 在这里拆成独立步骤;镜像名在 CLI 侧已拼成完整 `imageRef`(等价于先 build -t 再 tag 成仓库地址)。
|
|
20
|
+
* 远程 `docker pull` 用 dockerode 调用远程引擎 API(参考代码若只操作本机则不会包含这一步)。
|
|
21
|
+
*
|
|
22
|
+
* 配置由 {@link BackendDeployParams} 传入(例如从 `.apm/apm.config.json` 映射)。
|
|
14
23
|
*/
|
|
15
24
|
class BackendDeployWorkflow {
|
|
16
25
|
params;
|
|
@@ -18,35 +27,52 @@ class BackendDeployWorkflow {
|
|
|
18
27
|
this.params = params;
|
|
19
28
|
}
|
|
20
29
|
/**
|
|
21
|
-
* @param cwd - 解析相对路径时的基准目录(Dockerfile
|
|
30
|
+
* @param cwd - 解析相对路径时的基准目录(Dockerfile)
|
|
22
31
|
*/
|
|
23
|
-
async run(cwd
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
32
|
+
async run(cwd) {
|
|
33
|
+
(0, resolve_dockerfile_1.resolveDockerBuildPaths)(cwd);
|
|
34
|
+
(0, image_tag_1.assertDeployImageTag)(this.params.tag);
|
|
35
|
+
(0, local_docker_build_1.buildDockerImageLocally)(this.params, cwd);
|
|
36
|
+
(0, registry_login_push_1.dockerLoginPrivateRegistry)(this.params, cwd);
|
|
37
|
+
(0, registry_login_push_1.dockerTagImage)(this.params, cwd);
|
|
38
|
+
(0, registry_login_push_1.dockerPushImage)(this.params, cwd);
|
|
39
|
+
const remoteClient = (0, dockerode_client_1.createDockerodeClient)({
|
|
40
|
+
host: this.params.remoteHost,
|
|
41
|
+
port: this.params.remotePort,
|
|
42
|
+
protocol: this.params.remoteProtocol,
|
|
43
|
+
ca: this.params.remoteCaPath,
|
|
44
|
+
cert: this.params.remoteCertPath,
|
|
45
|
+
key: this.params.remoteKeyPath,
|
|
46
|
+
});
|
|
47
|
+
const serveraddress = `https://${this.params.registryHost}`;
|
|
48
|
+
const image = `${this.params.registryHost}/${this.params.registryNamespace}/${this.params.image}:${this.params.tag}`;
|
|
49
|
+
const containerName = `${this.params.image}:${this.params.tag}`;
|
|
50
|
+
const existingContainerId = await remoteClient.findContainerIdByName(containerName);
|
|
51
|
+
if (existingContainerId) {
|
|
52
|
+
logger_1.Logger.info(`远程容器「${containerName}」已存在,正在停止并删除容器...`);
|
|
53
|
+
await remoteClient.stopContainer(existingContainerId);
|
|
54
|
+
await remoteClient.removeContainer(existingContainerId);
|
|
55
|
+
}
|
|
56
|
+
if (await remoteClient.imageExists(image)) {
|
|
57
|
+
logger_1.Logger.info("远程已存在同名镜像,正在删除以便重新拉取...");
|
|
58
|
+
await remoteClient.removeImage(image);
|
|
59
|
+
}
|
|
60
|
+
await remoteClient.pullImage(image, {
|
|
61
|
+
username: this.params.registryUser,
|
|
62
|
+
password: this.params.registryPassword,
|
|
63
|
+
serveraddress,
|
|
64
|
+
});
|
|
65
|
+
logger_1.Logger.success("远程拉取镜像完成");
|
|
66
|
+
const envFilePath = node_path_1.default.resolve(cwd, this.params.envFilePath || '.env');
|
|
67
|
+
const envObj = (0, dockerode_client_1.loadEnvFromFile)(envFilePath);
|
|
68
|
+
const containerId = await remoteClient.createContainer({
|
|
69
|
+
name: containerName,
|
|
70
|
+
image,
|
|
71
|
+
env: (0, env_1.toEnvArray)(envObj),
|
|
72
|
+
...(0, dockerode_client_1.parsePorts)(this.params.containerPortsMappings)
|
|
33
73
|
});
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
await (0, registry_login_push_1.loginAndPushImage)(this.params.registry, this.params.imageRef);
|
|
37
|
-
completedSteps.push("registryPush");
|
|
38
|
-
console.log("登录并推送镜像完成,开始远程拉取镜像");
|
|
39
|
-
const remoteClient = (0, remote_docker_client_1.createRemoteDockerClient)(this.params.remoteDocker);
|
|
40
|
-
await (0, remote_pull_image_1.pullImageOnRemote)(remoteClient, this.params.imageRef, this.params.remotePullAuth);
|
|
41
|
-
completedSteps.push("remotePull");
|
|
42
|
-
console.log("远程拉取镜像完成,部署完成");
|
|
43
|
-
return {
|
|
44
|
-
ok: true,
|
|
45
|
-
imageRef: this.params.imageRef,
|
|
46
|
-
dockerfileAbs: paths.dockerfileAbs,
|
|
47
|
-
contextAbs: paths.contextAbs,
|
|
48
|
-
completedSteps,
|
|
49
|
-
};
|
|
74
|
+
await remoteClient.startContainer(containerId);
|
|
75
|
+
logger_1.Logger.success("远程容器创建并启动完成");
|
|
50
76
|
}
|
|
51
77
|
}
|
|
52
78
|
exports.BackendDeployWorkflow = BackendDeployWorkflow;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend-deploy-workflow.js","sourceRoot":"","sources":["../../../src/core/backend-deploy/backend-deploy-workflow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"backend-deploy-workflow.js","sourceRoot":"","sources":["../../../src/core/backend-deploy/backend-deploy-workflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-runner.d.ts","sourceRoot":"","sources":["../../../src/core/backend-deploy/command-runner.ts"],"names":[],"mappings":"AAMA,qBAAa,aAAa;IACxB;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IAgBlD;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;CAY3D"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CommandRunner = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* 命令执行工具类
|
|
6
|
+
*/
|
|
7
|
+
const child_process_1 = require("child_process");
|
|
8
|
+
const logger_1 = require("./logger");
|
|
9
|
+
class CommandRunner {
|
|
10
|
+
/**
|
|
11
|
+
* 执行命令
|
|
12
|
+
*/
|
|
13
|
+
static exec(command, cwd) {
|
|
14
|
+
try {
|
|
15
|
+
logger_1.Logger.info(`执行命令: ${command}`);
|
|
16
|
+
const result = (0, child_process_1.execSync)(command, {
|
|
17
|
+
cwd,
|
|
18
|
+
encoding: "utf8",
|
|
19
|
+
stdio: "pipe",
|
|
20
|
+
});
|
|
21
|
+
return result.toString().trim();
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
logger_1.Logger.error(`命令执行失败: ${command}`);
|
|
25
|
+
logger_1.Logger.error(error.message);
|
|
26
|
+
throw error;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* 执行命令并显示输出
|
|
31
|
+
*/
|
|
32
|
+
static execWithOutput(command, cwd) {
|
|
33
|
+
try {
|
|
34
|
+
logger_1.Logger.info(`执行命令: ${command}`);
|
|
35
|
+
(0, child_process_1.execSync)(command, {
|
|
36
|
+
cwd,
|
|
37
|
+
stdio: "inherit",
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
catch (error) {
|
|
41
|
+
logger_1.Logger.error(`命令执行失败: ${command}`);
|
|
42
|
+
throw error;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
exports.CommandRunner = CommandRunner;
|
|
47
|
+
//# sourceMappingURL=command-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command-runner.js","sourceRoot":"","sources":["../../../src/core/backend-deploy/command-runner.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,iDAAyC;AACzC,qCAAkC;AAElC,MAAa,aAAa;IACxB;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,GAAY;QACvC,IAAI,CAAC;YACH,eAAM,CAAC,IAAI,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC;YAChC,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,OAAO,EAAE;gBAC/B,GAAG;gBACH,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAClC,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,eAAM,CAAC,KAAK,CAAC,WAAW,OAAO,EAAE,CAAC,CAAC;YACnC,eAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,OAAe,EAAE,GAAY;QACjD,IAAI,CAAC;YACH,eAAM,CAAC,IAAI,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC;YAChC,IAAA,wBAAQ,EAAC,OAAO,EAAE;gBAChB,GAAG;gBACH,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,eAAM,CAAC,KAAK,CAAC,WAAW,OAAO,EAAE,CAAC,CAAC;YACnC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF;AAnCD,sCAmCC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { DockerContainerStateSummary, DockerCreateContainerInput, DockerodeClientFactory, DockerodeClientPort, DockerDeployConnectionConfig, DockerPullAuth } from "./types";
|
|
2
|
+
export declare class DockerodeClient implements DockerodeClientPort {
|
|
3
|
+
private readonly client;
|
|
4
|
+
constructor(config: DockerDeployConnectionConfig);
|
|
5
|
+
ping(): Promise<void>;
|
|
6
|
+
imageExists(image: string): Promise<boolean>;
|
|
7
|
+
removeImage(image: string): Promise<void>;
|
|
8
|
+
pullImage(image: string, auth?: DockerPullAuth): Promise<void>;
|
|
9
|
+
findContainerIdByName(name: string): Promise<string | undefined>;
|
|
10
|
+
stopContainer(id: string): Promise<void>;
|
|
11
|
+
removeContainer(id: string): Promise<void>;
|
|
12
|
+
createContainer(input: DockerCreateContainerInput): Promise<string>;
|
|
13
|
+
startContainer(id: string): Promise<void>;
|
|
14
|
+
inspectContainer(id: string): Promise<DockerContainerStateSummary>;
|
|
15
|
+
getContainerLogs(id: string, tail?: number): Promise<string>;
|
|
16
|
+
}
|
|
17
|
+
export declare const createDockerodeClient: DockerodeClientFactory;
|
|
18
|
+
//# sourceMappingURL=client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../src/core/backend-deploy/dockerode-client/client.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,2BAA2B,EAC3B,0BAA0B,EAC1B,sBAAsB,EACtB,mBAAmB,EACnB,4BAA4B,EAC5B,cAAc,EACf,MAAM,SAAS,CAAC;AAEjB,qBAAa,eAAgB,YAAW,mBAAmB;IACzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAEpB,MAAM,EAAE,4BAA4B;IAK1C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAS5C,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B9D,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAQhE,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASxC,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1C,eAAe,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,MAAM,CAAC;IAMnE,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKzC,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAiBlE,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,SAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAchE;AAED,eAAO,MAAM,qBAAqB,EAAE,sBACP,CAAC"}
|