ylyx-cli 1.0.4 → 1.0.6

package/bin/ylyx.js

@@ -114,23 +114,29 @@ program
 program
 	.command('deploy')
 	.description('部署：递归上传本地目录到远端目录（读取当前项目 .ylyxrc.json 的 deploy 字段）')
-	.option('--env <env>', '部署环境：test|prod（不传会提示选择）')
+	.option('--env <env>', '部署环境：test|prod（不传会交互选择）')
+	.option('--build-dir <name>', '压缩文件名使用的 buildDir（默认取 .ylyxrc.json 的 buildDir）')
 	.option('--host <host>', '覆盖 deploy.host')
 	.option('--port <port>', '覆盖 deploy.port')
 	.option('-u, --username <username>', '覆盖 deploy.username')
 	.option('-p, --password <password>', '覆盖 deploy.password')
 	.option('--local <path>', '覆盖 deploy.localDir（默认 ./EXTERNAL_DIGIC）')
 	.option('--remote <path>', '覆盖 deploy.remoteDir')
+	.option('--zip', '部署后把 localDir 压缩成 zip（参考 compressing.zip.compressDir）')
+	.option('--zip-out <path>', 'zip 输出目录（默认：./.ylyx-deploy）')
 	.action(async (options) => {
 		try {
 			await deploy({
 				env: options.env,
+				buildDir: options.buildDir,
 				host: options.host,
 				port: options.port,
 				username: options.username,
 				password: options.password,
 				localDir: options.local,
 				remoteDir: options.remote,
+				zipAfter: !!options.zip,
+				zipOutDir: options.zipOut,
 			});
 		} catch (error) {
 			console.error('❌ 部署失败:', error.message);

package/lib/deploy.js

@@ -1,37 +1,37 @@
 const path = require('path');
-const fs = require('fs');
-const crypto = require('crypto');
+const fs = require('fs-extra');
 const ora = require('ora');
-const prompts = require('prompts');
+const inquirer = require('inquirer');
 const archiver = require('archiver');
 const { readProjectConfig } = require('./utils');
 
 let spinner = null; // 加载实例
 
-function pad2(n) {
-  return String(n).padStart(2, '0');
-}
-
-function formatTimestampForFolderName(date = new Date()) {
-  // 用户要求：YYYY-MM-DD HH:mm:ss（注意：该字符串用于 zip 内的顶层目录名，不受 Windows 文件名限制）
+function formatTimestampCompact(date = new Date()) {
+  const pad2 = (n) => String(n).padStart(2, '0');
   const yyyy = date.getFullYear();
   const MM = pad2(date.getMonth() + 1);
   const dd = pad2(date.getDate());
   const HH = pad2(date.getHours());
   const mm = pad2(date.getMinutes());
   const ss = pad2(date.getSeconds());
-  return `${yyyy}-${MM}-${dd} ${HH}:${mm}:${ss}`;
+  return `${yyyy}${MM}${dd}${HH}${mm}${ss}`;
 }
 
-function sanitizeFileName(name) {
-  // Windows 文件名不允许 : * ? " < > | 等，这里做最小化替换，用于 zip 文件名
-  return String(name)
-    .replace(/[\\/:*?"<>|]/g, '-')
-    .replace(/\s+/g, '_')
-    .slice(0, 180);
+function formatBytes(bytes) {
+  const n = Number(bytes) || 0;
+  const units = ['B', 'KB', 'MB', 'GB', 'TB'];
+  let v = n;
+  let i = 0;
+  while (v >= 1024 && i < units.length - 1) {
+    v /= 1024;
+    i++;
+  }
+  const fixed = i === 0 ? 0 : v < 10 ? 2 : v < 100 ? 1 : 0;
+  return `${v.toFixed(fixed)}${units[i]}`;
 }
 
-function listFilesRecursively(rootDir) {
+function listLocalFilesWithSize(rootDir) {
   const out = [];
   const stack = [rootDir];
   while (stack.length) {
@@ -41,34 +41,30 @@ function listFilesRecursively(rootDir) {
       const p = path.join(current, e);
       const st = fs.statSync(p);
       if (st.isDirectory()) stack.push(p);
-      else if (st.isFile()) out.push({ path: p, size: st.size, mtimeMs: st.mtimeMs });
+      else if (st.isFile()) {
+        out.push({
+          localPath: p,
+          relPosix: path.relative(rootDir, p).replace(/\\/g, '/'),
+          size: st.size,
+          mtimeMs: st.mtimeMs,
+        });
+      }
     }
   }
-  // 稳定排序
-  out.sort((a, b) => a.path.localeCompare(b.path));
+  out.sort((a, b) => a.relPosix.localeCompare(b.relPosix));
   return out;
 }
 
-function computeDirHashShort(dir) {
-  const h = crypto.createHash('sha256');
-  const files = listFilesRecursively(dir);
-  for (const f of files) {
-    const rel = path.relative(dir, f.path).replace(/\\/g, '/');
-    h.update(rel);
-    h.update('\n');
-    h.update(String(f.size));
-    h.update('\n');
-    h.update(String(Math.floor(f.mtimeMs)));
-    h.update('\n');
-  }
-  return h.digest('hex').slice(0, 8);
+function sanitizeBuildDirName(name) {
+  // 用户要求：项目名称来源于 buildDir 字段；同时确保文件名安全
+  return String(name || 'build')
+    .replace(/[\\/]/g, '')
+    .replace(/[^a-zA-Z0-9._-]/g, '')
+    .slice(0, 80);
 }
 
-async function zipDirWithTopFolder({ srcDir, outDir, topFolderName }) {
-  fs.mkdirSync(outDir, { recursive: true });
-  const zipFileName = `${sanitizeFileName(topFolderName)}.zip`;
-  const zipPath = path.join(outDir, zipFileName);
-
+async function zipDirAsTopFolder({ srcDir, zipPath, topFolderName }) {
+  fs.ensureDirSync(path.dirname(zipPath));
   await new Promise((resolve, reject) => {
     const output = fs.createWriteStream(zipPath);
     const archive = archiver('zip', { zlib: { level: 9 } });
@@ -76,20 +72,127 @@ async function zipDirWithTopFolder({ srcDir, outDir, topFolderName }) {
     output.on('close', resolve);
     output.on('error', reject);
     archive.on('warning', (err) => {
-      // 非致命 warning（如 ENOENT）按 warning 处理；其它仍抛出
       if (err && err.code === 'ENOENT') return;
       reject(err);
     });
     archive.on('error', reject);
 
     archive.pipe(output);
-
-    // 把 srcDir 内容放到 zip 的顶层目录 topFolderName 下
+    // 关键：zip 内顶层目录名强制为 buildDirName
     archive.directory(srcDir, topFolderName);
     archive.finalize();
   });
+}
 
-  return { zipPath };
+function hashLettersFromSha256(buf, lettersLen = 12) {
+  const alphabet = 'abcdefghijklmnop'; // 16 letters for 0..15
+  let out = '';
+  for (let i = 0; i < buf.length && out.length < lettersLen; i++) {
+    const b = buf[i];
+    out += alphabet[(b >> 4) & 0xf];
+    if (out.length >= lettersLen) break;
+    out += alphabet[b & 0xf];
+  }
+  return out.slice(0, lettersLen);
+}
+
+function computeDirHashLetters(localDir) {
+  const crypto = require('crypto');
+  const h = crypto.createHash('sha256');
+  const files = listLocalFilesWithSize(localDir);
+  for (const f of files) {
+    h.update(f.relPosix);
+    h.update('\n');
+    h.update(String(f.size || 0));
+    h.update('\n');
+    h.update(String(Math.floor(f.mtimeMs || 0)));
+    h.update('\n');
+  }
+  const digest = h.digest();
+  return hashLettersFromSha256(digest, 12);
+}
+
+async function chooseDeployEnv(env) {
+  if (env === 'test' || env === 'prod') return env;
+  const ans = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'env',
+      message: '请选择部署环境',
+      choices: [
+        { name: '部署测试服（上传到服务器）', value: 'test' },
+        { name: '部署正式服（不上传，仅压缩）', value: 'prod' },
+      ],
+      default: 'test',
+    },
+  ]);
+  return ans.env;
+}
+
+async function uploadDirWithProgress({ sftp, localDir, remoteDirPosix, onProgress }) {
+  const files = listLocalFilesWithSize(localDir);
+  const totalBytes = files.reduce((sum, f) => sum + (f.size || 0), 0);
+  if (files.length === 0) return { totalBytes: 0, uploadedBytes: 0, fileCount: 0 };
+
+  // 先创建需要的目录（去重）
+  const dirSet = new Set();
+  for (const f of files) {
+    const remoteFile = path.posix.join(remoteDirPosix, f.relPosix);
+    dirSet.add(path.posix.dirname(remoteFile));
+  }
+  // 目录从浅到深创建，避免多余失败
+  const dirs = Array.from(dirSet).sort((a, b) => a.length - b.length);
+  for (const d of dirs) {
+    await sftp.mkdir(d, true);
+  }
+
+  let uploadedBytes = 0;
+  let lastRenderAt = 0;
+  const render = (state) => {
+    if (typeof onProgress !== 'function') return;
+    const now = Date.now();
+    // 轻微节流，避免刷屏
+    if (now - lastRenderAt < 80 && state && state.force !== true) return;
+    lastRenderAt = now;
+    onProgress(state);
+  };
+
+  for (let i = 0; i < files.length; i++) {
+    const f = files[i];
+    const remoteFile = path.posix.join(remoteDirPosix, f.relPosix);
+    let lastTransferred = 0;
+
+    await sftp.fastPut(f.localPath, remoteFile, {
+      step: (transferred) => {
+        // transferred：当前文件已传输的总字节数（累计）
+        const delta = Math.max(0, Number(transferred || 0) - lastTransferred);
+        lastTransferred = Number(transferred || 0);
+        uploadedBytes += delta;
+        render({
+          uploadedBytes,
+          totalBytes,
+          fileIndex: i + 1,
+          fileCount: files.length,
+          currentFile: f.relPosix,
+        });
+      },
+    });
+
+    // fastPut 有时不会触发 step（极小文件/实现差异），这里兜底补齐本文件剩余字节
+    if (lastTransferred < f.size) {
+      uploadedBytes += f.size - lastTransferred;
+    }
+    render({
+      uploadedBytes,
+      totalBytes,
+      fileIndex: i + 1,
+      fileCount: files.length,
+      currentFile: f.relPosix,
+      force: true,
+    });
+  }
+
+  return { totalBytes, uploadedBytes, fileCount: files.length };
 }
 
 function resolveDeployConfig(overrides = {}) {
@@ -97,12 +200,16 @@ function resolveDeployConfig(overrides = {}) {
   const deploy = (projectConfig && projectConfig.deploy) || {};
 
   const cfg = {
+    env: overrides.env ?? deploy.env,
+    buildDir: overrides.buildDir ?? deploy.buildDir ?? projectConfig.buildDir,
     host: overrides.host ?? deploy.host,
     port: String(overrides.port ?? deploy.port ?? '22'),
     username: overrides.username ?? deploy.username,
     password: overrides.password ?? deploy.password,
     localDir: overrides.localDir ?? deploy.localDir ?? './EXTERNAL_DIGIC',
     remoteDir: overrides.remoteDir ?? deploy.remoteDir ?? '/usr/local/nginx/html/EXTERNAL_DIGIC',
+    zipAfter: overrides.zipAfter ?? deploy.zipAfter ?? false,
+    zipOutDir: overrides.zipOutDir ?? deploy.zipOutDir ?? path.join(process.cwd(), '.ylyx-deploy'),
   };
 
   return cfg;
@@ -110,69 +217,54 @@ function resolveDeployConfig(overrides = {}) {
 
 /**
  * 执行部署（递归上传目录到远端）
- * 测试服：压缩 + 上传 zip
- * 正式服：只压缩（不上传）
- * @param {{env?:'test'|'prod',host?:string,port?:string|number,username?:string,password?:string,localDir?:string,remoteDir?:string}} overrides
+ * 测试服：上传到服务器（可选部署后压缩）
+ * 正式服：不上传，仅压缩
+ * @param {{env?:'test'|'prod',host?:string,port?:string|number,username?:string,password?:string,localDir?:string,remoteDir?:string,zipAfter?:boolean,zipOutDir?:string}} overrides
  */
 async function deploy(overrides = {}) {
   const cfg = resolveDeployConfig(overrides);
   const localFolderPath = cfg.localDir;
   const remoteFolderPath = cfg.remoteDir;
 
-  // 选择部署环境（prompts）
-  let env = overrides.env;
-  if (!env) {
-    const ans = await prompts({
-      type: 'select',
-      name: 'env',
-      message: '请选择部署环境',
-      choices: [
-        { title: '测试服（压缩 + 上传）', value: 'test' },
-        { title: '正式服（只压缩）', value: 'prod' },
-      ],
-      initial: 0,
-    });
-    env = ans.env;
-  }
-  if (env !== 'test' && env !== 'prod') {
-    throw new Error(`不支持的 env：${env}（仅支持 test/prod）`);
-  }
+  const env = await chooseDeployEnv(cfg.env);
 
   if (!fs.existsSync(localFolderPath)) {
     throw new Error(`本地目录不存在：${path.resolve(localFolderPath)}`);
   }
 
-  // buildDir：使用本地目录名（最后一段）
-  const buildDirName = path.basename(path.resolve(localFolderPath));
-  const ts = formatTimestampForFolderName(new Date());
-  const hash = computeDirHashShort(localFolderPath);
-  const topFolderName = `${buildDirName}-${ts}-${hash}`;
-
-  // zip 输出目录（本地）
-  const zipOutDir = path.join(process.cwd(), '.ylyx-deploy');
-
-  spinner = ora('开始压缩...').start();
-  const { zipPath } = await zipDirWithTopFolder({
-    srcDir: localFolderPath,
-    outDir: zipOutDir,
-    topFolderName,
-  });
-  spinner.succeed(`压缩完成：${path.relative(process.cwd(), zipPath)}`);
-
+  // 正式服：仅压缩
   if (env === 'prod') {
-    console.log(`正式服：仅压缩不上传。zip 顶层目录名：${topFolderName}`);
+    const buildDirName = sanitizeBuildDirName(
+      cfg.buildDir != null && cfg.buildDir !== ''
+        ? String(cfg.buildDir).replace(/\//g, '').replace(/\\/g, '')
+        : path.basename(path.resolve(localFolderPath)).replace(/[\\/]/g, '')
+    );
+    const ts = formatTimestampCompact(new Date());
+    const hashLetters = computeDirHashLetters(localFolderPath); // 纯字母
+    const zipBaseName = `${buildDirName}${ts}${hashLetters}`;
+    fs.ensureDirSync(cfg.zipOutDir);
+    const zipName = `${zipBaseName}.zip`;
+    const zipPath = path.join(cfg.zipOutDir, zipName);
+
+    const zipSpinner = ora(`开始压缩：${zipName}`).start();
+    try {
+      await zipDirAsTopFolder({ srcDir: localFolderPath, zipPath, topFolderName: buildDirName });
+      zipSpinner.succeed(`压缩完成：${path.relative(process.cwd(), zipPath)}`);
+    } catch (e) {
+      zipSpinner.fail('压缩失败');
+      throw e;
+    }
     return;
   }
 
-  // test 环境需要上传
-  if (!cfg.host) throw new Error('缺少 deploy.host（测试服上传需要，在 .ylyxrc.json 的 deploy 字段配置）');
-  if (!cfg.username) throw new Error('缺少 deploy.username（测试服上传需要，在 .ylyxrc.json 的 deploy 字段配置）');
-  if (!cfg.password) throw new Error('缺少 deploy.password（测试服上传需要，在 .ylyxrc.json 的 deploy 字段配置）');
-  if (!remoteFolderPath) throw new Error('缺少 deploy.remoteDir（测试服上传需要，在 .ylyxrc.json 的 deploy 字段配置）');
+  // 测试服：上传到服务器
+  if (!cfg.host) throw new Error('缺少 deploy.host（测试服上传需要）');
+  if (!cfg.username) throw new Error('缺少 deploy.username（测试服上传需要）');
+  if (!cfg.password) throw new Error('缺少 deploy.password（测试服上传需要）');
+  if (!remoteFolderPath) throw new Error('缺少 deploy.remoteDir（测试服上传需要）');
 
   let Client;
   try {
-    // 仅在需要“上传”时才加载，避免“正式服只压缩”也因为缺依赖而崩
     Client = require('ssh2-sftp-client');
   } catch (e) {
     throw new Error(
@@ -192,18 +284,27 @@ async function deploy(overrides = {}) {
       password: cfg.password,
     });
 
-    spinner.text = '确保远端目录存在...';
+    spinner.text = '服务器连接成功，准备清理远端目录...';
+    try {
+      await sftp.rmdir(remoteFolderPath, true);
+    } catch (e) {
+      // ignore
+    }
     await sftp.mkdir(remoteFolderPath, true);
 
-    const remoteZipPath = path.posix.join(
-      remoteFolderPath.replace(/\\/g, '/'),
-      path.basename(zipPath)
-    );
-
-    spinner.text = '开始上传 zip...';
-    // fastPut 对单文件更快；若目标路径不存在会失败，所以先 mkdir 上面做了
-    await sftp.fastPut(zipPath, remoteZipPath);
-    spinner.succeed(`测试服上传成功：${remoteZipPath}`);
+    const remoteDirPosix = remoteFolderPath.replace(/\\/g, '/');
+    spinner.text = '开始上传目录...';
+    const { uploadedBytes, totalBytes, fileCount } = await uploadDirWithProgress({
+      sftp,
+      localDir: localFolderPath,
+      remoteDirPosix,
+      onProgress: ({ uploadedBytes: up, totalBytes: tot, fileIndex, fileCount: cnt, currentFile }) => {
+        const percent = tot ? ((up / tot) * 100).toFixed(2) : '100.00';
+        const shortFile = currentFile ? currentFile.slice(-60) : '';
+        spinner.text = `上传进度: ${percent}% (${formatBytes(up)}/${formatBytes(tot)}) 文件:${fileIndex}/${cnt} ${shortFile}`;
+      },
+    });
+    spinner.succeed(`上传成功：${formatBytes(uploadedBytes)}/${formatBytes(totalBytes)}，共 ${fileCount} 个文件`);
   } catch (err) {
     if (spinner) spinner.fail('部署失败');
     throw err;
@@ -213,6 +314,30 @@ async function deploy(overrides = {}) {
     } catch (e) {}
     if (spinner) spinner.info('部署结束');
   }
+
+  // 测试服可选：部署后压缩（延续之前的可选开关）
+  if (cfg.zipAfter) {
+    const buildDirName = sanitizeBuildDirName(
+      cfg.buildDir != null && cfg.buildDir !== ''
+        ? String(cfg.buildDir).replace(/\//g, '').replace(/\\/g, '')
+        : path.basename(path.resolve(localFolderPath)).replace(/[\\/]/g, '')
+    );
+    const ts = formatTimestampCompact(new Date());
+    const hashLetters = computeDirHashLetters(localFolderPath); // 纯字母
+    const zipBaseName = `${buildDirName}${ts}${hashLetters}`;
+    fs.ensureDirSync(cfg.zipOutDir);
+    const zipName = `${zipBaseName}.zip`;
+    const zipPath = path.join(cfg.zipOutDir, zipName);
+
+    const zipSpinner = ora(`开始压缩：${zipName}`).start();
+    try {
+      await zipDirAsTopFolder({ srcDir: localFolderPath, zipPath, topFolderName: buildDirName });
+      zipSpinner.succeed(`压缩完成：${path.relative(process.cwd(), zipPath)}`);
+    } catch (e) {
+      zipSpinner.fail('压缩失败');
+      throw e;
+    }
+  }
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ylyx-cli",
-    "version": "1.0.4",
+    "version": "1.0.6",
     "description": "公司内部代码生成模板脚手架工具，支持快速生成项目初始结构和代码模板",
     "main": "lib/index.js",
     "bin": {
@@ -51,7 +51,6 @@
         "handlebars": "^4.7.8",
         "glob": "^10.3.10",
         "ora": "^5.4.1",
-        "prompts": "^2.4.2",
         "ssh2-sftp-client": "^9.0.4"
     },
     "devDependencies": {