zhixuan-plugin-cli 1.0.1 → 1.0.2

package/bin/index.js

@@ -6,41 +6,81 @@ const { version } = require('../package.json');
 
 program
   .version(version, '-v, --version')
+  .description('zhixuan插件项目脚手架CLI工具')
   .usage('<command> [options]');
 
 // 注册 create 命令
 program
   .command('create <project-name>')
-  .description('创建一个新的Vue2项目')
-  .option('-t, --template <template>', '指定模板类型 (default/ts/multi)')
+  .description('创建一个新项目')
+  .option('-t, --template <template>', '指定模板类型 (h5/vue2/vue3/react)')
+  .option('--pluginId <pluginId>', '插件ID')
   .action((projectName, options) => {
     require('../commands/create')(projectName, options);
   });
 
-// 注册 config 命令
+// 注册 pull 命令 - 支持versionId和token参数
 program
-  .command('config')
-  .description('管理脚手架配置')
-  .option('-s, --set <key> <value>', '设置配置')
-  .option('-g, --get <key>', '获取配置')
-  .option('-l, --list', '列出所有配置')
+  .command('pull')
+  .description('从智轩平台拉取插件')
+  .option('--versionId <versionId>', '版本ID')
+  .option('-t, --token <token>', '访问令牌')
+  .option('--server <server>', '服务器地址')
+  .option('-d, --dir <directory>', '下载到指定目录')
+  .option('-f, --force', '强制拉取，不询问确认')
   .action((options) => {
-    require('../commands/config')(options);
+    require('../commands/pull')(options);
   });
 
-// 处理未知命令
+// 注册 push 命令 - 支持pluginId、version和token参数
 program
