@oinone/cli 7.2.5 → 7.2.6

package/bin/cli.js

@@ -1,492 +1,67 @@
 #!/usr/bin/env node
 
 const { program } = require('commander');
-const inquirer = require('inquirer');
-const fs = require('fs-extra');
-const path = require('path');
 const chalk = require('chalk');
-const ora = require('ora');
-const https = require('https');
-const os = require('os');
-const AdmZip = require('adm-zip');
-const cliProgress = require('cli-progress');
 const packageJson = require('../package.json');
-const { t } = require('./i18n');
+const { setLang, 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(t('fetchFileInfoFailed', { status: headRes.statusCode })));
-        return;
-      }
-      
-      let etag = headRes.headers['etag'];
-      if (etag) {
-        etag = etag.replace(/"/g, ''); // Clean quotes
-      } else {
-        etag = headRes.headers['last-modified'] ? Buffer.from(headRes.headers['last-modified']).toString('hex') : 'default';
-      }
-      
-      const cacheDir = path.join(os.tmpdir(), 'oinone-cli-cache');
-      fs.ensureDirSync(cacheDir);
-      
-      const cachedZipPath = path.join(cacheDir, `static-resources-${etag}.zip`);
-      
-      if (fs.existsSync(cachedZipPath)) {
-        console.log(chalk.cyan(t('usingCached')));
-        try {
-          const zip = new AdmZip(cachedZipPath);
-          zip.extractAllTo(targetDir, true);
-          resolve();
-        } catch (err) {
-          fs.unlinkSync(cachedZipPath);
-          reject(err);
-        }
-        return;
-      }
-
-      const file = fs.createWriteStream(cachedZipPath);
-      
-      https.get(url, (response) => {
-        if (response.statusCode !== 200) {
-          response.resume(); // 消费响应数据释放 socket
-          reject(new Error(t('downloadFailed', { status: response.statusCode })));
-          return;
-        }
-        
-        const totalBytes = parseInt(response.headers['content-length'], 10);
-        let isMB = false;
-        let totalDisplay = 0;
-        let unit = 'KB';
-        
-        if (totalBytes > 10 * 1024 * 1024) {
-          isMB = true;
-          unit = 'MB';
-          totalDisplay = (totalBytes / (1024 * 1024)).toFixed(2);
-        } else {
-          totalDisplay = Math.round(totalBytes / 1024);
-        }
-        
-        let downloadedBytes = 0;
-        let startTime = Date.now();
-        
-        const progressBar = new cliProgress.SingleBar({
-          format: chalk.cyan(t('fetchingAwesomeness')) + `[{bar}] {percentage}% | ⏳ {eta}s ${t('progressLeft')} | 📦 {value}/{total} ${unit} | 💨 {speed} {speedUnit}/s`,
-          barCompleteChar: '\u2588',
-          barIncompleteChar: '\u2591',
-          hideCursor: true,
-          forceRedraw: true
-        });
-        
-        progressBar.start(Number(totalDisplay), 0, { speed: '0.00', speedUnit: 'KB' });
-
-        response.on('data', (chunk) => {
-          downloadedBytes += chunk.length;
-          let downloadedDisplay = 0;
-          if (isMB) {
-            downloadedDisplay = Number((downloadedBytes / (1024 * 1024)).toFixed(2));
-          } else {
-            downloadedDisplay = Math.round(downloadedBytes / 1024);
-          }
-          
-          const currentTime = Date.now();
-          const elapsedSeconds = (currentTime - startTime) / 1000;
-          let speed = 0;
-          let speedUnit = 'KB';
-          
-          if (elapsedSeconds > 0) {
-            const speedInBytes = downloadedBytes / elapsedSeconds;
-            if (speedInBytes > 1024 * 1024) {
-              speed = speedInBytes / (1024 * 1024);
-              speedUnit = 'MB';
-            } else {
-              speed = speedInBytes / 1024;
-              speedUnit = 'KB';
-            }
-          }
-          
-          progressBar.update(downloadedDisplay, { speed: speed.toFixed(2), speedUnit });
-        });
-
-        response.pipe(file);
-        file.on('finish', () => {
-          progressBar.stop();
-          file.close();
-          try {
-            const zip = new AdmZip(cachedZipPath);
-            zip.extractAllTo(targetDir, true);
-            resolve();
-          } catch (err) {
-            if (fs.existsSync(cachedZipPath)) fs.unlinkSync(cachedZipPath);
-            reject(err);
-          }
-        });
-      }).on('error', (err) => {
-        if (fs.existsSync(cachedZipPath)) fs.unlink(cachedZipPath, () => {});
-        reject(err);
-      });
-    });
-
-    req.on('error', (err) => {
-      reject(err);
-    });
-    
-    req.end();
-  });
-};
+const createAction = require('./commands/create');
+const setupCacheCommand = require('./commands/cache');
+const doctorAction = require('./commands/doctor');
 
 program
