xinyu-pro 0.21.1 → 0.21.3

package/bin/cli.js

@@ -1,20 +1,24 @@
 #!/usr/bin/env node
 
-const { existsSync, readFileSync, writeFileSync, mkdirSync, copyFileSync } = require('fs');
-const { join, resolve } = require('path');
+const { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync } = require('fs');
+const { join } = require('path');
 const { createInterface } = require('readline');
 const { execSync, spawn } = require('child_process');
 const { homedir } = require('os');
 
-const cwd = process.cwd();
-const APP_DIR = __dirname.includes('node_modules') ? resolve(__dirname, '..') : cwd;
+const isWin = process.platform === 'win32';
+const APP_DIR = __dirname.includes('node_modules') ? resolve(__dirname, '..') : process.cwd();
+const XINYU_HOME = join(homedir(), '.xinyu-pro');
+const RUN_DIR = XINYU_HOME;
 
 const args = process.argv.slice(2);
 const HELP_FLAG = args.includes('--help') || args.includes('-h');
 const DEV_FLAG = args.includes('--dev');
+const RESET_FLAG = args.includes('--reset');
 const PORT_INDEX = args.indexOf('--port');
 const CUSTOM_PORT = PORT_INDEX !== -1 ? args[PORT_INDEX + 1] : '3000';
