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

package/src/logger.mjs

@@ -0,0 +1,72 @@
+import chalk from 'chalk';
+import fse from 'fs-extra';
+import path from 'path';
+import fs from 'fs';
+import { CONSTANTS, LOG_LEVELS } from './constants.mjs';
+
+// 当前日志级别
+let currentLogLevel = LOG_LEVELS.INFO;
+
+/**
+ * 设置日志级别
+ * @param {number} level - 日志级别
+ */
+export function setLogLevel(level) {
+  currentLogLevel = level;
+}
+
+/**
+ * 获取当前日志级别
+ * @returns {number} 当前日志级别
+ */
+export function getLogLevel() {
+  return currentLogLevel;
+}
+
+/**
+ * 日志工具类
+ */
+export class Logger {
+  static debug(message, ...args) {
+    if (currentLogLevel <= LOG_LEVELS.DEBUG) {
+      console.log(chalk.gray(`[DEBUG] ${message}`), ...args);
+    }
+  }
+
+  static info(message, ...args) {
+    if (currentLogLevel <= LOG_LEVELS.INFO) {
+      console.log(chalk.blue(`[INFO] ${message}`), ...args);
+    }
+  }
+
+  static warn(message, ...args) {
+    if (currentLogLevel <= LOG_LEVELS.WARN) {
+      console.log(chalk.yellow(`[WARN] ${message}`), ...args);
+    }
+  }
+
+  static error(message, ...args) {
+    if (currentLogLevel <= LOG_LEVELS.ERROR) {
+      console.log(chalk.red(`[ERROR] ${message}`), ...args);
+    }
+  }
+
+  static success(message, ...args) {
+    console.log(chalk.green(`[SUCCESS] ${message}`), ...args);
+  }
+
+  static writeToFile(message, level = 'INFO') {
+    const logDir = CONSTANTS.LOGS_DIR;
+    const logFile = path.join(logDir, `cli-${new Date().toISOString().split('T')[0]}.log`);
+
+    try {
+      fse.ensureDirSync(logDir);
+      const timestamp = new Date().toISOString();
+      const logEntry = `[${timestamp}] [${level}] ${message}\n`;
+      fs.appendFileSync(logFile, logEntry);
+    } catch (error) {
+      console.error('写入日志文件失败:', error.message);
+    }
+  }
+}
+

package/src/project-initializer.mjs

