@nocobase/cli 2.1.0-alpha.40 → 2.1.0-alpha.46

package/dist/commands/app/stop.js

@@ -7,27 +7,28 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
+import { getCurrentEnvName } from '../../lib/auth-store.js';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
-import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, stopDockerContainer, } from '../../lib/app-runtime.js';
-import { announceTargetEnv, failTask, startTask, succeedTask } from '../../lib/ui.js';
+import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, runLocalNocoBaseCommand, } from '../../lib/app-runtime.js';
+import { announceTargetEnv, failTask, isInteractiveTerminal, printInfo, startTask, succeedTask } from '../../lib/ui.js';
+import { builtinDbContainerName, removeDockerContainerIfExists } from './shared.js';
 function formatStopFailure(envName, message) {
-    if (/does not exist/i.test(message)) {
-        return [
-            `Can't stop NocoBase for "${envName}" yet.`,
-            'The saved Docker app for this env could not be found on this machine.',
-            'If it was removed manually, reinstall or reconnect the env before trying again.',
-            `Details: ${message}`,
-        ].join('\n');
-    }
     return [
         `Couldn't stop NocoBase for "${envName}".`,
         'Check that the local app or Docker runtime is still available, then try again.',
         `Details: ${message}`,
     ].join('\n');
 }
+function formatStopCrossEnvConfirmationRequiredMessage(currentEnv, requestedEnv) {
+    return [
+        `Refusing to stop env "${requestedEnv}" because the current env is "${currentEnv}" and interactive confirmation is unavailable in the current session.`,
+        '',
+        'Re-run the command with `--yes` to confirm this one-off cross-env stop, or switch the current env first.',
+    ].join('\n');
+}
 export default class AppStop extends Command {
     static hidden = false;
-    static description = 'Stop NocoBase for the selected env. Local npm/git installs stop the app process, and Docker installs stop the saved app container.';
+    static description = 'Stop NocoBase for the selected env. Local npm/git installs stop the app process, and Docker installs remove the saved app container.';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --env local',
@@ -44,6 +45,15 @@ export default class AppStop extends Command {
             description: 'Confirm using --env when it targets a different env than the current env',
             default: false,
         }),
+        force: Flags.boolean({
+            char: 'f',
+            hidden: true,
+            default: false,
+        }),
+        'with-db': Flags.boolean({
+            description: 'Also remove the CLI-managed built-in database container when present',
+            default: false,
+        }),
         verbose: Flags.boolean({
             description: 'Show raw shutdown output from the underlying local or Docker command',
             default: false,
@@ -53,13 +63,23 @@ export default class AppStop extends Command {
         const { flags } = await this.parse(AppStop);
         const requestedEnv = flags.env?.trim() || undefined;
         if (requestedEnv && hasExplicitEnvSelection(this.argv)) {
-            const confirmed = await ensureCrossEnvConfirmed({
-                command: this,
-                requestedEnv,
-                yes: flags.yes,
-            });
-            if (!confirmed) {
-                return;
+            const skipCrossEnvConfirmation = flags.yes || flags.force;
+            if (!isInteractiveTerminal()) {
+                const currentEnv = await getCurrentEnvName();
+                const normalizedCurrentEnv = String(currentEnv ?? '').trim() || undefined;
+                if (normalizedCurrentEnv && normalizedCurrentEnv !== requestedEnv && !skipCrossEnvConfirmation) {
+                    this.error(formatStopCrossEnvConfirmationRequiredMessage(normalizedCurrentEnv, requestedEnv));
+                }
+            }
+            else {
+                const confirmed = await ensureCrossEnvConfirmed({
+                    command: this,
+                    requestedEnv,
+                    yes: skipCrossEnvConfirmation,
+                });
+                if (!confirmed) {
+                    return;
+                }
             }
         }
         const runtime = await resolveManagedAppRuntime(requestedEnv);
@@ -83,32 +103,58 @@ export default class AppStop extends Command {
         }
         announceTargetEnv(runtime.envName);
         if (runtime.kind === 'docker') {
+            startTask(`Removing the saved Docker app container for "${runtime.envName}"...`);
+            try {
+                const state = await removeDockerContainerIfExists(runtime.containerName, {
+                    stdio: commandStdio,
+                });
+                succeedTask(state === 'removed'
+                    ? `Docker app container removed for "${runtime.envName}".`
+                    : `No Docker app container found for "${runtime.envName}".`);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                failTask(`Failed to stop NocoBase for "${runtime.envName}".`);
+                this.error(formatStopFailure(runtime.envName, message));
+            }
+        }
+        else {
             startTask(`Stopping NocoBase for "${runtime.envName}"...`);
             try {
-                const state = await stopDockerContainer(runtime.containerName, {
+                await runLocalNocoBaseCommand(runtime, ['pm2', 'kill'], {
                     stdio: commandStdio,
                 });
-                succeedTask(state === 'already-stopped'
-                    ? `NocoBase is already stopped for "${runtime.envName}".`
-                    : `NocoBase has stopped for "${runtime.envName}".`);
+                succeedTask(`NocoBase has stopped for "${runtime.envName}".`);
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
                 failTask(`Failed to stop NocoBase for "${runtime.envName}".`);
                 this.error(formatStopFailure(runtime.envName, message));
             }
+        }
+        if (!flags['with-db']) {
+            return;
+        }
+        if (runtime.kind !== 'local' && runtime.kind !== 'docker') {
+            return;
+        }
+        const dbContainerName = builtinDbContainerName(runtime);
+        if (!dbContainerName) {
+            printInfo(`Env "${runtime.envName}" does not use a CLI-managed built-in database. Only the app runtime was stopped.`);
             return;
         }
-        startTask(`Stopping NocoBase for "${runtime.envName}"...`);
+        startTask(`Removing the built-in database container for "${runtime.envName}"...`);
         try {
-            await runLocalNocoBaseCommand(runtime, ['pm2', 'kill'], {
+            const state = await removeDockerContainerIfExists(dbContainerName, {
                 stdio: commandStdio,
             });
-            succeedTask(`NocoBase has stopped for "${runtime.envName}".`);
+            succeedTask(state === 'removed'
+                ? `Built-in database container removed for "${runtime.envName}".`
+                : `No built-in database container found for "${runtime.envName}".`);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            failTask(`Failed to stop NocoBase for "${runtime.envName}".`);
+            failTask(`Failed to stop the built-in database for "${runtime.envName}".`);
             this.error(formatStopFailure(runtime.envName, message));
         }
     }