-  .version(packageJson.version, '-V, --version', t('versionOption'))
-  .description(t('description'))
-  .helpOption('-h, --help', t('helpOption'));
+  .name('oinone-frontend')
+  .description(t('cli.description'))
+  .version(packageJson.version, '-v, --version', t('cli.versionOption'))
+  .helpOption('-h, --help', t('cli.helpOption'));
 
-// Cache Command
-const cacheCmd = program
-  .command('cache')
-  .description(t('cacheCmdDesc'))
-  .action(() => {
-    // If just "cache" is typed without subcommands, show cache help
-    cacheCmd.help();
-  });
+program
+  .option('-l, --lang <lang>', 'Specify language (zh-CN or en-US)')
+  ;
 
-cacheCmd
-  .command('clean')
-  .description(t('cacheCleanDesc'))
-  .action(() => {
-    const cacheDir = path.join(os.tmpdir(), 'oinone-cli-cache');
-    if (fs.existsSync(cacheDir)) {
-      fs.removeSync(cacheDir);
-      console.log(chalk.green(t('cacheCleaned', { dir: cacheDir })));
-    } else {
-      console.log(chalk.yellow(t('cacheAlreadyEmpty', { dir: cacheDir })));
-    }
-  });
+program.hook('preAction', (thisCommand) => {
+  const opts = thisCommand.opts();
+  setLang(opts.lang);
+});
 
