tuyoo-devflow 0.1.21 → 0.1.22
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 +6 -0
- package/README.md +16 -2
- package/dist/commands/agent/doctor.js +13 -3
- package/dist/commands/agent/doctor.js.map +1 -1
- package/dist/commands/agent/install.js +22 -7
- package/dist/commands/agent/install.js.map +1 -1
- package/dist/commands/agent/linuxRunUserPrompt.d.ts +6 -0
- package/dist/commands/agent/linuxRunUserPrompt.js +61 -0
- package/dist/commands/agent/linuxRunUserPrompt.js.map +1 -0
- package/dist/commands/agent/shared.d.ts +1 -1
- package/dist/commands/agent/shared.js +2 -2
- package/dist/commands/agent/shared.js.map +1 -1
- package/dist/core/generator/linuxSystemd.js +2 -2
- package/dist/core/linuxUser.d.ts +7 -0
- package/dist/core/linuxUser.js +61 -0
- package/dist/core/linuxUser.js.map +1 -0
- package/dist/core/pipeline/setupPytuyooPipeline.d.ts +2 -0
- package/dist/core/pipeline/setupPytuyooPipeline.js +10 -6
- package/dist/core/pipeline/setupPytuyooPipeline.js.map +1 -1
- package/dist/core/platform.d.ts +1 -1
- package/dist/core/platform.js +2 -2
- package/dist/core/platform.js.map +1 -1
- package/dist/core/precheck/linuxGuard.d.ts +1 -1
- package/dist/core/precheck/linuxGuard.js +18 -9
- package/dist/core/precheck/linuxGuard.js.map +1 -1
- package/dist/core/store/linuxRunUserStore.d.ts +8 -0
- package/dist/core/store/linuxRunUserStore.js +43 -0
- package/dist/core/store/linuxRunUserStore.js.map +1 -0
- package/dist/types.d.ts +2 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
|
|
|
6
6
|
|
|
7
7
|
## [Unreleased]
|
|
8
8
|
|
|
9
|
+
## [0.1.22] - 2026-04-23
|
|
10
|
+
|
|
11
|
+
### Changed
|
|
12
|
+
|
|
13
|
+
- Linux `agent doctor` / `agent install` 现在支持选择或通过 `--linux-user` 指定运行用户,不再固定要求 `tywork`;systemd、conda 与 `pytuyoo-pipeline` 准备流程会统一使用该用户。
|
|
14
|
+
|
|
9
15
|
## [0.1.21] - 2026-04-23
|
|
10
16
|
|
|
11
17
|
### Changed
|
package/README.md
CHANGED
|
@@ -29,8 +29,9 @@
|
|
|
29
29
|
- Miniconda(`conda` 命令可用)
|
|
30
30
|
- Linux 额外要求:
|
|
31
31
|
- 系统必须是 `rocky9*`
|
|
32
|
-
-
|
|
33
|
-
-
|
|
32
|
+
- 必须存在本次选择的 Linux 运行用户
|
|
33
|
+
- `doctor` / `install` 会在 Linux 下提示选择运行用户,也可通过 `--linux-user <user>` 显式指定
|
|
34
|
+
- 若当前执行账号与目标运行用户不同,需要具备 `sudo -u <user>` 及 systemd 相关权限
|
|
34
35
|
|
|
35
36
|
## 安装与开发
|
|
36
37
|
|
|
@@ -53,6 +54,12 @@ npm run dev -- --help
|
|
|
53
54
|
tdf agent doctor
|
|
54
55
|
```
|
|
55
56
|
|
|
57
|
+
Linux 如需显式指定运行用户:
|
|
58
|
+
|
|
59
|
+
```bash
|
|
60
|
+
tdf agent doctor --linux-user alice
|
|
61
|
+
```
|
|
62
|
+
|
|
56
63
|
进入后会自动进入交互式页面:
|
|
57
64
|
|
|
58
65
|
- 先展示当前系统信息
|
|
@@ -66,6 +73,12 @@ tdf agent doctor
|
|
|
66
73
|
tdf agent install
|
|
67
74
|
```
|
|
68
75
|
|
|
76
|
+
Linux 如需显式指定运行用户:
|
|
77
|
+
|
|
78
|
+
```bash
|
|
79
|
+
tdf agent install --linux-user alice
|
|
80
|
+
```
|
|
81
|
+
|
|
69
82
|
macOS 如需改为直接脚本启动,可显式指定:
|
|
70
83
|
|
|
71
84
|
```bash
|
|
@@ -130,6 +143,7 @@ bash <workDir>/start_jenkins_agent.sh
|
|
|
130
143
|
- Linux:
|
|
131
144
|
- `${workDir}/start_jenkins_agent.sh`
|
|
132
145
|
- 默认自动安装 `/etc/systemd/system/jenkins_agent.service` 并执行 `systemctl daemon-reload && systemctl enable --now`
|
|
146
|
+
- systemd、conda、`pytuyoo-pipeline` 准备流程都会使用本次选择的 Linux 运行用户
|
|
133
147
|
- 若 `jenkins_agent.service` 已存在,会提示输入新的 `.service` 文件名后继续自动安装与启动
|
|
134
148
|
- 同时保留 `${workDir}/<service>.service` 本地副本,便于排查
|
|
135
149
|
- 写入 `${workDir}/agent-install.json`,记录最终服务名与安装结果,供后续卸载自动识别
|
|
@@ -6,6 +6,7 @@ import { summarizeDoctorCheckProfile, } from "../../core/precheck/checkProfile.j
|
|
|
6
6
|
import { getFailedToolKinds, getNonAutoInstallableFailedToolChecks, guideAndInstallMissingTools, } from "../../core/precheck/autoInstall.js";
|
|
7
7
|
import { checkRequiredTools } from "../../core/precheck/tools.js";
|
|
8
8
|
import { collectSystemInfoResults } from "../../core/precheck/systemInfo.js";
|
|
9
|
+
import { resolveLinuxRunUser } from "./linuxRunUserPrompt.js";
|
|
9
10
|
import { readDoctorCheckProfile, writeDoctorCheckProfile, } from "../../core/store/doctorCheckProfileStore.js";
|
|
10
11
|
import { loadDoctorJenkinsUrlCache, saveDoctorJenkinsUrlCache, shouldPersistDoctorJenkinsUrlCache, } from "../../core/store/doctorJenkinsUrlCache.js";
|
|
11
12
|
import { CheckReport } from "../../ui/CheckReport.js";
|
|
@@ -29,12 +30,21 @@ export function registerDoctorCommand(agentCommand) {
|
|
|
29
30
|
agentCommand
|
|
30
31
|
.command("doctor")
|
|
31
32
|
.description("进入交互式 doctor 页面并执行检查")
|
|
32
|
-
.
|
|
33
|
+
.option("--linux-user <user>", "Linux 运行用户(systemd / conda / pipeline 将以该用户执行)")
|
|
34
|
+
.action(async (options) => {
|
|
33
35
|
try {
|
|
34
36
|
const platform = getSupportedPlatform();
|
|
35
37
|
const username = getCurrentUsername();
|
|
36
38
|
const systemInfo = collectSystemInfoResults(platform, username);
|
|
37
39
|
await renderOnce(_jsx(CheckReport, { title: "\u5F53\u524D\u7CFB\u7EDF\u4FE1\u606F", results: systemInfo }));
|
|
40
|
+
const linuxRunUser = await resolveLinuxRunUser({
|
|
41
|
+
platform,
|
|
42
|
+
currentUser: username,
|
|
43
|
+
requestedRunUser: options.linuxUser,
|
|
44
|
+
});
|
|
45
|
+
if (linuxRunUser) {
|
|
46
|
+
console.log(`本次 Linux 运行用户: ${linuxRunUser}`);
|
|
47
|
+
}
|
|
38
48
|
const cachedJenkinsUrl = await loadDoctorJenkinsUrlCache();
|
|
39
49
|
let jenkinsUrl;
|
|
40
50
|
if (cachedJenkinsUrl) {
|
|
@@ -71,7 +81,7 @@ export function registerDoctorCommand(agentCommand) {
|
|
|
71
81
|
const checkProfile = await promptDoctorCheckProfile(jenkinsUrl, previousProfile);
|
|
72
82
|
await writeDoctorCheckProfile(checkProfile);
|
|
73
83
|
console.log(`本次检查策略: ${summarizeDoctorCheckProfile(jenkinsUrl, checkProfile)}`);
|
|
74
|
-
let checks = await runDoctorChecks(platform, jenkinsUrl, checkProfile.selectedNetworkTargets);
|
|
84
|
+
let checks = await runDoctorChecks(platform, jenkinsUrl, checkProfile.selectedNetworkTargets, linuxRunUser);
|
|
75
85
|
await printCheckSummary(checks);
|
|
76
86
|
if (hasLinuxOrNetworkFailure(checks)) {
|
|
77
87
|
await printFailedWhitelistReport(checks);
|
|
@@ -98,7 +108,7 @@ export function registerDoctorCommand(agentCommand) {
|
|
|
98
108
|
console.error("工具自动安装后仍有失败项,请手动修复。");
|
|
99
109
|
return;
|
|
100
110
|
}
|
|
101
|
-
checks = await runDoctorChecks(platform, jenkinsUrl, checkProfile.selectedNetworkTargets);
|
|
111
|
+
checks = await runDoctorChecks(platform, jenkinsUrl, checkProfile.selectedNetworkTargets, linuxRunUser);
|
|
102
112
|
}
|
|
103
113
|
const remainingManualOnlyFailedToolChecks = getNonAutoInstallableFailedToolChecks(getFailedToolChecks(checks));
|
|
104
114
|
if (remainingManualOnlyFailedToolChecks.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/commands/agent/doctor.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACL,2BAA2B,GAC5B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,kBAAkB,EAClB,qCAAqC,EACrC,2BAA2B,GAC5B,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EACL,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,kCAAkC,GACnC,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB,EACjB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/commands/agent/doctor.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { VERSION_POLICY } from "../../constants/versionPolicy.js";
|
|
|
6
6
|
import { downloadAgentJar } from "../../core/jenkins/downloadAgentJar.js";
|
|
7
7
|
import { buildJavaArgsFromParsed } from "../../core/jenkins/directLaunch.js";
|
|
8
8
|
import { parseAgentCommand } from "../../core/jenkins/parseAgentCommand.js";
|
|
9
|
+
import { resolveLinuxUserHome } from "../../core/linuxUser.js";
|
|
9
10
|
import { safeErrorMessage } from "../../core/log/redact.js";
|
|
10
11
|
import { getCurrentUsername, getDefaultPipelineRepoDir, getSupportedPlatform } from "../../core/platform.js";
|
|
11
12
|
import { checkCondaEnvExists, inspectCondaActivateForShell, runCondaInitForShell, setupPytuyooPipelineEnv, } from "../../core/pipeline/setupPytuyooPipeline.js";
|
|
@@ -24,6 +25,7 @@ import { getDefaultDoctorCheckProfile, summarizeDoctorCheckProfile, } from "../.
|
|
|
24
25
|
import { readDoctorCheckProfile, writeDoctorCheckProfile, } from "../../core/store/doctorCheckProfileStore.js";
|
|
25
26
|
import { getFailedToolChecks, hasLinuxOrNetworkFailure, printCheckSummary, runDoctorChecks, } from "./shared.js";
|
|
26
27
|
import { promptDoctorCheckProfile } from "./checkProfilePrompt.js";
|
|
28
|
+
import { resolveLinuxRunUser } from "./linuxRunUserPrompt.js";
|
|
27
29
|
export const DEFAULT_LINUX_SYSTEMD_SERVICE_FILE = "jenkins_agent.service";
|
|
28
30
|
function printAgentCommandInputGuide() {
|
|
29
31
|
console.log("");
|
|
@@ -154,6 +156,7 @@ export function registerInstallCommand(agentCommand) {
|
|
|
154
156
|
.option("--java-line <line>", "java 启动命令行")
|
|
155
157
|
.option("--gitlab-user <user>", "GitLab 用户名")
|
|
156
158
|
.option("--gitlab-token <token>", "GitLab Token(不建议命令行明文传入)")
|
|
159
|
+
.option("--linux-user <user>", "Linux 运行用户(systemd / conda / pipeline 将以该用户执行)")
|
|
157
160
|
.option("--mac-start-mode <mode>", "macOS 启动方式:tmux(默认)、launchctl 或 script", "tmux")
|
|
158
161
|
.option("--reconfigure-checks", "重新选择本次 install 需要阻塞通过的网络检查项")
|
|
159
162
|
.action(async (options) => {
|
|
@@ -161,8 +164,13 @@ export function registerInstallCommand(agentCommand) {
|
|
|
161
164
|
const platform = getSupportedPlatform();
|
|
162
165
|
const currentUser = getCurrentUsername();
|
|
163
166
|
const macStartMode = normalizeMacStartMode(options.macStartMode);
|
|
164
|
-
|
|
165
|
-
|
|
167
|
+
const linuxRunUser = await resolveLinuxRunUser({
|
|
168
|
+
platform,
|
|
169
|
+
currentUser,
|
|
170
|
+
requestedRunUser: options.linuxUser,
|
|
171
|
+
});
|
|
172
|
+
if (linuxRunUser) {
|
|
173
|
+
console.log(`本次 Linux 运行用户: ${linuxRunUser}`);
|
|
166
174
|
}
|
|
167
175
|
const cachedCommands = await loadInstallCommandCache();
|
|
168
176
|
let curlLine = options.curlLine;
|
|
@@ -235,7 +243,7 @@ export function registerInstallCommand(agentCommand) {
|
|
|
235
243
|
console.log("未发现 doctor 检查策略,当前按基础模式执行网络检查(默认不含 Harbor)。");
|
|
236
244
|
}
|
|
237
245
|
console.log(`步骤 2/5: 执行系统、网络与工具检查(${summarizeDoctorCheckProfile(parsed.jenkinsBaseUrl, doctorCheckProfile)})...`);
|
|
238
|
-
const checks = await runDoctorChecks(platform, parsed.jenkinsBaseUrl, doctorCheckProfile.selectedNetworkTargets);
|
|
246
|
+
const checks = await runDoctorChecks(platform, parsed.jenkinsBaseUrl, doctorCheckProfile.selectedNetworkTargets, linuxRunUser);
|
|
239
247
|
await printCheckSummary(checks);
|
|
240
248
|
if (hasLinuxOrNetworkFailure(checks)) {
|
|
241
249
|
throw new Error("系统/网络前置检查未通过,安装中止。");
|
|
@@ -262,10 +270,12 @@ export function registerInstallCommand(agentCommand) {
|
|
|
262
270
|
await saveInstallCommandCache(curlLine, javaLine);
|
|
263
271
|
}
|
|
264
272
|
console.log("步骤 3/5: 准备 GitLab 凭证与 conda 流水线环境...");
|
|
265
|
-
const
|
|
273
|
+
const linuxHomeDir = platform === "linux" && linuxRunUser ? await resolveLinuxUserHome(linuxRunUser) : undefined;
|
|
274
|
+
const repoDir = getDefaultPipelineRepoDir(platform, linuxHomeDir);
|
|
266
275
|
const hasPipelineEnv = await checkCondaEnvExists({
|
|
267
276
|
platform,
|
|
268
277
|
envName: VERSION_POLICY.conda.envName,
|
|
278
|
+
linuxRunUser,
|
|
269
279
|
});
|
|
270
280
|
let shouldSetupPipelineRepo = true;
|
|
271
281
|
if (hasPipelineEnv) {
|
|
@@ -300,6 +310,7 @@ export function registerInstallCommand(agentCommand) {
|
|
|
300
310
|
repoDir,
|
|
301
311
|
gitlabUsername: gitlabUser,
|
|
302
312
|
gitlabToken,
|
|
313
|
+
linuxRunUser,
|
|
303
314
|
logger(message) {
|
|
304
315
|
console.log(`[步骤 3/5] ${message}`);
|
|
305
316
|
},
|
|
@@ -307,7 +318,7 @@ export function registerInstallCommand(agentCommand) {
|
|
|
307
318
|
}
|
|
308
319
|
const condaActivateStatus = await inspectCondaActivateForShell({
|
|
309
320
|
platform,
|
|
310
|
-
asUser: platform === "linux" ?
|
|
321
|
+
asUser: platform === "linux" ? linuxRunUser : undefined,
|
|
311
322
|
envName: VERSION_POLICY.conda.envName,
|
|
312
323
|
});
|
|
313
324
|
if (condaActivateStatus.supported) {
|
|
@@ -319,7 +330,7 @@ export function registerInstallCommand(agentCommand) {
|
|
|
319
330
|
try {
|
|
320
331
|
const afterInit = await runCondaInitForShell({
|
|
321
332
|
platform,
|
|
322
|
-
asUser: platform === "linux" ?
|
|
333
|
+
asUser: platform === "linux" ? linuxRunUser : undefined,
|
|
323
334
|
logger(message) {
|
|
324
335
|
console.log(`[步骤 3/5] ${message}`);
|
|
325
336
|
},
|
|
@@ -352,18 +363,20 @@ export function registerInstallCommand(agentCommand) {
|
|
|
352
363
|
await writeLinuxStartupScript(startupScriptPath, parsed.workDir, javaArgs);
|
|
353
364
|
const installed = await tryInstallSystemdService({
|
|
354
365
|
serviceName,
|
|
355
|
-
serviceUser:
|
|
366
|
+
serviceUser: linuxRunUser ?? currentUser,
|
|
356
367
|
workDir: parsed.workDir,
|
|
357
368
|
startupScriptPath,
|
|
358
369
|
agentLabel: parsed.nodeName,
|
|
359
370
|
});
|
|
360
371
|
metadata = {
|
|
372
|
+
linuxRunUser,
|
|
361
373
|
serviceName,
|
|
362
374
|
serviceFileName: `${serviceName}.service`,
|
|
363
375
|
systemUnitPath: installed.unitPath,
|
|
364
376
|
localUnitPath: installed.localUnitPath,
|
|
365
377
|
};
|
|
366
378
|
summaryLines = [
|
|
379
|
+
`运行用户: ${linuxRunUser ?? currentUser}`,
|
|
367
380
|
`Conda 环境: ${VERSION_POLICY.conda.envName}`,
|
|
368
381
|
`启动脚本(含明文 secret): ${startupScriptPath}`,
|
|
369
382
|
`服务文件: ${installed.unitPath}`,
|
|
@@ -440,6 +453,7 @@ export function registerInstallCommand(agentCommand) {
|
|
|
440
453
|
}
|
|
441
454
|
const profile = await upsertProfile({
|
|
442
455
|
platform,
|
|
456
|
+
linuxRunUser,
|
|
443
457
|
macStartMode: metadata.macStartMode,
|
|
444
458
|
mode: parsed.mode,
|
|
445
459
|
jenkinsBaseUrl: parsed.jenkinsBaseUrl,
|
|
@@ -455,6 +469,7 @@ export function registerInstallCommand(agentCommand) {
|
|
|
455
469
|
});
|
|
456
470
|
await writeInstallMetadata({
|
|
457
471
|
platform,
|
|
472
|
+
linuxRunUser,
|
|
458
473
|
macStartMode: metadata.macStartMode,
|
|
459
474
|
workDir: parsed.workDir,
|
|
460
475
|
startupScriptPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/commands/agent/install.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/commands/agent/install.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { confirm, input } from "@inquirer/prompts";
|
|
2
|
+
import { safeErrorMessage } from "../../core/log/redact.js";
|
|
3
|
+
import { resolveDefaultLinuxRunUser, validateLinuxRunUser, } from "../../core/linuxUser.js";
|
|
4
|
+
import { readLinuxRunUserConfig, writeLinuxRunUserConfig, } from "../../core/store/linuxRunUserStore.js";
|
|
5
|
+
function formatCacheTime(isoTime) {
|
|
6
|
+
if (!isoTime) {
|
|
7
|
+
return "未知时间";
|
|
8
|
+
}
|
|
9
|
+
const date = new Date(isoTime);
|
|
10
|
+
if (Number.isNaN(date.getTime())) {
|
|
11
|
+
return isoTime;
|
|
12
|
+
}
|
|
13
|
+
return date.toLocaleString();
|
|
14
|
+
}
|
|
15
|
+
export async function resolveLinuxRunUser(options) {
|
|
16
|
+
if (options.platform !== "linux") {
|
|
17
|
+
return undefined;
|
|
18
|
+
}
|
|
19
|
+
if (options.requestedRunUser) {
|
|
20
|
+
const validated = await validateLinuxRunUser(options.requestedRunUser);
|
|
21
|
+
await writeLinuxRunUserConfig(validated);
|
|
22
|
+
return validated;
|
|
23
|
+
}
|
|
24
|
+
const cached = await readLinuxRunUserConfig();
|
|
25
|
+
if (cached) {
|
|
26
|
+
try {
|
|
27
|
+
const validatedCached = await validateLinuxRunUser(cached.runUser);
|
|
28
|
+
console.log(`检测到本地缓存的 Linux 运行用户(更新时间: ${formatCacheTime(cached.updatedAt)})。`);
|
|
29
|
+
console.log(`缓存内容: ${validatedCached}`);
|
|
30
|
+
const shouldModifyCachedUser = await confirm({
|
|
31
|
+
message: "是否需要修改 Linux 运行用户?(默认不修改,直接继续下一步)",
|
|
32
|
+
default: false,
|
|
33
|
+
});
|
|
34
|
+
if (!shouldModifyCachedUser) {
|
|
35
|
+
console.log("已使用本地缓存的 Linux 运行用户,继续执行。");
|
|
36
|
+
return validatedCached;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
// ignore invalid runtime cache and reprompt below
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
const defaultRunUser = cached?.runUser ?? (await resolveDefaultLinuxRunUser(options.currentUser));
|
|
44
|
+
const runUser = await input({
|
|
45
|
+
message: "请输入 Linux 运行用户(systemd / conda / pipeline 将以该用户执行)",
|
|
46
|
+
default: defaultRunUser,
|
|
47
|
+
async validate(value) {
|
|
48
|
+
try {
|
|
49
|
+
await validateLinuxRunUser(value);
|
|
50
|
+
return true;
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
return safeErrorMessage(error);
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
});
|
|
57
|
+
const validated = await validateLinuxRunUser(runUser);
|
|
58
|
+
await writeLinuxRunUserConfig(validated);
|
|
59
|
+
return validated;
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=linuxRunUserPrompt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"linuxRunUserPrompt.js","sourceRoot":"","sources":["../../../src/commands/agent/linuxRunUserPrompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,uCAAuC,CAAC;AAG/C,SAAS,eAAe,CAAC,OAAe;IACtC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAIzC;IACC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC7B,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACvE,MAAM,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACzC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAC9C,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACnE,OAAO,CAAC,GAAG,CACT,6BAA6B,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CACnE,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,SAAS,eAAe,EAAE,CAAC,CAAC;YACxC,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC;gBAC3C,OAAO,EAAE,mCAAmC;gBAC5C,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YACH,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;gBACzC,OAAO,eAAe,CAAC;YACzB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,kDAAkD;QACpD,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,EAAE,OAAO,IAAI,CAAC,MAAM,0BAA0B,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IAClG,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC;QAC1B,OAAO,EAAE,oDAAoD;QAC7D,OAAO,EAAE,cAAc;QACvB,KAAK,CAAC,QAAQ,CAAC,KAAK;YAClB,IAAI,CAAC;gBACH,MAAM,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBAClC,OAAO,IAAI,CAAC;YACd,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,uBAAuB,CAAC,SAAS,CAAC,CAAC;IACzC,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -4,7 +4,7 @@ export interface DoctorCheckResult {
|
|
|
4
4
|
networkResults: NetworkCheckResult[];
|
|
5
5
|
toolResults: CheckResult[];
|
|
6
6
|
}
|
|
7
|
-
export declare function runDoctorChecks(platform: SupportedPlatform, jenkinsBaseUrl: string, selectedNetworkTargets?: NetworkTargetKey[]): Promise<DoctorCheckResult>;
|
|
7
|
+
export declare function runDoctorChecks(platform: SupportedPlatform, jenkinsBaseUrl: string, selectedNetworkTargets?: NetworkTargetKey[], linuxRunUser?: string): Promise<DoctorCheckResult>;
|
|
8
8
|
export declare function hasBlockingFailure(checks: DoctorCheckResult): boolean;
|
|
9
9
|
export declare function hasLinuxOrNetworkFailure(checks: DoctorCheckResult): boolean;
|
|
10
10
|
export declare function getFailedToolChecks(checks: DoctorCheckResult): CheckResult[];
|
|
@@ -5,8 +5,8 @@ import { formatWhitelistFailureReport, saveWhitelistFailureReport, } from "../..
|
|
|
5
5
|
import { checkRequiredTools } from "../../core/precheck/tools.js";
|
|
6
6
|
import { CheckReport } from "../../ui/CheckReport.js";
|
|
7
7
|
import { renderOnce } from "../../ui/renderOnce.js";
|
|
8
|
-
export async function runDoctorChecks(platform, jenkinsBaseUrl, selectedNetworkTargets) {
|
|
9
|
-
const linuxResults = platform === "linux" ? await checkLinuxGuards() : [];
|
|
8
|
+
export async function runDoctorChecks(platform, jenkinsBaseUrl, selectedNetworkTargets, linuxRunUser) {
|
|
9
|
+
const linuxResults = platform === "linux" ? await checkLinuxGuards(linuxRunUser) : [];
|
|
10
10
|
const toolResults = await checkRequiredTools(platform, selectedNetworkTargets ?? []);
|
|
11
11
|
const networkResults = await checkWhitelistConnectivity(jenkinsBaseUrl, selectedNetworkTargets);
|
|
12
12
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/commands/agent/shared.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,GAC3B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAQpD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAA2B,EAC3B,cAAsB,EACtB,sBAA2C;
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/commands/agent/shared.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,GAC3B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAQpD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAA2B,EAC3B,cAAsB,EACtB,sBAA2C,EAC3C,YAAqB;IAErB,MAAM,YAAY,GAAG,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,QAAQ,EAAE,sBAAsB,IAAI,EAAE,CAAC,CAAC;IACrF,MAAM,cAAc,GAAG,MAAM,0BAA0B,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;IAChG,OAAO;QACL,YAAY;QACZ,cAAc;QACd,WAAW;KACZ,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAyB;IAC1D,OAAO,CAAC,GAAG,MAAM,CAAC,YAAY,EAAE,GAAG,MAAM,CAAC,cAAc,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CACnF,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CACjC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAAyB;IAChE,OAAO,CAAC,GAAG,MAAM,CAAC,YAAY,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;AACnG,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAyB;IAC3D,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAyB;IAC9D,OAAO,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAyB;IAC/D,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,UAAU,CAAC,KAAC,WAAW,IAAC,KAAK,EAAC,gCAAY,EAAC,OAAO,EAAE,MAAM,CAAC,YAAY,GAAI,CAAC,CAAC;IACrF,CAAC;IACD,MAAM,UAAU,CAAC,KAAC,WAAW,IAAC,KAAK,EAAC,4CAAS,EAAC,OAAO,EAAE,MAAM,CAAC,WAAW,GAAI,CAAC,CAAC;IAC/E,MAAM,UAAU,CACd,KAAC,WAAW,IACV,KAAK,EAAC,4CAAS,EACf,OAAO,EACL,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;YAC9B,CAAC,CAAC,MAAM,CAAC,cAAc;YACvB,CAAC,CAAC;gBACE;oBACE,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,sBAAsB;iBAC/B;aACF,GAEP,CACH,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAAyB;IACxE,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC3D,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,4BAA4B,CAAC,mBAAmB,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,MAAM,0BAA0B,CAAC,MAAM,CAAC,CAAC;IAE5D,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC1C,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,CAAC,KAAK,CAAC,UAAU,UAAU,EAAE,CAAC,CAAC;IAEtC,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -11,11 +11,11 @@ export function buildLinuxStartupScript(workDir, javaArgs) {
|
|
|
11
11
|
return `#!/usr/bin/env bash
|
|
12
12
|
set -euo pipefail
|
|
13
13
|
|
|
14
|
-
if [ -f
|
|
14
|
+
if [ -n "\${HOME:-}" ] && [ -f "$HOME/.bashrc" ]; then
|
|
15
15
|
# Some system bashrc files read unset guard variables and are not nounset-safe.
|
|
16
16
|
set +u
|
|
17
17
|
# shellcheck disable=SC1091
|
|
18
|
-
source
|
|
18
|
+
source "$HOME/.bashrc"
|
|
19
19
|
set -u
|
|
20
20
|
fi
|
|
21
21
|
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export declare const DEFAULT_LINUX_RUN_USER = "tywork";
|
|
2
|
+
export declare function normalizeLinuxRunUser(value: string): string;
|
|
3
|
+
export declare function isValidLinuxRunUser(value: string): boolean;
|
|
4
|
+
export declare function linuxUserExists(user: string): Promise<boolean>;
|
|
5
|
+
export declare function validateLinuxRunUser(user: string): Promise<string>;
|
|
6
|
+
export declare function resolveDefaultLinuxRunUser(currentUser: string): Promise<string>;
|
|
7
|
+
export declare function resolveLinuxUserHome(runUser: string): Promise<string>;
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import { runCommand } from "./shell/commandRunner.js";
|
|
3
|
+
export const DEFAULT_LINUX_RUN_USER = "tywork";
|
|
4
|
+
function shellQuote(value) {
|
|
5
|
+
return `'${value.replace(/'/g, `'\\''`)}'`;
|
|
6
|
+
}
|
|
7
|
+
export function normalizeLinuxRunUser(value) {
|
|
8
|
+
return value.trim();
|
|
9
|
+
}
|
|
10
|
+
export function isValidLinuxRunUser(value) {
|
|
11
|
+
return /^[A-Za-z_][A-Za-z0-9_.-]*[$]?$/.test(normalizeLinuxRunUser(value));
|
|
12
|
+
}
|
|
13
|
+
export async function linuxUserExists(user) {
|
|
14
|
+
const normalized = normalizeLinuxRunUser(user);
|
|
15
|
+
if (!isValidLinuxRunUser(normalized)) {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
const result = await runCommand(`id -u ${shellQuote(normalized)}`, { allowFailure: true });
|
|
19
|
+
return result.code === 0;
|
|
20
|
+
}
|
|
21
|
+
export async function validateLinuxRunUser(user) {
|
|
22
|
+
const normalized = normalizeLinuxRunUser(user);
|
|
23
|
+
if (!normalized) {
|
|
24
|
+
throw new Error("Linux 运行用户不能为空。");
|
|
25
|
+
}
|
|
26
|
+
if (!isValidLinuxRunUser(normalized)) {
|
|
27
|
+
throw new Error("Linux 运行用户名格式不正确。");
|
|
28
|
+
}
|
|
29
|
+
if (!(await linuxUserExists(normalized))) {
|
|
30
|
+
throw new Error(`Linux 用户不存在: ${normalized}`);
|
|
31
|
+
}
|
|
32
|
+
return normalized;
|
|
33
|
+
}
|
|
34
|
+
export async function resolveDefaultLinuxRunUser(currentUser) {
|
|
35
|
+
const normalizedCurrentUser = normalizeLinuxRunUser(currentUser);
|
|
36
|
+
if (normalizedCurrentUser && normalizedCurrentUser !== "root") {
|
|
37
|
+
return normalizedCurrentUser;
|
|
38
|
+
}
|
|
39
|
+
if (await linuxUserExists(DEFAULT_LINUX_RUN_USER)) {
|
|
40
|
+
return DEFAULT_LINUX_RUN_USER;
|
|
41
|
+
}
|
|
42
|
+
return normalizedCurrentUser || DEFAULT_LINUX_RUN_USER;
|
|
43
|
+
}
|
|
44
|
+
export async function resolveLinuxUserHome(runUser) {
|
|
45
|
+
const normalized = await validateLinuxRunUser(runUser);
|
|
46
|
+
const passwd = await runCommand(`getent passwd ${shellQuote(normalized)}`, {
|
|
47
|
+
allowFailure: true,
|
|
48
|
+
});
|
|
49
|
+
const entry = passwd.stdout.trim().split("\n").find(Boolean);
|
|
50
|
+
if (entry) {
|
|
51
|
+
const fields = entry.split(":");
|
|
52
|
+
if (fields[5]?.trim()) {
|
|
53
|
+
return fields[5].trim();
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
if (normalized === "root") {
|
|
57
|
+
return "/root";
|
|
58
|
+
}
|
|
59
|
+
return path.join("/home", normalized);
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=linuxUser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"linuxUser.js","sourceRoot":"","sources":["../../src/core/linuxUser.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ export interface SetupPipelineOptions {
|
|
|
4
4
|
repoDir: string;
|
|
5
5
|
gitlabUsername: string;
|
|
6
6
|
gitlabToken: string;
|
|
7
|
+
linuxRunUser?: string;
|
|
7
8
|
logger?: (message: string) => void;
|
|
8
9
|
}
|
|
9
10
|
export interface CondaActivateInspection {
|
|
@@ -16,6 +17,7 @@ export interface CondaActivateInspection {
|
|
|
16
17
|
export declare function checkCondaEnvExists(options: {
|
|
17
18
|
platform: SupportedPlatform;
|
|
18
19
|
envName?: string;
|
|
20
|
+
linuxRunUser?: string;
|
|
19
21
|
}): Promise<boolean>;
|
|
20
22
|
export declare function inspectCondaActivateForShell(options: {
|
|
21
23
|
platform: SupportedPlatform;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from "fs-extra";
|
|
2
2
|
import { VERSION_POLICY } from "../../constants/versionPolicy.js";
|
|
3
|
+
import { resolveLinuxUserHome } from "../linuxUser.js";
|
|
3
4
|
import { runCommand } from "../shell/commandRunner.js";
|
|
4
5
|
const PIPELINE_GIT_HOST = "tygit.tuyoo.com";
|
|
5
6
|
const PIPELINE_GIT_PATH = "liutongqing/pytuyoo-pipeline.git";
|
|
@@ -7,9 +8,9 @@ const CONDA_TOS_CHANNELS = [
|
|
|
7
8
|
"https://repo.anaconda.com/pkgs/main",
|
|
8
9
|
"https://repo.anaconda.com/pkgs/r",
|
|
9
10
|
];
|
|
10
|
-
function userForPlatform(platform) {
|
|
11
|
+
function userForPlatform(platform, linuxRunUser) {
|
|
11
12
|
if (platform === "linux") {
|
|
12
|
-
return
|
|
13
|
+
return linuxRunUser;
|
|
13
14
|
}
|
|
14
15
|
return undefined;
|
|
15
16
|
}
|
|
@@ -106,10 +107,13 @@ async function resolveCondaExecutable(runAsUser) {
|
|
|
106
107
|
"/opt/miniconda/bin/conda",
|
|
107
108
|
"/opt/conda/bin/conda",
|
|
108
109
|
"$HOME/miniconda3/bin/conda",
|
|
109
|
-
"/home/tywork/miniconda3/bin/conda",
|
|
110
110
|
];
|
|
111
|
+
if (runAsUser) {
|
|
112
|
+
const homeDir = await resolveLinuxUserHome(runAsUser);
|
|
113
|
+
fallbackCandidates.push(`${homeDir}/miniconda3/bin/conda`);
|
|
114
|
+
}
|
|
111
115
|
for (const candidate of fallbackCandidates) {
|
|
112
|
-
const check = await runCommand(`[ -x ${candidate} ]`, {
|
|
116
|
+
const check = await runCommand(`[ -x "${candidate}" ]`, {
|
|
113
117
|
asUser: runAsUser,
|
|
114
118
|
allowFailure: true,
|
|
115
119
|
});
|
|
@@ -127,7 +131,7 @@ async function detectCondaEnvExists(condaExecutable, envName, runAsUser) {
|
|
|
127
131
|
return envList.code === 0 && envList.stdout.includes(envName);
|
|
128
132
|
}
|
|
129
133
|
export async function checkCondaEnvExists(options) {
|
|
130
|
-
const runAsUser = userForPlatform(options.platform);
|
|
134
|
+
const runAsUser = userForPlatform(options.platform, options.linuxRunUser);
|
|
131
135
|
const envName = options.envName ?? VERSION_POLICY.conda.envName;
|
|
132
136
|
const condaExecutable = await resolveCondaExecutable(runAsUser);
|
|
133
137
|
return await detectCondaEnvExists(condaExecutable, envName, runAsUser);
|
|
@@ -188,7 +192,7 @@ export async function runCondaInitForShell(options) {
|
|
|
188
192
|
});
|
|
189
193
|
}
|
|
190
194
|
export async function setupPytuyooPipelineEnv(options) {
|
|
191
|
-
const runAsUser = userForPlatform(options.platform);
|
|
195
|
+
const runAsUser = userForPlatform(options.platform, options.linuxRunUser);
|
|
192
196
|
const envName = VERSION_POLICY.conda.envName;
|
|
193
197
|
const pythonVersion = VERSION_POLICY.conda.pythonVersion;
|
|
194
198
|
const log = options.logger ?? ((message) => console.log(message));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupPytuyooPipeline.js","sourceRoot":"","sources":["../../../src/core/pipeline/setupPytuyooPipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAC5C,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AAC7D,MAAM,kBAAkB,GAAG;IACzB,qCAAqC;IACrC,kCAAkC;CACnC,CAAC;
|
|
1
|
+
{"version":3,"file":"setupPytuyooPipeline.js","sourceRoot":"","sources":["../../../src/core/pipeline/setupPytuyooPipeline.ts"],"names":[],"mappings":"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"}
|
package/dist/core/platform.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SupportedPlatform } from "../types.js";
|
|
2
2
|
export declare function getSupportedPlatform(): SupportedPlatform;
|
|
3
3
|
export declare function getCurrentUsername(): string;
|
|
4
|
-
export declare function getDefaultPipelineRepoDir(platform: SupportedPlatform): string;
|
|
4
|
+
export declare function getDefaultPipelineRepoDir(platform: SupportedPlatform, linuxHomeDir?: string): string;
|
|
5
5
|
export declare function getConfigDir(): string;
|
package/dist/core/platform.js
CHANGED
|
@@ -15,9 +15,9 @@ export function getSupportedPlatform() {
|
|
|
15
15
|
export function getCurrentUsername() {
|
|
16
16
|
return os.userInfo().username;
|
|
17
17
|
}
|
|
18
|
-
export function getDefaultPipelineRepoDir(platform) {
|
|
18
|
+
export function getDefaultPipelineRepoDir(platform, linuxHomeDir) {
|
|
19
19
|
if (platform === "linux") {
|
|
20
|
-
return path.join("/home", "tywork", "pytuyoo-pipeline");
|
|
20
|
+
return path.join(linuxHomeDir ?? path.join("/home", "tywork"), "pytuyoo-pipeline");
|
|
21
21
|
}
|
|
22
22
|
return path.join(os.homedir(), "pytuyoo-pipeline");
|
|
23
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../src/core/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,UAAU,oBAAoB;IAClC,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,QAA2B;
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../src/core/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,UAAU,oBAAoB;IAClC,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,QAA2B,EAAE,YAAqB;IAC1F,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACrF,CAAC;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,kBAAkB,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { CheckResult } from "../../types.js";
|
|
2
|
-
export declare function checkLinuxGuards(): Promise<CheckResult[]>;
|
|
2
|
+
export declare function checkLinuxGuards(runUser?: string): Promise<CheckResult[]>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
|
-
import {
|
|
2
|
+
import { validateLinuxRunUser } from "../linuxUser.js";
|
|
3
3
|
function parseOsRelease(content) {
|
|
4
4
|
const output = {};
|
|
5
5
|
for (const line of content.split("\n")) {
|
|
@@ -11,7 +11,7 @@ function parseOsRelease(content) {
|
|
|
11
11
|
}
|
|
12
12
|
return output;
|
|
13
13
|
}
|
|
14
|
-
export async function checkLinuxGuards() {
|
|
14
|
+
export async function checkLinuxGuards(runUser = "tywork") {
|
|
15
15
|
if (process.platform !== "linux") {
|
|
16
16
|
return [];
|
|
17
17
|
}
|
|
@@ -36,13 +36,22 @@ export async function checkLinuxGuards() {
|
|
|
36
36
|
hint: "无法读取 /etc/os-release。",
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
39
|
+
try {
|
|
40
|
+
const validatedRunUser = await validateLinuxRunUser(runUser);
|
|
41
|
+
checks.push({
|
|
42
|
+
name: "Linux 运行用户检查",
|
|
43
|
+
status: "pass",
|
|
44
|
+
detail: `存在运行用户 ${validatedRunUser}`,
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
checks.push({
|
|
49
|
+
name: "Linux 运行用户检查",
|
|
50
|
+
status: "fail",
|
|
51
|
+
detail: error instanceof Error ? error.message : String(error),
|
|
52
|
+
hint: `请先创建运行用户 ${runUser} 后再安装。`,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
46
55
|
return checks;
|
|
47
56
|
}
|
|
48
57
|
//# sourceMappingURL=linuxGuard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linuxGuard.js","sourceRoot":"","sources":["../../../src/core/precheck/linuxGuard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"linuxGuard.js","sourceRoot":"","sources":["../../../src/core/precheck/linuxGuard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAQvD,SAAS,cAAc,CAAC,OAAe;IACrC,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,SAAS;QACX,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,GAAsB,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAO,GAAG,QAAQ;IACvD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,MAAM,GAAkB,EAAE,CAAC;IAEjC,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,QAAQ,GACZ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;YAClD,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAE7C,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;YAClC,MAAM,EAAE,OAAO,CAAC,WAAW,IAAI,SAAS;YACxC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,yBAAyB;SACvD,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YAC9D,IAAI,EAAE,uBAAuB;SAC9B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC7D,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,UAAU,gBAAgB,EAAE;SACrC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YAC9D,IAAI,EAAE,YAAY,OAAO,QAAQ;SAClC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export interface LinuxRunUserConfig {
|
|
2
|
+
runUser: string;
|
|
3
|
+
updatedAt: string;
|
|
4
|
+
}
|
|
5
|
+
export declare function getLinuxRunUserConfigPath(): string;
|
|
6
|
+
export declare function shouldPersistLinuxRunUser(runUser: string): boolean;
|
|
7
|
+
export declare function readLinuxRunUserConfig(): Promise<LinuxRunUserConfig | null>;
|
|
8
|
+
export declare function writeLinuxRunUserConfig(runUser: string): Promise<void>;
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import fs from "fs-extra";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { getConfigDir } from "../platform.js";
|
|
4
|
+
import { isValidLinuxRunUser, normalizeLinuxRunUser } from "../linuxUser.js";
|
|
5
|
+
const LINUX_RUN_USER_FILE_NAME = "linux-run-user.json";
|
|
6
|
+
export function getLinuxRunUserConfigPath() {
|
|
7
|
+
return path.join(getConfigDir(), LINUX_RUN_USER_FILE_NAME);
|
|
8
|
+
}
|
|
9
|
+
export function shouldPersistLinuxRunUser(runUser) {
|
|
10
|
+
const normalized = normalizeLinuxRunUser(runUser);
|
|
11
|
+
return Boolean(normalized) && isValidLinuxRunUser(normalized);
|
|
12
|
+
}
|
|
13
|
+
export async function readLinuxRunUserConfig() {
|
|
14
|
+
const filePath = getLinuxRunUserConfigPath();
|
|
15
|
+
if (!(await fs.pathExists(filePath))) {
|
|
16
|
+
return null;
|
|
17
|
+
}
|
|
18
|
+
const raw = (await fs.readJson(filePath));
|
|
19
|
+
if (!raw.runUser || !shouldPersistLinuxRunUser(raw.runUser)) {
|
|
20
|
+
await fs.remove(filePath);
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
return {
|
|
24
|
+
runUser: normalizeLinuxRunUser(raw.runUser),
|
|
25
|
+
updatedAt: raw.updatedAt ?? "",
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
export async function writeLinuxRunUserConfig(runUser) {
|
|
29
|
+
const normalized = normalizeLinuxRunUser(runUser);
|
|
30
|
+
if (!shouldPersistLinuxRunUser(normalized)) {
|
|
31
|
+
throw new Error("Linux 运行用户名格式不正确。");
|
|
32
|
+
}
|
|
33
|
+
const filePath = getLinuxRunUserConfigPath();
|
|
34
|
+
await fs.ensureDir(path.dirname(filePath));
|
|
35
|
+
await fs.writeJson(filePath, {
|
|
36
|
+
runUser: normalized,
|
|
37
|
+
updatedAt: new Date().toISOString(),
|
|
38
|
+
}, { spaces: 2 });
|
|
39
|
+
if (process.platform !== "win32") {
|
|
40
|
+
await fs.chmod(filePath, 0o600);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=linuxRunUserStore.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"linuxRunUserStore.js","sourceRoot":"","sources":["../../../src/core/store/linuxRunUserStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAO7E,MAAM,wBAAwB,GAAG,qBAAqB,CAAC;AAEvD,MAAM,UAAU,yBAAyB;IACvC,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,wBAAwB,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,OAAe;IACvD,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB;IAC1C,MAAM,QAAQ,GAAG,yBAAyB,EAAE,CAAC;IAC7C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAgC,CAAC;IACzE,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5D,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,OAAO,EAAE,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC;QAC3C,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,EAAE;KAC/B,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAe;IAC3D,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,QAAQ,GAAG,yBAAyB,EAAE,CAAC;IAC7C,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3C,MAAM,EAAE,CAAC,SAAS,CAChB,QAAQ,EACR;QACE,OAAO,EAAE,UAAU;QACnB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACpC,EACD,EAAE,MAAM,EAAE,CAAC,EAAE,CACd,CAAC;IACF,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC;AACH,CAAC"}
|
package/dist/types.d.ts
CHANGED
|
@@ -35,6 +35,7 @@ export interface AgentProfile {
|
|
|
35
35
|
id: string;
|
|
36
36
|
createdAt: string;
|
|
37
37
|
platform: SupportedPlatform;
|
|
38
|
+
linuxRunUser?: string;
|
|
38
39
|
macStartMode?: "launchctl" | "script" | "tmux";
|
|
39
40
|
mode: "url" | "jnlpUrl";
|
|
40
41
|
jenkinsBaseUrl: string;
|
|
@@ -50,6 +51,7 @@ export interface AgentProfile {
|
|
|
50
51
|
}
|
|
51
52
|
export interface AgentInstallMetadata {
|
|
52
53
|
platform: SupportedPlatform;
|
|
54
|
+
linuxRunUser?: string;
|
|
53
55
|
macStartMode?: "launchctl" | "script" | "tmux";
|
|
54
56
|
workDir: string;
|
|
55
57
|
startupScriptPath: string;
|