@fecommunity/reactpress 4.0.0-beta.12 → 4.0.0-beta.14

package/out/core/services/admin-static.js

@@ -0,0 +1,136 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveBundledAdminDistDir = resolveBundledAdminDistDir;
+exports.resolveWebPackageRoot = resolveWebPackageRoot;
+exports.ensureAdminRewritesInNextConfig = ensureAdminRewritesInNextConfig;
+exports.ensureAdminStaticForTheme = ensureAdminStaticForTheme;
+exports.shouldRebuildThemeAfterAdminSync = shouldRebuildThemeAfterAdminSync;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const node_child_process_1 = require("node:child_process");
+const node_path_1 = __importDefault(require("node:path"));
+const ADMIN_REWRITES_MARKER = 'reactpress-admin-rewrites';
+function getCliPackageRoot() {
+    return node_path_1.default.join(__dirname, '..', '..', '..');
+}
+function resolveBundledAdminDistDir() {
+    const bundled = node_path_1.default.join(getCliPackageRoot(), 'admin-dist', 'index.html');
+    return fs_extra_1.default.existsSync(bundled) ? node_path_1.default.dirname(bundled) : null;
+}
+function resolveWebPackageRoot(projectRoot) {
+    for (const candidate of [node_path_1.default.join(projectRoot, 'web'), node_path_1.default.join(projectRoot, '..', 'web')]) {
+        if (fs_extra_1.default.existsSync(node_path_1.default.join(candidate, 'package.json')))
+            return candidate;
+    }
+    return null;
+}
+function syncDirToPublicAdmin(sourceDist, themeDir) {
+    const target = node_path_1.default.join(themeDir, 'public', 'admin');
+    fs_extra_1.default.removeSync(target);
+    fs_extra_1.default.mkdirSync(node_path_1.default.dirname(target), { recursive: true });
+    fs_extra_1.default.copySync(sourceDist, target);
+    return target;
+}
+function removeReactpressAdminMiddleware(themeDir) {
+    for (const name of ['middleware.js', 'middleware.mjs']) {
+        const filePath = node_path_1.default.join(themeDir, name);
+        if (!fs_extra_1.default.existsSync(filePath))
+            continue;
+        const content = fs_extra_1.default.readFileSync(filePath, 'utf8');
+        if (content.includes('reactpress-admin-middleware')) {
+            fs_extra_1.default.removeSync(filePath);
+        }
+    }
+}
+/** Patch theme next.config.js with afterFiles admin SPA rewrites. */
+function ensureAdminRewritesInNextConfig(themeDir) {
+    const configCandidates = ['next.config.js', 'next.config.mjs', 'next.config.ts'];
+    const configPath = configCandidates
+        .map((name) => node_path_1.default.join(themeDir, name))
+        .find((candidate) => fs_extra_1.default.existsSync(candidate));
+    if (!configPath)
+        return false;
+    let src = fs_extra_1.default.readFileSync(configPath, 'utf8');
+    if (src.includes(ADMIN_REWRITES_MARKER))
+        return false;
+    const arrayReturn = /async rewrites\(\)\s*\{\s*return (\[[\s\S]*?\])\s*\}/m.exec(src);
+    if (!arrayReturn) {
+        console.warn('[ReactPress Client] Could not patch next.config rewrites() for admin SPA');
+        return false;
+    }
+    const replacement = `async rewrites() {
+    // ${ADMIN_REWRITES_MARKER}
+    return {
+      beforeFiles: ${arrayReturn[1]},
+      afterFiles: [
+        { source: '/admin', destination: '/admin/index.html' },
+        { source: '/admin/:path*', destination: '/admin/index.html' },
+      ],
+    };
+  }`;
+    src = src.replace(arrayReturn[0], replacement);
+    fs_extra_1.default.writeFileSync(configPath, src, 'utf8');
+    removeReactpressAdminMiddleware(themeDir);
+    return true;
+}
+function finalizeAdminThemeSetup(themeDir) {
+    return ensureAdminRewritesInNextConfig(themeDir);
+}
+/** Returns true when admin static or rewrites were newly applied (theme rebuild recommended). */
+function ensureAdminStaticForTheme(projectRoot, themeDir) {
+    const adminIndex = node_path_1.default.join(themeDir, 'public', 'admin', 'index.html');
+    if (fs_extra_1.default.existsSync(adminIndex)) {
+        return finalizeAdminThemeSetup(themeDir);
+    }
+    const webRoot = resolveWebPackageRoot(projectRoot);
+    if (webRoot) {
+        const webDist = node_path_1.default.join(webRoot, 'dist', 'index.html');
+        if (!fs_extra_1.default.existsSync(webDist)) {
+            console.log('[ReactPress Client] Building admin SPA (web/)…');
+            const buildWeb = (0, node_child_process_1.spawnSync)('pnpm', ['run', 'build'], { cwd: webRoot, stdio: 'inherit' });
+            if (buildWeb.status !== 0)
+                process.exit(buildWeb.status || 1);
+        }
+        const syncScript = node_path_1.default.join(webRoot, 'bin', 'reactpress-web.js');
+        const publicAdmin = node_path_1.default.join(themeDir, 'public', 'admin');
+        console.log('[ReactPress Client] Syncing admin static → theme public/admin…');
+        const sync = (0, node_child_process_1.spawnSync)(process.execPath, [syncScript, 'sync-public', publicAdmin], {
+            stdio: 'inherit',
+            cwd: webRoot,
+        });
+        if (sync.status !== 0)
+            process.exit(sync.status || 1);
+        return finalizeAdminThemeSetup(themeDir) || true;
+    }
+    const bundledDist = resolveBundledAdminDistDir();
+    if (!bundledDist) {
+        console.warn('[ReactPress Client] Admin static missing and bundled admin-dist not found');
+        return false;
+    }
+    console.log('[ReactPress Client] Syncing bundled admin static → theme public/admin…');
+    syncDirToPublicAdmin(bundledDist, themeDir);
+    return finalizeAdminThemeSetup(themeDir) || true;
+}
+function shouldRebuildThemeAfterAdminSync(themeDir) {
+    const adminIndex = node_path_1.default.join(themeDir, 'public', 'admin', 'index.html');
+    const nextDir = node_path_1.default.join(themeDir, '.next');
+    const configPath = node_path_1.default.join(themeDir, 'next.config.js');
+    if (!fs_extra_1.default.existsSync(adminIndex))
+        return false;
+    if (!fs_extra_1.default.existsSync(nextDir))
+        return true;
+    const adminMtime = fs_extra_1.default.statSync(adminIndex).mtimeMs;
+    const nextMtime = fs_extra_1.default.statSync(nextDir).mtimeMs;
+    if (adminMtime > nextMtime)
+        return true;
+    if (fs_extra_1.default.existsSync(configPath)) {
+        const configMtime = fs_extra_1.default.statSync(configPath).mtimeMs;
+        if (configMtime > nextMtime && fs_extra_1.default.readFileSync(configPath, 'utf8').includes(ADMIN_REWRITES_MARKER)) {
+            return true;
+        }
+    }
+    return false;
+}
+//# sourceMappingURL=admin-static.js.map