@@ -0,0 +1,207 @@
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import fse from 'fs-extra';
+import md5 from 'md5';
+import lodash from 'lodash';
+import ora from 'ora';
+import boxen from 'boxen';
+import chalk from 'chalk';
+import gradient from 'gradient-string';
+import { input, confirm } from '@inquirer/prompts';
+import select from '@inquirer/select';
+import { Logger } from './logger.mjs';
+import { CONSTANTS } from './constants.mjs';
+import { ProjectConfig } from './config.mjs';
+import { TemplateProcessor } from './template-processor.mjs';
+import { FileSystemUtils } from './file-system.mjs';
+
+/**
+ * 项目初始化器类
+ */
+export class ProjectInitializer {
+  constructor() {
+    this.config = new ProjectConfig();
+    this.processor = new TemplateProcessor(this.config);
+  }
+
+  async initialize() {
+    const spinner = ora('正在初始化项目...').start();
+
+    try {
+      // 1. 获取用户输入
+      const userInputs = await this.getUserInputs();
+
+      // 2. 验证输入
+      const validation = this.validateInputs(userInputs);
+      if (!validation.isValid) {
+        spinner.fail('输入验证失败');
+        Logger.error(validation.error);
+        return;
+      }
+
+      // 3. 检查目录
+      const rootPath = path.join(process.cwd(), userInputs.appName);
+      if (fs.existsSync(rootPath)) {
+        spinner.fail('目录已存在');
+        Logger.error(`目录已存在: ${rootPath}`);
+        return;
+      }
+
+      // 4. 创建项目
+      await this.createProject(userInputs, rootPath, spinner);
+
+      // 5. 显示成功信息
+      this.showSuccessInfo(userInputs.appName, rootPath);
+
+    } catch (error) {
+      spinner.fail('项目初始化失败');
+      Logger.error('初始化失败:', error.message);
+      if (error.exitCode === 128) {
+        Logger.error('Error: 目录已经存在。');
+      } else if (error.code === 'ENOTFOUND') {
+        Logger.error('网络连接失败，请检查网络连接或尝试使用其他镜像源。');
+      } else if (error.code === 'ECONNREFUSED') {
+        Logger.error('连接被拒绝，请检查防火墙设置或网络配置。');
+      }
+    }
+  }
+
+  async getUserInputs() {
+    Logger.info('\n开始收集项目信息...\n');
+
+    const appName = await input({
+      message: '输入应用程序目录名称',
+      default: 'my-htyf-mp',
+      validate: (input) => {
+        if (!this.config.validateAppName(input)) {
+          return '请以 my-app-name 格式输入您的应用程序英文目录名称';
+        }
+        return true;
+      }
+    });
+
+    const displayName = await input({
+      message: '输入应用程序名称',
+      default: '小程序',
+      validate: (input) => {
+        if (!this.config.validateDisplayName(input)) {
+          return '只能中文、字母和数字, 不能包含特殊字符, 限2-4个字符';
+        }
+        return true;
+      }
+    });
+
+    const templateType = await select({
+      message: '请选择模板类型?',
+      choices: Object.entries(this.config.templates).map(([key, template]) => ({
+        name: template.name,
+        value: key
+      }))
+    });
+
+    Logger.info(`已选择模板: ${this.config.templates[templateType].name}`);
+
+    const repoType = await select({
+      message: '请选择模板镜像?',
+      choices: [
+        { name: 'GitHub (最新)', value: CONSTANTS.TEMPLATE_REPOS.GITHUB },
+        { name: 'Coding (最快)', value: CONSTANTS.TEMPLATE_REPOS.CODING }
+      ]
+    });
+
+    return { appName, displayName, templateType, repoType };
+  }
+
+  validateInputs(inputs) {
+    const pathValidation = FileSystemUtils.validatePath(inputs.appName);
+    if (!pathValidation.isValid) {
+      return { isValid: false, error: pathValidation.error };
+    }
+
+    return { isValid: true };
+  }
+
+  async createProject(userInputs, rootPath, spinner) {
+    const { appName, displayName, templateType, repoType } = userInputs;
+
+    // 创建临时目录
+    spinner.text = '正在准备临时目录...';
+    const tmpdir = path.join(os.tmpdir(), md5('__HTYF__'), appName);
+    fse.emptyDirSync(tmpdir);
+
+    try {
+      // 克隆仓库
+      spinner.text = '正在克隆模板仓库...';
+      await this.processor.cloneRepository(repoType, tmpdir);
+
+      // 确定应用根路径
+      const template = this.config.templates[templateType];
+      const appRootPath = path.join(tmpdir, template.tempPath);
+
+      // 清理不需要的文件
+      spinner.text = '正在清理模板文件...';
+      this.processor.cleanupUnusedTemplates(tmpdir, templateType);
+
+      // 处理模板
+      spinner.text = '正在处理模板...';
+      this.processor.processTemplate(appRootPath, templateType);
+
+      // 生成配置
+      spinner.text = '正在生成项目配置...';
+      const appid = this.config.generateAppId();
+      const projectConfig = this.config.createProjectConfig(appName, displayName, appid);
+
+      // 写入配置文件
+      const configPath = path.join(appRootPath, 'project.dgz.json');
+      fs.writeFileSync(configPath, JSON.stringify(projectConfig, undefined, 2));
+
+      // 清理临时文件
+      spinner.text = '正在清理临时文件...';
+      const tempPath = path.join(appRootPath, '__TEMP__');
+      if (fs.existsSync(tempPath)) {
+        fse.removeSync(tempPath);
+      }
+
+      // 移动到目标目录
+      spinner.text = '正在创建项目目录...';
+      fse.moveSync(appRootPath, rootPath);
+
+      // 清理临时目录
+      fse.removeSync(tmpdir);
+
+      spinner.succeed('项目创建完成');
+
+    } catch (error) {
+      // 清理临时目录
+      if (fs.existsSync(tmpdir)) {
+        fse.removeSync(tmpdir);
+      }
+      throw error;
+    }
+  }
+
+  showSuccessInfo(appName, rootPath) {
+    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' +
+      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.gray('💡 提示: 使用 --debug 参数可以查看详细的调试信息'),
+      {
+        padding: 1,
+        margin: 1,
+        borderStyle: 'round',
+        borderColor: 'green'
+      }
+    ));
+  }
+}
+

package/src/shared-output.json

@@ -16,7 +16,6 @@
   "@react-native-masked-view/masked-view": "0.3.2",
   "@react-native-picker/picker": "2.11.1",
   "@react-native-segmented-control/segmented-control": "2.5.7",
-  "@sayem314/react-native-keep-awake": "1.3.1",
   "@shopify/flash-list": "1.8.3",
   "@shopify/react-native-skia": "2.1.1",
   "expo": "53.0.20",
