@oinone/cli 7.2.3 → 7.2.5

package/bin/cli.js

@@ -11,12 +11,16 @@ const os = require('os');
 const AdmZip = require('adm-zip');
 const cliProgress = require('cli-progress');
 const packageJson = require('../package.json');
+const { t } = require('./i18n');
 
 const downloadAndExtractZip = (url, targetDir) => {
   return new Promise((resolve, reject) => {
     const req = https.request(url, { method: 'HEAD' }, (headRes) => {
+      // 必须调用 resume() 消费响应数据，否则 Node 19+ 默认开启 keepAlive 会导致 socket 保持连接，进程卡住 60 秒
+      headRes.resume();
+
       if (headRes.statusCode !== 200) {
-        reject(new Error(`Failed to fetch file info: ${headRes.statusCode}`));
+        reject(new Error(t('fetchFileInfoFailed', { status: headRes.statusCode })));
         return;
       }
       
@@ -33,7 +37,7 @@ const downloadAndExtractZip = (url, targetDir) => {
       const cachedZipPath = path.join(cacheDir, `static-resources-${etag}.zip`);
       
       if (fs.existsSync(cachedZipPath)) {
-        console.log(chalk.cyan('⚡ Zap! Using cached static resources...'));
+        console.log(chalk.cyan(t('usingCached')));
         try {
           const zip = new AdmZip(cachedZipPath);
           zip.extractAllTo(targetDir, true);
@@ -49,7 +53,8 @@ const downloadAndExtractZip = (url, targetDir) => {
       
       https.get(url, (response) => {
         if (response.statusCode !== 200) {
-          reject(new Error(`Failed to download: ${response.statusCode}`));
+          response.resume(); // 消费响应数据释放 socket
+          reject(new Error(t('downloadFailed', { status: response.statusCode })));
           return;
         }
         
@@ -70,7 +75,7 @@ const downloadAndExtractZip = (url, targetDir) => {
         let startTime = Date.now();
         
         const progressBar = new cliProgress.SingleBar({
-          format: chalk.cyan('🚀 Fetching awesomeness ') + `[{bar}] {percentage}% | ⏳ {eta}s left | 📦 {value}/{total} ${unit} | 💨 {speed} {speedUnit}/s`,
+          format: chalk.cyan(t('fetchingAwesomeness')) + `[{bar}] {percentage}% | ⏳ {eta}s ${t('progressLeft')} | 📦 {value}/{total} ${unit} | 💨 {speed} {speedUnit}/s`,
           barCompleteChar: '\u2588',
           barIncompleteChar: '\u2591',
           hideCursor: true,
@@ -135,14 +140,14 @@ const downloadAndExtractZip = (url, targetDir) => {
 };
 
 program
-  .version(packageJson.version)
-  .description('Oinone Frontend Template CLI')
-  .helpOption('-h, --help', 'display help for command');
+  .version(packageJson.version, '-V, --version', t('versionOption'))
+  .description(t('description'))
+  .helpOption('-h, --help', t('helpOption'));
 
 // Cache Command
 const cacheCmd = program
   .command('cache')
-  .description('Manage the local static resources cache')
+  .description(t('cacheCmdDesc'))
   .action(() => {
     // If just "cache" is typed without subcommands, show cache help
     cacheCmd.help();
@@ -150,29 +155,29 @@ const cacheCmd = program
 
 cacheCmd
   .command('clean')
-  .description('Clean the local static resources cache')
+  .description(t('cacheCleanDesc'))
   .action(() => {
     const cacheDir = path.join(os.tmpdir(), 'oinone-cli-cache');
     if (fs.existsSync(cacheDir)) {
       fs.removeSync(cacheDir);
-      console.log(chalk.green(`✨ Whoosh! Cache swept clean at ${cacheDir}`));
+      console.log(chalk.green(t('cacheCleaned', { dir: cacheDir })));
     } else {
-      console.log(chalk.yellow(`🤷 Cache directory already vanished (or never existed): ${cacheDir}`));
+      console.log(chalk.yellow(t('cacheAlreadyEmpty', { dir: cacheDir })));
     }
   });
 
 cacheCmd
   .command('info')
-  .description('Print cache directory information')
+  .description(t('cacheInfoDesc'))
   .action(async () => {
     const cacheDir = path.join(os.tmpdir(), 'oinone-cli-cache');
-    console.log(chalk.cyan('📂 Cache Directory: ') + cacheDir);
+    console.log(chalk.cyan(t('cacheDir')) + cacheDir);
     
     if (fs.existsSync(cacheDir)) {
       const files = await fs.readdir(cacheDir);
       let totalSize = 0;
       
-      console.log(chalk.cyan('📦 Cached Files:'));
+      console.log(chalk.cyan(t('cachedFiles')));
       for (const file of files) {
         const filePath = path.join(cacheDir, file);
         const stat = await fs.stat(filePath);
@@ -195,23 +200,47 @@ cacheCmd
         totalDisplaySize = `${Math.round(totalSize / 1024)} KB`;
       }
       
-      console.log(chalk.cyan(`\n📊 Total Cache Size: `) + totalDisplaySize);
+      console.log(chalk.cyan(t('totalCacheSize')) + totalDisplaySize);
     } else {
-      console.log(chalk.yellow('🍃 Cache is currently as empty as space.'));
+      console.log(chalk.yellow(t('cacheEmpty')));
     }
   });
 
 // Create Command (Default Behavior)
 program
-  .argument('[project-name]', 'Name of the project to create silently')
-  .option('--download-static-resource <value>', 'Download static resources (true/false)', 'true')
-  .option('--oinone-version <value>', 'Oinone version to use (e.g. 7.2.0, 6.4.0)', '7.2.0')
-  .option('--edition <value>', 'Oinone edition to use (community/enterprise)', 'community')
+  .argument('[project-name]', t('projectNameArg'))
+  .option('--download-static-resource <value>', t('downloadOpt'), 'true')
+  .option('--oinone-version <value>', t('versionOpt'), '7.2.0')
+  .option('--edition <value>', t('editionOpt'), 'community')
   .action(async (projectNameArg, options) => {
     // If command is 'cache', skip create logic
     if (projectNameArg === 'cache') {
       return;
     }
+
+    // Trigger version check without blocking
+    let checkReq = null;
+    const versionCheckPromise = new Promise((resolve) => {
+      checkReq = https.get('https://registry.npmjs.org/-/package/@oinone/cli/dist-tags', { timeout: 3000 }, (res) => {
+        let data = '';
+        res.on('data', chunk => data += chunk);
+        res.on('end', () => {
+          try {
+            const parsed = JSON.parse(data);
+            resolve(parsed.latest);
+          } catch (e) {
+            resolve(null);
+          }
+        });
+      });
+      checkReq.on('timeout', () => {
+        checkReq.destroy();
+        resolve(null);
+      });
+      checkReq.on('error', () => {
+        resolve(null);
+      });
+    });
     
     try {
       let prefix;
@@ -238,47 +267,47 @@ program
         {
           type: 'input',
           name: 'companyName',
-          message: '🏢 What is your awesome company/org name? (e.g. ss):',
+          message: t('promptCompany'),
           default: 'ss',
           validate: (input) => {
-            if (input.trim() === '') return 'Oops! Company name cannot be empty 🙈';
+            if (input.trim() === '') return t('errorCompanyEmpty');
             return true;
           },
         },
         {
           type: 'input',
           name: 'projectName',
-          message: '🚀 Name your epic project (e.g. oms):',
+          message: t('promptProject'),
           default: 'oms',
           validate: (input) => {
-            if (input.trim() === '') return 'Hold on! Project name cannot be empty 🛑';
+            if (input.trim() === '') return t('errorProjectEmpty');
             return true;
           },
         },
         {
           type: 'list',
           name: 'edition',
-          message: '💎 Choose your Oinone flavor:',
+          message: t('promptEdition'),
           choices: [
-            { name: '🌱 Community Edition (Default)', value: 'community' },
-            { name: '👑 Enterprise Edition', value: 'enterprise' }
+            { name: t('editionCommunity'), value: 'community' },
+            { name: t('editionEnterprise'), value: 'enterprise' }
           ],
           default: 'community'
         },
         {
           type: 'list',
           name: 'oinoneVersion',
-          message: '📦 Which Oinone version are we rocking today?',
+          message: t('promptVersion'),
           choices: [
-            { name: '✨ 7.2.0 (Default)', value: '~7.2.0' },
-            { name: '🕰️  6.4.0', value: '~6.4.0' }
+            { name: t('version720'), value: '~7.2.0' },
+            { name: t('version640'), value: '~6.4.0' }
           ],
           default: '~7.2.0'
         },
         {
           type: 'confirm',
           name: 'downloadStaticResources',
-          message: '📥 Shall we fetch the latest static resources for you? (Highly recommended! 🌟)',
+          message: t('promptDownload'),
           default: true
         }
       ]);
@@ -293,17 +322,17 @@ program
       const targetPath = path.resolve(process.cwd(), fullProjectName);
 
       if (fs.existsSync(targetPath)) {
-        console.log(chalk.red(`\n🚫 Yikes! The directory ${fullProjectName} already exists. Try a different name or clear the path.\n`));
+        console.log(chalk.red(t('errorDirExists', { name: fullProjectName })));
         process.exit(1);
       }
 
-      const spinner = ora('✨ Weaving magic to create your project...').start();
+      const spinner = ora(t('weavingMagic')).start();
 
       const versionDir = oinoneVersion.replace(/[^0-9.]/g, ''); // Extract '7.2.0' or '6.4.0'
       const templatePath = path.resolve(__dirname, `../template-${versionDir}-${edition}`);
 
       if (!fs.existsSync(templatePath)) {
-        spinner.fail(chalk.red(`😢 Uh-oh! Template for version ${oinoneVersion} (${edition} edition) went missing in action.`));
+        spinner.fail(chalk.red(t('errorTemplateMissing', { version: oinoneVersion, edition })));
         process.exit(1);
       }
 
@@ -394,35 +423,68 @@ program
       }
 
       if (downloadStaticResources) {
-        spinner.succeed(chalk.green('🎉 Boom! Project structure is ready!'));
-        console.log(chalk.cyan('🚚 Hauling in the static resources...'));
+        spinner.succeed(chalk.green(t('structureReady')));
+        console.log(chalk.cyan(t('haulingStatic')));
         try {
           const ossDir = path.join(targetPath, 'packages', `${prefix}-boot`, 'public', 'oss');
           await fs.ensureDir(ossDir);
           await downloadAndExtractZip('https://pamirs.oss-cn-hangzhou.aliyuncs.com/oinone/installer/static-resources.zip', ossDir);
-          console.log(chalk.green('🎯 Bullseye! Static resources downloaded and ready to roll!'));
+          console.log(chalk.green(t('staticDownloaded')));
         } catch (err) {
-          console.log(chalk.yellow(`⚠️  Project is ready, but the static resources had a hiccup: ${err.message}`));
+          console.log(chalk.yellow(t('staticHiccup', { msg: err.message })));
         }
       } else {
-        spinner.succeed(chalk.green('🎉 Boom! Project created successfully!'));
+        spinner.succeed(chalk.green(t('projectCreated')));
         const relativeOssDir = `packages/${prefix}-boot/public/oss`;
-        console.log(chalk.yellow(`\n⚠️  You chose to skip the static resources download.`));
-        console.log(chalk.yellow(`Don't forget to grab them manually before you fire up the project:`));
+        console.log(chalk.yellow(t('skipStaticWarning')));
+        console.log(chalk.yellow(t('manualStaticInstructions')));
         console.log(chalk.cyan(`  mkdir -p ${fullProjectName}/${relativeOssDir}`));
         console.log(chalk.cyan(`  curl -L https://pamirs.oss-cn-hangzhou.aliyuncs.com/oinone/installer/static-resources.zip -o static-resources.zip`));
         console.log(chalk.cyan(`  unzip static-resources.zip -d ${fullProjectName}/${relativeOssDir}`));
         console.log(chalk.cyan(`  rm static-resources.zip`));
       }
 
-      console.log(`\n🚀 Let's get this party started:\n`);
+      console.log(t('partyStarted'));
       console.log(chalk.cyan(`  cd ${fullProjectName}`));
       console.log(chalk.cyan(`  pnpm install`));
       console.log(chalk.cyan(`  pnpm run dev\n`));
-      console.log(chalk.magenta(`Happy coding! 💻☕\n`));
+      console.log(chalk.magenta(t('happyCoding')));
+
+      try {
+        const latestVersion = await Promise.race([
+          versionCheckPromise,
+          new Promise(resolve => setTimeout(() => {
+            if (checkReq) checkReq.destroy();
+            resolve(null);
+          }, 1000))
+        ]);
+
+        if (latestVersion) {
+          const isNewerVersion = (current, latest) => {
+            const c = current.replace(/[^0-9.]/g, '').split('.').map(Number);
+            const l = latest.replace(/[^0-9.]/g, '').split('.').map(Number);
+            for (let i = 0; i < Math.max(c.length, l.length); i++) {
+              const numC = c[i] || 0;
+              const numL = l[i] || 0;
+              if (numL > numC) return true;
+              if (numL < numC) return false;
+            }
+            return false;
+          };
+          
+          if (isNewerVersion(packageJson.version, latestVersion)) {
+            console.log(chalk.yellow(`====================================================`));
+            console.log(chalk.yellow(t('updateAvailable', { current: chalk.red(packageJson.version), latest: chalk.green(latestVersion) })));
+            console.log(chalk.yellow(t('runUpdate', { cmd: chalk.cyan('npm install -g @oinone/cli') })));
+            console.log(chalk.yellow(`====================================================\n`));
+          }
+        }
+      } catch (e) {
+        // ignore errors
+      }
 
     } catch (error) {
-      console.error(chalk.red(`\n💥 Oops! Something broke: ${error.message}\n`));
+      console.error(chalk.red(t('somethingBroke', { msg: error.message })));
       process.exit(1);
     }
   });

package/bin/i18n.js

@@ -0,0 +1,134 @@
+const detectLanguage = () => {
+  try {
+    const locale = new Intl.DateTimeFormat().resolvedOptions().locale;
+    if (locale.toLowerCase().startsWith('zh')) {
+      return 'zh-CN';
+    }
+  } catch (e) {
+    // Ignore error
+  }
+  
+  // Also check environment variables for language
+  const envLang = process.env.LANG || process.env.LANGUAGE || process.env.LC_ALL || '';
+  if (envLang.toLowerCase().startsWith('zh')) {
+    return 'zh-CN';
+  }
+  
+  return 'en-US';
+};
+
+const currentLang = detectLanguage();
+
+const locales = {
+  'en-US': {
+    usingCached: '⚡ Zap! Using cached static resources...',
+    fetchFileInfoFailed: 'Failed to fetch file info: {status}',
+    downloadFailed: 'Failed to download: {status}',
+    fetchingAwesomeness: '🚀 Fetching awesomeness ',
+    progressLeft: 'left',
+    cacheCleaned: '✨ Whoosh! Cache swept clean at {dir}',
+    cacheAlreadyEmpty: '🤷 Cache directory already vanished (or never existed): {dir}',
+    cacheDir: '📂 Cache Directory: ',
+    cachedFiles: '📦 Cached Files:',
+    totalCacheSize: '\n📊 Total Cache Size: ',
+    cacheEmpty: '🍃 Cache is currently as empty as space.',
+    description: 'Oinone Frontend Template CLI',
+    cacheCmdDesc: 'Manage the local static resources cache',
+    cacheCleanDesc: 'Clean the local static resources cache',
+    cacheInfoDesc: 'Print cache directory information',
+    versionOption: 'output the version number',
+    helpOption: 'display help for command',
+    projectNameArg: 'Name of the project to create silently',
+    downloadOpt: 'Download static resources (true/false)',
+    versionOpt: 'Oinone version to use (e.g. 7.2.0, 6.4.0)',
+    editionOpt: 'Oinone edition to use (community/enterprise)',
+    promptCompany: '🏢 What is your awesome company/org name? (e.g. ss):',
+    errorCompanyEmpty: 'Oops! Company name cannot be empty 🙈',
+    promptProject: '🚀 Name your epic project (e.g. oms):',
+    errorProjectEmpty: 'Hold on! Project name cannot be empty 🛑',
+    promptEdition: '💎 Choose your Oinone flavor:',
+    editionCommunity: '🌱 Community Edition (Default)',
+    editionEnterprise: '👑 Enterprise Edition',
+    promptVersion: '📦 Which Oinone version are we rocking today?',
+    version720: '✨ 7.2.0 (Default)',
+    version640: '🕰️  6.4.0',
+    promptDownload: '📥 Shall we fetch the latest static resources for you? (Highly recommended! 🌟)',
+    errorDirExists: '\n🚫 Yikes! The directory {name} already exists. Try a different name or clear the path.\n',
+    weavingMagic: '✨ Weaving magic to create your project...',
+    errorTemplateMissing: '😢 Uh-oh! Template for version {version} ({edition} edition) went missing in action.',
+    structureReady: '🎉 Boom! Project structure is ready!',
+    haulingStatic: '🚚 Hauling in the static resources...',
+    staticDownloaded: '🎯 Bullseye! Static resources downloaded and ready to roll!',
+    staticHiccup: '⚠️  Project is ready, but the static resources had a hiccup: {msg}',
+    projectCreated: '🎉 Boom! Project created successfully!',
+    skipStaticWarning: '\n⚠️  You chose to skip the static resources download.',
+    manualStaticInstructions: 'Don\'t forget to grab them manually before you fire up the project:',
+    partyStarted: '\n🚀 Let\'s get this party started:\n',
+    happyCoding: 'Happy coding! 💻☕\n',
+    updateAvailable: '📦 Update available! {current} → {latest}',
+    runUpdate: 'Run {cmd} to update.',
+    somethingBroke: '\n💥 Oops! Something broke: {msg}\n'
+  },
+  'zh-CN': {
+    usingCached: '⚡ 嗖！正在使用本地缓存的静态资源...',
+    fetchFileInfoFailed: '获取文件信息失败: {status}',
+    downloadFailed: '下载失败: {status}',
+    fetchingAwesomeness: '🚀 正在获取静态资源 ',
+    progressLeft: '剩余',
+    cacheCleaned: '✨ 呼！缓存清理完毕，位置：{dir}',
+    cacheAlreadyEmpty: '🤷 缓存目录已消失（或从未存在）：{dir}',
+    cacheDir: '📂 缓存目录: ',
+    cachedFiles: '📦 缓存文件:',
+    totalCacheSize: '\n📊 总缓存大小: ',
+    cacheEmpty: '🍃 当前缓存空空如也。',
+    description: 'Oinone 前端脚手架',
+    cacheCmdDesc: '管理本地静态资源缓存',
+    cacheCleanDesc: '清理本地静态资源缓存',
+    cacheInfoDesc: '打印缓存目录信息',
+    versionOption: '输出版本号',
+    helpOption: '显示命令帮助',
+    projectNameArg: '静默创建时的项目名称',
+    downloadOpt: '是否下载静态资源 (true/false)',
+    versionOpt: '使用的 Oinone 版本 (例如 7.2.0, 6.4.0)',
+    editionOpt: '使用的 Oinone 版本类型 (community/enterprise)',
+    promptCompany: '🏢 您的公司/组织名称是？(例如 ss):',
+    errorCompanyEmpty: '哎呀！公司名称不能为空 🙈',
+    promptProject: '🚀 给您的项目起个名字吧 (例如 oms):',
+    errorProjectEmpty: '稍等！项目名称不能为空 🛑',
+    promptEdition: '💎 请选择 Oinone 版本类型:',
+    editionCommunity: '🌱 社区版 (默认)',
+    editionEnterprise: '👑 企业版',
+    promptVersion: '📦 今天我们要使用哪个 Oinone 版本？',
+    version720: '✨ 7.2.0 (默认)',
+    version640: '🕰️  6.4.0',
+    promptDownload: '📥 是否为您获取最新的静态资源？(强烈推荐！🌟)',
+    errorDirExists: '\n🚫 哎呀！目录 {name} 已存在。请尝试其他名称或清理该路径。\n',
+    weavingMagic: '✨ 正在施展魔法为您创建项目...',
+    errorTemplateMissing: '😢 糟糕！未找到 {version} 版本 ({edition}版) 的模板。',
+    structureReady: '🎉 棒！项目结构已准备就绪！',
+    haulingStatic: '🚚 正在搬运静态资源...',
+    staticDownloaded: '🎯 太准了！静态资源下载完毕，随时可以起飞！',
+    staticHiccup: '⚠️  项目已就绪，但静态资源遇到点小麻烦: {msg}',
+    projectCreated: '🎉 棒！项目创建成功！',
+    skipStaticWarning: '\n⚠️  您选择了跳过静态资源下载。',
+    manualStaticInstructions: '启动项目前，别忘了手动获取它们：',
+    partyStarted: '\n🚀 让我们开始狂欢吧：\n',
+    happyCoding: '编码愉快！💻☕\n',
+    updateAvailable: '📦 发现新版本！{current} → {latest}',
+    runUpdate: '运行 {cmd} 进行更新。',
+    somethingBroke: '\n💥 糟糕！出了点问题: {msg}\n'
+  }
+};
+
+const t = (key, params = {}) => {
+  let str = locales[currentLang][key] || locales['en-US'][key] || key;
+  Object.keys(params).forEach((k) => {
+    str = str.replace(new RegExp(`{${k}}`, 'g'), params[k]);
+  });
+  return str;
+};
+
+module.exports = {
+  currentLang,
+  t
+};

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@oinone/cli",
-  "version": "7.2.3",
+  "version": "7.2.5",
   "description": "CLI tool to generate Oinone Frontend Template",
   "main": "index.js",
   "bin": {
     "oinone-frontend": "./bin/cli.js"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "vitest run"
   },
   "keywords": [
     "oinone",
@@ -25,5 +25,8 @@
     "fs-extra": "^11.3.4",
     "inquirer": "^8.2.6",
     "ora": "^5.4.1"
+  },
+  "devDependencies": {
+    "vitest": "^4.1.4"
   }
 }