nodebbs 0.4.1 → 0.4.2

package/README.md

@@ -71,31 +71,33 @@ CLI 会自动根据当前目录内容判断部署模式：
 ```bash
 $ nodebbs
 ? 选择命令:
-❯ start         启动服务
-  stop          停止服务
-  restart       重启服务
-  upgrade       升级服务
-  status        查看服务状态
-  logs          查看服务日志  [+]
+❯ start         启动
+  stop          停止
+  restart       重启
+  upgrade       升级
+  status        查看状态
+  logs          查看日志  [+]
   db            数据库操作 (种子数据, 重置等)  [+]
   backup        备份数据 (数据库, 上传文件等)  [+]
   import        导入/恢复数据  [+]
   clean         清理 Docker 缓存和残留资源
   shell         进入容器终端  [+]
   pack          生成离线部署包
-  ❌ 退出
+ ──────────────
+❯ 返回
+  退出
 ```
 
 #### 命令说明
 
 | 命令 | 说明 |
 |------|---------| 
-| **start** | 启动服务（根据当前配置环境）|
+| **start** | 启动（根据当前配置环境）|
 | **stop** | 停止所有服务 |
-| **restart** | 重启服务（相当于 `docker compose up --force-recreate`）|
-| **upgrade** | 升级服务（拉取最新 Docker 镜像或重新构建本地镜像）|
+| **restart** | 重启（相当于 `docker compose up --force-recreate`）|
+| **upgrade** | 升级（拉取最新 Docker 镜像或重新构建本地镜像）|
 | **status** | 查看所有容器的运行状态和健康检查结果 |
-| **logs** | 查看服务日志（支持选择特定服务 API/Web/DB/Redis）|
+| **logs** | 查看日志（支持选择特定服务 API/Web/DB/Redis）|
 | **db** | 数据库操作：种子数据 (seed)、重置 (reset) 等 |
 | **backup** | 备份数据：<br>• 数据库 (db)<br>• 上传文件 (uploads)<br>• 一键全部备份 (all) |
 | **import** | 恢复数据：<br>• 数据库 (db)<br>• 上传文件 (uploads)<br>• 一键全部恢复 (all) |

package/dist/commands/backup/all.d.ts

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

package/dist/commands/backup/all.js

@@ -1,26 +1,26 @@
 import { Command, Flags } from '@oclif/core';
-import { logger } from '../../utils/logger.js';
 import fs from 'node:fs';
 import path from 'node:path';