-cacheCmd
-  .command('info')
-  .description(t('cacheInfoDesc'))
-  .action(async () => {
-    const cacheDir = path.join(os.tmpdir(), 'oinone-cli-cache');
-    console.log(chalk.cyan(t('cacheDir')) + cacheDir);
-    
-    if (fs.existsSync(cacheDir)) {
-      const files = await fs.readdir(cacheDir);
-      let totalSize = 0;
-      
-      console.log(chalk.cyan(t('cachedFiles')));
-      for (const file of files) {
-        const filePath = path.join(cacheDir, file);
-        const stat = await fs.stat(filePath);
-        totalSize += stat.size;
-        
-        let displaySize = '';
-        if (stat.size > 1024 * 1024) {
-          displaySize = `${(stat.size / (1024 * 1024)).toFixed(2)} MB`;
-        } else {
-          displaySize = `${Math.round(stat.size / 1024)} KB`;
-        }
-        
-        console.log(`  - 📄 ${file} (${displaySize})`);
-      }
-      
-      let totalDisplaySize = '';
-      if (totalSize > 1024 * 1024) {
-        totalDisplaySize = `${(totalSize / (1024 * 1024)).toFixed(2)} MB`;
-      } else {
-        totalDisplaySize = `${Math.round(totalSize / 1024)} KB`;
-      }
-      
-      console.log(chalk.cyan(t('totalCacheSize')) + totalDisplaySize);
-    } else {
-      console.log(chalk.yellow(t('cacheEmpty')));
-    }
+program
+  .command('create [projectName]')
+  .description(t('create.createCmdDesc'))
+  .option('--company-name <name>', 'Company/Organization name (silent mode)')
+  .option('--project-name <name>', 'Project name (silent mode)')
+  .option('--download-static-resource <boolean>', t('cli.downloadOpt'))
+  .option('-o, --oinone-version <version>', t('cli.versionOpt'))
+  .option('-e, --edition <edition>', t('cli.editionOpt'))
+  .option('--auth-token <token>', 'Oinone registry auth token (for enterprise edition)')
+  .option('--write-project-credential', 'Allow writing credentials to project directory')
+  .option('-f, --force', 'Overwrite target directory if it exists')
+  .option('-d, --dry-run', 'Skip writing files to disk')
+  .action((projectNameArg, options, command) => {
+    const mergedOptions = { ...program.opts(), ...options };
+    return createAction(projectNameArg, mergedOptions);
   });
 
-// Create Command (Default Behavior)
 program
-  .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;
-      let fullProjectName;
-      let oinoneVersion;
-      let edition;
-      let downloadStaticResources;
-
-      if (projectNameArg) {
-        // Remove '-frontend' suffix if it exists to form the prefix
-        prefix = projectNameArg.endsWith('-frontend') 
-          ? projectNameArg.slice(0, -9) 
-          : projectNameArg;
-        fullProjectName = projectNameArg;
-        oinoneVersion = options.oinoneVersion;
-        // Ensure oinoneVersion has a tilde prefix
-        if (!oinoneVersion.startsWith('~')) {
-          oinoneVersion = `~${oinoneVersion}`;
-        }
-        edition = options.edition;
-        downloadStaticResources = options.downloadStaticResource !== 'false';
-      } else {
-        const answers = await inquirer.prompt([
-        {
-          type: 'input',
-          name: 'companyName',
-          message: t('promptCompany'),
-          default: 'ss',
-          validate: (input) => {
-            if (input.trim() === '') return t('errorCompanyEmpty');
-            return true;
-          },
-        },
-        {
-          type: 'input',
-          name: 'projectName',
-          message: t('promptProject'),
-          default: 'oms',
-          validate: (input) => {
-            if (input.trim() === '') return t('errorProjectEmpty');
-            return true;
-          },
-        },
-        {
-          type: 'list',
-          name: 'edition',
-          message: t('promptEdition'),
-          choices: [
-            { name: t('editionCommunity'), value: 'community' },
-            { name: t('editionEnterprise'), value: 'enterprise' }
-          ],
-          default: 'community'
-        },
-        {
-          type: 'list',
-          name: 'oinoneVersion',
-          message: t('promptVersion'),
-          choices: [
-            { name: t('version720'), value: '~7.2.0' },
-            { name: t('version640'), value: '~6.4.0' }
-          ],
-          default: '~7.2.0'
-        },
-        {
-          type: 'confirm',
-          name: 'downloadStaticResources',
-          message: t('promptDownload'),
-          default: true
-        }
-      ]);
-
-        prefix = answers.companyName;
-        fullProjectName = `${answers.companyName}-${answers.projectName}-frontend`;
-        oinoneVersion = answers.oinoneVersion;
-        edition = answers.edition;
-        downloadStaticResources = answers.downloadStaticResources;
-      }
-
-      const targetPath = path.resolve(process.cwd(), fullProjectName);
-
-      if (fs.existsSync(targetPath)) {
-        console.log(chalk.red(t('errorDirExists', { name: fullProjectName })));
-        process.exit(1);
-      }
-
-      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(t('errorTemplateMissing', { version: oinoneVersion, edition })));
-        process.exit(1);
-      }
-
-      // Helper function to process files recursively
-      const processDirectory = async (dirPath) => {
-        const files = await fs.readdir(dirPath);
-        for (const file of files) {
-          const currentPath = path.join(dirPath, file);
-          const stat = await fs.stat(currentPath);
-
-          // Rename directory if it starts with 'ss-'
-          let newPath = currentPath;
-          if (file.startsWith('ss-')) {
-            const newFile = file.replace(/^ss-/, `${prefix}-`);
-            newPath = path.join(dirPath, newFile);
-            await fs.rename(currentPath, newPath);
-          }
-
-          if (stat.isDirectory()) {
-            await processDirectory(newPath);
-          } else {
-            // Check if it's a text file
-            const ext = path.extname(newPath);
-            const isTextFile = !['.png', '.ico', '.jpg', '.jpeg', '.gif'].includes(ext);
-            
-            if (isTextFile) {
-              let content = await fs.readFile(newPath, 'utf8');
-              let hasChanges = false;
-
-              // Replace 'ss-' with '${prefix}-' but avoid replacing within words
-              // We use a regex that matches 'ss-' either at the start of a string or preceded by non-word characters
-              // To prevent changing things like postcss -> postprefix
-              const regex = /(^|[^a-zA-Z])ss-/g;
-              if (regex.test(content)) {
-                content = content.replace(regex, `$1${prefix}-`);
-                hasChanges = true;
-              }
-
-              // Replace '@ss/oinone' with `@${prefix}/oinone`
-              if (content.includes('@ss/')) {
-                content = content.replace(/@ss\//g, `@${prefix}/`);
-                hasChanges = true;
-              }
-
-              if (hasChanges) {
-                await fs.writeFile(newPath, content, 'utf8');
-              }
-            }
-          }
-        }
-      };
-
-      // Copy template files
-      await fs.copy(templatePath, targetPath, {
-        filter: (src) => {
-          // Ignore node_modules just in case
-          const relativePath = path.relative(templatePath, src);
-          if (relativePath.split(path.sep).includes('node_modules')) return false;
-          return true;
-        }
-      });
-
-      // Process the copied files (rename and replace content)
-      await processDirectory(targetPath);
-
-      // Handle package.json
-      const pkgPath = path.join(targetPath, '_package.json');
-      const newPkgPath = path.join(targetPath, 'package.json');
-      if (fs.existsSync(pkgPath)) {
-        const pkgContent = await fs.readJson(pkgPath);
-        pkgContent.name = fullProjectName;
-        await fs.writeJson(newPkgPath, pkgContent, { spaces: 2 });
-        await fs.remove(pkgPath);
-      }
-
-      // Handle gitignore
-      const gitignorePath = path.join(targetPath, 'gitignore');
-      const newGitignorePath = path.join(targetPath, '.gitignore');
-      if (fs.existsSync(gitignorePath)) {
-        await fs.move(gitignorePath, newGitignorePath);
-      }
-
-      // Handle npmrc
-      const npmrcPath = path.join(targetPath, 'npmrc');
-      const newNpmrcPath = path.join(targetPath, '.npmrc');
-      if (fs.existsSync(npmrcPath)) {
-        await fs.move(npmrcPath, newNpmrcPath);
-      }
-
-      if (downloadStaticResources) {
-        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(t('staticDownloaded')));
-        } catch (err) {
-          console.log(chalk.yellow(t('staticHiccup', { msg: err.message })));
-        }
-      } else {
-        spinner.succeed(chalk.green(t('projectCreated')));
-        const relativeOssDir = `packages/${prefix}-boot/public/oss`;
-        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(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(t('happyCoding')));
+  .command('doctor')
+  .description(t('doctor.doctorCmdDesc'))
+  .option('-o, --oinone-version <version>', t('cli.versionOpt'))
+  .action((...args) => {
+    const cmd = args[args.length - 1];
+    const mergedOptions = { ...program.opts(), ...(cmd && typeof cmd.opts === 'function' ? cmd.opts() : {}) };
+    return doctorAction(mergedOptions);
+  });
 
-      try {
-        const latestVersion = await Promise.race([
-          versionCheckPromise,
-          new Promise(resolve => setTimeout(() => {
-            if (checkReq) checkReq.destroy();
-            resolve(null);
-          }, 1000))
-        ]);
+setupCacheCommand();
 
-        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
-      }
+program.on('command:*', (operands) => {
+  const first = Array.isArray(operands) && operands.length > 0 ? operands[0] : '';
+  console.log(chalk.red(t('cli.requireCreateSubcommand', { cmd: first })));
+  process.exit(1);
+});
 
-    } catch (error) {
-      console.error(chalk.red(t('somethingBroke', { msg: error.message })));
-      process.exit(1);
-    }
-  });
+if (process.argv.length <= 2) {
+  program.outputHelp();
+  process.exit(0);
+}
 
 program.parse(process.argv);

