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

package/README.md

@@ -1,47 +1,42 @@
-# @fecommunity/reactpress-cli
+# @fecommunity/reactpress
 
-零配置一键初始化与管理 ReactPress CMS & 博客服务器。内置 NestJS 服务端，无需单独克隆 [fecommunity/reactpress](https://github.com/fecommunity/reactpress)。
+ReactPress 4 CLI — zero-dependency publishing platform. Initialize a local SQLite site and bundled API with a single command.
 
-完整文档与贡献指南见：[github.com/fecommunity/reactpress-cli](https://github.com/fecommunity/reactpress-cli)
+Monorepo docs: [github.com/fecommunity/reactpress](https://github.com/fecommunity/reactpress) · Chinese overview: [README-zh_CN.md](../README-zh_CN.md)
 
-## 安装
+## Install
 
 ```bash
-npm install -g @fecommunity/reactpress-cli
+npm install -g @fecommunity/reactpress
 ```
 
-全局命令为 `reactpress-cli`（与 npm 包名无关）。
+Requires Node.js 18+. On first install, `postinstall` downloads bundled server runtime dependencies (~1–2 minutes).
 
-> npm 上的无作用域包名 `reactpress-cli` 已被占用，本包发布为 `@fecommunity/reactpress-cli`。
-
-## 快速开始
+## Quick start
 
 ```bash
-mkdir my-blog && cd my-blog
-reactpress-cli init
-reactpress-cli start
+mkdir my-site && cd my-site
+reactpress init
 ```
 
-浏览器访问 `http://localhost:3002`（API 文档：`/api`）。
+- Site: `http://localhost:3001`
+- Admin: `http://localhost:3001/admin/` (`admin` / `admin`)
+- API: `http://127.0.0.1:3002/api`
 
-## 常用命令
+## Commands
 
-| 命令 | 说明 |
-|------|------|
-| `reactpress-cli init [dir]` | 初始化项目 |
-| `reactpress-cli start` | 启动服务（自动准备数据库） |
-| `reactpress-cli stop` | 停止服务 |
-| `reactpress-cli restart` | 重启服务 |
-| `reactpress-cli status` | 查看状态 |
-| `reactpress-cli config [key] [value]` | 查看/修改配置 |
-| `reactpress-cli config server.port 3003 --apply` | 改端口并重启 |
+| Command | Description |
+|---------|-------------|
+| `reactpress init [dir]` | Initialize project (default command) |
+| `reactpress doctor [dir]` | Diagnose Node.js, ports, database, and services |
+| `reactpress doctor logs [dir]` | Tail API logs (error / request / response) for debugging |
 
-## 要求
+## Requirements
 
 - Node.js 18+
 - macOS / Linux / Windows
-- 默认使用 Docker 运行嵌入式 MySQL；也可在 `.reactpress/config.json` 中配置外部数据库
+- No Docker, nginx, or MySQL required (embedded SQLite + bundled API)
 
-## 许可证
+## License
 
 MIT © FECommunity

package/out/bin/reactpress.js

@@ -20,6 +20,7 @@ const { t } = require('../lib/i18n');
 const { describeProject } = require('../lib/project-type');
 const { refreshBannerWithStartup } = require('../ui/banner-startup');
 const { runDoctor } = require('../lib/doctor');
+const { runDoctorLogs } = require('../lib/project-logs');
 const LEGACY_COMMANDS = new Set([
     'start',
     'dev',
@@ -65,6 +66,8 @@ async function startServices(projectRoot) {
     const code = await runLifecycleCommand('start', projectRoot);
     if (code !== 0)
         process.exit(code);
+    const { ensureDefaultTheme } = require('../core/services/theme-bootstrap');
+    await ensureDefaultTheme(projectRoot);
     printRunningPanel(projectRoot);
     try {
         const themeBin = getThemeBin(projectRoot);
@@ -108,20 +111,42 @@ program
     .action(async (directory, options) => {
     await runInit(directory || '.', options);
 });
-program
-    .command('doctor [directory]')
+const doctorCommand = program
+    .command('doctor')
+    .description(t('cli.doctor.description'));
+doctorCommand
+    .command('logs [directory]')
+    .description(t('cli.doctor.logs.description'))
+    .option('--tail <n>', t('cli.doctor.logs.tailOption'), '50')
+    .option('--source <name>', t('cli.doctor.logs.sourceOption'), 'error')
+    .option('--grep <pattern>', t('cli.doctor.logs.grepOption'))
+    .option('--list', t('cli.doctor.logs.listOption'))
+    .action(async (directory, options) => {
+    const projectRoot = path.resolve(directory || '.');
+    process.env.REACTPRESS_ORIGINAL_CWD = projectRoot;
+    const code = await runDoctorLogs(projectRoot, options);
+    process.exit(code);
+});
+doctorCommand
+    .command('check [directory]', { isDefault: true })
     .description(t('cli.doctor.description'))
-    .action(async (directory) => {
+    .option('--show-logs', t('cli.doctor.showLogs'))
+    .action(async (directory, options) => {
     const projectRoot = path.resolve(directory || '.');
     process.env.REACTPRESS_ORIGINAL_CWD = projectRoot;
-    const code = await runDoctor(projectRoot);
+    const code = await runDoctor(projectRoot, options);
     process.exit(code);
 });
 program.on('--help', () => {
     console.log('');
     console.log(brand.bold(t('cli.help.examples')));
     console.log(divider(40));
-    for (const line of [t('cli.help.init'), t('cli.help.doctor'), t('cli.help.zeroDep')]) {
+    for (const line of [
+        t('cli.help.init'),
+        t('cli.help.doctor'),
+        t('cli.help.doctorLogs'),
+        t('cli.help.zeroDep'),
+    ]) {
         console.log(brand.dim(line));
     }
     console.log('');

package/out/core/services/theme-bootstrap.js

@@ -18,7 +18,7 @@ function writeActiveThemeManifest(projectRoot, themeId, themeDir) {
 }
 /** Install catalog featured theme when no resolvable theme exists (npm standalone init). */
 async function ensureDefaultTheme(projectRoot) {
-    const { hasResolvableActiveTheme, } = require('../../lib/theme-runtime');
+    const { hasResolvableActiveTheme } = require('../../lib/theme-runtime');
     const { installThemeFromNpm } = require('../../lib/theme-install');
     const { readThemeCatalog } = require('../../lib/theme-registry');
     const { t } = require('../../lib/i18n');
@@ -27,7 +27,8 @@ async function ensureDefaultTheme(projectRoot) {
         return { installed: false, skipped: true };
     }
     const catalog = readThemeCatalog(root);
-    const featured = catalog.themes.find((entry) => entry.featured && entry.npm) ?? catalog.themes.find((entry) => entry.npm);
+    const featured = catalog.themes.find((entry) => entry.featured && entry.npm) ??
+        catalog.themes.find((entry) => entry.npm);
     if (!featured?.npm) {
         return { installed: false, error: 'NO_CATALOG_THEME' };
     }

package/out/lib/doctor.js

@@ -13,6 +13,7 @@ const { checkNginx } = require('./nginx');
 const { envFileStatus } = require('./status');
 const { describeProject } = require('./project-type');
 const { t } = require('./i18n');
+const { runDoctorLogs } = require('./project-logs');
 function checkNodeVersion() {
     const major = parseInt(process.versions.node.split('.')[0], 10);
     if (major >= 18) {
@@ -301,7 +302,7 @@ async function runCheckWithSpinner(name, run) {
     }
     return result;
 }
-async function runDoctor(projectRoot) {
+async function runDoctor(projectRoot, options = {}) {
     const profile = await resolveProjectProfile(projectRoot);
     applyProjectRuntimeEnv(profile);
     const env = envFileStatus(projectRoot);
@@ -366,6 +367,13 @@ async function runDoctor(projectRoot) {
                 console.log(`    ${brand.primary('→')}  ${brand.dim(name)}  ${brand.warn(fix)}`);
             }
         }
+        if (!options.showLogs) {
+            console.log('');
+            console.log(`  ${brand.dim(t('doctor.logsHint'))}`);
+        }
+    }
+    if (options.showLogs) {
+        await runDoctorLogs(projectRoot, { tail: 40, source: 'error' });
     }
     console.log('');
     return failed === 0 ? 0 : 1;

package/out/lib/i18n/strings.js

@@ -70,6 +70,12 @@ const STRINGS = {
         'cli.help.nginx': '  reactpress nginx up          Start reverse proxy (:80)',
         'cli.status.description': 'Project, API, frontend, and Docker status',
         'cli.doctor.description': 'Diagnose Node, Docker, ports, database, and API health',
+        'cli.doctor.showLogs': 'Show recent API error logs after diagnostics',
+        'cli.doctor.logs.description': 'View recent API logs (error, request, response)',
+        'cli.doctor.logs.tailOption': 'Number of lines to show per log file',
+        '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.db.description': 'Database operations',
         'cli.db.backup': 'Backup current project database with mysqldump',
         'cli.db.backup.output': 'Output SQL file path',
@@ -80,6 +86,7 @@ const STRINGS = {
         'cli.help.examples': 'Usage:',
         'cli.help.init': '  reactpress init              Initialize (default)',
         'cli.help.doctor': '  reactpress doctor            Diagnose environment issues',
+        'cli.help.doctorLogs': '  reactpress doctor logs       Tail API logs for quick debugging',
         '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',
@@ -408,6 +415,20 @@ 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.logs.subtitle': 'API log viewer',
+        'doctor.logs.dir': 'Log dir   {path}',
+        'doctor.logs.empty': 'No API log files found yet.',
+        'doctor.logs.emptyHint': 'Start the API with reactpress init — logs are written to .reactpress/logs/server/',
+        'doctor.logs.listHeader': 'Available log files',
+        'doctor.logs.fileHeader': '{file} (showing {count} line(s))',
+        'doctor.logs.noMatchingLines': 'No matching log lines.',
+        'doctor.logs.badPattern': 'Invalid grep pattern: {pattern}',
+        '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)',
         'status.title': 'ReactPress project status',
         'status.dir': 'Project     {path}',
         'status.apiSource': 'API source  {source}',
@@ -703,6 +724,12 @@ const STRINGS = {
         'cli.help.nginx': '  reactpress nginx up          启动反向代理 (:80)',
         'cli.status.description': '查看项目、API、前端、Docker 综合状态',
         'cli.doctor.description': '诊断环境：Node、Docker、端口、数据库、API 健康',
+        'cli.doctor.showLogs': '诊断结束后显示最近的 API 错误日志',
+        'cli.doctor.logs.description': '查看 API 日志（error / request / response）',
+        'cli.doctor.logs.tailOption': '每个日志文件显示的行数',
+        'cli.doctor.logs.sourceOption': '日志类型：error、request、response 或 all',
+        'cli.doctor.logs.grepOption': '用正则过滤日志行',
+        'cli.doctor.logs.listOption': '仅列出可用日志文件',
         'cli.db.description': '数据库运维',
         'cli.db.backup': '使用 mysqldump 备份当前项目数据库',
         'cli.db.backup.output': '输出 SQL 文件路径',
@@ -713,6 +740,7 @@ const STRINGS = {
         'cli.help.examples': '用法:',
         'cli.help.init': '  reactpress init              初始化（默认命令）',
         'cli.help.doctor': '  reactpress doctor            诊断环境问题',
+        'cli.help.doctorLogs': '  reactpress doctor logs       查看 API 日志，快速定位问题',
         'cli.help.zeroDep': '  零依赖：仅需 Node.js 18+，无需 Docker、nginx 或 MySQL',
         'cli.plugin.description': '管理 ReactPress 插件',
         'cli.plugin.install.description': '安装本地插件到 .reactpress/plugins',
@@ -1040,6 +1068,20 @@ 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.logs.subtitle': 'API 日志查看',
+        'doctor.logs.dir': '日志目录  {path}',
+        'doctor.logs.empty': '尚未找到 API 日志文件。',
+        'doctor.logs.emptyHint': '运行 reactpress init 启动 API 后，日志会写入 .reactpress/logs/server/',
+        'doctor.logs.listHeader': '可用日志文件',
+        'doctor.logs.fileHeader': '{file}（显示 {count} 行）',
+        'doctor.logs.noMatchingLines': '没有匹配的日志行。',
+        'doctor.logs.badPattern': 'grep 正则无效：{pattern}',
+        '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）',
         'status.title': 'ReactPress 项目状态',
         'status.dir': '项目目录    {path}',
         'status.apiSource': 'API 来源    {source}',

package/out/lib/lifecycle.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const fs = require('fs');
+const path = require('path');
 const { spawn } = require('child_process');
 const ora = require('ora');
 const { ensureProjectEnvironment } = require('./bootstrap');
@@ -92,6 +94,8 @@ async function startApi(projectRoot, { wait = true } = {}) {
     else {
         console.log(t('lifecycle.startingBundledApi'));
     }
+    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,
@@ -99,6 +103,7 @@ async function startApi(projectRoot, { wait = true } = {}) {
         env: {
             ...process.env,
             REACTPRESS_ORIGINAL_CWD: projectRoot,
+            REACTPRESS_SERVER_LOG_DIR: serverLogDir,
         },
     });
     child.unref();

package/out/lib/project-logs.js

@@ -0,0 +1,197 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+const fs = require('fs');
+const path = require('path');
+const { brand, divider, gradientText, palette, sectionHeader } = require('../ui/theme');
+const { getServerDir, getPidFile } = require('./paths');
+const { readPid, isProcessRunning } = require('./process');
+const { t } = require('./i18n');
+const LOG_SOURCES = ['error', 'request', 'response'];
+function getProjectServerLogDir(projectRoot) {
+    const preferred = path.join(projectRoot, '.reactpress', 'logs', 'server');
+    if (fs.existsSync(preferred)) {
+        return preferred;
+    }
+    const bundled = path.join(getServerDir(projectRoot), 'logs');
+    if (fs.existsSync(bundled)) {
+        return bundled;
+    }
+    return preferred;
+}
+function normalizeSource(source) {
+    const value = String(source || 'error').toLowerCase();
+    if (value === 'all')
+        return 'all';
+    if (LOG_SOURCES.includes(value))
+        return value;
+    return 'error';
+}
+function listLogFiles(logDir, source = 'error') {
+    const normalized = normalizeSource(source);
+    const sources = normalized === 'all' ? LOG_SOURCES : [normalized];
+    const files = [];
+    for (const name of sources) {
+        const dir = path.join(logDir, name);
+        if (!fs.existsSync(dir))
+            continue;
+        for (const entry of fs.readdirSync(dir)) {
+            if (!entry.endsWith('.log'))
+                continue;
+            const fullPath = path.join(dir, entry);
+            let stat;
+            try {
+                stat = fs.statSync(fullPath);
+            }
+            catch {
+                continue;
+            }
+            if (!stat.isFile())
+                continue;
+            files.push({
+                source: name,
+                path: fullPath,
+                name: entry,
+                mtimeMs: stat.mtimeMs,
+                size: stat.size,
+            });
+        }
+    }
+    files.sort((a, b) => b.mtimeMs - a.mtimeMs);
+    return files;
+}
+function readTailLines(filePath, lineCount = 50) {
+    const maxLines = Math.max(1, Math.min(Number(lineCount) || 50, 5000));
+    let content;
+    try {
+        content = fs.readFileSync(filePath, 'utf8');
+    }
+    catch {
+        return [];
+    }
+    if (!content)
+        return [];
+    const lines = content.split(/\r?\n/);
+    if (lines.length && lines[lines.length - 1] === '') {
+        lines.pop();
+    }
+    if (lines.length <= maxLines)
+        return lines;
+    return lines.slice(-maxLines);
+}
+function filterLines(lines, pattern) {
+    if (!pattern)
+        return lines;
+    let re;
+    try {
+        re = new RegExp(pattern, 'i');
+    }
+    catch {
+        const err = new Error(t('doctor.logs.badPattern', { pattern }));
+        err.code = 'REACTPRESS_LOG_BAD_PATTERN';
+        throw err;
+    }
+    return lines.filter((line) => re.test(line));
+}
+function formatBytes(size) {
+    if (size < 1024)
+        return `${size} B`;
+    if (size < 1024 * 1024)
+        return `${(size / 1024).toFixed(1)} KB`;
+    return `${(size / (1024 * 1024)).toFixed(1)} MB`;
+}
+function formatTimestamp(ms) {
+    return new Date(ms).toISOString().replace('T', ' ').slice(0, 19);
+}
+function printProcessHint(projectRoot) {
+    const pid = readPid(projectRoot);
+    const pidFile = getPidFile(projectRoot);
+    if (!pid) {
+        console.log(`  ${brand.dim(t('doctor.logs.noPid', { path: pidFile }))}`);
+        return;
+    }
+    const alive = isProcessRunning(pid);
+    console.log(`  ${brand.dim(alive
+        ? t('doctor.logs.pidRunning', { pid, path: pidFile })
+        : t('doctor.logs.pidStale', { pid, path: pidFile }))}`);
+}
+async function runDoctorLogs(projectRoot, options = {}) {
+    const tail = Math.max(1, Math.min(parseInt(String(options.tail ?? '50'), 10) || 50, 5000));
+    const source = normalizeSource(options.source);
+    const logDir = getProjectServerLogDir(projectRoot);
+    const files = listLogFiles(logDir, source);
+    const w = 56;
+    console.log('');
+    console.log(`  ${gradientText(t('doctor.logs.title'), [palette.primary, palette.accent], { bold: true })}  ${brand.dim(t('doctor.logs.subtitle'))}`);
+    console.log(`  ${brand.dim(t('doctor.project', { path: projectRoot }))}`);
+    console.log(`  ${brand.dim(t('doctor.logs.dir', { path: logDir }))}`);
+    printProcessHint(projectRoot);
+    console.log(`  ${divider(w)}`);
+    if (options.list) {
+        if (!files.length) {
+            console.log(`  ${brand.warn(t('doctor.logs.empty'))}`);
+            console.log(`  ${brand.dim(t('doctor.logs.emptyHint'))}`);
+            console.log('');
+            return 1;
+        }
+        console.log(sectionHeader(t('doctor.logs.listHeader')));
+        for (const file of files) {
+            const rel = path.join(file.source, file.name);
+            console.log(`    ${brand.primary(rel)}  ${brand.dim(`${formatBytes(file.size)}  ${formatTimestamp(file.mtimeMs)}`)}`);
+        }
+        console.log('');
+        return 0;
+    }
+    if (!files.length) {
+        console.log(`  ${brand.warn(t('doctor.logs.empty'))}`);
+        console.log(`  ${brand.dim(t('doctor.logs.emptyHint'))}`);
+        console.log('');
+        return 1;
+    }
+    const grouped = new Map();
+    for (const file of files) {
+        if (!grouped.has(file.source))
+            grouped.set(file.source, file);
+    }
+    let printed = 0;
+    for (const name of source === 'all' ? LOG_SOURCES : [source]) {
+        const file = grouped.get(name);
+        if (!file)
+            continue;
+        let lines = readTailLines(file.path, tail);
+        lines = filterLines(lines, options.grep);
+        const rel = path.join(file.source, file.name);
+        console.log('');
+        console.log(sectionHeader(t('doctor.logs.fileHeader', {
+            file: rel,
+            count: lines.length,
+        })));
+        if (!lines.length) {
+            console.log(`    ${brand.dim(t('doctor.logs.noMatchingLines'))}`);
+            continue;
+        }
+        for (const line of lines) {
+            const isError = /\[ERROR\]/i.test(line) || name === 'error';
+            console.log(`    ${isError ? brand.warn(line) : brand.dim(line)}`);
+        }
+        printed += lines.length;
+    }
+    if (!printed) {
+        console.log(`  ${brand.warn(t('doctor.logs.noMatchingLines'))}`);
+        console.log('');
+        return 1;
+    }
+    console.log('');
+    console.log(`  ${brand.dim(t('doctor.logs.moreHint'))}`);
+    console.log('');
+    return 0;
+}
+module.exports = {
+    LOG_SOURCES,
+    getProjectServerLogDir,
+    listLogFiles,
+    readTailLines,
+    filterLines,
+    runDoctorLogs,
+};
+//# sourceMappingURL=project-logs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.12",
   "description": "ReactPress 4 — zero-dependency publishing platform. Commands: reactpress init, reactpress doctor",
   "author": "fecommunity",
   "license": "MIT",

package/server/bin/reactpress-server.js

@@ -154,6 +154,22 @@ function startWithPM2() {
   }
 }
 
+// Function to prepend bundled runtime paths so sibling toolkit/ can resolve server/node_modules.
+function prependNodePath(...dirs) {
+  const Module = require('module');
+  const sep = path.delimiter;
+  const parts = (process.env.NODE_PATH || '').split(sep).filter(Boolean);
+  for (const dir of dirs) {
+    if (fs.existsSync(dir) && !parts.includes(dir)) {
+      parts.unshift(dir);
+    }
+  }
+  if (parts.length) {
+    process.env.NODE_PATH = parts.join(sep);
+    Module._initPaths();
+  }
+}
+
 // Function to start with regular Node.js
 function startWithNode() {
   // Check if the server is built
@@ -186,6 +202,9 @@ function startWithNode() {
   // Set environment variables
   process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
+  // Bundled CLI layout: toolkit/ is a sibling of server/; expose server deps to toolkit requires.
+  prependNodePath(path.join(serverDir, 'node_modules'));
+
   // Import and run the server (require() alone does not invoke main — see dist/main.js)
   try {
     const mainModule = require(distPath);

package/server/dist/app.module.js

@@ -7,9 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppModule = void 0;
-const reactpress_toolkit_1 = require("../../toolkit/dist");
+const config_1 = require("../../toolkit/dist/config");
 const common_1 = require("@nestjs/common");
-const config_1 = require("@nestjs/config");
+const config_2 = require("@nestjs/config");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_options_1 = require("./database/typeorm-options");
 const api_key_module_1 = require("./modules/api-key/api-key.module");
@@ -35,10 +35,10 @@ let AppModule = class AppModule {
 AppModule = __decorate([
     (0, common_1.Module)({
         imports: [
-            config_1.ConfigModule.forRoot({ isGlobal: true, envFilePath: [reactpress_toolkit_1.config.file] }),
+            config_2.ConfigModule.forRoot({ isGlobal: true, envFilePath: [config_1.config.file] }),
             typeorm_1.TypeOrmModule.forRootAsync({
-                imports: [config_1.ConfigModule],
-                inject: [config_1.ConfigService],
+                imports: [config_2.ConfigModule],
+                inject: [config_2.ConfigService],
                 useFactory: async (configService) => (0, typeorm_options_1.createTypeOrmOptions)(configService),
             }),
             user_module_1.UserModule,

package/server/dist/main.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = void 0;
 require("./node-polyfills");
 const bodyParser = require("body-parser");
 const express = require("express");
@@ -141,6 +142,7 @@ const main = async () => {
         process.exit(1);
     }
 };
+exports.main = main;
 const getProjectRoot = () => {
     if (process.env.REACTPRESS_ORIGINAL_CWD) {
         if (!(0, local_api_quiet_util_1.isLocalApiQuiet)()) {

package/server/dist/modules/extension/extension.module.js

@@ -27,7 +27,9 @@ let ExtensionModule = class ExtensionModule {
         this.pluginLoader = pluginLoader;
     }
     onModuleInit() {
-        void this.themeService.ensureDefaultTheme();
+        void this.themeService.ensureDefaultTheme().catch((err) => {
+            console.warn('[ThemeService] ensureDefaultTheme skipped:', err instanceof Error ? err.message : err);
+        });
         void this.pluginLoader.loadActivePlugins();
     }
 };

package/server/dist/modules/extension/preview-draft.store.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPreviewDraft = exports.putPreviewDraft = void 0;
-const theme_1 = require("../../../../toolkit/dist/theme");
+const extension_1 = require("../../../../toolkit/dist/theme/extension");
 const crypto_1 = require("crypto");
 const TTL_MS = 30 * 60 * 1000;
 const store = new Map();

package/server/dist/modules/extension/theme-registry.bridge.js

@@ -5,11 +5,33 @@ const fs = require("fs");
 const path = require("path");
 const project_root_util_1 = require("../../utils/project-root.util");
 let cached = null;
+function resolveBundledCliPackageRoot() {
+    const serverRoot = path.join(__dirname, '..', '..', '..');
+    const cliRoot = path.dirname(serverRoot);
+    const registryPath = path.join(cliRoot, 'out', 'lib', 'theme-registry.js');
+    if (fs.existsSync(registryPath)) {
+        return cliRoot;
+    }
+    try {
+        const pkgPath = path.join(cliRoot, 'package.json');
+        if (!fs.existsSync(pkgPath))
+            return null;
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+        if (pkg.name === '@fecommunity/reactpress') {
+            return cliRoot;
+        }
+    }
+    catch (_a) {
+    }
+    return null;
+}
 function resolveThemeRegistryPath(monorepoRoot) {
+    const bundledCliRoot = resolveBundledCliPackageRoot();
     const candidates = [
+        bundledCliRoot ? path.join(bundledCliRoot, 'out', 'lib', 'theme-registry.js') : null,
         path.join(monorepoRoot, 'cli', 'out', 'lib', 'theme-registry.js'),
         path.join(monorepoRoot, 'cli', 'lib', 'theme-registry.js'),
-    ];
+    ].filter(Boolean);
     for (const candidate of candidates) {
         if (fs.existsSync(candidate))
             return candidate;

package/server/dist/modules/extension/theme.service.js

@@ -14,8 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 var ThemeService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThemeService = void 0;
-const theme_1 = require("../../../../toolkit/dist/theme");
-const theme_2 = require("../../../../toolkit/dist/theme");
+const extension_1 = require("../../../../toolkit/dist/theme/extension");
+const extension_2 = require("../../../../toolkit/dist/theme/extension");
 const node_1 = require("../../../../toolkit/dist/theme/node");
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
@@ -26,7 +26,7 @@ const typeorm_2 = require("typeorm");
 const project_root_util_1 = require("../../utils/project-root.util");
 const setting_service_1 = require("../setting/setting.service");
 const setting_entity_1 = require("../setting/setting.entity");
-const theme_placeholder_cover_js_1 = require("../../../../cli/out/lib/theme-placeholder-cover.js");
+const theme_placeholder_cover_1 = require("../../utils/theme-placeholder-cover");
 const theme_registry_bridge_1 = require("./theme-registry.bridge");
 const preview_draft_store_1 = require("./preview-draft.store");
 function projectRoot() {
@@ -119,14 +119,14 @@ let ThemeService = ThemeService_1 = class ThemeService {
             return null;
         try {
             const raw = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
-            const parsed = (0, theme_2.parseThemeManifest)(raw);
+            const parsed = (0, extension_2.parseThemeManifest)(raw);
             if (parsed)
                 return parsed;
             if (raw && typeof raw.id === 'string') {
-                return (0, theme_2.parseThemeManifest)(Object.assign(Object.assign({}, raw), { id: raw.id }));
+                return (0, extension_2.parseThemeManifest)(Object.assign(Object.assign({}, raw), { id: raw.id }));
             }
             const id = path.basename(themeDir);
-            return (0, theme_2.parseThemeManifest)(Object.assign({ id, name: id, version: '1.0.0' }, raw));
+            return (0, extension_2.parseThemeManifest)(Object.assign({ id, name: id, version: '1.0.0' }, raw));
         }
         catch (_a) {
             return null;
@@ -222,11 +222,11 @@ let ThemeService = ThemeService_1 = class ThemeService {
     }
     async getThemeState() {
         const row = await this.getSettingRow();
-        return (0, theme_2.getThemeStateFromGlobalSetting)(this.parseGlobalSetting(row));
+        return (0, extension_2.getThemeStateFromGlobalSetting)(this.parseGlobalSetting(row));
     }
     async saveThemeState(patch) {
         const row = await this.getSettingRow();
-        const merged = (0, theme_2.mergeThemeStateIntoGlobalSetting)(this.parseGlobalSetting(row), patch);
+        const merged = (0, extension_2.mergeThemeStateIntoGlobalSetting)(this.parseGlobalSetting(row), patch);
         row.globalSetting = JSON.stringify(merged);
         await this.settingRepository.save(row);
         return merged.theme;
@@ -367,7 +367,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
         const manifest = this.getThemeManifestForConfig(themeId);
         if (!manifest)
             throw new common_1.NotFoundException(`Theme "${themeId}" not found`);
-        const schema = (0, theme_2.getConfigurationSchemaFromManifest)(manifest, themeId);
+        const schema = (0, extension_2.getConfigurationSchemaFromManifest)(manifest, themeId);
         return { themeId, schema };
     }
     async getThemeConfiguration(themeId) {
@@ -378,7 +378,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
         if (!manifest)
             throw new common_1.NotFoundException(`Theme "${themeId}" not found`);
         const row = await this.getSettingRow();
-        const configuration = (0, theme_2.getMergedThemeConfiguration)(this.parseGlobalSetting(row), themeId, {
+        const configuration = (0, extension_2.getMergedThemeConfiguration)(this.parseGlobalSetting(row), themeId, {
             manifest,
         });
         return { themeId, configuration };
@@ -391,7 +391,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
         const manifest = this.getThemeManifestForConfig(themeId);
         if (!manifest)
             throw new common_1.NotFoundException(`Theme "${themeId}" not found`);
-        const schema = (0, theme_2.getConfigurationSchemaFromManifest)(manifest, themeId);
+        const schema = (0, extension_2.getConfigurationSchemaFromManifest)(manifest, themeId);
         if (!schema) {
             throw new common_1.BadRequestException(`Theme "${themeId}" does not declare options schema`);
         }
@@ -399,21 +399,21 @@ let ThemeService = ThemeService_1 = class ThemeService {
         const globalRaw = this.parseGlobalSetting(row);
         const locale = (_a = options === null || options === void 0 ? void 0 : options.locale) !== null && _a !== void 0 ? _a : 'zh';
         if (options === null || options === void 0 ? void 0 : options.replace) {
-            const seed = (_b = (0, theme_2.getThemeConfigurationSeed)(themeId, locale)) !== null && _b !== void 0 ? _b : (0, theme_2.getMergedThemeConfiguration)(globalRaw, themeId, { locale, manifest });
-            const validation = (0, theme_2.validateThemeConfiguration)(schema, seed);
+            const seed = (_b = (0, extension_2.getThemeConfigurationSeed)(themeId, locale)) !== null && _b !== void 0 ? _b : (0, extension_2.getMergedThemeConfiguration)(globalRaw, themeId, { locale, manifest });
+            const validation = (0, extension_2.validateThemeConfiguration)(schema, seed);
             if (!validation.valid) {
                 throw new common_1.BadRequestException((_c = validation.message) !== null && _c !== void 0 ? _c : 'Invalid configuration');
             }
-            const mergedGlobal = (0, theme_2.mergeConfigIntoGlobalSetting)(globalRaw, themeId, seed);
+            const mergedGlobal = (0, extension_2.mergeConfigIntoGlobalSetting)(globalRaw, themeId, seed);
             row.globalSetting = JSON.stringify(mergedGlobal);
             await this.settingRepository.save(row);
             return { themeId, configuration: seed };
         }
-        const result = (0, theme_2.validateAndMergeThemeConfiguration)(themeId, globalRaw, patch, manifest);
+        const result = (0, extension_2.validateAndMergeThemeConfiguration)(themeId, globalRaw, patch, manifest);
         if (!result.ok) {
             throw new common_1.BadRequestException('message' in result ? result.message : 'Invalid configuration');
         }
-        const mergedGlobal = (0, theme_2.mergeConfigIntoGlobalSetting)(globalRaw, themeId, result.config);
+        const mergedGlobal = (0, extension_2.mergeConfigIntoGlobalSetting)(globalRaw, themeId, result.config);
         row.globalSetting = JSON.stringify(mergedGlobal);
         await this.settingRepository.save(row);
         return { themeId, configuration: result.config };
@@ -798,7 +798,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
         var _a;
         const manifest = this.getThemeManifestFromSources(id);
         const defaults = this.themeAppearanceDefaults(manifest);
-        return (0, theme_placeholder_cover_js_1.buildThemePlaceholderCoverSvg)({
+        return (0, theme_placeholder_cover_1.buildThemePlaceholderCoverSvg)({
             id,
             name: (_a = manifest === null || manifest === void 0 ? void 0 : manifest.name) !== null && _a !== void 0 ? _a : id,
             primary: defaults.primaryColor,
@@ -916,7 +916,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
             state.activeTheme,
             'hello-world',
             ...state.installedThemes,
-            theme_2.defaultSiteThemeState.activeTheme,
+            extension_2.defaultSiteThemeState.activeTheme,
         ];
         const seen = new Set();
         for (const id of candidates) {
@@ -948,7 +948,7 @@ let ThemeService = ThemeService_1 = class ThemeService {
                 activeTheme = saved.activeTheme;
             }
             else if (!activeTheme) {
-                const saved = await this.saveThemeState(theme_2.defaultSiteThemeState);
+                const saved = await this.saveThemeState(extension_2.defaultSiteThemeState);
                 activeTheme = saved.activeTheme;
             }
         }

package/server/dist/modules/setting/setting.constant.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UNPROTECTED_KEYS = exports.settings = exports.i18n = void 0;
-const theme_1 = require("../../../../toolkit/dist/theme");
+const extension_1 = require("../../../../toolkit/dist/theme/extension");
 var config_1 = require("../../../../toolkit/dist/config");
 Object.defineProperty(exports, "i18n", { enumerable: true, get: function () { return config_1.messages; } });
-exports.settings = theme_1.systemGlobalSettingDefaults;
-exports.UNPROTECTED_KEYS = [...theme_1.PUBLIC_SETTING_KEYS];
+exports.settings = extension_1.systemGlobalSettingDefaults;
+exports.UNPROTECTED_KEYS = [...extension_1.PUBLIC_SETTING_KEYS];
 //# sourceMappingURL=setting.constant.js.map

package/server/dist/modules/setting/setting.service.js

@@ -13,7 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingService = void 0;
-const theme_1 = require("../../../../toolkit/dist/theme");
+const extension_1 = require("../../../../toolkit/dist/theme/extension");
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
 const typeorm_1 = require("@nestjs/typeorm");
@@ -121,8 +121,8 @@ let SettingService = class SettingService {
         catch (_b) {
             data = {};
         }
-        const themeState = (0, theme_1.getThemeStateFromGlobalSetting)(data);
-        const defaultTheme = (0, theme_1.getThemeStateFromGlobalSetting)(setting_constant_1.settings);
+        const themeState = (0, extension_1.getThemeStateFromGlobalSetting)(data);
+        const defaultTheme = (0, extension_1.getThemeStateFromGlobalSetting)(setting_constant_1.settings);
         const mergedTheme = Object.assign(Object.assign(Object.assign({}, defaultTheme), themeState), { mods: Object.assign(Object.assign({}, defaultTheme.mods), themeState.mods), installedThemes: ((_a = themeState.installedThemes) === null || _a === void 0 ? void 0 : _a.length) > 0 ? themeState.installedThemes : defaultTheme.installedThemes });
         const mergedSettings = Object.assign(Object.assign({}, data), { theme: mergedTheme });
         const mergedSettingsString = JSON.stringify(mergedSettings);
@@ -166,7 +166,7 @@ let SettingService = class SettingService {
         catch (_a) {
             gs = {};
         }
-        const { global, changed } = (0, theme_1.migrateLegacyAppearanceToThemeMods)(gs, target);
+        const { global, changed } = (0, extension_1.migrateLegacyAppearanceToThemeMods)(gs, target);
         if (changed) {
             target.globalSetting = JSON.stringify(global);
             await this.settingRepository.save(target);
@@ -184,14 +184,14 @@ let SettingService = class SettingService {
         catch (_a) {
             gs = {};
         }
-        const themeState = (0, theme_1.getThemeStateFromGlobalSetting)(gs);
+        const themeState = (0, extension_1.getThemeStateFromGlobalSetting)(gs);
         const activeTheme = themeState.activeTheme || 'hello-world';
         const config = gs.config && typeof gs.config === 'object'
             ? Object.assign({}, gs.config)
             : {};
         let changed = false;
         for (const themeId of THEMES_WITH_CONFIGURATION) {
-            const seed = (0, theme_1.getThemeConfigurationSeed)(themeId, 'zh');
+            const seed = (0, extension_1.getThemeConfigurationSeed)(themeId, 'zh');
             if (!seed)
                 continue;
             const current = config[themeId];
@@ -221,16 +221,16 @@ let SettingService = class SettingService {
         if (isAdmin && !innerInvoke) {
             return res;
         }
-        const effective = (0, theme_1.resolveEffectiveSettingRow)(res);
+        const effective = (0, extension_1.resolveEffectiveSettingRow)(res);
         if (innerInvoke) {
             return effective;
         }
-        return (0, theme_1.buildPublicSettingView)(effective);
+        return (0, extension_1.buildPublicSettingView)(effective);
     }
     async update(setting) {
         var _a;
         const old = await this.ensureSettingRow();
-        const sanitized = (0, theme_1.pickSystemSettingPatch)(setting);
+        const sanitized = (0, extension_1.pickSystemSettingPatch)(setting);
         if ('smtpPass' in sanitized && !String((_a = sanitized.smtpPass) !== null && _a !== void 0 ? _a : '').trim()) {
             delete sanitized.smtpPass;
         }

package/server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@fecommunity/reactpress-server",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@fecommunity/reactpress-server",
-      "version": "4.0.0-beta.10",
+      "version": "4.0.0-beta.12",
       "deprecated": "Use the built-in API in @fecommunity/reactpress (CLI). Standalone server publishing stopped from 3.1.",
       "license": "MIT",
       "dependencies": {
@@ -91,7 +91,15 @@
     },
     "../toolkit": {
       "name": "@fecommunity/reactpress-toolkit",
-      "version": "4.0.0-beta.10"
+      "version": "4.0.0-beta.12",
+      "dependencies": {
+        "ajv": "^8.17.1",
+        "axios": "^1.12.2",
+        "dotenv": "^8.6.0",
+        "fs-extra": "^10.0.0",
+        "lodash": "^4.17.21",
+        "swagger-typescript-api": "^12.0.4"
+      }
     },
     "node_modules/@angular-devkit/core": {
       "version": "7.3.8",

package/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress-server",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.12",
   "deprecated": "Use the built-in API in @fecommunity/reactpress (CLI). Standalone server publishing stopped from 3.1.",
   "description": "ReactPress NestJS CMS API — headless REST for the publishing platform (MySQL or SQLite)",
   "author": "fecommunity",

package/toolkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress-toolkit",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.12",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -44,6 +44,10 @@
       "types": "./dist/theme/node.d.ts",
       "default": "./dist/theme/node.js"
     },
+    "./theme/extension": {
+      "types": "./dist/theme/extension/index.d.ts",
+      "default": "./dist/theme/extension/index.js"
+    },
     "./theme/providers": {
       "types": "./dist/theme/providers/index.d.ts",
       "default": "./dist/theme/providers/index.js"
@@ -92,5 +96,13 @@
       "types": "./dist/plugin/node.d.ts",
       "default": "./dist/plugin/node.js"
     }
+  },
+  "dependencies": {
+    "ajv": "^8.17.1",
+    "axios": "^1.12.2",
+    "dotenv": "^8.6.0",
+    "fs-extra": "^10.0.0",
+    "lodash": "^4.17.21",
+    "swagger-typescript-api": "^12.0.4"
   }
 }