@aaricchen1991/deploy 0.1.0 → 1.0.0

package/src/commands/config.ts

@@ -0,0 +1,195 @@
+/**
+ * Config management: init, get, set, delete, list.
+ */
+
+import fs from "node:fs";
+import path from "node:path";
+import consola from "consola";
+import type { ConfigKey } from "../lib/config-store.js";
+import {
+  getConfigValue,
+  isValidConfigKey,
+  loadConfig,
+  saveConfig,
+  setConfigValue,
+  deleteConfigValue,
+} from "../lib/config-store.js";
+import { getDefaultConfigPath, resolveConfigPath } from "../lib/paths.js";
+
+const DEFAULT_TEMPLATE = `# n2-deploy 配置 (~/.deploy/config.yaml)
+# 阿里云 DNS API（用于 ACME 申请证书）
+# aliyun_access_key_id: "your-key"
+# aliyun_access_key_secret: "your-secret"
+
+api:
+  backend_port: 3000
+  domains: []
+
+admin:
+  domains: []
+
+tenant:
+  domains: []
+
+client:
+  domains: []
+`;
+
+export interface ConfigInitOptions {
+  config?: string;
+  force?: boolean;
+}
+
+export async function runConfigInit(opts: ConfigInitOptions): Promise<void> {
+  const configPath = opts.config
+    ? resolveConfigPath(opts.config)
+    : getDefaultConfigPath();
+  const dir = path.dirname(configPath);
+
+  if (fs.existsSync(configPath) && !opts.force) {
+    consola.info(`配置文件已存在: ${configPath}`);
+    consola.info("使用 --force 可覆盖为默认模板");
+    return;
+  }
+
+  fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(configPath, DEFAULT_TEMPLATE, "utf8");
+  consola.success(`已初始化配置: ${configPath}`);
+}
+
+export interface ConfigGetOptions {
+  config: string;
+  key?: string;
+}
+
+export async function runConfigGet(opts: ConfigGetOptions): Promise<void> {
+  const configPath = resolveConfigPath(opts.config);
+  if (!fs.existsSync(configPath)) {
+    consola.error(`配置文件不存在: ${configPath}`);
+    consola.info("请先执行: n2-deploy config init");
+    process.exit(1);
+  }
+
+  const data = loadConfig(configPath);
+
+  if (!opts.key) {
+    // List all
+    const lines: string[] = [];
+    if (data.aliyunAccessKeyId != null)
+      lines.push(`aliyun_access_key_id: ${data.aliyunAccessKeyId}`);
+    if (data.aliyunAccessKeySecret != null)
+      lines.push(`aliyun_access_key_secret: ***`);
+    lines.push(`api.backend_port: ${data.domainsConfig.api.backend_port}`);
+    lines.push(
+      `api.domains: [${data.domainsConfig.api.domains.join(", ")}]`
+    );
+    lines.push(
+      `admin.domains: [${data.domainsConfig.admin.domains.join(", ")}]`
+    );
+    lines.push(
+      `tenant.domains: [${data.domainsConfig.tenant.domains.join(", ")}]`
+    );
+    lines.push(
+      `client.domains: [${data.domainsConfig.client.domains.join(", ")}]`
+    );
+    consola.log(lines.join("\n"));
+    return;
+  }
+
+  if (!isValidConfigKey(opts.key)) {
+    consola.error(
+      `无效的配置项: ${opts.key}。可选: aliyun_access_key_id, aliyun_access_key_secret, api.backend_port, api.domains, admin.domains, tenant.domains, client.domains`
+    );
+    process.exit(1);
+  }
+
+  const value = getConfigValue(data, opts.key);
+  if (value === undefined || value === null) {
+    consola.log("");
+    return;
+  }
+  if (Array.isArray(value)) {
+    consola.log(value.join("\n"));
+  } else {
+    consola.log(String(value));
+  }
+}
+
+export interface ConfigSetOptions {
+  config: string;
+  key: string;
+  values: string[];
+}
+
+export async function runConfigSet(opts: ConfigSetOptions): Promise<void> {
+  const configPath = resolveConfigPath(opts.config);
+  if (!fs.existsSync(configPath)) {
+    consola.error(`配置文件不存在: ${configPath}`);
+    consola.info("请先执行: n2-deploy config init");
+    process.exit(1);
+  }
+
+  if (!isValidConfigKey(opts.key)) {
+    consola.error(
+      `无效的配置项: ${opts.key}。可选: aliyun_access_key_id, aliyun_access_key_secret, api.backend_port, api.domains, admin.domains, tenant.domains, client.domains`
+    );
+    process.exit(1);
+  }
+
+  const data = loadConfig(configPath);
+  const isDomainsKey =
+    opts.key === "api.domains" ||
+    opts.key === "admin.domains" ||
+    opts.key === "tenant.domains" ||
+    opts.key === "client.domains";
+  const isPortKey = opts.key === "api.backend_port";
+
+  let value: string | number | string[];
+  if (isDomainsKey) {
+    value = opts.values.length > 0 ? opts.values : [];
+  } else if (isPortKey) {
+    const n = opts.values[0] ? parseInt(opts.values[0], 10) : 3000;
+    if (Number.isNaN(n)) {
+      consola.error("api.backend_port 必须为数字");
+      process.exit(1);
+    }
+    value = n;
+  } else {
+    value = opts.values[0] ?? "";
+  }
+
+  setConfigValue(data, opts.key as ConfigKey, value);
+  saveConfig(configPath, data);
+  consola.success(`已设置 ${opts.key}`);
+}
+
+export interface ConfigDeleteOptions {
+  config: string;
+  key: string;
+}
+
+export async function runConfigDelete(opts: ConfigDeleteOptions): Promise<void> {
+  const configPath = resolveConfigPath(opts.config);
+  if (!fs.existsSync(configPath)) {
+    consola.error(`配置文件不存在: ${configPath}`);
+    process.exit(1);
+  }
+
+  if (!isValidConfigKey(opts.key)) {
+    consola.error(`无效的配置项: ${opts.key}`);
+    process.exit(1);
+  }
+
+  const data = loadConfig(configPath);
+  deleteConfigValue(data, opts.key as ConfigKey);
+  saveConfig(configPath, data);
+  consola.success(`已清除 ${opts.key}`);
+}
+
+export interface ConfigListOptions {
+  config: string;
+}
+
+export async function runConfigList(opts: ConfigListOptions): Promise<void> {
+  await runConfigGet({ config: opts.config });
+}