-const BUILD_FLAG = args.includes('--build');
+
+const SKIP_DIRS = new Set(['node_modules', '.next', 'data', '.git']);
 
 function echo(msg, type = 'info') {
   const colors = {
@@ -48,10 +52,10 @@ function showHelp() {
   echo('  ╚══════════════════════════════════════╝', 'bold');
   echo('');
   echo('  用法:', 'bold');
-  echo('    $ xinyu             启动服务器（自动构建）');
+  echo('    $ xinyu             启动服务器');
   echo('    $ xinyu --dev       开发模式（热更新）');
   echo('    $ xinyu --port 4000 指定端口');
-  echo('    $ xinyu --build     仅构建不启动');
+  echo('    $ xinyu --reset     重新安装并启动');
   echo('    $ xinyu --help      显示帮助');
   echo('');
   echo('  环境要求:', 'bold');
@@ -69,132 +73,154 @@ function checkNodeVersion() {
   }
 }
 
-function detectPackageManager() {
-  if (existsSync(join(APP_DIR, 'yarn.lock'))) return 'yarn';
-  if (existsSync(join(APP_DIR, 'pnpm-lock.yaml'))) return 'pnpm';
-  return 'npm';
+function copyRecursive(src, dest) {
+  mkdirSync(dest, { recursive: true });
+  const entries = readdirSync(src, { withFileTypes: true });
+  for (const entry of entries) {
+    if (SKIP_DIRS.has(entry.name)) continue;
+    if (entry.name.startsWith('.env') && entry.name !== '.env.example') continue;
+    const srcPath = join(src, entry.name);
+    const destPath = join(dest, entry.name);
+    if (entry.isDirectory()) {
+      copyRecursive(srcPath, destPath);
+    } else {
+      if (!existsSync(destPath)) {
+        try {
+          mkdirSync(join(dest, '..'), { recursive: true });
+          writeFileSync(destPath, readFileSync(srcPath));
+        } catch { }
+      }
+    }
+  }
 }
 
-function getNextCliPath() {
-  const possiblePaths = [
-    join(APP_DIR, 'node_modules', '.bin', 'next'),
-    join(APP_DIR, 'node_modules', 'next', 'dist', 'bin', 'next'),
-    join(cwd, 'node_modules', '.bin', 'next'),
-  ];
-  for (const p of possiblePaths) {
-    if (existsSync(p)) return p;
+function ensureAppSetup() {
+  const isFresh = !existsSync(join(RUN_DIR, 'package.json'));
+
+  if (isFresh || RESET_FLAG) {
+    if (RESET_FLAG && existsSync(RUN_DIR)) {
+      echo('  ■ 正在重置应用...', 'info');
+      try {
+        const rmDir = join(RUN_DIR, '..', '.xinyu-pro-backup');
+        if (existsSync(rmDir)) {
+          execSync(isWin ? `rmdir /s /q "${rmDir}"` : `rm -rf "${rmDir}"`, { shell: isWin });
+        }
+        execSync(isWin ? `move "${RUN_DIR}" "${rmDir}"` : `mv "${RUN_DIR}" "${rmDir}"`, { shell: isWin });
+      } catch { }
+    }
+
+    echo('  ■ 正在初始化应用目录...', 'info');
+    echo('    ' + RUN_DIR, 'dim');
+    mkdirSync(RUN_DIR, { recursive: true });
+    copyRecursive(APP_DIR, RUN_DIR);
+
+    const envTarget = join(RUN_DIR, '.env.local');
+    if (!existsSync(envTarget)) {
+      const envExample = join(RUN_DIR, '.env.example');
+      if (existsSync(envExample)) {
+        writeFileSync(envTarget, readFileSync(envExample, 'utf-8'), 'utf-8');
+      }
+    }
+    return true;
   }
-  return 'next';
+
+  return false;
 }
 
-function checkDependencies() {
-  if (!existsSync(join(APP_DIR, 'node_modules'))) {
-    echo('  ⚠ 未检测到 node_modules，正在安装依赖...', 'warn');
-    const pm = detectPackageManager();
-    const cmd = pm === 'yarn' ? 'yarn install' : pm === 'pnpm' ? 'pnpm install' : 'npm install';
-    echo(`  $ ${cmd}`, 'dim');
-    execSync(cmd, { cwd: APP_DIR, stdio: 'inherit' });
+function installDependencies() {
+  if (!existsSync(join(RUN_DIR, 'node_modules'))) {
+    echo('  ■ 正在安装依赖...', 'info');
+    execSync('npm install', { cwd: RUN_DIR, stdio: 'inherit', shell: isWin });
     return true;
   }
   return false;
 }
 
-function setupEnvFile() {
-  const envPath = join(APP_DIR, '.env.local');
-  const examplePath = join(APP_DIR, '.env.example');
+function runBuild() {
+  echo('  ■ 正在构建应用（首次需要 1-2 分钟）...', 'info');
+  try {
+    execSync('npx next build', { cwd: RUN_DIR, stdio: 'inherit', shell: isWin });
+    echo('  ✓ 构建完成', 'success');
+  } catch {
+    echo('  ✗ 构建失败，请检查错误信息', 'error');
+    process.exit(1);
+  }
+}
+
+function getNextBin() {
+  const binDir = join(RUN_DIR, 'node_modules', '.bin');
+  if (isWin) {
+    const cmdPath = join(binDir, 'next.cmd');
+    if (existsSync(cmdPath)) return cmdPath;
+  }
+  const unixPath = join(binDir, 'next');
+  if (existsSync(unixPath)) return unixPath;
+  return 'next';
+}
+
+function setupEnvInteractive() {
+  const envPath = join(RUN_DIR, '.env.local');
+  const examplePath = join(RUN_DIR, '.env.example');
 
   if (existsSync(envPath)) {
     const content = readFileSync(envPath, 'utf-8');
     if (content.includes('your-api-key') || content.includes('你的密码')) {
-      echo('  ⚠ .env.local 中存在占位值，建议修改为真实配置', 'warn');
+      echo('  ⚠ .env.local 中存在占位值，建议修改', 'warn');
     }
     return;
   }
 
-  echo('  ⚠ 未检测到 .env.local 配置文件', 'warn');
-  echo('');
-
   if (!existsSync(examplePath)) {
-    echo('  ✗ 未找到 .env.example，请手动创建 .env.local', 'error');
+    echo('  ✗ 未找到 .env.example', 'error');
     process.exit(1);
   }
 
   const example = readFileSync(examplePath, 'utf-8');
   writeFileSync(envPath, example, 'utf-8');
-  echo('  ✓ 已从 .env.example 创建 .env.local', 'success');
-  echo('');
+  echo('  ✓ 已创建 .env.local', 'success');
 
-  const setupInteractive = async () => {
-    echo('  ── 请填写以下必要配置（直接回车可跳过） ──', 'bold');
+  const run = async () => {
     echo('');
-
+    echo('  ── 填写配置（直接回车可跳过） ──', 'bold');
     const apiKey = await ask('  AI API 密钥 (AI_API_KEY): ');
     if (apiKey) {
-      let content = readFileSync(envPath, 'utf-8');
-      content = content.replace(/AI_API_KEY=.*/, `AI_API_KEY=${apiKey}`);
-      writeFileSync(envPath, content, 'utf-8');
+      let c = readFileSync(envPath, 'utf-8');
+      writeFileSync(envPath, c.replace(/AI_API_KEY=.*/, `AI_API_KEY=${apiKey}`), 'utf-8');
     }
-
-    const dbPassword = await ask('  数据库密码 (DB_PASSWORD，默认空): ');
+    const dbPassword = await ask('  数据库密码 (DB_PASSWORD): ');
     if (dbPassword) {
-      let content = readFileSync(envPath, 'utf-8');
-      content = content.replace(/DB_PASSWORD=.*/, `DB_PASSWORD=${dbPassword}`);
-      writeFileSync(envPath, content, 'utf-8');
+      let c = readFileSync(envPath, 'utf-8');
+      writeFileSync(envPath, c.replace(/DB_PASSWORD=.*/, `DB_PASSWORD=${dbPassword}`), 'utf-8');
     }
-
     const dbName = await ask('  数据库名称 (DB_NAME，默认 xinyu): ');
     if (dbName) {
-      let content = readFileSync(envPath, 'utf-8');
-      content = content.replace(/DB_NAME=.*/, `DB_NAME=${dbName}`);
-      writeFileSync(envPath, content, 'utf-8');
+      let c = readFileSync(envPath, 'utf-8');
+      writeFileSync(envPath, c.replace(/DB_NAME=.*/, `DB_NAME=${dbName}`), 'utf-8');
     }
-
-    echo('');
-    echo('  ✓ .env.local 配置完成', 'success');
-    echo('  ✎ 如需修改，请编辑 ' + envPath, 'dim');
+    echo('  ✓ 配置完成', 'success');
+    echo('  ✎ 编辑: ' + envPath, 'dim');
   };
-
-  return setupInteractive();
-}
-
-function checkBuildExists() {
-  return existsSync(join(APP_DIR, '.next', 'BUILD_ID'));
-}
-
-function runBuild() {
-  echo('  ■ 正在构建应用，首次构建可能需要 1-2 分钟...', 'info');
-  const nextCli = getNextCliPath();
-  try {
-    execSync(`"${process.execPath}" "${nextCli}" build`, {
-      cwd: APP_DIR,
-      stdio: 'inherit',
-    });
-    echo('  ✓ 构建完成', 'success');
-  } catch (e) {
-    echo('  ✗ 构建失败，请检查代码错误', 'error');
-    process.exit(1);
-  }
+  return run();
 }
 
 function startServer(port, devMode) {
-  const nextCli = getNextCliPath();
+  const nextBin = getNextBin();
+  const action = devMode ? 'dev' : 'start';
 
   echo('');
   echo(`  ╔══════════════════════════════════════╗`, 'success');
   echo(`  ║  星语 Pro 服务器已启动               ║`, 'success');
   echo(`  ║  访问地址: http://localhost:${port}      ║`, 'success');
+  echo(`  ║  工作目录: ${RUN_DIR}`, 'dim');
   echo(`  ║  按 Ctrl+C 停止                      ║`, 'success');
   echo(`  ╚══════════════════════════════════════╝`, 'success');
   echo('');
 
-  const cmd = devMode ? 'dev' : 'start';
-  const child = spawn(process.execPath, [nextCli, cmd, '-p', port], {
-    cwd: APP_DIR,
+  const child = spawn(nextBin, [action, '-p', port], {
+    cwd: RUN_DIR,
     stdio: 'inherit',
-    env: {
-      ...process.env,
-      PORT: port,
-    },
+    shell: isWin,
+    env: { ...process.env, PORT: port },
   });
 
   child.on('error', (err) => {
@@ -211,7 +237,7 @@ function startServer(port, devMode) {
 
   process.on('SIGINT', () => {
     echo('');
-    echo('  ■ 正在关闭服务器...', 'info');
+    echo('  ■ 正在关闭...', 'info');
     child.kill('SIGINT');
     process.exit(0);
   });
@@ -226,7 +252,6 @@ async function main() {
   echo('');
   echo('  ╔══════════════════════════════════════╗', 'bold');
   echo('  ║       星语 Pro (xinyu-pro)           ║', 'bold');
-  echo('  ║  启动中...                           ║', 'bold');
   echo('  ╚══════════════════════════════════════╝', 'bold');
   echo('');
 
@@ -236,19 +261,13 @@ async function main() {
   }
 
   checkNodeVersion();
-  checkDependencies();
-
-  await setupEnvFile();
-
-  if (BUILD_FLAG) {
-    runBuild();
-    echo('  ✓ 构建完成，可使用 xinyu 启动服务器', 'success');
-    return;
-  }
+  ensureAppSetup();
+  installDependencies();
+  await setupEnvInteractive();
 
-  if (!DEV_FLAG && !checkBuildExists()) {
-    echo('  ⚠ 未检测到构建产物，将自动执行构建', 'warn');
-    echo('  （首次构建需要下载依赖并编译 TypeScript，请耐心等待）', 'dim');
+  if (!DEV_FLAG && !existsSync(join(RUN_DIR, '.next', 'BUILD_ID'))) {
+    echo('  ⚠ 未检测到构建产物，自动构建...', 'warn');
+    echo('  （首次构建需要下载依赖并编译，请耐心等待）', 'dim');
     echo('');
     runBuild();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xinyu-pro",
-  "version": "0.21.1",
+  "version": "0.21.3",
   "private": false,
   "description": "星语 Pro - AI 驱动的互动叙事平台",
   "author": "RestRegular",

package/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.21.1",
+  "version": "0.21.3",
   "name": "xinyu-pro",
   "displayName": "星语 Pro",
   "description": "AI 驱动的互动叙事平台"