+import { logger } from '../../utils/logger.js';
 import BackupDb from './db.js';
 import BackupUploads from './uploads.js';
 export default class BackupAll extends Command {
-    static description = '一键备份全部数据 (数据库 + 上传文件)';
+    static description = '一键备份全部数据';
     static flags = {
-        output: Flags.string({
-            char: 'o',
-            description: '输出目录路径',
-        }),
         env: Flags.string({
             char: 'e',
             description: '运行环境 (production, lowmem, default)',
             options: ['production', 'lowmem', 'default'],
         }),
+        output: Flags.string({
+            char: 'o',
+            description: '输出目录路径',
+        }),
     };
     async run() {
         const { flags } = await this.parse(BackupAll);
         // 生成备份目录
-        const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
+        const timestamp = new Date().toISOString().replaceAll(/[:.]/g, '-').slice(0, 19);
         const backupDirName = flags.output || `backup_${timestamp}`;
         const backupDir = path.resolve(process.cwd(), backupDirName);
         // 创建备份目录
@@ -40,7 +40,7 @@ export default class BackupAll extends Command {
             }
             await BackupDb.run(dbArgs);
         }
-        catch (error) {
+        catch {
             logger.error('数据库备份失败，终止操作');
             this.exit(1);
         }
@@ -49,7 +49,7 @@ export default class BackupAll extends Command {
         try {
             await BackupUploads.run(['-o', uploadsBackupFile]);
         }
-        catch (error) {
+        catch {
             logger.warning('上传文件备份失败 (可能卷不存在)');
             // 不终止，因为数据库已备份
         }

package/dist/commands/backup/db.js

@@ -1,13 +1,13 @@
 import { Command, Flags } from '@oclif/core';
-import { getComposeFiles } from '../../utils/docker.js';
-import { logger } from '../../utils/logger.js';
+import dotenv from 'dotenv';
 import { execa } from 'execa';
 import fs from 'node:fs';
 import path from 'node:path';
-import dotenv from 'dotenv';
+import { getComposeFiles } from '../../utils/docker.js';
+import { logger } from '../../utils/logger.js';
 import { EnvFlag, selectEnvironment } from '../../utils/selection.js';
 export default class BackupDb extends Command {
-    static description = '备份数据库 (PostgreSQL)';
+    static description = '备份数据库';
     static flags = {
         env: EnvFlag,
         output: Flags.string({
@@ -22,7 +22,7 @@ export default class BackupDb extends Command {
         // 2. 确定输出文件
         let outputFile = flags.output;
         if (!outputFile) {
-            const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
+            const timestamp = new Date().toISOString().replaceAll(/[:.]/g, '-').slice(0, 19);
             outputFile = `backup_db_${timestamp}.sql`;
         }
         // 确保绝对路径

package/dist/commands/backup/uploads.js

@@ -1,11 +1,11 @@
 import { Command, Flags } from '@oclif/core';
-import { logger } from '../../utils/logger.js';
+import dotenv from 'dotenv';
 import { execa } from 'execa';
 import fs from 'node:fs';
 import path from 'node:path';
-import dotenv from 'dotenv';
+import { logger } from '../../utils/logger.js';
 export default class BackupUploads extends Command {
-    static description = '备份上传文件 (用户头像、附件等)';
+    static description = '备份上传文件';
     static flags = {
         output: Flags.string({
             char: 'o',
@@ -23,16 +23,14 @@ export default class BackupUploads extends Command {
         // 确定输出文件
         let outputFile = flags.output;
         if (!outputFile) {
-            const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
+            const timestamp = new Date().toISOString().replaceAll(/[:.]/g, '-').slice(0, 19);
             outputFile = `backup_uploads_${timestamp}.tar.gz`;
         }
         // 确保绝对路径
         const outputPath = path.resolve(process.cwd(), outputFile);
         const outputDir = path.dirname(outputPath);
         const outputFileName = path.basename(outputPath);
-        logger.info(`正在备份上传文件...`);
-        logger.info(`数据卷: ${volumeName}`);
-        logger.info(`输出文件: ${outputPath}`);
+        logger.info(`正在备份上传文件 → ${outputPath}`);
         try {
             // 使用 alpine 容器备份卷内容
             await execa('docker', [
@@ -101,10 +99,11 @@ export default class BackupUploads extends Command {
             if (volumes.length === 1) {
                 return volumes[0];
             }
-            else if (volumes.length > 1) {
+            if (volumes.length > 1) {
                 // 多个匹配，提示用户
                 logger.warning('找到多个可能的上传卷:');
-                volumes.forEach(v => logger.info(`  - ${v}`));
+                for (const v of volumes)
+                    logger.info(`  - ${v}`);
                 logger.info('请在 .env 中设置 COMPOSE_PROJECT_NAME 以指定正确的卷');
                 return volumes[0]; // 默认使用第一个
             }

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

@@ -4,9 +4,9 @@ export default class Clean extends Command {
     static flags: {
         all: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         cache: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        images: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         env: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        images: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/clean/index.js

@@ -1,32 +1,32 @@
-import { Command, Flags } from '@oclif/core';
 import { checkbox, confirm } from '@inquirer/prompts';
-import { logger } from '../../utils/logger.js';
+import { Command, Flags } from '@oclif/core';
 import { execa } from 'execa';
+import { logger } from '../../utils/logger.js';
 import { clearStoredEnv } from '../../utils/selection.js';
 export default class Clean extends Command {
     static description = '清理 Docker 缓存和残留资源';
     static flags = {
         all: Flags.boolean({
             char: 'a',
-            description: '清理所有 (构建缓存、无用镜像、网络、环境锁定)',
             default: false,
+            description: '清理所有 (构建缓存、无用镜像、网络、环境锁定)',
         }),
         cache: Flags.boolean({
-            description: '清理构建缓存',
-            default: false,
-        }),
-        images: Flags.boolean({
-            description: '清理无用镜像 (dangling)',
             default: false,
+            description: '清理构建缓存',
         }),
         env: Flags.boolean({
-            description: '清理环境锁定 (Environment Lock)',
             default: false,
+            description: '清理环境锁定 (Environment Lock)',
         }),
         force: Flags.boolean({
             char: 'f',
+            default: false,
             description: '跳过确认提示',
+        }),
+        images: Flags.boolean({
             default: false,
+            description: '清理无用镜像 (dangling)',
         }),
     };
     async run() {
@@ -47,13 +47,13 @@ export default class Clean extends Command {
         // 如果未提供标志，进行交互式选择
         if (targets.length === 0) {
             targets = await checkbox({
-                message: '请选择要清理的项目：',
                 choices: [
                     { name: '构建缓存 (Build Cache)', value: 'cache' },
                     { name: '无用镜像 (Dangling Images)', value: 'images' },
                     { name: '无用网络 (Unused Networks)', value: 'networks' },
                     { name: '环境锁定 (Environment Lock)', value: 'env' },
                 ],
+                message: '请选择要清理的项目：',
             });
         }
         if (targets.length === 0) {
@@ -64,8 +64,8 @@ export default class Clean extends Command {
         if (!flags.force) {
             logger.warning(`即将清理: ${targets.join(', ')}`);
             const confirmed = await confirm({
-                message: '确认继续？',
-                default: false
+                default: false,
+                message: '确认继续？'
             });
             if (!confirmed) {
                 logger.info('操作已取消。');

package/dist/commands/db/reset.js

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
 import { confirm } from '@inquirer/prompts';
+import { Command } from '@oclif/core';
 import { execCompose, getComposeFiles } from '../../utils/docker.js';
 import { logger } from '../../utils/logger.js';
 import { EnvFlag, selectEnvironment } from '../../utils/selection.js';
@@ -12,10 +12,10 @@ export default class DbReset extends Command {
         const { flags } = await this.parse(DbReset);
         const env = await selectEnvironment(flags.env);
         const { files, isBuiltIn } = await getComposeFiles(env);
-        logger.warning('警告：这将清除所有数据！');
+        logger.warning('这将清除所有数据！');
         const confirmReset = await confirm({
-            message: '确认继续？',
-            default: false
+            default: false,
+            message: '确认继续？'
         });
         if (!confirmReset) {
             logger.info('操作已取消。');

package/dist/commands/import/all.js

@@ -1,12 +1,12 @@
+import { confirm, input, select } from '@inquirer/prompts';
 import { Command, Flags } from '@oclif/core';
-import { logger } from '../../utils/logger.js';
 import fs from 'node:fs';
 import path from 'node:path';
-import { select, input, confirm } from '@inquirer/prompts';
+import { logger } from '../../utils/logger.js';
 import ImportDb from './db.js';
 import ImportUploads from './uploads.js';
 export default class ImportAll extends Command {
-    static description = '一键恢复全部数据 (数据库 + 上传文件)';
+    static description = '一键恢复全部数据';
     static flags = {
         dir: Flags.string({
             char: 'd',
@@ -34,15 +34,10 @@ export default class ImportAll extends Command {
                 const choices = dirs.map(d => ({ name: d, value: d }));
                 choices.push({ name: '手动输入路径', value: '__MANUAL__' });
                 const selection = await select({
+                    choices,
                     message: '请选择备份目录:',
-                    choices: choices,
                 });
-                if (selection === '__MANUAL__') {
-                    backupDir = await input({ message: '请输入备份目录路径:' });
-                }
-                else {
-                    backupDir = selection;
-                }
+                backupDir = selection === '__MANUAL__' ? (await input({ message: '请输入备份目录路径:' })) : selection;
             }
             else {
                 backupDir = await input({ message: '未找到备份目录，请输入路径:' });
@@ -69,10 +64,10 @@ export default class ImportAll extends Command {
         if (uploadsFile)
             logger.info(`  - 上传文件: ${uploadsFile}`);
         // 最终确认
-        logger.warning('\n警告: 此操作将清空当前所有数据并从备份恢复！');
+        logger.warning('此操作将清空当前所有数据并从备份恢复！');
         const isConfirmed = await confirm({
-            message: '确认继续完整恢复？(数据丢失不可撤销)',
-            default: false
+            default: false,
+            message: '确认继续完整恢复？(数据丢失不可撤销)'
         });
         if (!isConfirmed) {
             logger.info('操作已取消');
@@ -92,7 +87,7 @@ export default class ImportAll extends Command {
                 process.env.NODEBBS_SKIP_CONFIRM = 'true';
                 await ImportDb.run(dbArgs);
             }
-            catch (error) {
+            catch {
                 logger.error('数据库恢复失败');
                 this.exit(1);
             }
@@ -110,7 +105,7 @@ export default class ImportAll extends Command {
                 process.env.NODEBBS_SKIP_CONFIRM = 'true';
                 await ImportUploads.run(['-i', path.join(backupPath, uploadsFile)]);
             }
-            catch (error) {
+            catch {
                 logger.warning('上传文件恢复失败');
             }
             finally {

package/dist/commands/import/db.js

@@ -1,14 +1,14 @@
+import { confirm, input, select } from '@inquirer/prompts';
 import { Command, Flags } from '@oclif/core';
-import { getComposeFiles } from '../../utils/docker.js';
-import { logger } from '../../utils/logger.js';
+import dotenv from 'dotenv';
 import { execa } from 'execa';
 import fs from 'node:fs';
 import path from 'node:path';
-import dotenv from 'dotenv';
+import { getComposeFiles } from '../../utils/docker.js';
+import { logger } from '../../utils/logger.js';
 import { EnvFlag, selectEnvironment } from '../../utils/selection.js';
-import { confirm, select, input } from '@inquirer/prompts';
 export default class ImportDb extends Command {
-    static description = '导入数据库 (从 SQL 文件恢复)';
+    static description = '导入数据库';
     static flags = {
         env: EnvFlag,
         input: Flags.string({
@@ -39,15 +39,10 @@ export default class ImportDb extends Command {
                 }));
                 choices.push({ name: '手动输入路径', value: '__MANUAL__' });
                 const selection = await select({
+                    choices,
                     message: '请选择导入文件:',
-                    choices: choices,
                 });
-                if (selection === '__MANUAL__') {
-                    inputFile = await input({ message: '请输入文件路径:' });
-                }
-                else {
-                    inputFile = selection;
-                }
+                inputFile = selection === '__MANUAL__' ? (await input({ message: '请输入文件路径:' })) : selection;
             }
             else {
                 inputFile = await input({ message: '未找到 SQL 文件，请输入路径:' });
@@ -60,11 +55,11 @@ export default class ImportDb extends Command {
             this.exit(1);
         }
         // 3. 危险操作确认
-        logger.warning('警告: 此操作将清空当前数据库的所有数据并从备份恢复！');
+        logger.warning('此操作将清空当前数据库的所有数据并从备份恢复！');
         logger.warning(`目标文件: ${inputPath}`);
         const isConfirmed = await confirm({
-            message: '确认继续？(数据丢失不可撤销)',
-            default: false
+            default: false,
+            message: '确认继续？(数据丢失不可撤销)'
         });
         if (!isConfirmed) {
             logger.info('操作已取消');
@@ -94,7 +89,7 @@ export default class ImportDb extends Command {
             await execa('docker', ['compose', ...resetCmd], { env: envs });
             logger.success('数据库 Schema 已重置');
             // 步骤 B: 导入数据
-            logger.info(`正在导入数据 from ${path.basename(inputPath)}...`);
+            logger.info(`正在从 ${path.basename(inputPath)} 导入数据...`);
             const importCmd = [...composeArgs, 'exec', '-T', 'postgres', 'psql', '-U', dbUser, '-d', dbName];
             const subprocess = execa('docker', ['compose', ...importCmd], {
                 env: envs,

package/dist/commands/import/uploads.js

@@ -1,12 +1,12 @@
+import { confirm, input, select } from '@inquirer/prompts';
 import { Command, Flags } from '@oclif/core';
-import { logger } from '../../utils/logger.js';
+import dotenv from 'dotenv';
 import { execa } from 'execa';
 import fs from 'node:fs';
 import path from 'node:path';
-import dotenv from 'dotenv';
-import { confirm, select, input } from '@inquirer/prompts';
+import { logger } from '../../utils/logger.js';
 export default class ImportUploads extends Command {
-    static description = '恢复上传文件 (从 tar.gz 备份恢复)';
+    static description = '恢复上传文件';
     static flags = {
         input: Flags.string({
             char: 'i',
@@ -33,15 +33,10 @@ export default class ImportUploads extends Command {
                 }));
                 choices.push({ name: '手动输入路径', value: '__MANUAL__' });
                 const selection = await select({
+                    choices,
                     message: '请选择上传文件备份:',
-                    choices: choices,
                 });
-                if (selection === '__MANUAL__') {
-                    inputFile = await input({ message: '请输入文件路径:' });
-                }
-                else {
-                    inputFile = selection;
-                }
+                inputFile = selection === '__MANUAL__' ? (await input({ message: '请输入文件路径:' })) : selection;
             }
             else {
                 inputFile = await input({ message: '未找到上传备份文件 (.tar.gz)，请输入路径:' });
@@ -57,20 +52,19 @@ export default class ImportUploads extends Command {
         const volumeName = await this.getOrCreateUploadsVolume();
         // 危险操作确认
         if (process.env.NODEBBS_SKIP_CONFIRM !== 'true') {
-            logger.warning('警告: 此操作将清空当前上传目录的所有文件并从备份恢复！');
+            logger.warning('此操作将清空当前上传目录的所有文件并从备份恢复！');
             logger.warning(`目标文件: ${inputPath}`);
             logger.warning(`数据卷: ${volumeName}`);
             const isConfirmed = await confirm({
-                message: '确认继续？(文件丢失不可撤销)',
-                default: false
+                default: false,
+                message: '确认继续？(文件丢失不可撤销)'
             });
             if (!isConfirmed) {
                 logger.info('操作已取消');
                 this.exit(0);
             }
         }
-        logger.info('正在恢复上传文件...');
-        logger.info(`数据卷: ${volumeName}`);
+        logger.info(`正在恢复上传文件 (卷: ${volumeName})...`);
         const inputDir = path.dirname(inputPath);
         const inputFileName = path.basename(inputPath);
         try {
@@ -128,9 +122,10 @@ export default class ImportUploads extends Command {
             if (volumes.length === 1) {
                 return volumes[0];
             }
-            else if (volumes.length > 1) {
+            if (volumes.length > 1) {
                 logger.warning('找到多个可能的上传卷:');
-                volumes.forEach(v => logger.info(`  - ${v}`));
+                for (const v of volumes)
+                    logger.info(`  - ${v}`);
                 logger.info('请在 .env 中设置 COMPOSE_PROJECT_NAME 以指定正确的卷');
                 return volumes[0];
             }

package/dist/commands/logs/all.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 Logs extends Command {
-    static description = '查看所有服务日志';
+    static description = '查看日志';
     static flags = {
         env: EnvFlag,
     };

package/dist/commands/logs/api.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 LogsApi extends Command {
-    static description = '查看 API 服务日志';
+    static description = '查看 API 日志';
     static flags = {
         env: EnvFlag,
     };

package/dist/commands/logs/db.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 LogsDb extends Command {

package/dist/commands/logs/redis.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 LogsRedis extends Command {

package/dist/commands/logs/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 LogsWeb extends Command {