package/bin/commands/cache.js

@@ -0,0 +1,70 @@
+const { program } = require('commander');
+const fs = require('fs-extra');
+const path = require('path');
+const os = require('os');
+const chalk = require('chalk');
+const { t } = require('../i18n');
+
+function setupCacheCommand() {
+  const cacheCmd = program
+    .command('cache')
+    .description(t('cache.cacheCmdDesc'))
+    .action(() => {
+      cacheCmd.help();
+    });
+
+  cacheCmd
+    .command('clean')
+    .description(t('cache.cacheCleanDesc'))
+    .action(() => {
+      const cacheDir = path.join(os.tmpdir(), 'oinone-cli-cache');
+      if (fs.existsSync(cacheDir)) {
+        fs.removeSync(cacheDir);
+        console.log(chalk.green(t('cache.cacheCleaned', { dir: cacheDir })));
+      } else {
+        console.log(chalk.yellow(t('cache.cacheAlreadyEmpty', { dir: cacheDir })));
+      }
+    });
+
+  cacheCmd
+    .command('info')
+    .description(t('cache.cacheInfoDesc'))
+    .action(async () => {
+      const cacheDir = path.join(os.tmpdir(), 'oinone-cli-cache');
+      console.log(chalk.cyan(t('cache.cacheDir')) + cacheDir);
+      
+      if (fs.existsSync(cacheDir)) {
+        const files = await fs.readdir(cacheDir);
+        let totalSize = 0;
+        
+        console.log(chalk.cyan(t('cache.cachedFiles')));
+        for (const file of files) {
+          const filePath = path.join(cacheDir, file);
+          const stat = await fs.stat(filePath);
+          totalSize += stat.size;
+          
+          let displaySize = '';
+          if (stat.size > 1024 * 1024) {
+            displaySize = `${(stat.size / (1024 * 1024)).toFixed(2)} MB`;
+          } else {
+            displaySize = `${Math.round(stat.size / 1024)} KB`;
+          }
+          
+          console.log(`  - 📄 ${file} (${displaySize})`);
+        }
+        
+        let totalDisplaySize = '';
+        if (totalSize > 1024 * 1024) {
+          totalDisplaySize = `${(totalSize / (1024 * 1024)).toFixed(2)} MB`;
+        } else {
+          totalDisplaySize = `${Math.round(totalSize / 1024)} KB`;
+        }
+        
+        console.log(chalk.cyan(t('cache.totalCacheSize')) + totalDisplaySize);
+      } else {
+        console.log(chalk.yellow(t('cache.cacheEmpty')));
+      }
+    });
+}
+
+module.exports = setupCacheCommand;