@@ -68,7 +67,7 @@
   "react-native-safe-area-context": "5.5.2",
   "react-native-screens": "4.13.1",
   "react-native-share": "12.1.0",
-  "react-native-svg": "15.12.0",
+  "react-native-svg": "15.13.0",
   "react-native-track-player": "4.1.1",
   "react-native-vector-icons": "10.2.0",
   "react-native-video": "6.16.1",

package/src/template-processor.mjs

@@ -0,0 +1,137 @@
+import fs from 'fs';
+import path from 'path';
+import fse from 'fs-extra';
+import { execa } from 'execa';
+import { Logger } from './logger.mjs';
+import { CONSTANTS } from './constants.mjs';
+
+/**
+ * 模板处理器类
+ */
+export class TemplateProcessor {
+  constructor(config) {
+    this.config = config;
+  }
+
+  async cloneRepository(repoUrl, tmpdir) {
+    Logger.info('正在克隆模板仓库...');
+    Logger.debug(`仓库地址: ${repoUrl}`);
+    Logger.debug(`目标目录: ${tmpdir}`);
+    
+    try {
+      await execa('git', ['clone', '--depth', '1', repoUrl, tmpdir], {
+        timeout: 60000 // 60秒超时
+      });
+      Logger.success('模板仓库克隆完成');
+    } catch (error) {
+      if (error.code === 'ENOTFOUND') {
+        throw new Error('网络连接失败，请检查网络连接或尝试使用其他镜像源');
+      } else if (error.code === 'ECONNREFUSED') {
+        throw new Error('连接被拒绝，请检查防火墙设置或网络配置');
+      } else if (error.exitCode === 128) {
+        throw new Error('Git仓库访问失败，请检查仓库地址是否正确');
+      } else if (error.signal === 'SIGTERM' || error.timedOut) {
+        throw new Error('克隆操作超时，请检查网络连接或稍后重试');
+      } else {
+        throw new Error(`克隆失败: ${error.message}`);
+      }
+    }
+  }
+
+  cleanupUnusedTemplates(tmpdir, templateType) {
+    const pathsToRemove = [
+      path.join(tmpdir, 'cli'),
+      path.join(tmpdir, '.git'),
+      path.join(tmpdir, 'docs'),
+      path.join(tmpdir, 'README.md')
+    ];
+
+    // 根据模板类型移除不需要的模板
+    if (templateType === CONSTANTS.TEMPLATE_TYPES.TARO || templateType === CONSTANTS.TEMPLATE_TYPES.EXPO) {
+      pathsToRemove.push(path.join(tmpdir, 'mini-game-template'));
+    } else if (templateType === CONSTANTS.TEMPLATE_TYPES.GAME_COCOS) {
+      pathsToRemove.push(path.join(tmpdir, 'mini-apps-template'));
+    }
+
+    pathsToRemove.forEach(pathToRemove => {
+      try {
+        if (fs.existsSync(pathToRemove)) {
+          fse.removeSync(pathToRemove);
+          Logger.debug(`已移除: ${pathToRemove}`);
+        }
+      } catch (err) {
+        Logger.warn(`移除失败: ${pathToRemove}`, err.message);
+      }
+    });
+  }
+
+  processTemplate(appRootPath, templateType) {
+    const template = this.config.templates[templateType];
+    if (!template) {
+      throw new Error(`不支持的模板类型: ${templateType}`);
+    }
+
+    const tempPath = path.join(appRootPath, '__TEMP__');
+
+    if (templateType === CONSTANTS.TEMPLATE_TYPES.TARO) {
+      this.processTaroTemplate(appRootPath, tempPath, template);
+    } else if (templateType === CONSTANTS.TEMPLATE_TYPES.EXPO) {
+      this.processExpoTemplate(appRootPath, tempPath, template);
+    } else if (templateType === CONSTANTS.TEMPLATE_TYPES.GAME_COCOS) {
+      // 预留游戏模板处理
+      Logger.info('游戏模板处理功能开发中...');
+    }
+  }
+
+  processTaroTemplate(appRootPath, tempPath, template) {
+    Logger.info('正在处理 Taro 模板...');
+
+    // 复制模板文件
+    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'}`);
+
+      if (fs.existsSync(srcPath)) {
+        fse.copySync(srcPath, destPath);
+        Logger.debug(`已复制: ${fileName} -> ${destPath}`);
+      }
+    });
+
+    // 更新 package.json
+    const pkgPath = path.join(appRootPath, './package.json');
+    if (fs.existsSync(pkgPath)) {
+      const pkgInfo = fse.readJSONSync(pkgPath);
+      if (template.scripts) {
+        pkgInfo.scripts = {
+          ...(pkgInfo.scripts || {}),
+          ...template.scripts
+        };
+      }
+
+      // 移除不需要的脚本
+      if (pkgInfo.scripts) {
+        delete pkgInfo.scripts.web;
+        delete pkgInfo.scripts['web:dev'];
+      }
+
+      fse.writeJSONSync(pkgPath, pkgInfo, { spaces: 2 });
+      Logger.info('package.json 已更新');
+    }
+  }
+
+  processExpoTemplate(appRootPath, tempPath, template) {
+    Logger.info('正在处理 Expo 模板...');
+
+    // 复制模板文件
+    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'}`);
+
+      if (fs.existsSync(srcPath)) {
+        fse.copySync(srcPath, destPath);
+        Logger.debug(`已复制: ${fileName} -> ${destPath}`);
+      }
+    });
+  }
+}
+