package/src/commands/init.ts

@@ -6,10 +6,10 @@
 import { spawn } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
-import { getAllDomains, parseDomainsYaml } from "../lib/domains.js";
-import { error, info, warn } from "../lib/logger.js";
+import { getAllDomains, parseDeployConfig } from "../lib/domains.js";
+import { error, info, success, warn } from "../lib/logger.js";
 import { generateNginxConf } from "../lib/nginx.js";
-import { getScriptsDir } from "../lib/paths.js";
+import { getScriptsDir, resolveConfigPath } from "../lib/paths.js";
 
 const DEFAULT_SSL_LOG = "/opt/deploy/logs/ssl.log";
 
@@ -19,16 +19,17 @@ export interface InitOptions {
 }
 
 export async function runInit(opts: InitOptions): Promise<void> {
-  const configPath = path.resolve(process.cwd(), opts.config);
+  const configPath = resolveConfigPath(opts.config);
   if (!fs.existsSync(configPath)) {
-    error(`Domains config not found: ${configPath}`);
+    error(`配置文件不存在: ${configPath}`);
+    info("请先执行: n2-deploy config init");
     process.exit(1);
   }
 
   const yaml = fs.readFileSync(configPath, "utf8");
-  const config = parseDomainsYaml(yaml);
-  const domains = getAllDomains(config);
-  const nginxConf = generateNginxConf(config);
+  const { domainsConfig } = parseDeployConfig(yaml);
+  const domains = getAllDomains(domainsConfig);
+  const nginxConf = generateNginxConf(domainsConfig);
 
   const scriptsDir =
     opts.scriptsDir ||
@@ -36,13 +37,12 @@ export async function runInit(opts: InitOptions): Promise<void> {
     getScriptsDir(process.cwd());
 
   if (!scriptsDir || !fs.existsSync(path.join(scriptsDir, "server-setup.sh"))) {
-    error(
-      "Deploy scripts directory not found. Set N2_DEPLOY_SCRIPTS_DIR or run from repo root (scripts/deploy must exist)."
-    );
+    error("未找到部署脚本目录（需包含 server-setup.sh）");
+    info("请设置 N2_DEPLOY_SCRIPTS_DIR 或在仓库根目录执行（需存在 scripts/deploy）");
     process.exit(1);
   }
 
-  info("Using scripts directory: " + scriptsDir);
+  info(`使用脚本目录: ${scriptsDir}`);
 
   const tmpDir = path.join(
     process.env.TMPDIR || "/tmp",
@@ -59,7 +59,7 @@ export async function runInit(opts: InitOptions): Promise<void> {
       fs.copyFileSync(deploySh, path.join(tmpDir, "deploy.sh"));
       fs.chmodSync(path.join(tmpDir, "deploy.sh"), 0o755);
     } else {
-      error("deploy.sh not found in scripts directory");
+      error("脚本目录中未找到 deploy.sh");
       process.exit(1);
     }
 
@@ -92,7 +92,7 @@ export async function runInit(opts: InitOptions): Promise<void> {
       }
     }
 
-    info("Running server-setup.sh (may require sudo)...");
+    info("正在执行 server-setup.sh（可能需要 sudo）…");
     await new Promise<void>((resolve, reject) => {
       const child = spawn("bash", [path.join(tmpDir, "server-setup.sh")], {
         cwd: tmpDir,
@@ -110,13 +110,13 @@ export async function runInit(opts: InitOptions): Promise<void> {
     if (logDir && !fs.existsSync(logDir)) {
       try {
         fs.mkdirSync(logDir, { recursive: true });
-        info("Created log directory: " + logDir);
+        info(`已创建日志目录: ${logDir}`);
       } catch {
-        warn("Could not create log directory: " + logDir);
+        warn(`无法创建日志目录: ${logDir}`);
       }
     }
 
-    info("Server initialization completed.");
+    success("服务器初始化完成");
   } finally {
     try {
       fs.rmSync(tmpDir, { recursive: true, force: true });

package/src/commands/nginx.ts

@@ -5,9 +5,10 @@
 import { spawn } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
-import { parseDomainsYaml } from "../lib/domains.js";
-import { error, info, warn } from "../lib/logger.js";
+import { parseDeployConfig } from "../lib/domains.js";
+import { error, info, success, warn } from "../lib/logger.js";
 import { generateNginxConf } from "../lib/nginx.js";
+import { resolveConfigPath } from "../lib/paths.js";
 
 export interface NginxOptions {
   config: string;
@@ -18,30 +19,31 @@ export interface NginxOptions {
 const NGINX_CONF_NAME = "n2.conf";
 
 export async function runNginx(opts: NginxOptions): Promise<void> {
-  const configPath = path.resolve(process.cwd(), opts.config);
+  const configPath = resolveConfigPath(opts.config);
   if (!fs.existsSync(configPath)) {
-    error(`Config not found: ${configPath}`);
+    error(`配置文件不存在: ${configPath}`);
+    info("请先执行: n2-deploy config init");
     process.exit(1);
   }
 
   const yaml = fs.readFileSync(configPath, "utf8");
-  const config = parseDomainsYaml(yaml);
-  const nginxConf = generateNginxConf(config);
+  const { domainsConfig } = parseDeployConfig(yaml);
+  const nginxConf = generateNginxConf(domainsConfig);
 
   const outPath = path.resolve(process.cwd(), opts.output);
   const outDir = path.dirname(outPath);
   fs.mkdirSync(outDir, { recursive: true });
   fs.writeFileSync(outPath, nginxConf);
-  info(`Wrote ${outPath}`);
+  info(`已写入: ${outPath}`);
 
   if (opts.install) {
     const destDir = detectNginxConfDir();
     const destPath = path.join(destDir, NGINX_CONF_NAME);
     try {
       fs.copyFileSync(outPath, destPath);
-      info(`Installed to ${destPath}`);
+      info(`已安装到: ${destPath}`);
     } catch (e) {
-      error(`Install failed (try sudo): ${e}`);
+      error(`安装失败（可尝试 sudo）: ${e}`);
       process.exit(1);
     }
     await nginxTestAndReload();
@@ -66,12 +68,10 @@ function nginxTestAndReload(): Promise<void> {
       const r = spawn("systemctl", ["reload", "nginx"], { stdio: "inherit" });
       r.on("close", c => {
         if (c === 0) {
-          info("Nginx reloaded.");
+          success("Nginx 已重载");
           resolve();
         } else {
-          warn(
-            "systemctl reload nginx failed; try: sudo systemctl reload nginx"
-          );
+          warn("systemctl reload nginx 失败，请尝试: sudo systemctl reload nginx");
           resolve();
         }
       });

package/src/commands/ssl-logs.ts

@@ -4,6 +4,7 @@
 
 import fs from "node:fs";
 import path from "node:path";
+import consola from "consola";
 import { getLogFilePath } from "../lib/logger.js";
 
 const DEFAULT_SSL_LOG = "/opt/deploy/logs/ssl.log";
@@ -26,7 +27,7 @@ export async function runSslLogs(opts: SslLogsOptions): Promise<void> {
   const resolved = path.resolve(process.cwd(), logPath);
 
   if (!fs.existsSync(resolved)) {
-    console.error("Log file not found:", resolved);
+    consola.error("日志文件不存在:", resolved);
     process.exit(1);
   }
 
@@ -67,7 +68,7 @@ export async function runSslLogs(opts: SslLogsOptions): Promise<void> {
     opts.action || opts.result ? lastLines.filter(filter) : lastLines;
 
   for (const line of filtered) {
-    console.log(line);
+    consola.log(line);
   }
 
   if (opts.follow) {

package/src/commands/ssl.ts

@@ -6,15 +6,16 @@
 import { spawn } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
-import { getAllDomains, parseDomainsYaml } from "../lib/domains.js";
+import { getAllDomains, parseDeployConfig } from "../lib/domains.js";
 import {
   appendRaw,
   appendSslLog,
   error,
   info,
   setLogFile,
+  success,
 } from "../lib/logger.js";
-import { getScriptsDir } from "../lib/paths.js";
+import { getScriptsDir, resolveConfigPath } from "../lib/paths.js";
 
 const DEFAULT_SSL_LOG = "/opt/deploy/logs/ssl.log";
 
@@ -30,29 +31,38 @@ export interface SslOptions {
 }
 
 export async function runSsl(opts: SslOptions): Promise<void> {
-  const configPath = path.resolve(process.cwd(), opts.config);
+  const configPath = resolveConfigPath(opts.config);
   if (!fs.existsSync(configPath)) {
-    error(`Config not found: ${configPath}`);
+    error(`配置文件不存在: ${configPath}`);
+    info("请先执行: n2-deploy config init");
     process.exit(1);
   }
 
+  const yaml = fs.readFileSync(configPath, "utf8");
+  const {
+    domainsConfig,
+    aliyunAccessKeyId: configAliId,
+    aliyunAccessKeySecret: configAliSecret,
+  } = parseDeployConfig(yaml);
+
   const aliKey =
-    opts.aliKey ?? process.env.ALIYUN_ACCESS_KEY_ID ?? process.env.Ali_Key;
+    opts.aliKey ??
+    configAliId ??
+    process.env.ALIYUN_ACCESS_KEY_ID ??
+    process.env.Ali_Key;
   const aliSecret =
     opts.aliSecret ??
+    configAliSecret ??
     process.env.ALIYUN_ACCESS_KEY_SECRET ??
     process.env.Ali_Secret;
 
   if (!aliKey || !aliSecret) {
-    error(
-      "Aliyun API credentials required. Set --ali-key/--ali-secret or ALIYUN_ACCESS_KEY_ID/ALIYUN_ACCESS_KEY_SECRET (or Ali_Key/Ali_Secret)."
-    );
+    error("缺少阿里云 API 凭证");
+    info("请在配置 (~/.deploy/config.yaml)、--ali-key/--ali-secret 或环境变量 ALIYUN_ACCESS_KEY_ID/ALIYUN_ACCESS_KEY_SECRET 中设置");
     process.exit(1);
   }
 
-  const yaml = fs.readFileSync(configPath, "utf8");
-  const config = parseDomainsYaml(yaml);
-  const domains = getAllDomains(config);
+  const domains = getAllDomains(domainsConfig);
   const domainsTxt = domains.join("\n") + "\n";
 
   const logPath = opts.logFile ?? DEFAULT_SSL_LOG;
@@ -60,8 +70,8 @@ export async function runSsl(opts: SslOptions): Promise<void> {
   const logDir = path.dirname(logPath);
   fs.mkdirSync(logDir, { recursive: true });
 
-  info("SSL log file: " + logPath);
-  info("Domains: " + domains.join(", "));
+  info(`SSL 日志: ${logPath}`);
+  info(`域名: ${domains.join(", ") || "(无)"}`);
 
   const scriptsDir =
     opts.scriptsDir ||
@@ -75,7 +85,7 @@ export async function runSsl(opts: SslOptions): Promise<void> {
     scriptPath = "/opt/ssl/check-and-setup-ssl.sh";
     domainsFilePath = "/opt/ssl/domains.txt";
     fs.writeFileSync(domainsFilePath, domainsTxt);
-    info("Updated /opt/ssl/domains.txt");
+    info("已更新 /opt/ssl/domains.txt");
   } else if (
     scriptsDir &&
     fs.existsSync(path.join(scriptsDir, "ssl", "check-and-setup-ssl.sh"))
@@ -85,9 +95,8 @@ export async function runSsl(opts: SslOptions): Promise<void> {
     fs.writeFileSync(tmpDomains, domainsTxt);
     domainsFilePath = tmpDomains;
   } else {
-    error(
-      "SSL scripts not found. Run 'n2-deploy init' first or set N2_DEPLOY_SCRIPTS_DIR."
-    );
+    error("未找到 SSL 脚本");
+    info("请先执行 n2-deploy init 或设置 N2_DEPLOY_SCRIPTS_DIR");
     process.exit(1);
   }
 
@@ -124,7 +133,7 @@ export async function runSsl(opts: SslOptions): Promise<void> {
     child.on("close", (code, signal) => {
       if (code === 0) {
         appendSslLog("run", "", "ok", "done");
-        info("SSL certificate setup completed.");
+        success("SSL 证书配置完成");
         resolve();
       } else {
         appendSslLog("run", "", "fail", `exit ${code} ${signal ?? ""}`);

package/src/lib/config-store.ts

@@ -0,0 +1,146 @@
+/**
+ * Config file CRUD: load, get, set, delete, save for ~/.deploy/config.yaml.
+ * Keys: aliyun_access_key_id, aliyun_access_key_secret, api.backend_port,
+ *       api.domains, admin.domains, tenant.domains, client.domains
+ */
+
+import fs from "node:fs";
+import path from "node:path";
+import type { DeployConfigResult } from "./domains.js";
+import {
+  parseDeployConfig,
+  serializeDeployConfig,
+} from "./domains.js";
+
+export type ConfigKey =
+  | "aliyun_access_key_id"
+  | "aliyun_access_key_secret"
+  | "api.backend_port"
+  | "api.domains"
+  | "admin.domains"
+  | "tenant.domains"
+  | "client.domains";
+
+const SECTION_KEYS: ConfigKey[] = [
+  "api.backend_port",
+  "api.domains",
+  "admin.domains",
+  "tenant.domains",
+  "client.domains",
+];
+
+export function isValidConfigKey(key: string): key is ConfigKey {
+  return (
+    key === "aliyun_access_key_id" ||
+    key === "aliyun_access_key_secret" ||
+    SECTION_KEYS.includes(key as ConfigKey)
+  );
+}
+
+export function loadConfig(configPath: string): DeployConfigResult {
+  const content = fs.readFileSync(configPath, "utf8");
+  return parseDeployConfig(content);
+}
+
+export function saveConfig(
+  configPath: string,
+  data: DeployConfigResult
+): void {
+  const dir = path.dirname(configPath);
+  if (dir && dir !== ".") {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+  fs.writeFileSync(configPath, serializeDeployConfig(data), "utf8");
+}
+
+export function getConfigValue(
+  data: DeployConfigResult,
+  key: ConfigKey
+): string | number | string[] | undefined {
+  switch (key) {
+    case "aliyun_access_key_id":
+      return data.aliyunAccessKeyId;
+    case "aliyun_access_key_secret":
+      return data.aliyunAccessKeySecret;
+    case "api.backend_port":
+      return data.domainsConfig.api.backend_port;
+    case "api.domains":
+      return data.domainsConfig.api.domains;
+    case "admin.domains":
+      return data.domainsConfig.admin.domains;
+    case "tenant.domains":
+      return data.domainsConfig.tenant.domains;
+    case "client.domains":
+      return data.domainsConfig.client.domains;
+    default:
+      return undefined;
+  }
+}
+
+export function setConfigValue(
+  data: DeployConfigResult,
+  key: ConfigKey,
+  value: string | number | string[]
+): void {
+  switch (key) {
+    case "aliyun_access_key_id":
+      data.aliyunAccessKeyId = String(value);
+      break;
+    case "aliyun_access_key_secret":
+      data.aliyunAccessKeySecret = String(value);
+      break;
+    case "api.backend_port":
+      data.domainsConfig.api.backend_port =
+        typeof value === "number" ? value : parseInt(String(value), 10);
+      break;
+    case "api.domains":
+      data.domainsConfig.api.domains = Array.isArray(value)
+        ? value
+        : [String(value)];
+      break;
+    case "admin.domains":
+      data.domainsConfig.admin.domains = Array.isArray(value)
+        ? value
+        : [String(value)];
+      break;
+    case "tenant.domains":
+      data.domainsConfig.tenant.domains = Array.isArray(value)
+        ? value
+        : [String(value)];
+      break;
+    case "client.domains":
+      data.domainsConfig.client.domains = Array.isArray(value)
+        ? value
+        : [String(value)];
+      break;
+  }
+}
+
+export function deleteConfigValue(
+  data: DeployConfigResult,
+  key: ConfigKey
+): void {
+  switch (key) {
+    case "aliyun_access_key_id":
+      data.aliyunAccessKeyId = undefined;
+      break;
+    case "aliyun_access_key_secret":
+      data.aliyunAccessKeySecret = undefined;
+      break;
+    case "api.backend_port":
+      data.domainsConfig.api.backend_port = 3000;
+      break;
+    case "api.domains":
+      data.domainsConfig.api.domains = [];
+      break;
+    case "admin.domains":
+      data.domainsConfig.admin.domains = [];
+      break;
+    case "tenant.domains":
+      data.domainsConfig.tenant.domains = [];
+      break;
+    case "client.domains":
+      data.domainsConfig.client.domains = [];
+      break;
+  }
+}