@aaricchen1991/deploy 0.1.0 → 1.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/PUBLISHING.md +2 -0
- package/README.md +69 -47
- package/dist/cli.d.ts +1 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +98 -9
- package/dist/cli.js.map +1 -1
- package/dist/commands/config.d.ts +29 -0
- package/dist/commands/config.d.ts.map +1 -0
- package/dist/commands/config.js +134 -0
- package/dist/commands/config.js.map +1 -0
- package/dist/commands/init.js +17 -15
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/nginx.d.ts.map +1 -1
- package/dist/commands/nginx.js +13 -11
- package/dist/commands/nginx.js.map +1 -1
- package/dist/commands/ssl-logs.d.ts.map +1 -1
- package/dist/commands/ssl-logs.js +3 -2
- package/dist/commands/ssl-logs.js.map +1 -1
- package/dist/commands/ssl.d.ts.map +1 -1
- package/dist/commands/ssl.js +22 -15
- package/dist/commands/ssl.js.map +1 -1
- package/dist/lib/config-store.d.ts +14 -0
- package/dist/lib/config-store.d.ts.map +1 -0
- package/dist/lib/config-store.js +111 -0
- package/dist/lib/config-store.js.map +1 -0
- package/dist/lib/domains.d.ts +17 -2
- package/dist/lib/domains.d.ts.map +1 -1
- package/dist/lib/domains.js +70 -6
- package/dist/lib/domains.js.map +1 -1
- package/dist/lib/logger.d.ts +6 -1
- package/dist/lib/logger.d.ts.map +1 -1
- package/dist/lib/logger.js +19 -21
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/nginx.d.ts +2 -1
- package/dist/lib/nginx.d.ts.map +1 -1
- package/dist/lib/nginx.js +15 -42
- package/dist/lib/nginx.js.map +1 -1
- package/dist/lib/paths.d.ts +6 -0
- package/dist/lib/paths.d.ts.map +1 -1
- package/dist/lib/paths.js +14 -0
- package/dist/lib/paths.js.map +1 -1
- package/package.json +3 -2
- package/src/cli.ts +124 -13
- package/src/commands/config.ts +195 -0
- package/src/commands/init.ts +17 -17
- package/src/commands/nginx.ts +13 -13
- package/src/commands/ssl-logs.ts +3 -2
- package/src/commands/ssl.ts +27 -18
- package/src/lib/config-store.ts +146 -0
- package/src/lib/domains.ts +79 -5
- package/src/lib/logger.ts +21 -24
- package/src/lib/nginx.ts +19 -43
- package/src/lib/paths.ts +19 -0
package/dist/commands/init.js
CHANGED
|
@@ -5,29 +5,31 @@
|
|
|
5
5
|
import { spawn } from "node:child_process";
|
|
6
6
|
import fs from "node:fs";
|
|
7
7
|
import path from "node:path";
|
|
8
|
-
import { getAllDomains,
|
|
9
|
-
import { error, info, warn } from "../lib/logger.js";
|
|
8
|
+
import { getAllDomains, parseDeployConfig } from "../lib/domains.js";
|
|
9
|
+
import { error, info, success, warn } from "../lib/logger.js";
|
|
10
10
|
import { generateNginxConf } from "../lib/nginx.js";
|
|
11
|
-
import { getScriptsDir } from "../lib/paths.js";
|
|
11
|
+
import { getScriptsDir, resolveConfigPath } from "../lib/paths.js";
|
|
12
12
|
const DEFAULT_SSL_LOG = "/opt/deploy/logs/ssl.log";
|
|
13
13
|
export async function runInit(opts) {
|
|
14
|
-
const configPath =
|
|
14
|
+
const configPath = resolveConfigPath(opts.config);
|
|
15
15
|
if (!fs.existsSync(configPath)) {
|
|
16
|
-
error(
|
|
16
|
+
error(`配置文件不存在: ${configPath}`);
|
|
17
|
+
info("请先执行: n2-deploy config init");
|
|
17
18
|
process.exit(1);
|
|
18
19
|
}
|
|
19
20
|
const yaml = fs.readFileSync(configPath, "utf8");
|
|
20
|
-
const
|
|
21
|
-
const domains = getAllDomains(
|
|
22
|
-
const nginxConf = generateNginxConf(
|
|
21
|
+
const { domainsConfig } = parseDeployConfig(yaml);
|
|
22
|
+
const domains = getAllDomains(domainsConfig);
|
|
23
|
+
const nginxConf = generateNginxConf(domainsConfig);
|
|
23
24
|
const scriptsDir = opts.scriptsDir ||
|
|
24
25
|
process.env.N2_DEPLOY_SCRIPTS_DIR ||
|
|
25
26
|
getScriptsDir(process.cwd());
|
|
26
27
|
if (!scriptsDir || !fs.existsSync(path.join(scriptsDir, "server-setup.sh"))) {
|
|
27
|
-
error("
|
|
28
|
+
error("未找到部署脚本目录（需包含 server-setup.sh）");
|
|
29
|
+
info("请设置 N2_DEPLOY_SCRIPTS_DIR 或在仓库根目录执行（需存在 scripts/deploy）");
|
|
28
30
|
process.exit(1);
|
|
29
31
|
}
|
|
30
|
-
info(
|
|
32
|
+
info(`使用脚本目录: ${scriptsDir}`);
|
|
31
33
|
const tmpDir = path.join(process.env.TMPDIR || "/tmp", `n2-deploy-init-${Date.now()}`);
|
|
32
34
|
fs.mkdirSync(path.join(tmpDir, "nginx"), { recursive: true });
|
|
33
35
|
fs.mkdirSync(path.join(tmpDir, "ssl"), { recursive: true });
|
|
@@ -39,7 +41,7 @@ export async function runInit(opts) {
|
|
|
39
41
|
fs.chmodSync(path.join(tmpDir, "deploy.sh"), 0o755);
|
|
40
42
|
}
|
|
41
43
|
else {
|
|
42
|
-
error("deploy.sh
|
|
44
|
+
error("脚本目录中未找到 deploy.sh");
|
|
43
45
|
process.exit(1);
|
|
44
46
|
}
|
|
45
47
|
const setupSh = path.join(scriptsDir, "server-setup.sh");
|
|
@@ -65,7 +67,7 @@ export async function runInit(opts) {
|
|
|
65
67
|
fs.copyFileSync(path.join(libDir, name), path.join(libDest, name));
|
|
66
68
|
}
|
|
67
69
|
}
|
|
68
|
-
info("
|
|
70
|
+
info("正在执行 server-setup.sh（可能需要 sudo）…");
|
|
69
71
|
await new Promise((resolve, reject) => {
|
|
70
72
|
const child = spawn("bash", [path.join(tmpDir, "server-setup.sh")], {
|
|
71
73
|
cwd: tmpDir,
|
|
@@ -84,13 +86,13 @@ export async function runInit(opts) {
|
|
|
84
86
|
if (logDir && !fs.existsSync(logDir)) {
|
|
85
87
|
try {
|
|
86
88
|
fs.mkdirSync(logDir, { recursive: true });
|
|
87
|
-
info(
|
|
89
|
+
info(`已创建日志目录: ${logDir}`);
|
|
88
90
|
}
|
|
89
91
|
catch {
|
|
90
|
-
warn(
|
|
92
|
+
warn(`无法创建日志目录: ${logDir}`);
|
|
91
93
|
}
|
|
92
94
|
}
|
|
93
|
-
|
|
95
|
+
success("服务器初始化完成");
|
|
94
96
|
}
|
|
95
97
|
finally {
|
|
96
98
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,MAAM,eAAe,GAAG,0BAA0B,CAAC;AAOnD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAiB;IAC7C,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,KAAK,CAAC,YAAY,UAAU,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACjD,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAEnD,MAAM,UAAU,GACd,IAAI,CAAC,UAAU;QACf,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACjC,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAE/B,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC;QAC5E,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACxC,IAAI,CAAC,yDAAyD,CAAC,CAAC;QAChE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,WAAW,UAAU,EAAE,CAAC,CAAC;IAE9B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CACtB,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,EAC5B,kBAAkB,IAAI,CAAC,GAAG,EAAE,EAAE,CAC/B,CAAC;IACF,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5D,IAAI,CAAC;QACH,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;QAEnE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACpD,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;YAC1D,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QACzD,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;QAC/D,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE,KAAK,CAAC,CAAC;QAE1D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5C,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACzC,KAAK,MAAM,IAAI,IAAI,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACpC,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;oBAC9B,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;oBAC/C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;QACH,CAAC;QACD,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,EACvC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAC1B,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5C,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACzC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,KAAK,MAAM,IAAI,IAAI,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1C,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QAED,IAAI,CAAC,kCAAkC,CAAC,CAAC;QACzC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,EAAE;gBAClE,GAAG,EAAE,MAAM;gBACX,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE;aAC5C,CAAC,CAAC;YACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;gBACvB,IAAI,IAAI,KAAK,CAAC;oBAAE,OAAO,EAAE,CAAC;;oBACrB,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC7C,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC;gBACH,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC1C,IAAI,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC;YAC7B,CAAC;YAAC,MAAM,CAAC;gBACP,IAAI,CAAC,aAAa,MAAM,EAAE,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,OAAO,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YACH,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACtD,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nginx.d.ts","sourceRoot":"","sources":["../../src/commands/nginx.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"nginx.d.ts","sourceRoot":"","sources":["../../src/commands/nginx.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAID,wBAAsB,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BhE"}
|
package/dist/commands/nginx.js
CHANGED
|
@@ -4,33 +4,35 @@
|
|
|
4
4
|
import { spawn } from "node:child_process";
|
|
5
5
|
import fs from "node:fs";
|
|
6
6
|
import path from "node:path";
|
|
7
|
-
import {
|
|
8
|
-
import { error, info, warn } from "../lib/logger.js";
|
|
7
|
+
import { parseDeployConfig } from "../lib/domains.js";
|
|
8
|
+
import { error, info, success, warn } from "../lib/logger.js";
|
|
9
9
|
import { generateNginxConf } from "../lib/nginx.js";
|
|
10
|
+
import { resolveConfigPath } from "../lib/paths.js";
|
|
10
11
|
const NGINX_CONF_NAME = "n2.conf";
|
|
11
12
|
export async function runNginx(opts) {
|
|
12
|
-
const configPath =
|
|
13
|
+
const configPath = resolveConfigPath(opts.config);
|
|
13
14
|
if (!fs.existsSync(configPath)) {
|
|
14
|
-
error(
|
|
15
|
+
error(`配置文件不存在: ${configPath}`);
|
|
16
|
+
info("请先执行: n2-deploy config init");
|
|
15
17
|
process.exit(1);
|
|
16
18
|
}
|
|
17
19
|
const yaml = fs.readFileSync(configPath, "utf8");
|
|
18
|
-
const
|
|
19
|
-
const nginxConf = generateNginxConf(
|
|
20
|
+
const { domainsConfig } = parseDeployConfig(yaml);
|
|
21
|
+
const nginxConf = generateNginxConf(domainsConfig);
|
|
20
22
|
const outPath = path.resolve(process.cwd(), opts.output);
|
|
21
23
|
const outDir = path.dirname(outPath);
|
|
22
24
|
fs.mkdirSync(outDir, { recursive: true });
|
|
23
25
|
fs.writeFileSync(outPath, nginxConf);
|
|
24
|
-
info(
|
|
26
|
+
info(`已写入: ${outPath}`);
|
|
25
27
|
if (opts.install) {
|
|
26
28
|
const destDir = detectNginxConfDir();
|
|
27
29
|
const destPath = path.join(destDir, NGINX_CONF_NAME);
|
|
28
30
|
try {
|
|
29
31
|
fs.copyFileSync(outPath, destPath);
|
|
30
|
-
info(
|
|
32
|
+
info(`已安装到: ${destPath}`);
|
|
31
33
|
}
|
|
32
34
|
catch (e) {
|
|
33
|
-
error(
|
|
35
|
+
error(`安装失败（可尝试 sudo）: ${e}`);
|
|
34
36
|
process.exit(1);
|
|
35
37
|
}
|
|
36
38
|
await nginxTestAndReload();
|
|
@@ -54,11 +56,11 @@ function nginxTestAndReload() {
|
|
|
54
56
|
const r = spawn("systemctl", ["reload", "nginx"], { stdio: "inherit" });
|
|
55
57
|
r.on("close", c => {
|
|
56
58
|
if (c === 0) {
|
|
57
|
-
|
|
59
|
+
success("Nginx 已重载");
|
|
58
60
|
resolve();
|
|
59
61
|
}
|
|
60
62
|
else {
|
|
61
|
-
warn("systemctl reload nginx
|
|
63
|
+
warn("systemctl reload nginx 失败，请尝试: sudo systemctl reload nginx");
|
|
62
64
|
resolve();
|
|
63
65
|
}
|
|
64
66
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nginx.js","sourceRoot":"","sources":["../../src/commands/nginx.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"nginx.js","sourceRoot":"","sources":["../../src/commands/nginx.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssl-logs.d.ts","sourceRoot":"","sources":["../../src/commands/ssl-logs.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"ssl-logs.d.ts","sourceRoot":"","sources":["../../src/commands/ssl-logs.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,MAAM,WAAW,cAAc;IAC7B,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uBAAuB;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,uDAAuD;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAwDpE"}
|
|
@@ -3,13 +3,14 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import fs from "node:fs";
|
|
5
5
|
import path from "node:path";
|
|
6
|
+
import consola from "consola";
|
|
6
7
|
import { getLogFilePath } from "../lib/logger.js";
|
|
7
8
|
const DEFAULT_SSL_LOG = "/opt/deploy/logs/ssl.log";
|
|
8
9
|
export async function runSslLogs(opts) {
|
|
9
10
|
const logPath = opts.logFile ?? getLogFilePath() ?? DEFAULT_SSL_LOG;
|
|
10
11
|
const resolved = path.resolve(process.cwd(), logPath);
|
|
11
12
|
if (!fs.existsSync(resolved)) {
|
|
12
|
-
|
|
13
|
+
consola.error("日志文件不存在:", resolved);
|
|
13
14
|
process.exit(1);
|
|
14
15
|
}
|
|
15
16
|
const lines = opts.lines ?? 50;
|
|
@@ -41,7 +42,7 @@ export async function runSslLogs(opts) {
|
|
|
41
42
|
};
|
|
42
43
|
const filtered = opts.action || opts.result ? lastLines.filter(filter) : lastLines;
|
|
43
44
|
for (const line of filtered) {
|
|
44
|
-
|
|
45
|
+
consola.log(line);
|
|
45
46
|
}
|
|
46
47
|
if (opts.follow) {
|
|
47
48
|
const { spawn } = await import("node:child_process");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssl-logs.js","sourceRoot":"","sources":["../../src/commands/ssl-logs.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,eAAe,GAAG,0BAA0B,CAAC;AAenD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAoB;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,cAAc,EAAE,IAAI,eAAe,CAAC;IACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;IAEtD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,OAAO,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"ssl-logs.js","sourceRoot":"","sources":["../../src/commands/ssl-logs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssl.d.ts","sourceRoot":"","sources":["../../src/commands/ssl.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"ssl.d.ts","sourceRoot":"","sources":["../../src/commands/ssl.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkBH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gEAAgE;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8FAA8F;IAC9F,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoH5D"}
|
package/dist/commands/ssl.js
CHANGED
|
@@ -5,34 +5,40 @@
|
|
|
5
5
|
import { spawn } from "node:child_process";
|
|
6
6
|
import fs from "node:fs";
|
|
7
7
|
import path from "node:path";
|
|
8
|
-
import { getAllDomains,
|
|
9
|
-
import { appendRaw, appendSslLog, error, info, setLogFile, } from "../lib/logger.js";
|
|
10
|
-
import { getScriptsDir } from "../lib/paths.js";
|
|
8
|
+
import { getAllDomains, parseDeployConfig } from "../lib/domains.js";
|
|
9
|
+
import { appendRaw, appendSslLog, error, info, setLogFile, success, } from "../lib/logger.js";
|
|
10
|
+
import { getScriptsDir, resolveConfigPath } from "../lib/paths.js";
|
|
11
11
|
const DEFAULT_SSL_LOG = "/opt/deploy/logs/ssl.log";
|
|
12
12
|
export async function runSsl(opts) {
|
|
13
|
-
const configPath =
|
|
13
|
+
const configPath = resolveConfigPath(opts.config);
|
|
14
14
|
if (!fs.existsSync(configPath)) {
|
|
15
|
-
error(
|
|
15
|
+
error(`配置文件不存在: ${configPath}`);
|
|
16
|
+
info("请先执行: n2-deploy config init");
|
|
16
17
|
process.exit(1);
|
|
17
18
|
}
|
|
18
|
-
const
|
|
19
|
+
const yaml = fs.readFileSync(configPath, "utf8");
|
|
20
|
+
const { domainsConfig, aliyunAccessKeyId: configAliId, aliyunAccessKeySecret: configAliSecret, } = parseDeployConfig(yaml);
|
|
21
|
+
const aliKey = opts.aliKey ??
|
|
22
|
+
configAliId ??
|
|
23
|
+
process.env.ALIYUN_ACCESS_KEY_ID ??
|
|
24
|
+
process.env.Ali_Key;
|
|
19
25
|
const aliSecret = opts.aliSecret ??
|
|
26
|
+
configAliSecret ??
|
|
20
27
|
process.env.ALIYUN_ACCESS_KEY_SECRET ??
|
|
21
28
|
process.env.Ali_Secret;
|
|
22
29
|
if (!aliKey || !aliSecret) {
|
|
23
|
-
error("
|
|
30
|
+
error("缺少阿里云 API 凭证");
|
|
31
|
+
info("请在配置 (~/.deploy/config.yaml)、--ali-key/--ali-secret 或环境变量 ALIYUN_ACCESS_KEY_ID/ALIYUN_ACCESS_KEY_SECRET 中设置");
|
|
24
32
|
process.exit(1);
|
|
25
33
|
}
|
|
26
|
-
const
|
|
27
|
-
const config = parseDomainsYaml(yaml);
|
|
28
|
-
const domains = getAllDomains(config);
|
|
34
|
+
const domains = getAllDomains(domainsConfig);
|
|
29
35
|
const domainsTxt = domains.join("\n") + "\n";
|
|
30
36
|
const logPath = opts.logFile ?? DEFAULT_SSL_LOG;
|
|
31
37
|
setLogFile(logPath);
|
|
32
38
|
const logDir = path.dirname(logPath);
|
|
33
39
|
fs.mkdirSync(logDir, { recursive: true });
|
|
34
|
-
info(
|
|
35
|
-
info(
|
|
40
|
+
info(`SSL 日志: ${logPath}`);
|
|
41
|
+
info(`域名: ${domains.join(", ") || "(无)"}`);
|
|
36
42
|
const scriptsDir = opts.scriptsDir ||
|
|
37
43
|
process.env.N2_DEPLOY_SCRIPTS_DIR ||
|
|
38
44
|
getScriptsDir(process.cwd());
|
|
@@ -42,7 +48,7 @@ export async function runSsl(opts) {
|
|
|
42
48
|
scriptPath = "/opt/ssl/check-and-setup-ssl.sh";
|
|
43
49
|
domainsFilePath = "/opt/ssl/domains.txt";
|
|
44
50
|
fs.writeFileSync(domainsFilePath, domainsTxt);
|
|
45
|
-
info("
|
|
51
|
+
info("已更新 /opt/ssl/domains.txt");
|
|
46
52
|
}
|
|
47
53
|
else if (scriptsDir &&
|
|
48
54
|
fs.existsSync(path.join(scriptsDir, "ssl", "check-and-setup-ssl.sh"))) {
|
|
@@ -52,7 +58,8 @@ export async function runSsl(opts) {
|
|
|
52
58
|
domainsFilePath = tmpDomains;
|
|
53
59
|
}
|
|
54
60
|
else {
|
|
55
|
-
error("SSL
|
|
61
|
+
error("未找到 SSL 脚本");
|
|
62
|
+
info("请先执行 n2-deploy init 或设置 N2_DEPLOY_SCRIPTS_DIR");
|
|
56
63
|
process.exit(1);
|
|
57
64
|
}
|
|
58
65
|
appendSslLog("run", "", "ok", "start");
|
|
@@ -80,7 +87,7 @@ export async function runSsl(opts) {
|
|
|
80
87
|
child.on("close", (code, signal) => {
|
|
81
88
|
if (code === 0) {
|
|
82
89
|
appendSslLog("run", "", "ok", "done");
|
|
83
|
-
|
|
90
|
+
success("SSL 证书配置完成");
|
|
84
91
|
resolve();
|
|
85
92
|
}
|
|
86
93
|
else {
|
package/dist/commands/ssl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssl.js","sourceRoot":"","sources":["../../src/commands/ssl.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"ssl.js","sourceRoot":"","sources":["../../src/commands/ssl.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Config file CRUD: load, get, set, delete, save for ~/.deploy/config.yaml.
|
|
3
|
+
* Keys: aliyun_access_key_id, aliyun_access_key_secret, api.backend_port,
|
|
4
|
+
* api.domains, admin.domains, tenant.domains, client.domains
|
|
5
|
+
*/
|
|
6
|
+
import type { DeployConfigResult } from "./domains.js";
|
|
7
|
+
export type ConfigKey = "aliyun_access_key_id" | "aliyun_access_key_secret" | "api.backend_port" | "api.domains" | "admin.domains" | "tenant.domains" | "client.domains";
|
|
8
|
+
export declare function isValidConfigKey(key: string): key is ConfigKey;
|
|
9
|
+
export declare function loadConfig(configPath: string): DeployConfigResult;
|
|
10
|
+
export declare function saveConfig(configPath: string, data: DeployConfigResult): void;
|
|
11
|
+
export declare function getConfigValue(data: DeployConfigResult, key: ConfigKey): string | number | string[] | undefined;
|
|
12
|
+
export declare function setConfigValue(data: DeployConfigResult, key: ConfigKey, value: string | number | string[]): void;
|
|
13
|
+
export declare function deleteConfigValue(data: DeployConfigResult, key: ConfigKey): void;
|
|
14
|
+
//# sourceMappingURL=config-store.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-store.d.ts","sourceRoot":"","sources":["../../src/lib/config-store.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAMvD,MAAM,MAAM,SAAS,GACjB,sBAAsB,GACtB,0BAA0B,GAC1B,kBAAkB,GAClB,aAAa,GACb,eAAe,GACf,gBAAgB,GAChB,gBAAgB,CAAC;AAUrB,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,SAAS,CAM9D;AAED,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,CAGjE;AAED,wBAAgB,UAAU,CACxB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,kBAAkB,GACvB,IAAI,CAMN;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,SAAS,GACb,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAmBxC;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAChC,IAAI,CAiCN;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,SAAS,GACb,IAAI,CAwBN"}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Config file CRUD: load, get, set, delete, save for ~/.deploy/config.yaml.
|
|
3
|
+
* Keys: aliyun_access_key_id, aliyun_access_key_secret, api.backend_port,
|
|
4
|
+
* api.domains, admin.domains, tenant.domains, client.domains
|
|
5
|
+
*/
|
|
6
|
+
import fs from "node:fs";
|
|
7
|
+
import path from "node:path";
|
|
8
|
+
import { parseDeployConfig, serializeDeployConfig, } from "./domains.js";
|
|
9
|
+
const SECTION_KEYS = [
|
|
10
|
+
"api.backend_port",
|
|
11
|
+
"api.domains",
|
|
12
|
+
"admin.domains",
|
|
13
|
+
"tenant.domains",
|
|
14
|
+
"client.domains",
|
|
15
|
+
];
|
|
16
|
+
export function isValidConfigKey(key) {
|
|
17
|
+
return (key === "aliyun_access_key_id" ||
|
|
18
|
+
key === "aliyun_access_key_secret" ||
|
|
19
|
+
SECTION_KEYS.includes(key));
|
|
20
|
+
}
|
|
21
|
+
export function loadConfig(configPath) {
|
|
22
|
+
const content = fs.readFileSync(configPath, "utf8");
|
|
23
|
+
return parseDeployConfig(content);
|
|
24
|
+
}
|
|
25
|
+
export function saveConfig(configPath, data) {
|
|
26
|
+
const dir = path.dirname(configPath);
|
|
27
|
+
if (dir && dir !== ".") {
|
|
28
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
29
|
+
}
|
|
30
|
+
fs.writeFileSync(configPath, serializeDeployConfig(data), "utf8");
|
|
31
|
+
}
|
|
32
|
+
export function getConfigValue(data, key) {
|
|
33
|
+
switch (key) {
|
|
34
|
+
case "aliyun_access_key_id":
|
|
35
|
+
return data.aliyunAccessKeyId;
|
|
36
|
+
case "aliyun_access_key_secret":
|
|
37
|
+
return data.aliyunAccessKeySecret;
|
|
38
|
+
case "api.backend_port":
|
|
39
|
+
return data.domainsConfig.api.backend_port;
|
|
40
|
+
case "api.domains":
|
|
41
|
+
return data.domainsConfig.api.domains;
|
|
42
|
+
case "admin.domains":
|
|
43
|
+
return data.domainsConfig.admin.domains;
|
|
44
|
+
case "tenant.domains":
|
|
45
|
+
return data.domainsConfig.tenant.domains;
|
|
46
|
+
case "client.domains":
|
|
47
|
+
return data.domainsConfig.client.domains;
|
|
48
|
+
default:
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
export function setConfigValue(data, key, value) {
|
|
53
|
+
switch (key) {
|
|
54
|
+
case "aliyun_access_key_id":
|
|
55
|
+
data.aliyunAccessKeyId = String(value);
|
|
56
|
+
break;
|
|
57
|
+
case "aliyun_access_key_secret":
|
|
58
|
+
data.aliyunAccessKeySecret = String(value);
|
|
59
|
+
break;
|
|
60
|
+
case "api.backend_port":
|
|
61
|
+
data.domainsConfig.api.backend_port =
|
|
62
|
+
typeof value === "number" ? value : parseInt(String(value), 10);
|
|
63
|
+
break;
|
|
64
|
+
case "api.domains":
|
|
65
|
+
data.domainsConfig.api.domains = Array.isArray(value)
|
|
66
|
+
? value
|
|
67
|
+
: [String(value)];
|
|
68
|
+
break;
|
|
69
|
+
case "admin.domains":
|
|
70
|
+
data.domainsConfig.admin.domains = Array.isArray(value)
|
|
71
|
+
? value
|
|
72
|
+
: [String(value)];
|
|
73
|
+
break;
|
|
74
|
+
case "tenant.domains":
|
|
75
|
+
data.domainsConfig.tenant.domains = Array.isArray(value)
|
|
76
|
+
? value
|
|
77
|
+
: [String(value)];
|
|
78
|
+
break;
|
|
79
|
+
case "client.domains":
|
|
80
|
+
data.domainsConfig.client.domains = Array.isArray(value)
|
|
81
|
+
? value
|
|
82
|
+
: [String(value)];
|
|
83
|
+
break;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
export function deleteConfigValue(data, key) {
|
|
87
|
+
switch (key) {
|
|
88
|
+
case "aliyun_access_key_id":
|
|
89
|
+
data.aliyunAccessKeyId = undefined;
|
|
90
|
+
break;
|
|
91
|
+
case "aliyun_access_key_secret":
|
|
92
|
+
data.aliyunAccessKeySecret = undefined;
|
|
93
|
+
break;
|
|
94
|
+
case "api.backend_port":
|
|
95
|
+
data.domainsConfig.api.backend_port = 3000;
|
|
96
|
+
break;
|
|
97
|
+
case "api.domains":
|
|
98
|
+
data.domainsConfig.api.domains = [];
|
|
99
|
+
break;
|
|
100
|
+
case "admin.domains":
|
|
101
|
+
data.domainsConfig.admin.domains = [];
|
|
102
|
+
break;
|
|
103
|
+
case "tenant.domains":
|
|
104
|
+
data.domainsConfig.tenant.domains = [];
|
|
105
|
+
break;
|
|
106
|
+
case "client.domains":
|
|
107
|
+
data.domainsConfig.client.domains = [];
|
|
108
|
+
break;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
//# sourceMappingURL=config-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-store.js","sourceRoot":"","sources":["../../src/lib/config-store.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/domains.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Parse domains.yaml
|
|
2
|
+
* Parse domains.yaml / deploy config format.
|
|
3
|
+
* Deploy config (~/.deploy/config.yaml) may include ALIYUN_ACCESS_KEY_ID, ALIYUN_ACCESS_KEY_SECRET and domain sections.
|
|
3
4
|
*/
|
|
4
5
|
export interface DomainsConfig {
|
|
5
6
|
api: {
|
|
@@ -16,7 +17,21 @@ export interface DomainsConfig {
|
|
|
16
17
|
domains: string[];
|
|
17
18
|
};
|
|
18
19
|
}
|
|
20
|
+
/** Result of parsing a deploy config file (aliyun credentials + domains). */
|
|
21
|
+
export interface DeployConfigResult {
|
|
22
|
+
domainsConfig: DomainsConfig;
|
|
23
|
+
aliyunAccessKeyId?: string;
|
|
24
|
+
aliyunAccessKeySecret?: string;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Parse deploy config YAML: optional aliyun_access_key_id / aliyun_access_key_secret at top level,
|
|
28
|
+
* plus api/admin/tenant/client sections (same as domains.yaml).
|
|
29
|
+
*/
|
|
30
|
+
export declare function parseDeployConfig(content: string): DeployConfigResult;
|
|
31
|
+
/** Parse domains-only YAML (backward compatible). */
|
|
19
32
|
export declare function parseDomainsYaml(content: string): DomainsConfig;
|
|
20
|
-
/** Return all domains
|
|
33
|
+
/** Return all domains that need SSL (admin + tenant + client). API 与前端同域，不再单独申请证书。 */
|
|
21
34
|
export declare function getAllDomains(config: DomainsConfig): string[];
|
|
35
|
+
/** Serialize DeployConfigResult to YAML-like deploy config string. */
|
|
36
|
+
export declare function serializeDeployConfig(data: DeployConfigResult): string;
|
|
22
37
|
//# sourceMappingURL=domains.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domains.d.ts","sourceRoot":"","sources":["../../src/lib/domains.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"domains.d.ts","sourceRoot":"","sources":["../../src/lib/domains.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACjD,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC7B,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC9B,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC/B;AAED,6EAA6E;AAC7E,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAoBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAiErE;AAED,qDAAqD;AACrD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAE/D;AAED,sFAAsF;AACtF,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,EAAE,CAM7D;AAED,sEAAsE;AACtE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CA2BtE"}
|
package/dist/lib/domains.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Parse domains.yaml
|
|
2
|
+
* Parse domains.yaml / deploy config format.
|
|
3
|
+
* Deploy config (~/.deploy/config.yaml) may include ALIYUN_ACCESS_KEY_ID, ALIYUN_ACCESS_KEY_SECRET and domain sections.
|
|
3
4
|
*/
|
|
4
5
|
const DEFAULT_CONFIG = {
|
|
5
6
|
api: { backend_port: 3000, domains: [] },
|
|
@@ -7,8 +8,22 @@ const DEFAULT_CONFIG = {
|
|
|
7
8
|
tenant: { domains: [] },
|
|
8
9
|
client: { domains: [] },
|
|
9
10
|
};
|
|
10
|
-
|
|
11
|
+
function unquote(s) {
|
|
12
|
+
const t = s.trim();
|
|
13
|
+
if ((t.startsWith('"') && t.endsWith('"')) ||
|
|
14
|
+
(t.startsWith("'") && t.endsWith("'"))) {
|
|
15
|
+
return t.slice(1, -1);
|
|
16
|
+
}
|
|
17
|
+
return t;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Parse deploy config YAML: optional aliyun_access_key_id / aliyun_access_key_secret at top level,
|
|
21
|
+
* plus api/admin/tenant/client sections (same as domains.yaml).
|
|
22
|
+
*/
|
|
23
|
+
export function parseDeployConfig(content) {
|
|
11
24
|
const result = JSON.parse(JSON.stringify(DEFAULT_CONFIG));
|
|
25
|
+
let aliyunAccessKeyId;
|
|
26
|
+
let aliyunAccessKeySecret;
|
|
12
27
|
const lines = content.split(/\r?\n/);
|
|
13
28
|
let current = null;
|
|
14
29
|
let inDomains = false;
|
|
@@ -16,6 +31,16 @@ export function parseDomainsYaml(content) {
|
|
|
16
31
|
const trimmed = line.trim();
|
|
17
32
|
if (trimmed.startsWith("#") || !trimmed)
|
|
18
33
|
continue;
|
|
34
|
+
const aliIdMatch = trimmed.match(/^aliyun_access_key_id:\s*(.*)$/i);
|
|
35
|
+
if (aliIdMatch) {
|
|
36
|
+
aliyunAccessKeyId = unquote(aliIdMatch[1]).trim() || undefined;
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
39
|
+
const aliSecretMatch = trimmed.match(/^aliyun_access_key_secret:\s*(.*)$/i);
|
|
40
|
+
if (aliSecretMatch) {
|
|
41
|
+
aliyunAccessKeySecret = unquote(aliSecretMatch[1]).trim() || undefined;
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
19
44
|
if (/^api:\s*$/.test(trimmed)) {
|
|
20
45
|
current = "api";
|
|
21
46
|
inDomains = false;
|
|
@@ -52,13 +77,19 @@ export function parseDomainsYaml(content) {
|
|
|
52
77
|
result[current].domains.push(domain);
|
|
53
78
|
}
|
|
54
79
|
}
|
|
55
|
-
return
|
|
80
|
+
return {
|
|
81
|
+
domainsConfig: result,
|
|
82
|
+
aliyunAccessKeyId,
|
|
83
|
+
aliyunAccessKeySecret,
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
/** Parse domains-only YAML (backward compatible). */
|
|
87
|
+
export function parseDomainsYaml(content) {
|
|
88
|
+
return parseDeployConfig(content).domainsConfig;
|
|
56
89
|
}
|
|
57
|
-
/** Return all domains
|
|
90
|
+
/** Return all domains that need SSL (admin + tenant + client). API 与前端同域，不再单独申请证书。 */
|
|
58
91
|
export function getAllDomains(config) {
|
|
59
92
|
const list = [];
|
|
60
|
-
for (const d of config.api.domains)
|
|
61
|
-
list.push(d);
|
|
62
93
|
for (const d of config.admin.domains)
|
|
63
94
|
list.push(d);
|
|
64
95
|
for (const d of config.tenant.domains)
|
|
@@ -67,4 +98,37 @@ export function getAllDomains(config) {
|
|
|
67
98
|
list.push(d);
|
|
68
99
|
return list;
|
|
69
100
|
}
|
|
101
|
+
/** Serialize DeployConfigResult to YAML-like deploy config string. */
|
|
102
|
+
export function serializeDeployConfig(data) {
|
|
103
|
+
const lines = [];
|
|
104
|
+
if (data.aliyunAccessKeyId != null && data.aliyunAccessKeyId !== "") {
|
|
105
|
+
lines.push(`aliyun_access_key_id: "${data.aliyunAccessKeyId}"`);
|
|
106
|
+
}
|
|
107
|
+
if (data.aliyunAccessKeySecret != null && data.aliyunAccessKeySecret !== "") {
|
|
108
|
+
lines.push(`aliyun_access_key_secret: "${data.aliyunAccessKeySecret}"`);
|
|
109
|
+
}
|
|
110
|
+
const c = data.domainsConfig;
|
|
111
|
+
lines.push("");
|
|
112
|
+
lines.push("api:");
|
|
113
|
+
lines.push(` backend_port: ${c.api.backend_port}`);
|
|
114
|
+
lines.push(" domains:");
|
|
115
|
+
for (const d of c.api.domains)
|
|
116
|
+
lines.push(` - ${d}`);
|
|
117
|
+
lines.push("");
|
|
118
|
+
lines.push("admin:");
|
|
119
|
+
lines.push(" domains:");
|
|
120
|
+
for (const d of c.admin.domains)
|
|
121
|
+
lines.push(` - ${d}`);
|
|
122
|
+
lines.push("");
|
|
123
|
+
lines.push("tenant:");
|
|
124
|
+
lines.push(" domains:");
|
|
125
|
+
for (const d of c.tenant.domains)
|
|
126
|
+
lines.push(` - ${d}`);
|
|
127
|
+
lines.push("");
|
|
128
|
+
lines.push("client:");
|
|
129
|
+
lines.push(" domains:");
|
|
130
|
+
for (const d of c.client.domains)
|
|
131
|
+
lines.push(` - ${d}`);
|
|
132
|
+
return lines.join("\n") + "\n";
|
|
133
|
+
}
|
|
70
134
|
//# sourceMappingURL=domains.js.map
|