package/src/utils-functions.mjs

@@ -0,0 +1,76 @@
+import path from 'path';
+import fs from 'fs';
+import fse from 'fs-extra';
+import { Logger } from './logger.mjs';
+import { CONSTANTS } from './constants.mjs';
+import { getProjectRoot } from './utils.mjs';
+
+const projectPath = getProjectRoot();
+
+/**
+ * 版本号递增函数
+ * @param {string} version - 当前版本号 (格式: x.y.z)
+ * @returns {string} - 递增后的版本号
+ */
+export function incrementVersion(version) {
+  if (!version || !CONSTANTS.VERSION_NAME_REGEX.test(version)) {
+    return CONSTANTS.DEFAULT_VERSION_NAME;
+  }
+  
+  const parts = version.split('.').map(Number);
+  parts[2] = (parts[2] || 0) + 1; // 补丁版本号加1
+  
+  return parts.join('.');
+}
+
+/**
+ * 更新应用配置
+ * @param {object} newConfig - 新配置对象
+ * @returns {boolean} 是否成功
+ */
+export function updateAppConfig(newConfig) {
+  try {
+    const configPath = path.join(projectPath, 'app.json');
+    const localConfig = fse.readJsonSync(configPath);
+    const _newConfig = {
+      ...localConfig,
+      'htyf': {
+        ...localConfig.htyf,
+        ...newConfig
+      }
+    }
+
+    fs.writeFileSync(configPath, JSON.stringify(_newConfig, undefined, 2), 'utf-8');
+    Logger.success(`配置文件已更新: ${configPath}`);
+
+    return true;
+  } catch (error) {
+    Logger.error(`更新配置文件失败: ${error.message}`);
+    return false;
+  }
+}
+
+/**
+ * 获取小程序脚本ID
+ * @param {string} appid - 应用ID
+ * @param {string} version - 版本号
+ * @returns {string} 脚本ID
+ */
+export function getMiniAppScriptId(appid, version) {
+  return `${appid}_v${version?.replace(/\./gi, '_')}`;
+}
+
+/**
+ * 打印二维码
+ * @param {string} url - 二维码URL
+ */
+export async function printQrcode(url) {
+  try {
+    const QRCode = await import('qrcode');
+    let terminalStr = await QRCode.toString(url, { type: 'terminal', small: true });
+    console.log(terminalStr);
+  } catch (error) {
+    Logger.error(`生成二维码失败: ${error.message}`);
+  }
+}
+

package/src/utils.mjs

@@ -1,73 +1,14 @@
 import path from 'path';
