@dokploy/cli 0.2.4 → 0.2.5

package/dist/commands/database/redis/deploy.js

@@ -1,69 +1,103 @@
-import { Command } from "@oclif/core";
+import { Command, Flags } from "@oclif/core";
 import { readAuthConfig } from "../../../utils/utils.js";
 import chalk from "chalk";
 import { getProject, getProjects } from "../../../utils/shared.js";
 import inquirer from "inquirer";
 import axios from "axios";
 export default class DatabaseRedisDeploy extends Command {
-    static description = "Deploy an redis to a project.";
-    static examples = ["$ <%= config.bin %> app deploy"];
+    static description = "Deploy a Redis instance to a project.";
+    static examples = ["$ <%= config.bin %> redis deploy"];
+    static flags = {
+        projectId: Flags.string({
+            char: "p",
+            description: "ID of the project",
+            required: false,
+        }),
+        redisId: Flags.string({
+            char: "r",
+            description: "ID of the Redis instance to deploy",
+            required: false,
+        }),
+        skipConfirm: Flags.boolean({
+            char: "y",
+            description: "Skip confirmation prompt",
+            default: false,
+        }),
+    };
     async run() {
         const auth = await readAuthConfig(this);
-        console.log(chalk.blue.bold("\n  Listing all Projects \n"));
-        const projects = await getProjects(auth, this);
-        const { project } = await inquirer.prompt([
-            {
-                choices: projects.map((project) => ({
-                    name: project.name,
-                    value: project,
-                })),
-                message: "Select a project to deploy the redis in:",
-                name: "project",
-                type: "list",
-            },
-        ]);
-        const projectId = project.projectId;
-        const projectSelected = await getProject(projectId, auth, this);
-        if (projectSelected.redis.length === 0) {
-            this.error(chalk.yellow("No redis found in this project."));
+        const { flags } = await this.parse(DatabaseRedisDeploy);
+        let { projectId, redisId } = flags;
+        // Modo interactivo si no se proporcionan los flags necesarios
+        if (!projectId || !redisId) {
+            console.log(chalk.blue.bold("\n  Listing all Projects \n"));
+            const projects = await getProjects(auth, this);
+            if (!projectId) {
+                const { project } = await inquirer.prompt([
+                    {
+                        choices: projects.map((project) => ({
+                            name: project.name,
+                            value: project,
+                        })),
+                        message: "Select a project to deploy the Redis instance from:",
+                        name: "project",
+                        type: "list",
+                    },
+                ]);
+                projectId = project.projectId;
+            }
+            const projectSelected = await getProject(projectId, auth, this);
+            if (projectSelected.redis.length === 0) {
+                this.error(chalk.yellow("No Redis instances found in this project."));
+            }
+            if (!redisId) {
+                const dbAnswers = await inquirer.prompt([
+                    {
+                        // @ts-ignore
+                        choices: projectSelected.redis.map((db) => ({
+                            name: db.name,
+                            value: db.redisId,
+                        })),
+                        message: "Select the Redis instance to deploy:",
+                        name: "selectedDb",
+                        type: "list",
+                    },
+                ]);
+                redisId = dbAnswers.selectedDb;
+            }
         }
-        const appAnswers = await inquirer.prompt([
-            {
-                // @ts-ignore
-                choices: projectSelected.redis.map((app) => ({
-                    name: app.name,
-                    value: app.redisId,
-                })),
-                message: "Select the redis to deploy:",
-                name: "selectedApp",
-                type: "list",
-            },
-        ]);
-        const redisId = appAnswers.selectedApp;
-        const confirmAnswers = await inquirer.prompt([
-            {
-                default: false,
-                message: "Are you sure you want to deploy this redis?",
-                name: "confirmDelete",
-                type: "confirm",
-            },
-        ]);
-        if (!confirmAnswers.confirmDelete) {
-            this.error(chalk.yellow("redis deployment cancelled."));
+        // Confirmar si no se especifica --skipConfirm
+        if (!flags.skipConfirm) {
+            const confirmAnswers = await inquirer.prompt([
+                {
+                    default: false,
+                    message: "Are you sure you want to deploy this Redis instance?",
+                    name: "confirmDeploy",
+                    type: "confirm",
+                },
+            ]);
+            if (!confirmAnswers.confirmDeploy) {
+                this.error(chalk.yellow("Redis deployment cancelled."));
+            }
         }
-        const response = await axios.post(`${auth.url}/api/trpc/redis.deploy`, {
-            json: {
-                redisId,
-            },
-        }, {
-            headers: {
-                Authorization: `Bearer ${auth.token}`,
-                "Content-Type": "application/json",
-            },
-        });
-        if (response.status !== 200) {
-            this.error(chalk.red("Error deploying redis"));
+        try {
+            const response = await axios.post(`${auth.url}/api/trpc/redis.deploy`, {
+                json: {
+                    redisId,
+                },
+            }, {
+                headers: {
+                    Authorization: `Bearer ${auth.token}`,
+                    "Content-Type": "application/json",
+                },
+            });
+            if (response.status !== 200) {
+                this.error(chalk.red("Error deploying Redis instance"));
+            }
+            this.log(chalk.green("Redis instance deployed successfully."));
+        }
+        catch (error) {
+            this.error(chalk.red(`Error deploying Redis instance: ${error.message}`));
         }
-        this.log(chalk.green("Redis deployed successful."));
     }
 }

package/dist/commands/database/redis/stop.d.ts

@@ -2,5 +2,10 @@ import { Command } from "@oclif/core";
 export default class DatabaseRedisStop extends Command {
     static description: string;
     static examples: string[];
+    static flags: {
+        projectId: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        redisId: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        skipConfirm: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
 }

package/dist/commands/database/redis/stop.js

@@ -1,69 +1,103 @@
-import { Command } from "@oclif/core";
+import { Command, Flags } from "@oclif/core";
+import { readAuthConfig } from "../../../utils/utils.js";
 import chalk from "chalk";
+import { getProject, getProjects } from "../../../utils/shared.js";
 import inquirer from "inquirer";
 import axios from "axios";
-import { getProject, getProjects } from "../../../utils/shared.js";
-import { readAuthConfig } from "../../../utils/utils.js";
 export default class DatabaseRedisStop extends Command {
-    static description = "Stop an redis from a project.";
+    static description = "Stop a Redis instance in a project.";
     static examples = ["$ <%= config.bin %> redis stop"];
+    static flags = {
+        projectId: Flags.string({
+            char: "p",
+            description: "ID of the project",
+            required: false,
+        }),
+        redisId: Flags.string({
+            char: "r",
+            description: "ID of the Redis instance to stop",
+            required: false,
+        }),
+        skipConfirm: Flags.boolean({
+            char: "y",
+            description: "Skip confirmation prompt",
+            default: false,
+        }),
+    };
     async run() {
         const auth = await readAuthConfig(this);
-        console.log(chalk.blue.bold("\n  Listing all Projects \n"));
-        const projects = await getProjects(auth, this);
-        const { project } = await inquirer.prompt([
-            {
-                choices: projects.map((project) => ({
-                    name: project.name,
-                    value: project,
-                })),
-                message: "Select a project to stop the redis in:",
-                name: "project",
-                type: "list",
-            },
-        ]);
-        const projectId = project.projectId;
-        const projectSelected = await getProject(projectId, auth, this);
-        if (projectSelected.redis.length === 0) {
-            this.error(chalk.yellow("No redis found in this project."));
+        const { flags } = await this.parse(DatabaseRedisStop);
+        let { projectId, redisId } = flags;
+        // Modo interactivo si no se proporcionan los flags necesarios
+        if (!projectId || !redisId) {
+            console.log(chalk.blue.bold("\n  Listing all Projects \n"));
+            const projects = await getProjects(auth, this);
+            if (!projectId) {
+                const { project } = await inquirer.prompt([
+                    {
+                        choices: projects.map((project) => ({
+                            name: project.name,
+                            value: project,
+                        })),
+                        message: "Select a project to stop the Redis instance from:",
+                        name: "project",
+                        type: "list",
+                    },
+                ]);
+                projectId = project.projectId;
+            }
+            const projectSelected = await getProject(projectId, auth, this);
+            if (projectSelected.redis.length === 0) {
+                this.error(chalk.yellow("No Redis instances found in this project."));
+            }
+            if (!redisId) {
+                const dbAnswers = await inquirer.prompt([
+                    {
+                        // @ts-ignore
+                        choices: projectSelected.redis.map((db) => ({
+                            name: db.name,
+                            value: db.redisId,
+                        })),
+                        message: "Select the Redis instance to stop:",
+                        name: "selectedDb",
+                        type: "list",
+                    },
+                ]);
+                redisId = dbAnswers.selectedDb;
+            }
+        }
+        // Confirmar si no se especifica --skipConfirm
+        if (!flags.skipConfirm) {
+            const confirmAnswers = await inquirer.prompt([
+                {
+                    default: false,
+                    message: "Are you sure you want to stop this Redis instance?",
+                    name: "confirmStop",
+                    type: "confirm",
+                },
+            ]);
+            if (!confirmAnswers.confirmStop) {
+                this.error(chalk.yellow("Redis stop cancelled."));
+            }
         }
-        const appAnswers = await inquirer.prompt([
-            {
-                // @ts-ignore
-                choices: projectSelected.redis.map((app) => ({
-                    name: app.name,
-                    value: app.redisId,
-                })),
-                message: "Select the redis to stop:",
-                name: "selectedApp",
-                type: "list",
-            },
-        ]);
-        const redisId = appAnswers.selectedApp;
-        const confirmAnswers = await inquirer.prompt([
-            {
-                default: false,
-                message: "Are you sure you want to stop this redis?",
-                name: "confirmDelete",
-                type: "confirm",
-            },
-        ]);
-        if (!confirmAnswers.confirmDelete) {
-            this.error(chalk.yellow("redis stop cancelled."));
+        try {
+            const response = await axios.post(`${auth.url}/api/trpc/redis.stop`, {
+                json: {
+                    redisId,
+                },
+            }, {
+                headers: {
+                    Authorization: `Bearer ${auth.token}`,
+                    "Content-Type": "application/json",
+                },
+            });
+            if (response.status !== 200) {
+                this.error(chalk.red("Error stopping Redis instance"));
+            }
+            this.log(chalk.green("Redis instance stopped successfully."));
         }
-        const response = await axios.post(`${auth.url}/api/trpc/redis.stop`, {
-            json: {
-                redisId,
-            },
-        }, {
-            headers: {
-                Authorization: `Bearer ${auth.token}`,
-                "Content-Type": "application/json",
-            },
-        });
-        if (response.status !== 200) {
-            this.error(chalk.red("Error stopping redis"));
+        catch (error) {
+            this.error(chalk.red(`Error stopping Redis instance: ${error.message}`));
         }
-        this.log(chalk.green("Redis stop successful."));
     }
 }

package/dist/commands/project/create.d.ts

@@ -3,8 +3,9 @@ export default class ProjectCreate extends Command {
     static description: string;
     static examples: string[];
     static flags: {
-        description: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         name: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        description: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        skipConfirm: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/project/create.js

@@ -4,56 +4,76 @@ import chalk from "chalk";
 import inquirer from "inquirer";
 import { readAuthConfig } from "../../utils/utils.js";
 export default class ProjectCreate extends Command {
-    static description = "Create a new project with an optional description.";
+    static description = "Create a new project.";
     static examples = [
-        "$ <%= config.bin %> <%= command.id %> -n MyProject -d 'This is my project description'",
-        "$ <%= config.bin %> <%= command.id %> -n MyProject",
-        "$ <%= config.bin %> <%= command.id %>",
+        "$ <%= config.bin %> project create",
+        "$ <%= config.bin %> project create -n MyProject -d 'Project description'",
+        "$ <%= config.bin %> project create --name MyProject --skipConfirm",
     ];
     static flags = {
+        name: Flags.string({
+            char: "n",
+            description: "Name of the project",
+            required: false,
+        }),
         description: Flags.string({
             char: "d",
             description: "Description of the project",
             required: false,
         }),
-        name: Flags.string({
-            char: "n",
-            description: "Name of the project",
-            required: false,
+        skipConfirm: Flags.boolean({
+            char: "y",
+            description: "Skip confirmation prompt",
+            default: false,
         }),
     };
     async run() {
         const auth = await readAuthConfig(this);
-        console.log(chalk.blue.bold("\n  Create a New Project \n"));
         const { flags } = await this.parse(ProjectCreate);
-        let answers = {};
-        const questions = [];
-        if (!flags.name) {
-            questions.push({
-                message: chalk.green("Enter the project name:"),
-                name: "name",
-                type: "input",
-                validate: (input) => (input ? true : "Project name is required"),
-            });
-        }
-        if (!flags.description) {
-            questions.push({
-                default: "",
-                message: chalk.green("Enter the project description (optional):"),
-                name: "description",
-                type: "input",
-            });
+        let { name, description } = flags;
+        // Modo interactivo si no se proporcionan los flags necesarios
+        if (!name) {
+            const answers = await inquirer.prompt([
+                {
+                    message: "Enter the project name:",
+                    name: "name",
+                    type: "input",
+                    validate: (input) => (input ? true : "Project name is required"),
+                },
+                {
+                    message: "Enter the project description (optional):",
+                    name: "description",
+                    type: "input",
+                    default: description || "",
+                },
+            ]);
+            name = answers.name;
+            description = answers.description;
         }
-        if (questions.length > 0) {
-            answers = await inquirer.prompt(questions);
+        // Confirmar si no se especifica --skipConfirm
+        if (!flags.skipConfirm) {
+            const confirm = await inquirer.prompt([
+                {
+                    type: 'confirm',
+                    name: 'proceed',
+                    message: 'Do you want to create this project?',
+                    default: false,
+                },
+            ]);
+            if (!confirm.proceed) {
+                this.error(chalk.yellow("Project creation cancelled."));
+                return;
+            }
         }
-        const name = flags.name || answers.name;
-        const description = flags.description || answers.description;
         try {
+            console.log(JSON.stringify({
+                name,
+                description,
+            }, null, 2));
             const response = await axios.post(`${auth.url}/api/trpc/project.create`, {
                 json: {
-                    description,
                     name,
+                    description,
                 },
             }, {
                 headers: {
@@ -62,13 +82,12 @@ export default class ProjectCreate extends Command {
                 },
             });
             if (!response.data.result.data.json) {
-                this.error(chalk.red("Error`"));
+                this.error(chalk.red("Error creating project", response.data.result.data.json));
             }
             this.log(chalk.green(`Project '${name}' created successfully.`));
         }
         catch (error) {
-            // @ts-expect-error hola
-            this.error(chalk.red(`Failed to create project: ${error.message}`));
+            this.error(chalk.red(`Error creating project: ${error.message}`));
         }
     }
 }

package/dist/utils/utils.js

@@ -6,14 +6,21 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const configPath = path.join(__dirname, "..", "..", "config.json");
 export const readAuthConfig = async (command) => {
+    // Primero intentar leer desde variables de entorno
+    const envToken = process.env.DOKPLOY_AUTH_TOKEN;
+    const envUrl = process.env.DOKPLOY_URL;
+    if (envToken && envUrl) {
+        return { token: envToken, url: envUrl };
+    }
+    // Si no hay variables de entorno, usar el archivo de configuración
     if (!fs.existsSync(configPath)) {
-        command.error(chalk.red("No configuration file found. Please authenticate first using the 'authenticate' command."));
+        command.error(chalk.red("No configuration file found and no environment variables set. Please authenticate first using the 'authenticate' command or set DOKPLOY_URL and DOKPLOY_AUTH_TOKEN environment variables."));
     }
     const configFileContent = fs.readFileSync(configPath, "utf8");
     const config = JSON.parse(configFileContent);
     const { token, url } = config;
     if (!url || !token) {
-        command.error(chalk.red("Incomplete authentication details. Please authenticate again using the 'authenticate' command."));
+        command.error(chalk.red("Incomplete authentication details. Please authenticate again using the 'authenticate' command or set environment variables."));
     }
     return { token, url };
 };