nodebbs 0.4.1 → 0.4.2

package/dist/commands/pack/index.js

@@ -1,15 +1,16 @@
 import { Command, Flags } from '@oclif/core';
 import { execa } from 'execa';
-import * as fs from 'fs';
-import * as path from 'path';
-import * as os from 'os';
-import { getTemplatePath } from '../../utils/template.js';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
 import { checkDocker, getComposeFiles, runCompose } from '../../utils/docker.js';
+import { logger } from '../../utils/logger.js';
 import { getDeploymentMode } from '../../utils/selection.js';
+import { getTemplatePath } from '../../utils/template.js';
 export default class Pack extends Command {
     static description = '生成离线部署包';
     static flags = {
-        output: Flags.string({ char: 'o', description: '输出文件名', default: 'nodebbs-offline.tar.gz' }),
+        output: Flags.string({ char: 'o', default: 'nodebbs-offline.tar.gz', description: '输出文件名' }),
     };
     async run() {
         const { flags } = await this.parse(Pack);
@@ -18,21 +19,22 @@ export default class Pack extends Command {
         await checkDocker();
         // 1. 准备临时目录
         const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'nodebbs-pack-'));
-        this.log(`正在准备构建环境: ${tmpDir}`);
+        logger.info(`正在准备构建环境: ${tmpDir}`);
         try {
             const mode = await getDeploymentMode();
             if (mode !== 'source') {
-                this.error('打包命令仅支持源码部署模式。请在 NodeBBS 项目根目录下运行 (需要包含 package.json 和源代码)。');
+                logger.error('打包命令仅支持源码部署模式。请在 NodeBBS 项目根目录下运行 (需要包含 package.json 和源代码)。');
+                this.exit(1);
             }
             // 2. 导出配置文件
             // 使用 getComposeFiles 获取准确的配置文件路径 (包含 base 和 override)
             // 默认打包生产环境配置
             const { files, isBuiltIn } = await getComposeFiles('production');
             if (isBuiltIn) {
-                console.warn('当前目录未找到 docker-compose.yml，将使用内置模板。');
+                logger.warning('当前目录未找到 docker-compose.yml，将使用内置模板。');
             }
             // 3. 构建应用镜像
-            this.log('正在构建应用镜像 (这可能需要几分钟)...');
+            logger.info('正在构建应用镜像 (这可能需要几分钟)...');
             // 注意：如果使用内置模板，context 可能是错的，但 build 命令通常需要 context。
             // getComposeFiles 返回的 file path 是绝对路径。
             // 如果是 isBuiltIn，说明用的是 cli/templates/docker-compose.yml
@@ -48,13 +50,13 @@ export default class Pack extends Command {
             // 所以这里应该使用 runCompose 来执行 build，以确保参数一致性
             await runCompose(files, ['build'], isBuiltIn);
             // 4. 拉取依赖镜像
-            this.log('正在确保数据库镜像已下载...');
+            logger.info('正在确保数据库镜像已下载...');
             await execa('docker', ['pull', 'postgres:16-alpine'], { stdio: 'inherit' });
             await execa('docker', ['pull', 'redis:7-alpine'], { stdio: 'inherit' });
             // 5. 导出镜像
-            this.log('正在导出镜像到文件 (nodebbs-images.tar)...');
+            logger.info('正在导出镜像到文件 (nodebbs-images.tar)...');
             // 获取所有相关镜像的列表
-            const projectName = path.basename(process.cwd()).toLowerCase().replace(/[^a-z0-9]/g, '');
+            const projectName = path.basename(process.cwd()).toLowerCase().replaceAll(/[^a-z0-9]/g, '');
             // 我们最好通过 docker compose config 来确认镜像名
             // 简单策略：先 save postgres 和 redis，对于 api 和 web，我们先 tag 一下以确保名字固定。
             await execa('docker', ['tag', `${projectName}-api`, 'nodebbs-api:latest']);
@@ -65,11 +67,11 @@ export default class Pack extends Command {
             // files[0] -> Base
             // files[1] -> Override (Optional)
             const baseFile = files[0];
-            let composeContent = fs.readFileSync(baseFile, 'utf-8');
+            const composeContent = fs.readFileSync(baseFile, 'utf8');
             const lines = composeContent.split('\n');
             const cleanedLines = lines.map(line => {
                 // 移除 api 和 web 的源码挂载
-                if (line.match(/- \.\/apps\/.*\/src:\/app\/apps\/.*\/src/)) {
+                if (/- \.\/apps\/.*\/src:\/app\/apps\/.*\/src/.test(line)) {
                     return line.replace(/^/, '# [OFFLINE-PACK-REMOVED] ');
                 }
                 return line;
@@ -82,16 +84,16 @@ export default class Pack extends Command {
                 fs.copyFileSync(overrideFile, path.join(tmpDir, 'docker-compose.prod.yml'));
             }
             if (fs.existsSync('.env')) {
-                this.warn('检测到 .env 文件，出于安全考虑，不会默认打包 .env 文件。请在部署时手动配置环境变量。');
+                logger.warning('检测到 .env 文件，出于安全考虑，不会默认打包 .env 文件。请在部署时手动配置环境变量。');
             }
             // 创建 .env.example
             const envTemplatePath = getTemplatePath('env');
             let envExample = '';
             try {
-                envExample = fs.readFileSync(envTemplatePath, 'utf-8');
+                envExample = fs.readFileSync(envTemplatePath, 'utf8');
             }
-            catch (e) {
-                this.warn(`读取 env 模板失败: ${envTemplatePath}，将使用空模板`);
+            catch {
+                logger.warning(`读取 env 模板失败: ${envTemplatePath}，将使用空模板`);
             }
             fs.writeFileSync(path.join(tmpDir, '.env.example'), envExample);
             // 7. 创建安装脚本
@@ -137,22 +139,23 @@ echo "部署完成！"
             fs.writeFileSync(path.join(tmpDir, 'install.sh'), installScript);
             fs.chmodSync(path.join(tmpDir, 'install.sh'), '755');
             // 8. 打包最终的 tar.gz
-            this.log(`正在生成最终压缩包: ${outputPath}`);
+            logger.info(`正在生成最终压缩包: ${outputPath}`);
             await execa('tar', ['-czf', outputPath, '-C', tmpDir, '.']);
-            this.log(`\n🎉 离线包生成成功: ${outputPath}`);
-            this.log('使用方法:');
-            this.log('1. 将压缩包上传到服务器');
-            this.log('2. 解压: tar -xzf nodebbs-offline.tar.gz');
-            this.log('3. 配置 .env');
-            this.log('4. 运行: ./install.sh');
+            logger.success(`🎉 离线包生成成功: ${outputPath}`);
+            logger.info('使用方法:');
+            logger.info('1. 将压缩包上传到服务器');
+            logger.info('2. 解压: tar -xzf nodebbs-offline.tar.gz');
+            logger.info('3. 配置 .env');
+            logger.info('4. 运行: ./install.sh');
         }
         catch (error) {
-            this.error(`打包失败: ${error.message}`);
+            logger.error(`打包失败: ${error.message}`);
+            this.exit(1);
         }
         finally {
             // 清理临时目录
             if (fs.existsSync(tmpDir)) {
-                fs.rmSync(tmpDir, { recursive: true, force: true });
+                fs.rmSync(tmpDir, { force: true, recursive: true });
             }
         }
     }

package/dist/commands/restart/index.js

@@ -1,10 +1,10 @@
 import { Command } from '@oclif/core';
-import { runCompose, getComposeFiles } from '../../utils/docker.js';
-import { logger } from '../../utils/logger.js';
-import { EnvFlag, selectEnvironment, getDeploymentMode } from '../../utils/selection.js';
+import { getComposeFiles, runCompose } from '../../utils/docker.js';
 import { initImageEnv } from '../../utils/env.js';
+import { logger } from '../../utils/logger.js';
+import { EnvFlag, getDeploymentMode, selectEnvironment } from '../../utils/selection.js';
 export default class Restart extends Command {
-    static description = '重启服务';
+    static description = '重启';
     static flags = {
         env: EnvFlag,
     };
@@ -13,13 +13,11 @@ export default class Restart extends Command {
         // 1. 选择环境
         const env = await selectEnvironment(flags.env);
         const { files, isBuiltIn } = await getComposeFiles(env);
-        logger.info('正在重启服务 (使用现有镜像)...');
         // 确保镜像配置存在
         await initImageEnv();
         const mode = await getDeploymentMode();
-        logger.info(`环境: ${env} (${mode === 'image' ? '镜像部署' : '源码部署'})`);
-        // 3. 不会执行构建 (除非镜像不存在)
-        // 在镜像模式下，我们需要确保不尝试构建 (哪怕镜像丢失，应该是 pull 而不是 build)
+        logger.info(`正在重启服务... (环境: ${env}, ${mode === 'image' ? '镜像部署' : '源码部署'})`);
+        // 在镜像模式下，不尝试构建
         const args = ['up', '-d', '--force-recreate'];
         if (mode === 'image') {
             args.push('--no-build');

package/dist/commands/shell/api.js

@@ -1,5 +1,5 @@
 import { Command } from '@oclif/core';
-import { runCompose, getComposeFiles } from '../../utils/docker.js';
+import { getComposeFiles, runCompose } from '../../utils/docker.js';
 import { logger } from '../../utils/logger.js';
 import { EnvFlag, selectEnvironment } from '../../utils/selection.js';
 export default class ShellApi extends Command {

package/dist/commands/shell/db.js

@@ -1,8 +1,8 @@
 import { Command } from '@oclif/core';
-import { runCompose, getComposeFiles } from '../../utils/docker.js';
+import { getComposeFiles, runCompose } from '../../utils/docker.js';
+import { getEnvValue } from '../../utils/env.js';
 import { logger } from '../../utils/logger.js';
 import { EnvFlag, selectEnvironment } from '../../utils/selection.js';
-import { getEnvValue } from '../../utils/env.js';
 export default class ShellDb extends Command {
     static description = '进入数据库 shell (psql)';
     static flags = {

package/dist/commands/shell/redis.js

@@ -1,8 +1,8 @@
 import { Command } from '@oclif/core';
-import { runCompose, getComposeFiles } from '../../utils/docker.js';
+import { getComposeFiles, runCompose } from '../../utils/docker.js';
+import { getEnvValue } from '../../utils/env.js';
 import { logger } from '../../utils/logger.js';
 import { EnvFlag, selectEnvironment } from '../../utils/selection.js';
-import { getEnvValue } from '../../utils/env.js';
 export default class ShellRedis extends Command {
     static description = '进入 Redis shell (redis-cli)';
     static flags = {

package/dist/commands/shell/web.js

@@ -1,5 +1,5 @@
 import { Command } from '@oclif/core';
-import { runCompose, getComposeFiles } from '../../utils/docker.js';
+import { getComposeFiles, runCompose } from '../../utils/docker.js';
 import { logger } from '../../utils/logger.js';
 import { EnvFlag, selectEnvironment } from '../../utils/selection.js';
 export default class ShellWeb extends Command {

package/dist/commands/start/index.d.ts

@@ -2,8 +2,8 @@ import { Command } from '@oclif/core';
 export default class Start extends Command {
     static description: string;
     static flags: {
-        env: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         build: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        env: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/start/index.js

@@ -1,19 +1,19 @@
-import { Command, Flags } from '@oclif/core';
 import { confirm } from '@inquirer/prompts';
-import { checkDocker, runCompose, waitForHealth, execCompose, getComposeFiles } from '../../utils/docker.js';
-import { initEnv, checkEnv, initDockerIgnore, initImageEnv } from '../../utils/env.js';
-import { logger } from '../../utils/logger.js';
+import { Command, Flags } from '@oclif/core';
 import dotenv from 'dotenv';
-import { EnvFlag, selectEnvironment, getDeploymentMode } from '../../utils/selection.js';
+import { checkDocker, execCompose, getComposeFiles, runCompose, waitForHealth } from '../../utils/docker.js';
+import { checkEnv, initDockerIgnore, initEnv, initImageEnv } from '../../utils/env.js';
+import { logger } from '../../utils/logger.js';
+import { EnvFlag, getDeploymentMode, selectEnvironment } from '../../utils/selection.js';
 export default class Start extends Command {
-    static description = '启动服务';
+    static description = '启动';
     static flags = {
-        env: EnvFlag,
         build: Flags.boolean({
             char: 'b',
-            description: '重新构建并启动服务 (跳过健康检查和数据初始化)',
             default: false,
+            description: '重新构建并启动服务 (跳过健康检查和数据初始化)',
         }),
+        env: EnvFlag,
     };
     async run() {
         const { flags } = await this.parse(Start);
@@ -53,16 +53,6 @@ export default class Start extends Command {
         await initDockerIgnore();
         await initImageEnv();
         await checkEnv(env);
-        if (!flags.build) {
-            const continueDeploy = await confirm({
-                message: '是否继续启动？',
-                default: true
-            });
-            if (!continueDeploy) {
-                logger.info('操作已取消。');
-                this.exit(0);
-            }
-        }
         // 4. 构建并启动服务
         const mode = await getDeploymentMode();
         if (flags.build) {
@@ -97,8 +87,8 @@ export default class Start extends Command {
         if (!flags.build) {
             await waitForHealth(composeFiles, isBuiltIn);
             const pushDb = await confirm({
-                message: '是否推送数据库 schema？',
-                default: false
+                default: false,
+                message: '是否推送数据库 schema？(初次部署推荐)'
             });
             if (pushDb) {
                 logger.info('正在推送数据库 schema...');
@@ -106,8 +96,8 @@ export default class Start extends Command {
                 logger.success('数据库 schema 推送完成');
             }
             const seedDb = await confirm({
-                message: '是否初始化种子数据？',
-                default: false
+                default: false,
+                message: '是否初始化种子数据？(初次部署推荐)'
             });
             if (seedDb) {
                 logger.info('正在初始化数据...');

package/dist/commands/status/index.js

@@ -1,9 +1,9 @@
 import { Command } from '@oclif/core';
-import { runCompose, getComposeFiles } from '../../utils/docker.js';
+import { getComposeFiles, runCompose } from '../../utils/docker.js';
 import { logger } from '../../utils/logger.js';
 import { EnvFlag, selectEnvironment } from '../../utils/selection.js';
 export default class Status extends Command {
-    static description = '查看服务状态';
+    static description = '查看状态';
     static flags = {
         env: EnvFlag,
     };

package/dist/commands/stop/index.d.ts

@@ -2,8 +2,8 @@ import { Command } from '@oclif/core';
 export default class Stop extends Command {
     static description: string;
     static flags: {
-        volumes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         env: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        volumes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/stop/index.js

@@ -1,17 +1,17 @@
+import { confirm } from '@inquirer/prompts';
 import { Command, Flags } from '@oclif/core';
-import { runCompose, getComposeFiles } from '../../utils/docker.js';
+import { getComposeFiles, runCompose } from '../../utils/docker.js';
 import { logger } from '../../utils/logger.js';
-import { confirm } from '@inquirer/prompts';
 import { EnvFlag, selectEnvironment } from '../../utils/selection.js';
 export default class Stop extends Command {
-    static description = '停止服务';
+    static description = '停止';
     static flags = {
+        env: EnvFlag,
         volumes: Flags.boolean({
             char: 'v',
-            description: '同时删除数据卷（危险！）',
             default: false,
+            description: '同时删除数据卷（危险！）',
         }),
-        env: EnvFlag,
     };
     async run() {
         const { flags } = await this.parse(Stop);
@@ -21,10 +21,10 @@ export default class Stop extends Command {
         });
         const { files, isBuiltIn } = await getComposeFiles(env);
         if (flags.volumes) {
-            logger.warning('警告：这将删除所有数据！');
+            logger.warning('这将删除所有数据！');
             const confirmDelete = await confirm({
-                message: '确认继续？',
                 default: false,
+                message: '确认继续？',
             });
             if (!confirmDelete) {
                 logger.info('操作已取消。');

package/dist/commands/upgrade/index.js

@@ -1,11 +1,11 @@
 import { Command } from '@oclif/core';
-import { runCompose, getComposeFiles } from '../../utils/docker.js';
-import { logger } from '../../utils/logger.js';
-import { EnvFlag, selectEnvironment, getDeploymentMode } from '../../utils/selection.js';
+import { getComposeFiles, runCompose } from '../../utils/docker.js';
 import { initImageEnv } from '../../utils/env.js';
+import { logger } from '../../utils/logger.js';
+import { EnvFlag, getDeploymentMode, selectEnvironment } from '../../utils/selection.js';
 import Start from '../start/index.js';
 export default class Upgrade extends Command {
-    static description = '升级服务';
+    static description = '升级';
     static flags = {
         env: EnvFlag,
     };
@@ -24,7 +24,7 @@ export default class Upgrade extends Command {
         // 2. 镜像模式：拉取更新并重启
         logger.header('NodeBBS 服务升级');
         // 选择环境 (通常需要与运行中一致，这里重新选择以防万一，或者可以复用 restart 的逻辑不传 env 则自选)
-        //为了简单，我们遵循 restart 的模式
+        // 为了简单，我们遵循 restart 的模式
         const env = await selectEnvironment(flags.env);
         // 确保镜像配置存在
         await initImageEnv();

package/dist/interactive.js

@@ -1,25 +1,25 @@
-import { Config } from '@oclif/core';
 import { select, Separator } from '@inquirer/prompts';
-import { fileURLToPath } from 'url';
+import { Config } from '@oclif/core';
+import chalk from 'chalk';
+import { fileURLToPath } from 'node:url';
 export async function runInteractive(root) {
     // Config.load 需要文件路径而不是 URL
     // 如果 root 是 import.meta.url，则进行转换
-    let rootPath = root.startsWith('file://') ? fileURLToPath(root) : root;
+    const rootPath = root.startsWith('file://') ? fileURLToPath(root) : root;
     const config = await Config.load(rootPath);
     // 构建命令树
-    const tree = { name: 'root', children: {} };
+    const tree = { children: {}, name: 'root' };
     for (const cmd of config.commands) {
         // 跳过隐藏命令
         if (cmd.hidden)
             continue;
         const parts = cmd.id.split(':');
         let currentNode = tree;
-        for (let i = 0; i < parts.length; i++) {
-            const part = parts[i];
+        for (const part of parts) {
             if (!currentNode.children[part]) {
                 currentNode.children[part] = {
-                    name: part,
-                    children: {}
+                    children: {},
+                    name: part
                 };
             }
             currentNode = currentNode.children[part];
@@ -31,9 +31,10 @@ export async function runInteractive(root) {
 }
 const GLOBAL_PRIORITY = ['start', 'stop', 'restart', 'upgrade', 'status', 'logs', 'db', 'backup', 'import', 'clean', 'shell', 'pack'];
 const SCOPED_PRIORITIES = {
-    'logs': ['all', 'web', 'api', 'db', 'redis'],
     'backup': ['all', 'db', 'uploads'],
+    'db': ['push', 'seed', 'reset'],
     'import': ['all', 'db', 'uploads'],
+    'logs': ['all', 'web', 'api', 'db', 'redis'],
 };
 async function navigate(node, breadcrumbs, config) {
     const currentPath = breadcrumbs.join(':');
@@ -59,8 +60,8 @@ async function navigate(node, breadcrumbs, config) {
         if (node.command) {
             choices.push({
                 name: `${node.command.description || node.command.id}`,
-                value: '__SELF__',
-                short: 'all'
+                short: 'all',
+                value: '__SELF__'
             });
         }
         const subChoices = keys.map(key => {
@@ -84,7 +85,7 @@ async function navigate(node, breadcrumbs, config) {
                 }
             }
             if (description) {
-                const shortDesc = description.split('.')[0].substring(0, 50);
+                const shortDesc = description.split('.')[0].slice(0, 50);
                 label = `${key.padEnd(12)}  ${shortDesc}`;
             }
             else {
@@ -95,18 +96,17 @@ async function navigate(node, breadcrumbs, config) {
             }
             return {
                 name: label,
-                value: key,
-                short: key
+                short: key,
+                value: key
             };
         });
         choices.push(...subChoices);
         // 添加导航选项
-        // 即使支持 Esc，保留显式选项也有助于发现性
+        choices.push(new Separator());
         if (breadcrumbs.length > 0) {
-            choices.push(new Separator());
-            choices.push({ name: '⬅️  返回', value: '__BACK__', short: '返回' });
+            choices.push({ name: chalk.dim('返回'), short: '返回', value: '__BACK__' });
         }
-        choices.push({ name: '❌ 退出', value: '__EXIT__', short: '退出' });
+        choices.push({ name: chalk.dim('退出'), short: '退出', value: '__EXIT__' });
         const controller = new AbortController();
         // 监听 Esc 键
         const onKeypress = (_str, key) => {
@@ -120,10 +120,10 @@ async function navigate(node, breadcrumbs, config) {
         process.stdin.on('keypress', onKeypress);
         try {
             const selection = await select({
-                message: breadcrumbs.length ? `选择命令 (${breadcrumbs.join(' > ')}):` : '选择命令:',
                 choices,
-                pageSize: 15,
                 loop: true, // 允许循环导航
+                message: breadcrumbs.length > 0 ? `选择命令 (${breadcrumbs.join(' > ')}):` : '选择命令:',
+                pageSize: 15,
                 // @ts-ignore: prompt signal support might be strict on types
                 signal: controller.signal
             });
@@ -151,10 +151,10 @@ async function navigate(node, breadcrumbs, config) {
                     }
                     console.error(error.message);
                 }
-                console.log('\n命令执行完成。');
+                console.log('\n✨ 命令执行完成。');
                 // 动态导入 input 以保持轻量
                 const { input } = await import('@inquirer/prompts');
-                await input({ message: '按回车键继续...' });
+                await input({ message: '按回车键返回菜单...' });
                 // 继续循环
                 continue;
             }
@@ -182,10 +182,10 @@ async function navigate(node, breadcrumbs, config) {
                     }
                     console.error(error.message);
                 }
-                console.log('\n命令执行完成。');
+                console.log('\n✨ 命令执行完成。');
                 // 动态导入 input 以保持轻量
                 const { input } = await import('@inquirer/prompts');
-                await input({ message: '按回车键继续...' });
+                await input({ message: '按回车键返回菜单...' });
             }
         }
         catch (error) {
@@ -195,10 +195,8 @@ async function navigate(node, breadcrumbs, config) {
                     // 子菜单 -> 返回
                     return;
                 }
-                else {
-                    // 顶级菜单 -> 退出
-                    process.exit(0);
-                }
+                // 顶级菜单 -> 退出
+                process.exit(0);
             }
             // 处理 Ctrl+C (ExitPromptError)
             if (error.name === 'ExitPromptError') {

package/dist/templates/docker-compose.yml

@@ -42,10 +42,7 @@ services:
 
   # API 服务
   api:
-    build:
-      context: .
-      dockerfile: apps/api/Dockerfile
-    image: ${API_IMAGE:-nodebbs-api:local}
+    image: ${API_IMAGE:-ghcr.io/aiprojecthub/nodebbs-api:latest}
     container_name: ${COMPOSE_PROJECT_NAME:-nodebbs}-api
     restart: unless-stopped
     environment:
@@ -80,10 +77,7 @@ services:
 
   # Web 前端服务
   web:
-    build:
-      context: .
-      dockerfile: apps/web/Dockerfile
-    image: ${WEB_IMAGE:-nodebbs-web:local}
+    image: ${WEB_IMAGE:-ghcr.io/aiprojecthub/nodebbs-web:latest}
     container_name: ${COMPOSE_PROJECT_NAME:-nodebbs}-web
     restart: unless-stopped
     environment:

package/dist/templates/env

@@ -2,6 +2,8 @@
 # NodeBBS Docker Compose 环境变量配置
 # ========================================
 
+#COMPOSE_PROJECT_NAME=nodebbs
+
 # ========================================
 # 数据库配置
 # ========================================