ylyx-cli 1.0.5 → 1.0.7

package/bin/ylyx.js

@@ -114,6 +114,8 @@ program
 program
 	.command('deploy')
 	.description('部署：递归上传本地目录到远端目录（读取当前项目 .ylyxrc.json 的 deploy 字段）')
+	.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')
@@ -125,6 +127,8 @@ program
 	.action(async (options) => {
 		try {
 			await deploy({
+				env: options.env,
+				buildDir: options.buildDir,
 				host: options.host,
 				port: options.port,
 				username: options.username,

package/lib/deploy.js

@@ -1,11 +1,13 @@
 const path = require('path');
 const fs = require('fs-extra');
 const ora = require('ora');
+const inquirer = require('inquirer');
+const archiver = require('archiver');
 const { readProjectConfig } = require('./utils');
 
 let spinner = null; // 加载实例
 
-function formatTimestampForZipName(date = new Date()) {
+function formatTimestampCompact(date = new Date()) {
   const pad2 = (n) => String(n).padStart(2, '0');
   const yyyy = date.getFullYear();
   const MM = pad2(date.getMonth() + 1);
@@ -13,8 +15,7 @@ function formatTimestampForZipName(date = new Date()) {
   const HH = pad2(date.getHours());
   const mm = pad2(date.getMinutes());
   const ss = pad2(date.getSeconds());
-  // zip 文件名避免冒号
-  return `${yyyy}-${MM}-${dd}_${HH}-${mm}-${ss}`;
+  return `${yyyy}${MM}${dd}${HH}${mm}${ss}`;
 }
 
 function formatBytes(bytes) {
@@ -45,6 +46,7 @@ function listLocalFilesWithSize(rootDir) {
           localPath: p,
           relPosix: path.relative(rootDir, p).replace(/\\/g, '/'),
           size: st.size,
+          mtimeMs: st.mtimeMs,
         });
       }
     }
@@ -53,6 +55,80 @@ function listLocalFilesWithSize(rootDir) {
   return out;
 }
 
+function sanitizeBuildDirName(name) {
+  // 用户要求：项目名称来源于 buildDir 字段；同时确保文件名安全
+  return String(name || 'build')
+    .replace(/[\\/]/g, '')
+    .replace(/[^a-zA-Z0-9._-]/g, '')
+    .slice(0, 80);
+}
+
+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 } });
+
+    output.on('close', resolve);
+    output.on('error', reject);
+    archive.on('warning', (err) => {
+      if (err && err.code === 'ENOENT') return;
+      reject(err);
+    });
+    archive.on('error', reject);
+
+    archive.pipe(output);
+    // 关键：zip 内顶层目录名强制为 buildDirName
+    archive.directory(srcDir, topFolderName);
+    archive.finalize();
+  });
+}
+
+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);
@@ -124,6 +200,8 @@ 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,
@@ -139,21 +217,51 @@ function resolveDeployConfig(overrides = {}) {
 
 /**
  * 执行部署（递归上传目录到远端）
- * @param {{host?:string,port?:string|number,username?:string,password?:string,localDir?:string,remoteDir?:string,zipAfter?:boolean,zipOutDir?: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;
 
+  const env = await chooseDeployEnv(cfg.env);
+
   if (!fs.existsSync(localFolderPath)) {
     throw new Error(`本地目录不存在：${path.resolve(localFolderPath)}`);
   }
 
-  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 (env === 'prod') {
+    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;
+  }
+
+  // 测试服：上传到服务器
+  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 {
@@ -180,7 +288,7 @@ async function deploy(overrides = {}) {
     try {
       await sftp.rmdir(remoteFolderPath, true);
     } catch (e) {
-      // 远端目录不存在/权限问题：继续尝试 mkdir
+      // ignore
     }
     await sftp.mkdir(remoteFolderPath, true);
 
@@ -207,25 +315,23 @@ async function deploy(overrides = {}) {
     if (spinner) spinner.info('部署结束');
   }
 
-  // 可选：部署后压缩（参考：compressing.zip.compressDir）
+  // 测试服可选：部署后压缩（延续之前的可选开关）
   if (cfg.zipAfter) {
-    let compressing;
-    try {
-      compressing = require('compressing');
-    } catch (e) {
-      throw new Error(
-        "缺少依赖：compressing（用于压缩）。请在 ylyx-cli 目录执行 `npm i` 或安装该依赖后重试。"
-      );
-    }
-
-    const buildDirName = path.basename(path.resolve(localFolderPath));
+    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 = `${buildDirName}.${formatTimestampForZipName(new Date())}.zip`;
+    const zipName = `${zipBaseName}.zip`;
     const zipPath = path.join(cfg.zipOutDir, zipName);
 
     const zipSpinner = ora(`开始压缩：${zipName}`).start();
     try {
-      await compressing.zip.compressDir(localFolderPath, zipPath);
+      await zipDirAsTopFolder({ srcDir: localFolderPath, zipPath, topFolderName: buildDirName });
       zipSpinner.succeed(`压缩完成：${path.relative(process.cwd(), zipPath)}`);
     } catch (e) {
       zipSpinner.fail('压缩失败');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ylyx-cli",
-    "version": "1.0.5",
+    "version": "1.0.7",
     "description": "公司内部代码生成模板脚手架工具，支持快速生成项目初始结构和代码模板",
     "main": "lib/index.js",
     "bin": {
@@ -43,8 +43,8 @@
         "node": ">=12.0.0"
     },
     "dependencies": {
+        "archiver": "^5.3.2",
         "commander": "^11.1.0",
-        "compressing": "^1.10.1",
         "inquirer": "^8.2.6",
         "chalk": "^4.1.2",
         "fs-extra": "^11.2.0",