jjb-cmd 2.5.6-beat.1 → 2.5.6-beta.2

package/bin/command.js

@@ -75,6 +75,25 @@ commander.command('push [args]').description('-- 发布包').action(async args =
   }
 });
 
+// npm-publish 命令 - 发布npm包
+commander.command('npm-publish [version]')
+  .description('-- 发布npm包（内部命令）')
+  .option('--tag <tag>', 'npm发布标签（如：beta、alpha等，默认为latest）')
+  .action(async (version, options) => {
+    const isLatest = await checkCmdVersion();
+    if (!isLatest) {
+      process.exit(1);
+    }
+    if (!version) {
+      console.log(`缺少必要参数，请使用:`);
+      console.log(`  yarn npm-publish <version>              发布npm包（latest标签）`);
+      console.log(`  yarn npm-publish <version> --tag <tag>  发布npm包（指定标签）`);
+      process.exit(0);
+    }
+    const tag = options.tag || null;
+    await require('../src/push-npm.js')(version, tag);
+  });
+
 // rm-rf 命令
 commander.command('rm-rf').description('-- 删除全部').action(async () => {
   const isLatest = await checkCmdVersion();

package/package.json

@@ -1,40 +1,41 @@
-{
-  "name": "jjb-cmd",
-  "use": "no",
-  "env": "prod",
-  "httpMethod": "http",
-  "pushMessage": "yes",
-  "version": "2.5.6-beat.1",
-  "description": "jjb-cmd命令行工具",
-  "main": "index.js",
-  "scripts": {
-    "test": "node bin/command.js help",
-    "install:package": "npm i",
-    "test:ai-pull": "node bin/command.js ai-pull"
-  },
-  "bin": {
-    "jjb-cmd": "bin/command.js"
-  },
-  "author": "jiaoxiwei",
-  "license": "MIT",
-  "dependencies": {
-    "@babel/core": "^7.19.3",
-    "@babel/generator": "^7.26.0",
-    "@babel/parser": "^7.26.1",
-    "@babel/preset-env": "^7.23.2",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.23.2",
-    "@babel/traverse": "^7.25.9",
-    "@cqsjjb/react-code-optimization": "latest",
-    "axios": "^1.1.3",
-    "better-sqlite3": "^12.6.2",
-    "chalk": "2.4.0",
-    "commander": "^1.3.2",
-    "compressing": "^1.5.1",
-    "inquirer": "^8.2.7",
-    "jenkins": "^1.0.2",
-    "prettier": "^3.3.3",
-    "request": "2.88.2",
-    "single-line-log": "1.1.2"
-  }
-}
+{
+  "name": "jjb-cmd",
+  "use": "no",
+  "env": "prod",
+  "httpMethod": "http",
+  "pushMessage": "yes",
+  "version": "2.5.6-beta.2",
+  "description": "jjb-cmd命令行工具",
+  "main": "index.js",
+  "scripts": {
+    "test": "node bin/command.js help",
+    "install:package": "npm i",
+    "test:ai-pull": "node bin/command.js ai-pull",
+    "npm-publish": "node bin/command.js npm-publish"
+  },
+  "bin": {
+    "jjb-cmd": "bin/command.js"
+  },
+  "author": "jiaoxiwei",
+  "license": "MIT",
+  "dependencies": {
+    "@babel/core": "^7.19.3",
+    "@babel/generator": "^7.26.0",
+    "@babel/parser": "^7.26.1",
+    "@babel/preset-env": "^7.23.2",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-typescript": "^7.23.2",
+    "@babel/traverse": "^7.25.9",
+    "@cqsjjb/react-code-optimization": "latest",
+    "axios": "^1.1.3",
+    "better-sqlite3": "^12.6.2",
+    "chalk": "2.4.0",
+    "commander": "^1.3.2",
+    "compressing": "^1.5.1",
+    "inquirer": "^8.2.7",
+    "jenkins": "^1.0.2",
+    "prettier": "^3.3.3",
+    "request": "2.88.2",
+    "single-line-log": "1.1.2"
+  }
+}

package/src/push-npm.js

@@ -0,0 +1,199 @@
+const path = require('path');
+const fs = require('fs');
+const child_process = require('child_process');
+const axios = require('axios');
+const {
+  logInfo,
+  logSuccess,
+  logError,
+  logWarning,
+  readFile,
+  writeFile,
+  executeCommand,
+  fileExists
+} = require('./utils');
+const { getApiHost } = require('./config');
+const { loadAuth } = require('./crypto-utils');
+
+/**
+ * 执行npm发布流程
+ * @param {string} version - 版本号
+ * @param {string} tag - npm tag（可选，默认为latest）
+ */
+module.exports = async (version, tag) => {
+  if (!version) {
+    logError('请提供版本号，例如: jjb-cmd push 2.5.7 或 jjb-cmd push 2.5.7 --tag beta');
+    process.exit(1);
+  }
+  
+  // 如果没有指定tag，默认为latest
+  const npmTag = tag || 'latest';
+
+  const rootPath = path.resolve(__dirname, '..');
+  const packageJsonPath = path.join(rootPath, 'package.json');
+
+  // 读取当前package.json
+  let packageJson;
+  try {
+    const packageJsonContent = readFile(packageJsonPath);
+    packageJson = JSON.parse(packageJsonContent);
+  } catch (error) {
+    logError(`读取package.json失败: ${error.message}`);
+    process.exit(1);
+  }
+
+  const currentVersion = packageJson.version;
+  logInfo(`当前版本: ${currentVersion}`);
+  logInfo(`目标版本: ${version}`);
+
+  // 更新package.json中的版本号
+  try {
+    packageJson.version = version;
+    writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n');
+    logSuccess(`已更新package.json版本号为: ${version}`);
+  } catch (error) {
+    logError(`更新package.json失败: ${error.message}`);
+    process.exit(1);
+  }
+
+  // 保存原始npm registry配置
+  let originalRegistry = 'https://registry.npmmirror.com/';
+  try {
+    const registryResult = child_process.execSync('npm config get registry', { encoding: 'utf8', cwd: rootPath });
+    originalRegistry = registryResult.trim() || 'https://registry.npmmirror.com/';
+  } catch (error) {
+    logWarning('无法获取当前npm registry配置，将使用默认值');
+  }
+
+  try {
+    // 1. 切换npm源到官方源
+    logInfo('正在切换npm源到官方源...');
+    executeCommand('npm config set registry https://registry.npmjs.org/', rootPath);
+    logSuccess('npm源已切换到官方源');
+    
+    // 检查是否已登录npm（针对官方源）
+    logInfo('正在检查npm登录状态...');
+    try {
+      const whoamiResult = child_process.execSync('npm whoami --registry=https://registry.npmjs.org/', { encoding: 'utf8', cwd: rootPath, stdio: 'pipe' });
+      const npmUser = whoamiResult.trim();
+      if (npmUser) {
+        logSuccess(`已登录npm账号: ${npmUser}`);
+      } else {
+        logError('未登录npm官方源，请先执行: npm login --registry=https://registry.npmjs.org/');
+        throw new Error('需要先登录npm官方源才能发布');
+      }
+    } catch (error) {
+      if (error.message.includes('需要先登录')) {
+        throw error;
+      }
+      logError('未登录npm官方源，请先执行: npm login --registry=https://registry.npmjs.org/');
+      logError('或者执行: npm adduser --registry=https://registry.npmjs.org/');
+      throw new Error('需要先登录npm官方源才能发布');
+    }
+
+    // 2. 发布到npm
+    // 注意：npm publish 不需要在命令中指定版本号，版本号已经从package.json中读取
+    // 但需要明确指定registry，确保使用官方源
+    logInfo(`正在发布版本 ${version} 到npm（tag: ${npmTag}）...`);
+    logInfo(`执行命令: npm publish --tag ${npmTag} --registry=https://registry.npmjs.org/（版本号 ${version} 已从package.json读取）`);
+    try {
+      const publishCommand = npmTag === 'latest' 
+        ? 'npm publish --registry=https://registry.npmjs.org/' 
+        : `npm publish --tag ${npmTag} --registry=https://registry.npmjs.org/`;
+      executeCommand(publishCommand, rootPath);
+      logSuccess(`版本 ${version} 发布成功（tag: ${npmTag}）！`);
+    } catch (error) {
+      // 如果发布失败，恢复package.json版本号
+      packageJson.version = currentVersion;
+      writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n');
+      logError(`npm发布失败: ${error.message}`);
+      throw error;
+    }
+
+    // 3. 切回镜像源
+    logInfo('正在切回npm镜像源...');
+    executeCommand('npm config set registry https://registry.npmmirror.com/', rootPath);
+    logSuccess('npm源已切回镜像源');
+
+    // 4. 更新数据库中的版本号
+    logInfo('正在更新服务器端版本号...');
+    try {
+      const authPath = path.join(rootPath, '.auth');
+      let username, password;
+
+      // 尝试从认证文件读取
+      if (fileExists(authPath)) {
+        try {
+          const authData = loadAuth(authPath);
+          username = authData.username;
+          password = authData.password;
+        } catch (error) {
+          logWarning(`读取认证信息失败: ${error.message}`);
+          logWarning('跳过服务器端版本号更新，请手动执行 jjb-cmd update-server-version');
+          logSuccess('npm发布完成！');
+          process.exit(0);
+        }
+      } else {
+        logWarning('未找到认证信息，跳过服务器端版本号更新');
+        logWarning('请手动执行 jjb-cmd update-server-version 来更新服务器端版本号');
+        logSuccess('npm发布完成！');
+        process.exit(0);
+      }
+
+      // 调用服务器接口更新版本号
+      const apiHost = getApiHost();
+      const response = await axios.post(`${apiHost}/api/cmd/update-version`, {
+        username,
+        password
+      }, {
+        timeout: 15000
+      });
+
+      if (response.data && response.data.status) {
+        const { version: updatedVersion, previousVersion } = response.data.data;
+        logSuccess('服务器端版本号更新成功！');
+        if (previousVersion) {
+          logInfo(`  旧版本: ${previousVersion}`);
+        }
+        logInfo(`  新版本: ${updatedVersion}`);
+      } else {
+        logWarning(`服务器端版本号更新失败: ${response.data.message || '未知错误'}`);
+        logWarning('请手动执行 jjb-cmd update-server-version 来更新服务器端版本号');
+      }
+    } catch (error) {
+      if (error && error.response) {
+        const status = error.response.status;
+        const serverMsg = (error.response.data && (error.response.data.message || error.response.data.msg)) || '';
+        logWarning(`服务器端版本号更新失败 (${status}): ${serverMsg || error.message}`);
+      } else if (error && error.request) {
+        logWarning('网络连接失败: 无法连接到服务器');
+      } else {
+        logWarning(`服务器端版本号更新失败: ${error.message || '未知错误'}`);
+      }
+      logWarning('请手动执行 jjb-cmd update-server-version 来更新服务器端版本号');
+    }
+
+    logSuccess('所有操作完成！');
+    process.exit(0);
+  } catch (error) {
+    // 发生错误时，尝试恢复npm源
+    try {
+      logInfo('正在恢复npm源...');
+      executeCommand(`npm config set registry ${originalRegistry}`, rootPath);
+      logInfo('npm源已恢复');
+    } catch (restoreError) {
+      logError(`恢复npm源失败: ${restoreError.message}`);
+    }
+
+    // 恢复package.json版本号
+    try {
+      packageJson.version = currentVersion;
+      writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n');
+      logInfo('已恢复package.json版本号');
+    } catch (restoreError) {
+      logError(`恢复package.json失败: ${restoreError.message}`);
+    }
+
+    process.exit(1);
+  }
+};