-  .arguments('<command>')
-  .action((cmd) => {
-    program.outputHelp();
-    console.log();
-    console.log(chalk.red(`  未知命令 ${chalk.yellow(cmd)}`));
-    console.log();
+  .command('push')
+  .description('推送到智轩平台')
+  .option('--pluginId <pluginId>', '插件ID')
+  .option('-vNo, --versionNum <version>', '版本号')
+  .option('-vDesc, versionDescription <versionDescription>', '插件描述')
+  .option('-t, --token <token>', '访问令牌')
+  .option('--server <server>', '服务器地址', 'https://dev.zhixuan.cloud')
+  .option('-f, --force', '强制推送，不询问确认')
+  .action((options) => {
+    require('../commands/push')(options);
   });
 
-program.parse(process.argv);
+// 设置帮助信息
+program.on('--help', () => {
+  console.log();
+  console.log(chalk.cyan('  示例:'));
+  console.log();
+  console.log(chalk.cyan('    # 创建新项目'));
+  console.log(chalk.white('    $ zx-cli create my-project'));
+  console.log();
+  console.log(chalk.cyan('    # 使用特定模板创建项目'));
+  console.log(chalk.white('    $ zx-cli create my-project -t vue2'));
+  console.log();
+  console.log(chalk.cyan('    # 拉取插件（使用版本ID和token）'));
+  console.log(chalk.white('    $ zx-cli pull --versionId <version-id> --token <token>'));
+  console.log();
+  console.log(chalk.cyan('    # 拉取插件到指定目录'));
+  console.log(chalk.white('    $ zx-cli pull --versionId <version-id> --token <token> --dir ./my-plugins'));
+  console.log();
+  console.log(chalk.cyan('    # 推送插件（使用插件ID、插件版本、token）'));
+  console.log(chalk.white('    $ zx-cli push --pluginId <plugin-id> --version <version> --token <token>'));
+  console.log();
+});
+
+// 处理未知命令或缺少参数的情况
+program
+  .arguments('[command]')
+  .action((cmd) => {
+    if (!cmd) {
+      // 没有提供命令参数，显示帮助
+      program.outputHelp();
+    } else {
+      // 提供了未知命令
+      console.log(chalk.red(`\n  未知命令 ${chalk.yellow(cmd)}`));
+      console.log();
+      program.outputHelp();
+    }
+  });
 
-// 如果没有参数，显示帮助
-if (!process.argv.slice(2).length) {
-  program.outputHelp();
-}
+program.parse(process.argv);

package/commands/create.js

@@ -36,6 +36,7 @@ module.exports = async function create(projectName, options) {
 
   // 选择模板
   let templateType = options.template;
+  const pluginId = options.pluginId;
   if (!templateType) {
     const answers = await inquirer.prompt([
       {
@@ -43,8 +44,10 @@ module.exports = async function create(projectName, options) {
         type: 'list',
         message: '请选择项目模板:',
         choices: [
-          { name: '标准模板 (h5)', value: 'default' },
+          { name: '标准模板 (h5)', value: 'javaScript' },
           { name: 'vue模板 (Vue2)', value: 'vue2' },
+          { name: 'vue模板 (Vue3)', value: 'vue3' },
+          { name: 'react模板 (react)', value: 'react' },
         ]
       }
     ]);
@@ -54,6 +57,15 @@ module.exports = async function create(projectName, options) {
   try {
     // 下载模板
     await downloadTemplate(projectName, templateType);
+
+    // 修改package.json中的项目名称
+    const packageJsonPath = path.join(targetDir, 'package.json');
+    if (await fs.pathExists(packageJsonPath)) {
+      const packageJson = await fs.readJson(packageJsonPath);
+      packageJson.name = projectName;
+      packageJson.pluginId = pluginId;
+      await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+    }
     
     console.log();
     console.log(chalk.green('✅  项目创建成功!'));

package/commands/pull.js

@@ -0,0 +1,165 @@
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+const fs = require('fs-extra');
+const path = require('path');
+const Conf = require('conf');
+const ora = require('ora');
+
+module.exports = async function pull(options) {
+  console.log();
+  console.log(chalk.cyan(`🔄  正在拉取插件`));
+
+  // 使用 Conf 管理配置
+  const config = new Conf({
+    configName: 'package',
+    fileExtension: 'json',
+    cwd: process.cwd(),
+    defaults: {
+      name: 'plugin',
+      version: '1.0.0',
+      pluginId: '',
+      versionDescription: '描述'
+    }
+  });
+
+  try {
+    // 获取服务器地址（优先使用命令行参数）
+    const serverUrl = options.server || config.get('settings.serverUrl');
+    
+    // 获取token（优先使用命令行参数）
+    let token = options.token;
+    if (!token) {
+      // 如果命令行没有提供token，尝试从配置中获取
+      const auth = config.get('auth');
+      if (auth.token) {
+        token = auth.token;
+      } else {
+        console.log(chalk.red('❌  未提供访问令牌'));
+        console.log(chalk.cyan('请使用 --token 参数提供访问令牌'));
+        return;
+      }
+    }
+
+    // 获取版本ID
+    const versionId = options.versionId;
+
+    if (!versionId) {
+      console.log(chalk.red('❌  未提供版本ID'));
+      console.log(chalk.cyan('请使用 --versionId 参数提供版本ID'));
+      return;
+    }
+
+    // 确定下载目录
+    let targetDir;
+    if (options.dir) {
+      targetDir = path.resolve(options.dir);
+    } else {
+      // 默认使用版本ID作为目录名的一部分
+      targetDir = path.join(process.cwd(), `version-${versionId}`);
+    }
+
+    // 检查目录是否已存在
+    if (await fs.pathExists(targetDir)) {
+      if (!options.force) {
+        const { action } = await inquirer.prompt([
+          {
+            name: 'action',
+            type: 'list',
+            message: `目标目录 ${chalk.cyan(targetDir)} 已存在，请选择操作:`,
+            choices: [
+              { name: '覆盖', value: 'overwrite' },
+              { name: '合并', value: 'merge' },
+              { name: '取消', value: false }
+            ]
+          }
+        ]);
+
+        if (!action) {
+          console.log(chalk.yellow('操作已取消'));
+          return;
+        }
+
+        if (action === 'overwrite') {
+          console.log(chalk.yellow(`\n移除目录 ${chalk.cyan(targetDir)} ...`));
+          await fs.remove(targetDir);
+        } else if (action === 'merge') {
+          console.log(chalk.yellow('将合并到现有目录中'));
+        }
+      } else {
+        console.log(chalk.yellow(`\n强制覆盖目录 ${chalk.cyan(targetDir)} ...`));
+        await fs.remove(targetDir);
+      }
+    }
+
+    // 显示加载动画
+    const spinner = ora({
+      text: chalk.yellow('正在下载插件...'),
+      spinner: 'clock'
+    });
+    spinner.start();
+
+    try {
+      // 构建下载API端点 - 使用版本ID
+      const downloadUrl = `${serverUrl.replace(/\/$/, '')}/api/plugins/versions/${versionId}/download`;
+
+      // 下载插件
+      await downloadPlugin(downloadUrl, token, targetDir, versionId);
+      
+      spinner.succeed(chalk.green('插件下载成功!'));
+      
+      console.log();
+      console.log(chalk.green('✅  插件拉取成功!'));
+      console.log();
+      console.log(chalk.cyan(`版本ID: ${versionId}`));
+      console.log(chalk.cyan('插件已下载到: ' + targetDir));
+      console.log();
+    } catch (error) {
+      spinner.fail(chalk.red('下载失败'));
+      throw error;
+    }
+
+  } catch (err) {
+    console.log(chalk.red('❌  插件拉取失败'));
+    console.log(chalk.red(err.message || err));
+  }
+};
+
+// 下载插件的函数
+async function downloadPlugin(downloadUrl, token, targetDir, versionId) {
+  // 模拟下载过程，实际应用中应替换为真实的下载逻辑
+  return new Promise(async (resolve, reject) => {
+    try {
+      // 模拟网络请求，实际应用中应使用真实的HTTP客户端
+      console.log(chalk.yellow(`正在从 ${downloadUrl} 下载版本 ${versionId}...`));
+      
+      // 模拟等待时间
+      await new Promise(resolve => setTimeout(resolve, 1500));
+      
+      // 创建目标目录
+      await fs.ensureDir(targetDir);
+      
+      // 模拟创建插件文件结构
+      const packageJson = {
+        name: `version-${versionId}`,
+        version: '1.0.0',
+        description: 'A Zhixuan plugin version',
+        main: 'index.js',
+        scripts: {
+          dev: 'zx-cli serve',
+          build: 'zx-cli build'
+        }
+      };
+
+      // 写入文件
+      await fs.writeJson(path.join(targetDir, 'package.json'), packageJson, { spaces: 2 });
+      await fs.writeFile(path.join(targetDir, 'index.js'), '// Plugin entry point\nconsole.log("Plugin loaded");', 'utf8');
+      await fs.writeFile(path.join(targetDir, 'README.md'), `# Version ${versionId}\n\nThis is a Zhixuan plugin version.`, 'utf8');
+      await fs.ensureDir(path.join(targetDir, 'src'));
+      await fs.ensureDir(path.join(targetDir, 'public'));
+
+      resolve();
+    } catch (error) {
+      reject(error);
+    }
+  });
+}

package/commands/push.js

@@ -0,0 +1,306 @@
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+const fs = require('fs-extra');
+const path = require('path');
+const Conf = require('conf');
+const ora = require('ora');
+const archiver = require('archiver');
+const { exec } = require('child_process');
+
+module.exports = async function push(options) {
+  console.log(chalk.cyan(`📤  准备推送插件`));
+
+  // 使用 Conf 管理配置
+  const config = new Conf({
+    configName: 'package',
+    fileExtension: 'json',
+    cwd: process.cwd(),
+    defaults: {
+      name: 'plugin',
+      version: '1.0.0',
+      pluginId: '',
+      versionDescription: '描述'
+    }
+  });
+
+  try {
+    // 获取服务器地址（优先使用命令行参数）
+    const serverUrl = options.server;
+    
+    // 获取token（优先使用命令行参数）
+    let token = options.token;
+    if (!token) {
+      // 如果命令行没有提供token，尝试从配置中获取
+      const auth = config.get('auth');
+      if (auth.token) {
+        token = auth.token;
+      } else {
+        console.log(chalk.red('❌  未提供访问令牌'));
+        console.log(chalk.cyan('请使用 --token 参数提供访问令牌'));
+        return;
+      }
+    }
+
+    // 获取插件ID和版本
+    const pluginId = options.pluginId;
+    const version = options.versionNum;
+    const versionDescription = options.versionDescription || config.get('versionDescription');
+
+    if (!pluginId) {
+      console.log(chalk.red('❌  未提供插件ID'));
+      console.log(chalk.cyan('请使用 --pluginId 参数提供插件ID'));
+      return;
+    }
+
+    console.log(config.get('version'));
+    console.log(config.get('pluginId'));
+
+    if (!(config.get('version') === '1.0.0' && config.get('pluginId') === '')) {
+      if (pluginId !== config.get('pluginId')) {
+        console.log(chalk.red('❌  插件ID不匹配'));
+        console.log(chalk.cyan('请检测pluginId是否匹配package.json中的插件ID'));
+        return;
+      }
+    }
+
+    if (!version) {
+      console.log(chalk.red('❌  未提供插件版本'));
+      console.log(chalk.cyan('请使用 --version 参数提供插件'));
+      return;
+    }
+
+    console.table([
+      {
+        '数据来源': '当前配置',
+        '插件名称': config.get('name'),
+        '插件id': pluginId,
+        '插件版本': config.get('version')
+      }, {
+        '数据来源': '推送配置',
+        '插件名称': config.get('name'),
+        '插件id': pluginId,
+        '插件版本': version
+      }
+    ])
+
+    // 确认上传（除非使用了force选项）
+    if (!options.force) {
+      const { confirm } = await inquirer.prompt([
+        {
+          name: 'confirm',
+          type: 'confirm',
+          message: `确定要上传推送吗?`,
+          default: true
+        }
+      ]);
+
+      if (!confirm) {
+        console.log(chalk.yellow('操作已取消'));
+        return;
+      }
+    }
+
+    // 显示上传进度
+    const spinner = ora({
+      text: chalk.yellow('正在打包并上传插件...'),
+      spinner: 'clock'
+    });
+    spinner.start();
+
+
+    try {
+      // 构建项目
+      spinner.text = chalk.yellow('正在构建项目...');
+      await runBuildCommand();
+
+      // 打包插件
+      spinner.text = chalk.yellow('正在建立压缩包...');
+      const pluginDir = process.cwd();
+      const zipBuffer = await packPlugin(pluginDir, `${pluginId}_${version}`);
+
+      spinner.text = chalk.yellow('正在上传插件...');
+      // 上传插件
+      await uploadPlugin(
+        `${serverUrl.replace(/\/$/, '')}/api/ViewPlugin/version/submit`,
+        token,
+        zipBuffer,
+        pluginId,
+        version,
+        versionDescription
+      );
+
+      spinner.succeed(chalk.green('✅  插件推送成功!'));
+
+      // 修改package.json中的pluginId和version
+      const packageJsonPath = path.join(process.cwd(), 'package.json');
+      if (await fs.pathExists(packageJsonPath)) {
+        const packageJson = await fs.readJson(packageJsonPath);
+        packageJson.pluginId = pluginId; // 更新插件ID
+        packageJson.version = version;   // 更新版本号
+        packPlugin.versionDescription = versionDescription; // 更新版本描述
+        await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+        console.log(chalk.green(`✅  package.json 已更新: pluginId="${pluginId}", version="${version}"`));
+      }
+
+    } catch (error) {
+      spinner.fail(chalk.red('上传失败'));
+      throw error;
+    }
+
+  } catch (err) {
+    console.log(chalk.red('❌  插件推送失败'));
+    console.log(chalk.red(err.message || err));
+  }
+};
+
+// 执行构建命令
+function runBuildCommand() {
+  return new Promise((resolve, reject) => {
+    console.log(chalk.yellow('正在执行构建命令: npm run build'));
+    
+    const buildProcess = exec('npm run build', {
+      cwd: process.cwd(),
+      maxBuffer: 1024 * 1024 * 10 // 设置最大缓冲区为10MB
+    });
+
+    // 只记录关键信息，避免过多输出
+    buildProcess.stdout.on('data', (data) => {
+      // 可以选择性输出重要信息，例如进度或错误
+      if (data.toLowerCase().includes('error') || data.toLowerCase().includes('failed')) {
+        console.log(chalk.red(data.toString()));
+      }
+      // 如果需要完全静默，可以注释掉下面一行
+      // console.log(data.toString());
+    });
+
+    buildProcess.stderr.on('data', (data) => {
+      console.error(chalk.red(data.toString()));
+    });
+
+    buildProcess.on('close', (code) => {
+      if (code === 0) {
+        console.log(chalk.green('构建成功!'));
+        resolve();
+      } else {
+        console.error(chalk.red(`构建失败，退出码: ${code}`));
+        reject(new Error(`构建失败，退出码: ${code}`));
+      }
+    });
+  });
+}
+
+// 打包插件函数
+async function packPlugin(pluginDir, versionId) {
+  return new Promise((resolve, reject) => {
+    const archive = archiver('zip', {
+      zlib: { level: 9 } // 设置压缩级别
+    });
+    
+    const output = [];
+    
+    archive.on('error', (err) => {
+      reject(err);
+    });
+    
+    archive.on('data', (chunk) => {
+      output.push(chunk);
+    });
+    
+    archive.on('end', () => {
+      const buffer = Buffer.concat(output);
+      resolve(buffer);
+    });
+    
+    // 递归添加目录内容，但排除node_modules
+    archive.directory(pluginDir, versionId, (entry) => {
+      // 排除node_modules目录
+      if (entry.name.includes('/node_modules/') || entry.name.startsWith('node_modules/')) {
+        return false;
+      }
+      // 排除压缩文件本身（如果存在）
+      if (entry.name.endsWith('.zip')) {
+        return false;
+      }
+      return entry;
+    });
+    
+    archive.finalize();
+  });
+}
+
+// 上传插件函数
+async function uploadPlugin(uploadUrl, token, packageFile, pluginId, version, versionDescription) {
+  // 实际的上传逻辑
+  return new Promise(async (resolve, reject) => {
+    try {
+      // 检查 packageFile 是否有效
+      if (!packageFile || packageFile.length === 0) {
+        throw new Error('packageFile is empty or invalid');
+      }
+      console.log(chalk.yellow(`文件大小: ${packageFile.length} bytes`));
+      console.log(chalk.yellow(`正在向 ${uploadUrl} 上传插件 ${pluginId}_${version} ...`));
+      
+
+      // 构建带查询参数的 URL
+      const query = new URLSearchParams();
+      query.set('pluginId', pluginId);
+      query.set('version', version);
+      query.set('versionDescription', versionDescription);
+      
+      const urlWithParams = `${uploadUrl}?${query.toString()}`;
+
+      // 创建FormData对象用于发送数据
+      const FormData = require('form-data');
+      const formData = new FormData();
+      formData.append('packageFile', packageFile, {
+        filename: `${pluginId}_${version}.zip`,
+        contentType: 'application/zip'
+      });
+
+      // 使用 axios 发送请求
+      const axios = require('axios');
+      
+      const response = await axios({
+        method: 'POST',
+        url: urlWithParams,
+        data: formData,
+        headers: {
+          ...formData.getHeaders(), // 这会自动包含正确的 Content-Type
+          'Authorization': `Bearer ${token}`
+        },
+        maxBodyLength: 50 * 1024 * 1024, // 50MB 限制
+      });
+      
+      if (response.status === 200) {
+        const result = response.data;
+        const { code } = result
+        if (code === 200) {
+          console.log(chalk.green('上传成功!'));
+          resolve({
+            success: true,
+            pluginId: pluginId,
+            version: version,
+            downloadUrl: result.downloadUrl || null
+          });
+        } else {
+          console.log();
+          console.error(result);
+          reject(new Error(`上传失败: ${result.msg}`));
+        }
+        
+      } else {
+        console.error(chalk.red(response));
+        reject(new Error(`上传失败: ${response.status} ${response.statusText}`));
+      }
+    } catch (error) {
+      if (error.response) {
+        console.error(chalk.red(`上传失败: ${error.response.status} ${error.response.statusText}`));
+        console.error(chalk.red(`错误详情: ${error.response.data}`));
+        reject(new Error(`上传失败: ${error.response.status} ${error.response.statusText}`));
+      } else {
+        console.error(chalk.red(`网络请求失败: ${error.message}`));
+        reject(error);
+      }
+    }
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zhixuan-plugin-cli",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "zhixuan插件项目脚手架CLI工具",
   "main": "bin/index.js",
   "bin": {
@@ -21,10 +21,13 @@
   "author": "shituanquan",
   "license": "MIT",
   "dependencies": {
+    "archiver": "^7.0.1",
+    "axios": "^1.13.6",
     "chalk": "^4.1.2",
     "commander": "^9.4.1",
     "conf": "^10.2.0",
     "download-git-repo": "^3.0.2",
+    "form-data": "^4.0.5",
     "fs-extra": "^10.1.0",
     "inquirer": "^8.2.5",
     "ora": "^5.4.1"
@@ -32,4 +35,4 @@
   "engines": {
     "node": ">=16.18.0"
   }
-}
+}

package/commands/config.js

@@ -1,29 +0,0 @@
-const Conf = require('conf');
-const chalk = require('chalk');
-
-const config = new Conf({
-  projectName: 'zhixuan-plugin-cli'
-});
-
-module.exports = function (options) {
-  if (options.list) {
-    console.log(chalk.cyan('当前配置:'));
-    console.log(config.store);
-    return;
-  }
-
-  if (options.get) {
-    const value = config.get(options.get);
-    console.log(chalk.cyan(`${options.get}=${value}`));
-    return;
-  }
-
-  if (options.set) {
-    const [key, value] = options.set;
-    config.set(key, value);
-    console.log(chalk.green(`设置 ${key}=${value} 成功`));
-    return;
-  }
-
-  console.log(chalk.yellow('请指定操作参数'));
-};