-import fs from 'fs';
-import { fileURLToPath } from 'url'
+import { fileURLToPath } from 'url';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+
 /**
  * 获取项目根目录
  * @returns {string} 项目根目录路径
  */
 export function getProjectRoot() {
-  let currentPath = __dirname;
-
-  // 调试信息
-  if (process.argv.includes('--debug')) {
-    console.log('开始查找项目根目录...');
-    console.log('当前文件路径:', __dirname);
-  }
-
-  // 如果当前在 node_modules 中，向上查找项目根目录
-  while (currentPath.includes('node_modules')) {
-    if (process.argv.includes('--debug')) {
-      console.log('在 node_modules 中，向上查找:', currentPath);
-    }
-    currentPath = path.dirname(currentPath);
-  }
-
-  // 继续向上查找，直到找到包含 app.json 的目录
-  while (currentPath !== path.dirname(currentPath)) {
-    const appJsonPath = path.join(currentPath, 'app.json');
-    const packageJsonPath = path.join(currentPath, 'package.json');
-    const pnpmWorkspacePath = path.join(currentPath, 'pnpm-workspace.yaml');
-
-    if (process.argv.includes('--debug')) {
-      console.log('检查路径:', currentPath);
-      console.log('  app.json 存在:', fs.existsSync(appJsonPath));
-      console.log('  package.json 存在:', fs.existsSync(packageJsonPath));
-      console.log('  pnpm-workspace.yaml 存在:', fs.existsSync(pnpmWorkspacePath));
-    }
-
-    // 检查是否是项目根目录（包含 app.json、package.json 和 pnpm-workspace.yaml）
-    if (fs.existsSync(appJsonPath) &&
-      fs.existsSync(packageJsonPath) &&
-      fs.existsSync(pnpmWorkspacePath)) {
-
-      // 验证 app.json 内容
-      try {
-        const appJson = JSON.parse(fs.readFileSync(appJsonPath, 'utf-8'));
-        if (appJson.htyf) {
-          if (process.argv.includes('--debug')) {
-            console.log('找到项目根目录:', currentPath);
-            console.log('app.json 内容:', JSON.stringify(appJson, null, 2));
-          }
-          return currentPath;
-        }
-      } catch (error) {
-        // 忽略 JSON 解析错误
-        if (process.argv.includes('--debug')) {
-          console.log('app.json 解析失败:', error.message);
-        }
-      }
-    }
-
-    currentPath = path.dirname(currentPath);
-  }
-
-  // 如果没找到，尝试使用原来的方法
-  const fallbackPath = path.resolve(__dirname, '../../../../');
-  if (process.argv.includes('--debug')) {
-    console.log('使用备用路径:', fallbackPath);
-  }
-  return fallbackPath;
+  let currentPath = process.cwd() || __dirname;
+  return currentPath;
 }

package/src/validators.mjs

@@ -0,0 +1,82 @@
+import lodash from 'lodash';
+import si from 'systeminformation';
+import { Logger } from './logger.mjs';
+
+/**
+ * 配置验证工具类
+ */
+export class ConfigValidator {
+  static validateAppConfig(config) {
+    const errors = [];
+    const warnings = [];
+
+    // 必需字段检查
+    const requiredFields = ['productName', 'versionName', 'versionCode'];
+    requiredFields.forEach(field => {
+      if (!config[field]) {
+        errors.push(`缺少必需字段: ${field}`);
+      }
+    });
+
+    // 平台配置检查
+    if (config.iosBuild) {
+      if (!config.iosBuild.appId) {
+        warnings.push('iOS配置缺少appId');
+      }
+    }
+
+    if (config.andBuild) {
+      if (!config.andBuild.appId) {
+        warnings.push('Android配置缺少appId');
+      }
+    }
+
+    return { errors, warnings, isValid: errors.length === 0 };
+  }
+
+  static async validateNetworkConfig() {
+    try {
+      const networkInfo = await si.networkInterfaces();
+      const defaultNet = (lodash.isArray(networkInfo) ? networkInfo : [networkInfo])
+        .find(i => lodash.get(i, 'default', false));
+
+      if (!defaultNet || !defaultNet.ip4) {
+        return { isValid: false, error: '无法获取网络配置' };
+      }
+
+      return {
+        isValid: true,
+        host: defaultNet.ip4,
+        interface: defaultNet.iface
+      };
+    } catch (error) {
+      Logger.error(`网络配置验证失败: ${error.message}`);
+      return { isValid: false, error: error.message };
+    }
+  }
+
+  /**
+   * 验证版本号格式
+   * @param {string} versionName - 版本名称
+   * @param {string} versionCode - 版本代码
+   * @returns {boolean} 是否有效
+   */
+  static validateVersion(versionName, versionCode) {
+    const VERSION_NAME_REGEX = /^\d+(\.\d+){2}$/g;
+    const VERSION_CODE_REGEX = /^\d+$/g;
+    
+    const isVersionNameValid = VERSION_NAME_REGEX.test(versionName);
+    const isVersionCodeValid = VERSION_CODE_REGEX.test(versionCode);
+
+    if (!isVersionNameValid) {
+      Logger.error(`版本名称格式错误: ${versionName}，应为 x.y.z 格式`);
+    }
+
+    if (!isVersionCodeValid) {
+      Logger.error(`版本代码格式错误: ${versionCode}，应为数字格式`);
+    }
+
+    return isVersionNameValid && isVersionCodeValid;
+  }
+}
+