@nocobase/cli 2.1.0-beta.19 → 2.1.0-beta.20

package/README.md

@@ -138,6 +138,7 @@ In non-interactive mode, pass these setup-only flags again because they are not
 | `nb download` | Advanced command used by `nb init` or `nb upgrade` to fetch NocoBase from Docker, npm, or Git. It is rarely used directly. |
 | `nb start` | Start the selected local app or Docker container. |
 | `nb stop` | Stop the selected local app or Docker container. |
+| `nb restart` | Stop, then start the selected local app or Docker container. |
 | `nb dev` | Run development mode for npm/Git source envs. |
 | `nb logs` | Show app logs for npm/Git or Docker envs. |
 | `nb ps` | Show runtime status for configured envs. |
@@ -154,6 +155,7 @@ Recommended style: use `--env` explicitly for app/runtime commands. `-e` is the
 
 ```bash
 nb start --env app1
+nb restart --env app1
 nb logs --env app1
 nb ps --env app1
 nb db ps --env app1
@@ -163,6 +165,7 @@ Equivalent shorthand examples:
 
 ```bash
 nb start -e app1
+nb restart -e app1
 nb logs -e app1
 nb upgrade -e app1
 nb db start -e app1
@@ -206,6 +209,7 @@ Docker envs are managed through saved Docker containers and images:
 ```bash
 nb init --env app1 --yes --source docker --version alpha
 nb start --env app1
+nb restart --env app1
 nb logs --env app1
 nb stop --env app1
 ```

package/README.zh-CN.md

@@ -133,6 +133,7 @@ nb install --env app1 --resume
 | `nb download` | `nb init` 或 `nb upgrade` 会使用的高级命令，用于从 Docker、npm 或 Git 获取 NocoBase。通常很少直接使用。 |
 | `nb start` | 启动选中的本地应用或 Docker 容器。 |
 | `nb stop` | 停止选中的本地应用或 Docker 容器。 |
+| `nb restart` | 先停止，再启动选中的本地应用或 Docker 容器。 |
 | `nb dev` | 为 npm/Git 源码 env 启动开发模式。 |
 | `nb logs` | 查看 npm/Git 或 Docker env 的应用日志。 |
 | `nb ps` | 查看已配置 env 的运行状态。 |
@@ -147,6 +148,7 @@ nb install --env app1 --resume
 
 ```bash
 nb start --env app1
+nb restart --env app1
 nb logs --env app1
 nb ps --env app1
 nb db ps --env app1
@@ -156,6 +158,7 @@ nb db ps --env app1
 
 ```bash
 nb start -e app1
+nb restart -e app1
 nb logs -e app1
 nb upgrade -e app1
 nb db start -e app1
@@ -170,6 +173,7 @@ Docker env 会通过已保存的 Docker 容器和镜像进行管理：
 ```bash
 nb init --env app1 --yes --source docker --version alpha
 nb start --env app1
+nb restart --env app1
 nb logs --env app1
 nb stop --env app1
 ```

package/dist/commands/restart.js

@@ -0,0 +1,74 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Command, Flags } from '@oclif/core';
+function argvHasToken(argv, tokens) {
+    return tokens.some((token) => argv.includes(token));
+}
+function pushFlag(argv, flag, value) {
+    if (value !== undefined) {
+        argv.push(flag, String(value));
+    }
+}
+export default class Restart extends Command {
+    static description = 'Restart NocoBase for the selected env by stopping it first, then starting it again.';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --env local',
+        '<%= config.bin %> <%= command.id %> --env local --quickstart',
+        '<%= config.bin %> <%= command.id %> --env local --port 12000',
+        '<%= config.bin %> <%= command.id %> --env local --daemon',
+        '<%= config.bin %> <%= command.id %> --env local --no-daemon',
+        '<%= config.bin %> <%= command.id %> --env local --instances 2',
+        '<%= config.bin %> <%= command.id %> --env local --launch-mode pm2',
+        '<%= config.bin %> <%= command.id %> --env local --verbose',
+        '<%= config.bin %> <%= command.id %> --env local-docker',
+    ];
+    static flags = {
+        env: Flags.string({
+            char: 'e',
+            description: 'CLI env name to restart. Defaults to the current env when omitted',
+        }),
+        quickstart: Flags.boolean({ description: 'Quickstart the application after stopping it', required: false }),
+        port: Flags.string({ description: 'Port (overrides appPort from env config when set)', char: 'p', required: false }),
+        daemon: Flags.boolean({
+            description: 'Run the application as a daemon after stopping it (default: true; use --no-daemon to stay in the foreground)',
+            char: 'd',
+            required: false,
+            default: true,
+            allowNo: true,
+        }),
+        instances: Flags.integer({ description: 'Number of instances to run after stopping it', char: 'i', required: false }),
+        'launch-mode': Flags.string({ description: 'Launch Mode', required: false, options: ['pm2', 'node'] }),
+        verbose: Flags.boolean({
+            description: 'Show raw shutdown/startup output from the underlying local or Docker command',
+            default: false,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(Restart);
+        const stopArgv = [];
+        const daemonFlagWasProvided = argvHasToken(this.argv, ['--daemon', '--no-daemon']);
+        pushFlag(stopArgv, '--env', flags.env?.trim() || undefined);
+        if (flags.verbose) {
+            stopArgv.push('--verbose');
+        }
+        await this.config.runCommand('stop', stopArgv);
+        const startArgv = [...stopArgv];
+        if (flags.quickstart) {
+            startArgv.push('--quickstart');
+        }
+        pushFlag(startArgv, '--port', flags.port);
+        if (daemonFlagWasProvided) {
+            startArgv.push(flags.daemon === false ? '--no-daemon' : '--daemon');
+        }
+        pushFlag(startArgv, '--instances', flags.instances);
+        pushFlag(startArgv, '--launch-mode', flags['launch-mode']);
+        await this.config.runCommand('start', startArgv);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-beta.19",
+  "version": "2.1.0-beta.20",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -68,5 +68,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "d89ab08dbcb25877de69827d5bad6823c27b2cbb"
+  "gitHead": "5515f27380c0c5410f7d1e5e5858364fcd838e5e"
 }