@htyf-mp/cli 0.2.0-alpha.3 → 0.2.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htyf-mp/cli",
-  "version": "0.2.0-alpha.3",
+  "version": "0.2.0-alpha.5",
   "description": "红糖云服app小程序模板-cli",
   "type": "module",
   "bin": "src/index.mjs",

package/src/command-executor.mjs

@@ -20,46 +20,72 @@ export class CommandExecutor {
     const displayCommand = showCommand ? command : description;
     const spinner = ora(displayCommand).start();
 
-    for (let attempt = 1; attempt <= retryCount; attempt++) {
-      try {
-        Logger.debug(`执行命令 (尝试 ${attempt}/${retryCount}): ${command}`);
-
-        const result = await new Promise((resolve, reject) => {
-          const timeoutId = setTimeout(() => {
-            reject(new Error(`命令执行超时 (${timeout}ms)`));
-          }, timeout);
-
-          shell.exec(command, {
-            silent: silent,
-            fatal: false,
-            async: false
-          }, (code, stdout, stderr) => {
-            clearTimeout(timeoutId);
-            resolve({ code, stdout, stderr });
+    // 信号处理：当收到退出信号时，停止 spinner
+    const cleanup = () => {
+      spinner.stop();
+    };
+    process.once('SIGINT', cleanup);
+    process.once('SIGTERM', cleanup);
+
+    try {
+      for (let attempt = 1; attempt <= retryCount; attempt++) {
+        try {
+          Logger.debug(`执行命令 (尝试 ${attempt}/${retryCount}): ${command}`);
+
+          const result = await new Promise((resolve, reject) => {
+            const timeoutId = setTimeout(() => {
+              reject(new Error(`命令执行超时 (${timeout}ms)`));
+            }, timeout);
+
+            shell.exec(command, {
+              silent: silent,
+              fatal: false,
+              async: false
+            }, (code, stdout, stderr) => {
+              clearTimeout(timeoutId);
+              resolve({ code, stdout, stderr });
+            });
           });
-        });
 
-        if (result.code === 0) {
-          spinner.succeed(`${description} 成功`);
-          Logger.debug(`命令输出: ${result.stdout}`);
-          return result;
-        } else {
-          throw new Error(`命令执行失败，退出码: ${result.code}, 错误: ${result.stderr}`);
-        }
-      } catch (error) {
-        if (attempt === retryCount) {
-          spinner.fail(`${description} 失败 (${retryCount} 次尝试后)`);
-          Logger.error(`命令执行失败: ${error.message}`);
+          if (result.code === 0) {
+            process.removeListener('SIGINT', cleanup);
+            process.removeListener('SIGTERM', cleanup);
+            spinner.succeed(`${description} 成功`);
+            Logger.debug(`命令输出: ${result.stdout}`);
+            return result;
+          } else {
+            throw new Error(`命令执行失败，退出码: ${result.code}, 错误: ${result.stderr}`);
+          }
+        } catch (error) {
+          // 如果是用户中断，直接退出
+          if (error.message && (error.message.includes('SIGINT') || error.message.includes('SIGTERM'))) {
+            process.removeListener('SIGINT', cleanup);
+            process.removeListener('SIGTERM', cleanup);
+            spinner.stop();
+            throw error;
+          }
 
-          if (fatal) {
-            process.exit(1);
+          if (attempt === retryCount) {
+            process.removeListener('SIGINT', cleanup);
+            process.removeListener('SIGTERM', cleanup);
+            spinner.fail(`${description} 失败 (${retryCount} 次尝试后)`);
+            Logger.error(`命令执行失败: ${error.message}`);
+
+            if (fatal) {
+              process.exit(1);
+            }
+            throw error;
+          } else {
+            Logger.warn(`命令执行失败，准备重试 (${attempt}/${retryCount}): ${error.message}`);
+            await new Promise(resolve => setTimeout(resolve, 1000 * attempt)); // 递增延迟
           }
-          throw error;
-        } else {
-          Logger.warn(`命令执行失败，准备重试 (${attempt}/${retryCount}): ${error.message}`);
-          await new Promise(resolve => setTimeout(resolve, 1000 * attempt)); // 递增延迟
         }
       }
+    } catch (error) {
+      process.removeListener('SIGINT', cleanup);
+      process.removeListener('SIGTERM', cleanup);
+      spinner.stop();
+      throw error;
     }
   }
 

package/src/config.mjs

@@ -13,17 +13,14 @@ export class ProjectConfig {
     };
 
     this.templates = {
-      [CONSTANTS.TEMPLATE_TYPES.EXPO]: {
-        name: 'Expo (https://docs.expo.dev/)',
-        tempPath: 'mini-apps-template',
-        files: {
-          src: 'expo_src',
-          app: 'expo.App.tsx',
-          index: 'expo.index.js',
-          babel: 'expo.babel.config.js',
-          config: 'expo.project.dgz.json'
-        }
+      [CONSTANTS.TEMPLATE_TYPES.APP_TEMPLATE]: {
+        name: 'app-template',
+        tempPath: '_apps_temp_'
       },
+      [CONSTANTS.TEMPLATE_TYPES.GAME_TEMPLATE]: {
+        name: 'game-template',
+        tempPath: '_games_temp_'
+      }
     };
   }
 

package/src/constants.mjs

@@ -25,9 +25,8 @@ export const CONSTANTS = {
     CODING: 'https://e.coding.net/dagouzhi/hongtangyun_mobile/htyf-mp.git'
   },
   TEMPLATE_TYPES: {
-    EXPO: 'expo',
-    TARO: 'taro',
-    GAME_COCOS: 'game-cocos',
+    APP_TEMPLATE: 'app-template',
+    GAME_TEMPLATE: 'game-template',
   }
 };
 

package/src/debug.mjs

@@ -94,14 +94,35 @@ export async function mpDebugShell(newAppInfo) {
       Logger.info('调试服务器已启动，按 Ctrl+C 停止');
     });
 
-    // 优雅关闭
-    process.on('SIGINT', () => {
-      Logger.info('正在关闭调试服务器...');
+    // 优雅关闭 - 移除全局处理，添加专用的服务器关闭处理
+    const handleShutdown = () => {
+      Logger.info('\n正在关闭调试服务器...');
+      let isClosed = false;
+      
       server.close(() => {
-        Logger.success('调试服务器已关闭');
-        process.exit(0);
+        if (!isClosed) {
+          isClosed = true;
+          Logger.success('调试服务器已关闭');
+          process.exit(0);
+        }
       });
-    });
+      
+      // 如果服务器在 3 秒内没有关闭，强制退出
+      setTimeout(() => {
+        if (!isClosed) {
+          isClosed = true;
+          Logger.warn('强制退出...');
+          process.exit(0);
+        }
+      }, 3000);
+    };
+
+    // 移除全局的信号处理，添加专用的服务器关闭处理
+    // 这样可以确保服务器能够正确关闭
+    process.removeAllListeners('SIGINT');
+    process.removeAllListeners('SIGTERM');
+    process.once('SIGINT', handleShutdown);
+    process.once('SIGTERM', handleShutdown);
 
   } catch (error) {
     Logger.error(`小程序调试失败: ${error.message}`);

package/src/file-system.mjs

@@ -62,6 +62,24 @@ export class FileSystemUtils {
     return Math.round(bytes / Math.pow(1024, i) * 100) / 100 + ' ' + sizes[i];
   }
 
+  /**
+   * 检查目录是否为空
+   * @param {string} dirPath
+   * @returns {boolean}
+   */
+  static isDirectoryEmpty(dirPath) {
+    if (!fs.existsSync(dirPath)) {
+      return true;
+    }
+    try {
+      const entries = fs.readdirSync(dirPath);
+      return entries.length === 0;
+    } catch (error) {
+      Logger.warn(`读取目录内容失败: ${dirPath}`, error.message);
+      return false;
+    }
+  }
+
   static validatePath(path) {
     // if (/[ -	fa5]/gi.test(path)) {
     //   return { isValid: false, error: '路径中包含中文字符' };

package/src/index.mjs

@@ -27,6 +27,48 @@ import { incrementVersion, updateAppConfig } from './utils-functions.mjs';
 
 const projectPath = getProjectRoot();
 
+// 全局状态管理，用于优雅退出
+let isExiting = false;
+let currentProcess = null;
+
+/**
+ * 优雅退出处理
+ */
+function handleGracefulExit() {
+  if (isExiting) {
+    // 如果已经在退出中，强制退出
+    Logger.warn('强制退出...');
+    process.exit(1);
+  }
+
+  isExiting = true;
+  Logger.info('\n正在退出...');
+
+  // 如果有正在运行的进程，尝试关闭
+  if (currentProcess) {
+    try {
+      if (typeof currentProcess.close === 'function') {
+        currentProcess.close();
+      } else if (typeof currentProcess.kill === 'function') {
+        currentProcess.kill('SIGTERM');
+      }
+    } catch (error) {
+      Logger.debug(`关闭进程时出错: ${error.message}`);
+    }
+  }
+
+  // 延迟退出，给清理操作一些时间
+  setTimeout(() => {
+    Logger.info('再见!');
+    process.exit(0);
+  }, 100);
+}
+
+// 注册全局信号处理（使用 once 确保只注册一次）
+// 注意：某些模块（如 debug.mjs）可能会移除这些监听器并添加自己的处理
+process.on('SIGINT', handleGracefulExit);
+process.on('SIGTERM', handleGracefulExit);
+
 /**
  * 主启动函数
  * @param {string} action - 操作类型
@@ -250,6 +292,13 @@ inquirer
     }
   })
   .catch((error) => {
+    // 如果是用户取消（Ctrl+C），不显示错误
+    if (error.isTtyError || error.name === 'AbortError') {
+      handleGracefulExit();
+      return;
+    }
     Logger.error(`程序启动失败: ${error.message}`);
-    process.exit(1);
+    if (!isExiting) {
+      process.exit(1);
+    }
   });

package/src/project-initializer.mjs

@@ -26,7 +26,28 @@ export class ProjectInitializer {
   }
 
   async initialize() {
-    const spinner = ora('正在初始化项目...').start();
+    const spinner = ora('正在初始化项目...');
+    let tmpdir = null;
+    let rootPath = null;
+
+    // 信号处理：清理临时文件并停止 spinner
+    const handleExit = () => {
+      spinner.stop();
+      Logger.info('\n正在清理临时文件...');
+      if (tmpdir && fs.existsSync(tmpdir)) {
+        try {
+          fse.removeSync(tmpdir);
+          Logger.info('临时文件已清理');
+        } catch (error) {
+          Logger.warn(`清理临时文件时出错: ${error.message}`);
+        }
+      }
+      Logger.info('已取消项目初始化');
+      process.exit(0);
+    };
+
+    process.once('SIGINT', handleExit);
+    process.once('SIGTERM', handleExit);
 
     try {
       // 1. 获取用户输入
@@ -35,26 +56,41 @@ export class ProjectInitializer {
       // 2. 验证输入
       const validation = this.validateInputs(userInputs);
       if (!validation.isValid) {
+        process.removeListener('SIGINT', handleExit);
+        process.removeListener('SIGTERM', handleExit);
         spinner.fail('输入验证失败');
         Logger.error(validation.error);
         return;
       }
 
       // 3. 检查目录
-      const rootPath = path.join(process.cwd(), userInputs.appName);
+      rootPath = path.join(process.cwd(), userInputs.appName);
       if (fs.existsSync(rootPath)) {
+        process.removeListener('SIGINT', handleExit);
+        process.removeListener('SIGTERM', handleExit);
         spinner.fail('目录已存在');
         Logger.error(`目录已存在: ${rootPath}`);
         return;
       }
 
-      // 4. 创建项目
-      await this.createProject(userInputs, rootPath, spinner);
+      // 4. 创建项目（在此之前启动 spinner）
+      spinner.start();
+      spinner.text = '正在初始化项目...';
+      // 传递 tmpdir 引用以便清理
+      await this.createProject(userInputs, rootPath, spinner, (dir) => {
+        tmpdir = dir;
+      });
+
+      // 移除信号监听器
+      process.removeListener('SIGINT', handleExit);
+      process.removeListener('SIGTERM', handleExit);
 
       // 5. 显示成功信息
-      this.showSuccessInfo(userInputs.appName, rootPath);
+      this.showSuccessInfo(userInputs.appName, rootPath, userInputs.templateType);
 
     } catch (error) {
+      process.removeListener('SIGINT', handleExit);
+      process.removeListener('SIGTERM', handleExit);
       spinner.fail('项目初始化失败');
       Logger.error('初始化失败:', error.message);
       if (error.exitCode === 128) {
@@ -106,7 +142,6 @@ export class ProjectInitializer {
       message: '请选择模板镜像?',
       choices: [
         { name: 'GitHub (最新)', value: CONSTANTS.TEMPLATE_REPOS.GITHUB },
-        { name: 'Coding (最快)', value: CONSTANTS.TEMPLATE_REPOS.CODING }
       ]
     });
 
@@ -122,13 +157,18 @@ export class ProjectInitializer {
     return { isValid: true };
   }
 
-  async createProject(userInputs, rootPath, spinner) {
+  async createProject(userInputs, rootPath, spinner, setTmpdirCallback = null) {
     const { appName, displayName, templateType, repoType } = userInputs;
 
     // 创建临时目录
     spinner.text = '正在准备临时目录...';
     const tmpdir = path.join(os.tmpdir(), md5('__HTYF__'), appName);
     fse.emptyDirSync(tmpdir);
+    
+    // 设置临时目录引用，以便在退出时清理
+    if (setTmpdirCallback) {
+      setTmpdirCallback(tmpdir);
+    }
 
     try {
       // 克隆仓库
@@ -153,7 +193,7 @@ export class ProjectInitializer {
       const projectConfig = this.config.createProjectConfig(appName, displayName, appid);
 
       // 写入配置文件
-      const configPath = path.join(appRootPath, 'project.dgz.json');
+      const configPath = path.join(appRootPath, 'htyf.json');
       fs.writeFileSync(configPath, JSON.stringify(projectConfig, undefined, 2));
 
       // 清理临时文件
@@ -165,7 +205,19 @@ export class ProjectInitializer {
 
       // 移动到目标目录
       spinner.text = '正在创建项目目录...';
-      fse.moveSync(appRootPath, rootPath);
+
+      if (fs.existsSync(rootPath)) {
+        fse.ensureDirSync(rootPath);
+        const items = fs.readdirSync(appRootPath);
+        items.forEach((item) => {
+          const source = path.join(appRootPath, item);
+          const destination = path.join(rootPath, item);
+          fse.moveSync(source, destination, { overwrite: true });
+        });
+        fse.removeSync(appRootPath);
+      } else {
+        fse.moveSync(appRootPath, rootPath);
+      }
 
       // 清理临时目录
       fse.removeSync(tmpdir);
@@ -181,19 +233,33 @@ export class ProjectInitializer {
     }
   }
 
-  showSuccessInfo(appName, rootPath) {
+  showSuccessInfo(appName, rootPath, templateType) {
     console.log('\n' + boxen(
       gradient.rainbow('🎉 项目创建成功!') + '\n\n' +
       chalk.cyan('项目名称: ') + chalk.white(appName) + '\n' +
       chalk.cyan('项目路径: ') + chalk.white(rootPath) + '\n\n' +
       chalk.yellow('下一步操作:') + '\n' +
-      chalk.white(`  cd ${appName}`) + '\n' +
-      chalk.white('  npm install') + '\n' +
-      chalk.white('  npm run dev:weapp') + '\n\n' +
+      (() => {
+        const relativePath = path.relative(process.cwd(), rootPath);
+        const commands = [];
+        if (relativePath) {
+          commands.push(chalk.white(`  cd ${relativePath}`));
+        }
+
+        if (templateType === CONSTANTS.TEMPLATE_TYPES.GAME_TEMPLATE) {
+          commands.push(chalk.white('  npm install'));
+        } else {
+          commands.push(
+            chalk.white('  npm install'),
+            chalk.white('  npm run ios'),
+            chalk.white('  npm run android')
+          );
+        }
+
+        return commands.join('\n');
+      })() + '\n\n' +
       chalk.blue('常用命令:') + '\n' +
-      chalk.white('  npm run build:weapp  # 构建微信小程序') + '\n' +
-      chalk.white('  npm run build:h5     # 构建H5版本') + '\n' +
-      chalk.white('  npm run build:rn     # 构建React Native版本') + '\n\n' +
+      chalk.white('  npm run htyf  # 构建红糖云服小程序') + '\n' +
       chalk.gray('💡 提示: 使用 --debug 参数可以查看详细的调试信息'),
       {
         padding: 1,

package/src/template-processor.mjs

@@ -89,7 +89,7 @@ export class TemplateProcessor {
     // 复制模板文件
     Object.entries(template.files).forEach(([key, fileName]) => {
       const srcPath = path.join(tempPath, fileName);
-      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'project.dgz.json'}`);
+      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'htyf.json'}`);
 
       if (fs.existsSync(srcPath)) {
         fse.copySync(srcPath, destPath);
@@ -125,7 +125,7 @@ export class TemplateProcessor {
     // 复制模板文件
     Object.entries(template.files).forEach(([key, fileName]) => {
       const srcPath = path.join(tempPath, fileName);
-      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'project.dgz.json'}`);
+      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'htyf.json'}`);
 
       if (fs.existsSync(srcPath)) {
         fse.copySync(srcPath, destPath);