package/out/core/services/local-site.js

@@ -123,10 +123,11 @@ async function initLocalProject(projectRoot, options = {}) {
     const paths = (0, paths_1.getProjectPaths)(projectRoot);
     const port = options.port ?? 3002;
     if ((await fs_extra_1.default.pathExists(paths.configPath)) && !options.force) {
+        const { t } = require('../../lib/i18n');
         return {
-            ok: false,
+            ok: true,
             projectRoot,
-            message: '目录已是 ReactPress 项目。使用 --force 覆盖配置。',
+            message: t('init.alreadyInitialized'),
         };
     }
     await fs_extra_1.default.ensureDir(projectRoot);

package/out/lib/client-lifecycle.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+const ora = require('ora');
+const { getThemeBin } = require('./paths');
+const { loadClientSiteUrl } = require('./http');
+const { runNodeScript } = require('./spawn');
+const { readClientPid, isProcessRunning, clearClientPidFile } = require('./process');
+const { PM2_CLIENT_APP, isPm2RuntimeAvailable, isPm2AppOnline, getPm2AppPid, } = require('./pm2-runtime');
+const { t } = require('./i18n');
+function stopClient(projectRoot) {
+    const pid = readClientPid(projectRoot);
+    if (pid && isProcessRunning(pid)) {
+        try {
+            process.kill(pid, 'SIGTERM');
+            console.log(t('lifecycle.clientStopped', { pid }));
+        }
+        catch (err) {
+            console.warn(t('lifecycle.stopClientPidFailed', { pid }), err.message);
+        }
+    }
+    clearClientPidFile(projectRoot);
+}
+async function startClientInBackground(projectRoot) {
+    const preferPm2 = isPm2RuntimeAvailable(projectRoot);
+    if (preferPm2 && isPm2AppOnline(projectRoot, PM2_CLIENT_APP)) {
+        const pid = getPm2AppPid(projectRoot, PM2_CLIENT_APP);
+        console.log(t('lifecycle.clientAlreadyRunning', { pid: pid ?? PM2_CLIENT_APP }));
+        return 0;
+    }
+    const existing = readClientPid(projectRoot);
+    if (!preferPm2 && existing && isProcessRunning(existing)) {
+        console.log(t('lifecycle.clientAlreadyRunning', { pid: existing }));
+        return 0;
+    }
+    clearClientPidFile(projectRoot);
+    const themeBin = getThemeBin(projectRoot);
+    const { resolveThemeDirectory, readActiveThemeManifest } = require('./theme-runtime');
+    const { activeTheme } = readActiveThemeManifest(projectRoot);
+    const themeDir = resolveThemeDirectory(projectRoot, activeTheme);
+    const bgFlag = preferPm2 ? '--pm2-bg' : '--bg';
+    await runNodeScript(themeBin, [bgFlag], {
+        cwd: projectRoot,
+        env: themeDir ? { REACTPRESS_THEME_DIR: themeDir } : undefined,
+    });
+    const supervised = isPm2AppOnline(projectRoot, PM2_CLIENT_APP);
+    const pid = supervised ? getPm2AppPid(projectRoot, PM2_CLIENT_APP) : readClientPid(projectRoot);
+    if (!supervised && !pid) {
+        console.error(t('lifecycle.clientPidMissing'));
+        return 1;
+    }
+    const clientUrl = loadClientSiteUrl(projectRoot);
+    const spinner = ora({
+        text: t('lifecycle.waitingClient', { url: clientUrl }),
+        color: 'magenta',
+        spinner: 'dots',
+    }).start();
+    const deadline = Date.now() + 180_000;
+    let ready = false;
+    while (Date.now() < deadline) {
+        const alive = supervised
+            ? isPm2AppOnline(projectRoot, PM2_CLIENT_APP)
+            : pid
+                ? isProcessRunning(pid)
+                : false;
+        if (!alive) {
+            spinner.fail(t('lifecycle.clientExitedEarly', { pid: pid ?? '—' }));
+            return 1;
+        }
+        if (await require('./http').isHttpResponding(clientUrl)) {
+            ready = true;
+            break;
+        }
+        await new Promise((r) => setTimeout(r, 500));
+    }
+    if (!ready) {
+        spinner.fail(t('lifecycle.clientTimeout', { url: clientUrl }));
+        return 1;
+    }
+    const readyPid = supervised ? getPm2AppPid(projectRoot, PM2_CLIENT_APP) ?? PM2_CLIENT_APP : pid;
+    spinner.succeed(t('lifecycle.clientReady', { url: clientUrl, pid: readyPid }));
+    return 0;
+}
+module.exports = {
+    startClientInBackground,
+    stopClient,
+};
+//# sourceMappingURL=client-lifecycle.js.map

package/out/lib/i18n/strings.js

@@ -76,6 +76,13 @@ const STRINGS = {
         'cli.doctor.logs.sourceOption': 'Log source: error, request, response, or all',
         'cli.doctor.logs.grepOption': 'Filter log lines by regex',
         'cli.doctor.logs.listOption': 'List available log files only',
+        'cli.logs.description': 'View recent API logs (error, request, response)',
+        'cli.logs.descriptionAlias': 'View API logs (alias of reactpress logs)',
+        'cli.logs.tailOption': 'Number of lines to show per log file',
+        'cli.logs.sourceOption': 'Log source: error, request, response, or all',
+        'cli.logs.grepOption': 'Filter log lines by regex',
+        'cli.logs.listOption': 'List available log files only',
+        'cli.stop.description': 'Stop API and site services started by init',
         'cli.db.description': 'Database operations',
         'cli.db.backup': 'Backup current project database with mysqldump',
         'cli.db.backup.output': 'Output SQL file path',
@@ -84,9 +91,11 @@ const STRINGS = {
         'cli.publish.publish': 'Publish core packages to npm',
         'cli.start.description': 'Start ReactPress (SQLite API + admin + theme)',
         'cli.help.examples': 'Usage:',
-        'cli.help.init': '  reactpress init              Initialize (default)',
+        'cli.help.init': '  reactpress init [dir]        Initialize project',
         'cli.help.doctor': '  reactpress doctor            Diagnose environment issues',
-        'cli.help.doctorLogs': '  reactpress doctor logs       Tail API logs for quick debugging',
+        'cli.help.logs': '  reactpress logs              Tail API logs for quick debugging',
+        'cli.help.stop': '  reactpress stop              Stop the background API',
+        'cli.help.doctorLogs': '  reactpress doctor logs       Alias of reactpress logs',
         'cli.help.zeroDep': '  Zero deps: Node.js 18+ only — no Docker, nginx, or MySQL',
         'cli.plugin.description': 'Manage ReactPress plugins',
         'cli.plugin.install.description': 'Install a local plugin into .reactpress/plugins',
@@ -112,10 +121,11 @@ const STRINGS = {
         'init.label.site': 'Site',
         'init.label.admin': 'Admin',
         'init.label.api': 'API',
-        'init.hint': 'Admin login: admin / admin · Press Ctrl+C to stop',
+        'init.hint': 'Login: admin / admin · Services run in background · Stop: reactpress stop · Logs: reactpress logs',
+        'init.alreadyInitialized': 'Project already initialized — ensuring services are running',
         'init.apiOnlyHint': 'API is running. Install a theme in Admin → Appearance to enable the public site.',
         'init.unknownCommand': 'Unknown command: {cmd}',
-        'init.useInitOnly': 'ReactPress 4 supports: reactpress init · reactpress doctor',
+        'init.useInitOnly': 'ReactPress 4: reactpress init · doctor · logs · stop',
         'banner.subtitle': '· Publishing platform · v4.0',
         'banner.tagline': 'Zero deps · SQLite · ship in ~60s',
         /** Left label for the decorative pulse bar (not a URL — the repo link
@@ -415,8 +425,10 @@ const STRINGS = {
         'doctor.checking': 'Checking {name}…',
         'doctor.summary': '{passed} passed  ·  {failed} failed  ·  {total} total',
         'doctor.fixesHeader': 'Suggested fixes',
-        'doctor.logsHint': 'Tip: run reactpress doctor logs --tail 100 to inspect API error logs',
-        'doctor.logs.title': 'ReactPress Doctor · Logs',
+        'doctor.logsHint': 'Tip: run reactpress logs --tail 100 to inspect API error logs',
+        'logs.title': 'ReactPress Logs',
+        'logs.subtitle': 'API log viewer',
+        'doctor.logs.title': 'ReactPress Logs',
         'doctor.logs.subtitle': 'API log viewer',
         'doctor.logs.dir': 'Log dir   {path}',
         'doctor.logs.empty': 'No API log files found yet.',
@@ -428,7 +440,7 @@ const STRINGS = {
         'doctor.logs.noPid': 'No API pid file at {path}',
         'doctor.logs.pidRunning': 'API pid {pid} (recorded in {path})',
         'doctor.logs.pidStale': 'Stale pid {pid} in {path} — process not running',
-        'doctor.logs.moreHint': 'Use --tail, --source, --grep, or --list for more control (see reactpress doctor logs --help)',
+        'doctor.logs.moreHint': 'Use --tail, --source, --grep, or --list for more control (see reactpress logs --help)',
         'status.title': 'ReactPress project status',
         'status.dir': 'Project     {path}',
         'status.apiSource': 'API source  {source}',
@@ -489,6 +501,14 @@ const STRINGS = {
         'lifecycle.apiTimeout120': '[reactpress] API not ready within 120s: {url}',
         'lifecycle.apiExitedEarly': '[reactpress] API process exited early (pid {pid})',
         'lifecycle.apiReady': '[reactpress] API ready: {url}',
+        'lifecycle.clientStopped': '[reactpress] Site process stopped (pid {pid})',
+        'lifecycle.stopClientPidFailed': '[reactpress] Failed to stop site pid {pid}:',
+        'lifecycle.clientAlreadyRunning': '[reactpress] Site already running (pid {pid})',
+        'lifecycle.clientPidMissing': '[reactpress] Site failed to start (no pid recorded)',
+        'lifecycle.waitingClient': 'Waiting for site at {url}…',
+        'lifecycle.clientTimeout': '[reactpress] Site not ready within 180s: {url}',
+        'lifecycle.clientExitedEarly': '[reactpress] Site process exited early (pid {pid})',
+        'lifecycle.clientReady': '[reactpress] Site ready: {url} (pid {pid})',
         'lifecycle.apiStatusTitle': '[reactpress] API status',
         'lifecycle.source': '  Source: {source}',
         'lifecycle.source.monorepo': 'monorepo server/',
@@ -500,6 +520,7 @@ const STRINGS = {
         'lifecycle.httpReachable': 'reachable',
         'lifecycle.httpUnreachable': 'unreachable',
         'lifecycle.unknownCommand': 'Unknown lifecycle command: {command}',
+        'lifecycle.processSupervisorFallback': '[reactpress] Process supervisor unavailable — falling back to background node start',
         'docker.stopping': '[reactpress] Stopping Docker services…',
         'docker.stopped': '[reactpress] Docker services stopped.',
         'docker.stopFailed': '[reactpress] Failed to stop Docker:',
@@ -730,6 +751,13 @@ const STRINGS = {
         'cli.doctor.logs.sourceOption': '日志类型：error、request、response 或 all',
         'cli.doctor.logs.grepOption': '用正则过滤日志行',
         'cli.doctor.logs.listOption': '仅列出可用日志文件',
+        'cli.logs.description': '查看 API 日志（error / request / response）',
+        'cli.logs.descriptionAlias': '查看 API 日志（同 reactpress logs）',
+        'cli.logs.tailOption': '每个日志文件显示的行数',
+        'cli.logs.sourceOption': '日志类型：error、request、response 或 all',
+        'cli.logs.grepOption': '用正则过滤日志行',
+        'cli.logs.listOption': '仅列出可用日志文件',
+        'cli.stop.description': '停止 init 启动的 API 与站点服务',
         'cli.db.description': '数据库运维',
         'cli.db.backup': '使用 mysqldump 备份当前项目数据库',
         'cli.db.backup.output': '输出 SQL 文件路径',
@@ -738,9 +766,11 @@ const STRINGS = {
         'cli.publish.publish': '发布核心 npm 包',
         'cli.start.description': '启动 ReactPress（SQLite API + 管理后台 + 主题）',
         'cli.help.examples': '用法:',
-        'cli.help.init': '  reactpress init              初始化（默认命令）',
+        'cli.help.init': '  reactpress init [dir]        初始化项目',
         'cli.help.doctor': '  reactpress doctor            诊断环境问题',
-        'cli.help.doctorLogs': '  reactpress doctor logs       查看 API 日志，快速定位问题',
+        'cli.help.logs': '  reactpress logs              查看 API 日志，快速定位问题',
+        'cli.help.stop': '  reactpress stop              停止后台 API',
+        'cli.help.doctorLogs': '  reactpress doctor logs       reactpress logs 的别名',
         'cli.help.zeroDep': '  零依赖：仅需 Node.js 18+，无需 Docker、nginx 或 MySQL',
         'cli.plugin.description': '管理 ReactPress 插件',
         'cli.plugin.install.description': '安装本地插件到 .reactpress/plugins',
@@ -766,10 +796,11 @@ const STRINGS = {
         'init.label.site': '站点',
         'init.label.admin': '后台',
         'init.label.api': 'API',
-        'init.hint': '后台账号：admin / admin · 按 Ctrl+C 停止',
+        'init.hint': '账号 admin / admin · 服务已在后台运行 · 停止：reactpress stop · 日志：reactpress logs',
+        'init.alreadyInitialized': '项目已初始化 — 正在确保服务运行',
         'init.apiOnlyHint': 'API 已运行。请在管理后台「外观 → 主题」安装主题以启用访客站。',
         'init.unknownCommand': '未知命令：{cmd}',
-        'init.useInitOnly': 'ReactPress 4 支持：reactpress init · reactpress doctor',
+        'init.useInitOnly': 'ReactPress 4 支持：reactpress init · doctor · logs · stop',
         'banner.subtitle': '· 发布平台 · v4.0',
         'banner.tagline': '零依赖 · SQLite · 约 60 秒上线',
         /** 左侧装饰性进度条标签（不是网址；仓库地址放在卡片顶部 Title 正下方）。 */
@@ -1068,8 +1099,10 @@ const STRINGS = {
         'doctor.checking': '正在检查 {name}…',
         'doctor.summary': '通过 {passed}  ·  失败 {failed}  ·  共 {total} 项',
         'doctor.fixesHeader': '修复建议',
-        'doctor.logsHint': '提示：运行 reactpress doctor logs --tail 100 查看 API 错误日志',
-        'doctor.logs.title': 'ReactPress Doctor · 日志',
+        'doctor.logsHint': '提示：运行 reactpress logs --tail 100 查看 API 错误日志',
+        'logs.title': 'ReactPress 日志',
+        'logs.subtitle': 'API 日志查看',
+        'doctor.logs.title': 'ReactPress 日志',
         'doctor.logs.subtitle': 'API 日志查看',
         'doctor.logs.dir': '日志目录  {path}',
         'doctor.logs.empty': '尚未找到 API 日志文件。',
@@ -1081,7 +1114,7 @@ const STRINGS = {
         'doctor.logs.noPid': '未找到 API pid 文件：{path}',
         'doctor.logs.pidRunning': 'API 进程 pid {pid}（记录在 {path}）',
         'doctor.logs.pidStale': 'pid 文件 {path} 中的 {pid} 已失效（进程未运行）',
-        'doctor.logs.moreHint': '可用 --tail、--source、--grep、--list 进一步筛选（见 reactpress doctor logs --help）',
+        'doctor.logs.moreHint': '可用 --tail、--source、--grep、--list 进一步筛选（见 reactpress logs --help）',
         'status.title': 'ReactPress 项目状态',
         'status.dir': '项目目录    {path}',
         'status.apiSource': 'API 来源    {source}',
@@ -1142,6 +1175,14 @@ const STRINGS = {
         'lifecycle.apiTimeout120': '[reactpress] API 在 120s 内未就绪: {url}',
         'lifecycle.apiExitedEarly': '[reactpress] API 进程已提前退出 (pid {pid})',
         'lifecycle.apiReady': '[reactpress] API 已就绪: {url}',
+        'lifecycle.clientStopped': '[reactpress] 已停止站点进程 (pid {pid})',
+        'lifecycle.stopClientPidFailed': '[reactpress] 停止站点 pid {pid} 失败:',
+        'lifecycle.clientAlreadyRunning': '[reactpress] 站点已在运行 (pid {pid})',
+        'lifecycle.clientPidMissing': '[reactpress] 站点启动失败（未记录 pid）',
+        'lifecycle.waitingClient': '等待站点就绪 {url}…',
+        'lifecycle.clientTimeout': '[reactpress] 站点在 180s 内未就绪: {url}',
+        'lifecycle.clientExitedEarly': '[reactpress] 站点进程已提前退出 (pid {pid})',
+        'lifecycle.clientReady': '[reactpress] 站点已就绪: {url} (pid {pid})',
         'lifecycle.apiStatusTitle': '[reactpress] API 状态',
         'lifecycle.source': '  来源: {source}',
         'lifecycle.source.monorepo': 'monorepo server/',
@@ -1153,6 +1194,7 @@ const STRINGS = {
         'lifecycle.httpReachable': '可访问',
         'lifecycle.httpUnreachable': '不可访问',
         'lifecycle.unknownCommand': '未知 lifecycle 命令: {command}',
+        'lifecycle.processSupervisorFallback': '[reactpress] 进程守护不可用 — 已回退到后台 Node 启动',
         'docker.stopping': '[reactpress] 正在停止 Docker 服务…',
         'docker.stopped': '[reactpress] Docker 服务已停止。',
         'docker.stopFailed': '[reactpress] 停止 Docker 失败:',

package/out/lib/lifecycle.js

@@ -10,9 +10,12 @@ const { loadServerSiteUrl, waitForHttp } = require('./http');
 const { getServerBin, getServerDir, isUsingMonorepoServer, canStartLocalApi, getPidFile, } = require('./paths');
 const net = require('net');
 const { readPid, isProcessRunning, clearPidFile, writePid } = require('./process');
+const { stopClient } = require('./client-lifecycle');
 const { ensureOriginalCwd } = require('./root');
 const { t } = require('./i18n');
+const { getPm2ServerMemoryRestart } = require('./prod-memory');
 const { ensureBundledServerDeps } = require('./server-bundle');
+const { PM2_API_APP, PM2_CLIENT_APP, isPm2RuntimeAvailable, isPm2AppOnline, getPm2AppPid, runPm2, stopPm2Apps, } = require('./pm2-runtime');
 function parseServerPort(projectRoot) {
     try {
         const url = new URL(loadServerSiteUrl(projectRoot));
@@ -67,51 +70,45 @@ function stopApi(projectRoot) {
     }
     clearPidFile(projectRoot);
 }
-async function startApi(projectRoot, { wait = true } = {}) {
-    if (!(await ensureConfig(projectRoot))) {
-        return 1;
-    }
-    const existing = readPid(projectRoot);
-    if (existing && isProcessRunning(existing)) {
-        console.log(t('lifecycle.apiAlreadyRunning', { pid: existing }));
-        return 0;
-    }
-    clearPidFile(projectRoot);
-    if (!canStartLocalApi(projectRoot)) {
-        console.error(t('lifecycle.noServerAvailable'));
-        return 1;
-    }
-    if (!isUsingMonorepoServer(projectRoot)) {
-        const bundled = await ensureBundledServerDeps(projectRoot);
-        if (!bundled.ok) {
-            console.error(bundled.message || t('bundle.serverBundle.notBuilt'));
-            return 1;
-        }
-    }
-    if (isUsingMonorepoServer(projectRoot)) {
-        console.log(t('lifecycle.startingLocalApi'));
-    }
-    else {
-        console.log(t('lifecycle.startingBundledApi'));
-    }
+function stopAll(projectRoot) {
+    stopPm2Apps(projectRoot, [PM2_API_APP, PM2_CLIENT_APP]);
+    stopClient(projectRoot);
+    stopApi(projectRoot);
+}
+async function startApiWithPm2(projectRoot, { wait = true } = {}) {
+    const serverBin = getServerBin(projectRoot);
+    const serverDir = getServerDir(projectRoot);
     const serverLogDir = path.join(projectRoot, '.reactpress', 'logs', 'server');
     fs.mkdirSync(serverLogDir, { recursive: true });
-    const child = spawn(process.execPath, [getServerBin(projectRoot)], {
-        cwd: getServerDir(projectRoot),
-        detached: true,
-        stdio: 'ignore',
+    const started = runPm2(projectRoot, [
+        'start',
+        serverBin,
+        '--name',
+        PM2_API_APP,
+        '--cwd',
+        serverDir,
+        '--max-memory-restart',
+        getPm2ServerMemoryRestart(),
+        '--update-env',
+        '-f',
+    ], {
         env: {
-            ...process.env,
             REACTPRESS_ORIGINAL_CWD: projectRoot,
             REACTPRESS_SERVER_LOG_DIR: serverLogDir,
         },
+        stdio: 'ignore',
     });
-    child.unref();
-    writePid(projectRoot, child.pid);
-    console.log(t('lifecycle.apiStartedBg', { pid: child.pid }));
-    if (!wait) {
-        return 0;
+    if (!started.ok) {
+        console.warn(t('lifecycle.processSupervisorFallback'));
+        return startApiDetached(projectRoot, { wait });
     }
+    const pid = getPm2AppPid(projectRoot, PM2_API_APP);
+    console.log(t('lifecycle.apiStartedBg', { pid: pid ?? PM2_API_APP }));
+    if (!wait)
+        return 0;
+    return waitForApiReady(projectRoot, pid);
+}
+async function waitForApiReady(projectRoot, pid) {
     const serverUrl = loadServerSiteUrl(projectRoot);
     const spinner = ora({
         text: t('dev.waitingApi', { url: serverUrl }),
@@ -121,8 +118,8 @@ async function startApi(projectRoot, { wait = true } = {}) {
     const deadline = Date.now() + 120_000;
     let ready = false;
     while (Date.now() < deadline) {
-        if (!isProcessRunning(child.pid)) {
-            spinner.fail(t('lifecycle.apiExitedEarly', { pid: child.pid }));
+        if (pid && !isProcessRunning(pid) && !isPm2AppOnline(projectRoot, PM2_API_APP)) {
+            spinner.fail(t('lifecycle.apiExitedEarly', { pid }));
             return 1;
         }
         if (await require('./http').isHttpResponding(serverUrl)) {
@@ -138,6 +135,63 @@ async function startApi(projectRoot, { wait = true } = {}) {
     spinner.succeed(t('lifecycle.apiReady', { url: serverUrl }));
     return 0;
 }
+async function startApiDetached(projectRoot, { wait = true } = {}) {
+    const serverLogDir = path.join(projectRoot, '.reactpress', 'logs', 'server');
+    fs.mkdirSync(serverLogDir, { recursive: true });
+    const child = spawn(process.execPath, [getServerBin(projectRoot)], {
+        cwd: getServerDir(projectRoot),
+        detached: true,
+        stdio: 'ignore',
+        env: {
+            ...process.env,
+            REACTPRESS_ORIGINAL_CWD: projectRoot,
+            REACTPRESS_SERVER_LOG_DIR: serverLogDir,
+        },
+    });
+    child.unref();
+    writePid(projectRoot, child.pid);
+    console.log(t('lifecycle.apiStartedBg', { pid: child.pid }));
+    if (!wait)
+        return 0;
+    return waitForApiReady(projectRoot, child.pid);
+}
+async function startApi(projectRoot, { wait = true } = {}) {
+    if (!(await ensureConfig(projectRoot))) {
+        return 1;
+    }
+    if (isPm2AppOnline(projectRoot, PM2_API_APP)) {
+        const pid = getPm2AppPid(projectRoot, PM2_API_APP);
+        console.log(t('lifecycle.apiAlreadyRunning', { pid: pid ?? PM2_API_APP }));
+        return 0;
+    }
+    const existing = readPid(projectRoot);
+    if (existing && isProcessRunning(existing)) {
+        console.log(t('lifecycle.apiAlreadyRunning', { pid: existing }));
+        return 0;
+    }
+    clearPidFile(projectRoot);
+    if (!canStartLocalApi(projectRoot)) {
+        console.error(t('lifecycle.noServerAvailable'));
+        return 1;
+    }
+    if (!isUsingMonorepoServer(projectRoot)) {
+        const bundled = await ensureBundledServerDeps(projectRoot);
+        if (!bundled.ok) {
+            console.error(bundled.message || t('bundle.serverBundle.notBuilt'));
+            return 1;
+        }
+    }
+    if (isUsingMonorepoServer(projectRoot)) {
+        console.log(t('lifecycle.startingLocalApi'));
+    }
+    else {
+        console.log(t('lifecycle.startingBundledApi'));
+    }
+    if (isPm2RuntimeAvailable(projectRoot)) {
+        return startApiWithPm2(projectRoot, { wait });
+    }
+    return startApiDetached(projectRoot, { wait });
+}
 async function statusApi(projectRoot) {
     const pid = readPid(projectRoot);
     const serverUrl = loadServerSiteUrl(projectRoot);
@@ -171,10 +225,10 @@ async function runLifecycleCommand(command, projectRoot = ensureOriginalCwd()) {
         case 'start:bg':
             return startApi(projectRoot, { wait: false });
         case 'stop':
-            stopApi(projectRoot);
+            stopAll(projectRoot);
             return 0;
         case 'restart':
-            stopApi(projectRoot);
+            stopAll(projectRoot);
             await waitForPortFree(parseServerPort(projectRoot));
             await new Promise((r) => setTimeout(r, 400));
             return startApi(projectRoot, { wait: true });
@@ -188,6 +242,7 @@ async function runLifecycleCommand(command, projectRoot = ensureOriginalCwd()) {
 module.exports = {
     startApi,
     stopApi,
+    stopAll,
     statusApi,
     runLifecycleCommand,
 };

package/out/lib/paths.js

@@ -95,6 +95,9 @@ function getClientBin(projectRoot) {
 function getPidFile(projectRoot) {
     return path.join(resolveProjectRoot(projectRoot), '.reactpress', 'server.pid');
 }
+function getClientPidFile(projectRoot) {
+    return path.join(resolveProjectRoot(projectRoot), '.reactpress', 'client.pid');
+}
 module.exports = {
     getMonorepoRoot,
     resolveProjectRoot,
@@ -113,5 +116,6 @@ module.exports = {
     getThemeBin,
     getClientBin,
     getPidFile,
+    getClientPidFile,
 };
 //# sourceMappingURL=paths.js.map