@chabokan.net/cli 0.8.9 → 0.8.15

package/dist/commands/deploy.js

@@ -2,7 +2,7 @@ import { Flags } from "@oclif/core";
 import inquirer from "inquirer";
 import chalk from "chalk";
 import Command from "../base.js";
-import { addIgnorePatterns, isEmptyObject } from "../helper.js";
+import { addIgnorePatterns, isEmptyObject, handleApiError, logErrorDetails } from "../helper.js";
 import ProgressBar from "progress";
 import FormData from "form-data";
 import ignore from "ignore";
@@ -23,21 +23,25 @@ export default class Deploy extends Command {
         service: Flags.string({ char: "s", description: "service name" }),
     };
     async run() {
-        const { args, flags } = await this.parse(Deploy);
+        const { flags } = await this.parse(Deploy);
         const cli = this;
         await this.init_run();
         const config_json = await this.read_config();
         let selected_service = flags.service;
-        let project_path = flags.path ? flags.path : process.cwd();
+        const project_path = flags.path ? flags.path : process.cwd();
         let chabok_file = { service: "" };
         try {
-            chabok_file =
-                JSON.parse(fs
-                    .readFileSync(path.join(project_path, "chabok.json"))
-                    .toString("utf-8")) || {};
-            cli.log("Reading Config from chabok.json ...");
+            const chabokFilePath = path.join(project_path, "chabok.json");
+            if (fs.existsSync(chabokFilePath)) {
+                chabok_file = JSON.parse(fs.readFileSync(chabokFilePath).toString("utf-8")) || {};
+                cli.log("Reading Config from chabok.json ...");
+            }
+        }
+        catch (error) {
+            if (process.env.CHABOK_DEBUG === "true") {
+                cli.log(`Error reading chabok.json: ${error}`);
+            }
         }
-        catch { }
         if (chabok_file.service) {
             selected_service = chabok_file.service;
         }
@@ -46,12 +50,12 @@ export default class Deploy extends Command {
             return;
         }
         if (!selected_service) {
-            let all_services = await this.get_services({
+            const all_services = await this.get_services({
                 has_deploy: "true",
                 status: "on",
             });
             if (all_services.length > 0) {
-                let { service } = await inquirer.prompt({
+                const { service } = await inquirer.prompt({
                     type: "list",
                     message: "Please select a service:",
                     name: "service",
@@ -64,72 +68,106 @@ export default class Deploy extends Command {
                 return;
             }
         }
-        let archive_path = await this.prepare_archive(project_path);
-        let upload_response = await this.upload(archive_path, selected_service, cli, chabok_file);
-        if (upload_response.success) {
-            cli.log(chalk.green(upload_response.message));
+        if (!selected_service) {
+            cli.log(`${chalk.red("[Error]")} No service selected.`);
+            return;
         }
-        else {
-            cli.log(chalk.red("[Error] " + upload_response.message));
+        try {
+            const archive_path = await this.prepare_archive(project_path);
+            const upload_response = await this.upload(archive_path, selected_service, cli, chabok_file);
+            if (upload_response.success) {
+                cli.log(chalk.green(upload_response.message));
+            }
+            else {
+                cli.log(chalk.red(`[Error] ${upload_response.message}`));
+            }
+        }
+        catch (error) {
+            const errorInfo = handleApiError(error, 'Deployment failed. Please check your project files and try again.', {
+                endpoint: `services/${selected_service}/deploy/`,
+                serviceName: selected_service,
+                operation: 'Deploy'
+            });
+            cli.log(chalk.red(`[Error] ${errorInfo.message}`));
+            logErrorDetails(errorInfo, cli);
         }
     }
     async prepare_archive(project_path) {
-        const defaultIgnores = [
-            ".npm",
-            ".git",
-            ".idea",
-            ".DS_Store",
-            ".vscode",
-            "__pycache__",
-            ".next",
-            ".nuxt",
-            "*.*~",
-            "node_modules",
-            "bower_components",
-            "venv",
-            "/vendor",
-            "*.log",
-        ];
-        const ignoreCache = {};
-        const ignoreInstance = ignore.default({ ignorecase: false });
-        ignoreInstance.add(defaultIgnores);
-        const ignoreFN = (f) => {
-            const dir = dirname(f);
-            if (!ignoreCache[dir]) {
-                addIgnorePatterns(ignoreInstance, project_path, dir);
-                ignoreCache[dir] = true;
+        try {
+            if (!fs.existsSync(project_path)) {
+                throw new Error(`Project path does not exist: ${project_path}`);
             }
-            if (!ignoreInstance.ignores(f)) {
-                return true;
+            if (!fs.statSync(project_path).isDirectory()) {
+                throw new Error(`Project path is not a directory: ${project_path}`);
             }
-            console.log(`ignoring ${f}`);
-            return false;
-        };
-        const tmpDir = path.join(os.tmpdir(), "/chabok-cli");
-        const archivePath = path.join(tmpDir, `${Date.now()}.tar.gz`);
-        fs.ensureDirSync(tmpDir);
-        const fileList = fs.readdirSync(project_path).filter(ignoreFN);
-        tar.c({
-            gzip: {
-                level: 9,
-            },
-            sync: true,
-            cwd: project_path,
-            filter: ignoreFN,
-            file: archivePath,
-        }, fileList);
-        return archivePath;
+            const defaultIgnores = [
+                ".npm",
+                ".git",
+                ".idea",
+                ".DS_Store",
+                ".vscode",
+                "__pycache__",
+                ".next",
+                ".nuxt",
+                "*.*~",
+                "node_modules",
+                "bower_components",
+                "venv",
+                "/vendor",
+                "*.log",
+            ];
+            const ignoreCache = {};
+            const ignoreInstance = ignore.default({ ignorecase: false });
+            ignoreInstance.add(defaultIgnores);
+            const ignoreFN = (f) => {
+                const dir = dirname(f);
+                if (!ignoreCache[dir]) {
+                    addIgnorePatterns(ignoreInstance, project_path, dir);
+                    ignoreCache[dir] = true;
+                }
+                if (!ignoreInstance.ignores(f)) {
+                    return true;
+                }
+                if (process.env.CHABOK_DEBUG === "true") {
+                    console.log(`ignoring ${f}`);
+                }
+                return false;
+            };
+            const tmpDir = path.join(os.tmpdir(), "/chabok-cli");
+            const archivePath = path.join(tmpDir, `${Date.now()}.tar.gz`);
+            fs.ensureDirSync(tmpDir);
+            const fileList = fs.readdirSync(project_path).filter(ignoreFN);
+            if (fileList.length === 0) {
+                throw new Error(`No files to archive in ${project_path}. The directory may be empty or all files are ignored.`);
+            }
+            tar.c({
+                gzip: {
+                    level: 9,
+                },
+                sync: true,
+                cwd: project_path,
+                filter: ignoreFN,
+                file: archivePath,
+            }, fileList);
+            return archivePath;
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                throw new Error(`Failed to prepare archive: ${error.message}`);
+            }
+            throw new Error('Failed to prepare archive: Unknown error');
+        }
     }
     async upload(archive_path, selected_service, cli, chabok_file) {
-        let upload_response = {
+        const upload_response = {
             success: false,
             message: "some problem",
         };
         const body = new FormData();
-        // @ts-ignore
         body.append("file", fs.createReadStream(archive_path));
         body.append("options", JSON.stringify(chabok_file));
-        const { size: sourceSize } = fs.statSync(archive_path);
+        const stats = fs.statSync(archive_path);
+        const sourceSize = stats.size;
         if (sourceSize > MAX_SOURCE_SIZE) {
             upload_response.message = "Source is too large. (max: 100MB)";
             return upload_response;
@@ -150,24 +188,31 @@ export default class Deploy extends Command {
                 .json();
             if (response.success) {
                 upload_response.success = true;
-                upload_response.message = "Deployment finished successfully.";
+                upload_response.message = `Deployment to service '${selected_service}' finished successfully.`;
             }
             else {
-                if (process.env.CHABOK_DEBUG == "true") {
-                    cli.log(response);
+                upload_response.message = `Deployment failed: ${String(response.message || "Unknown error occurred. Please try again.")}`;
+                if (process.env.CHABOK_DEBUG === "true") {
+                    cli.log(JSON.stringify(response, null, 2));
                 }
             }
             return upload_response;
         }
         catch (error) {
-            if (process.env.CHABOK_DEBUG == "true") {
-                cli.log(error);
-            }
+            const errorInfo = handleApiError(error, 'Deployment failed. Please check your project files and network connection.', {
+                endpoint: `services/${selected_service}/deploy/`,
+                serviceName: selected_service,
+                operation: 'Upload Deployment'
+            });
+            upload_response.message = errorInfo.message;
+            logErrorDetails(errorInfo, cli);
             return upload_response;
         }
         finally {
             // cleanup
-            fs.unlink(archive_path).catch(() => { });
+            fs.unlink(archive_path).catch(() => {
+                // Ignore cleanup errors
+            });
         }
     }
 }

package/dist/commands/login.js

@@ -2,7 +2,7 @@ import { Flags } from '@oclif/core';
 import inquirer from 'inquirer';
 import axios from "axios";
 import chalk from "chalk";
-import { isObject } from "../helper.js";
+import { isObject, handleApiError, logErrorDetails } from "../helper.js";
 import Command from "../base.js";
 export default class Login extends Command {
     static description = 'login to hub.chabokan.net account';
@@ -13,20 +13,23 @@ export default class Login extends Command {
         token: Flags.string({ char: 't', description: 'login with api token' }),
     };
     async run() {
-        const { args, flags } = await this.parse(Login);
+        const { flags } = await this.parse(Login);
         const cli = this;
         await this.init_run();
         const config_json = await this.read_config();
-        const body = { username: flags.username, password: flags.password };
+        const body = {
+            username: flags.username,
+            password: flags.password
+        };
         if (!flags.token) {
             if (!flags.username) {
-                let { username } = await inquirer.prompt({
+                const { username } = await inquirer.prompt({
                     type: 'input',
                     message: 'Enter your username:',
                     name: 'username',
                     validate(input) {
                         if (input.length === 0) {
-                            return false;
+                            return 'Username cannot be empty';
                         }
                         return true;
                     }
@@ -34,57 +37,74 @@ export default class Login extends Command {
                 body.username = username;
             }
             if (!flags.password) {
-                let { password } = await inquirer.prompt({
+                const { password } = await inquirer.prompt({
                     type: 'password',
                     name: 'password',
                     message: 'Enter your password:',
                     validate(input) {
                         if (input.length === 0) {
-                            return false;
+                            return 'Password cannot be empty';
                         }
                         return true;
                     }
                 });
                 body.password = password;
             }
-            const { data } = await axios.post("accounts/login/", body, this.axiosConfig);
-            if (data.success) {
-                if (!isObject(config_json.users)) {
-                    config_json.users = {};
+            if (!body.username || !body.password) {
+                cli.log(`${chalk.red('[Error]')} Username and password are required!`);
+                return;
+            }
+            try {
+                const { data } = await axios.post("accounts/login/", body, this.axiosConfig);
+                if (data.success && data.token) {
+                    if (!isObject(config_json.users)) {
+                        config_json.users = {};
+                    }
+                    config_json.users[body.username] = {
+                        token: data.token
+                    };
+                    config_json.default_user = body.username;
+                    await this.write_config(config_json);
+                    cli.log(`${chalk.green('[Success]')} You are logged in successfully as '${body.username}'.`);
+                }
+                else {
+                    cli.log(`${chalk.red('[Error]')} Login failed: Invalid username or password. Please check your credentials and try again.`);
                 }
-                // @ts-ignore
-                config_json.users[body.username] = {
-                    "token": data.token
-                };
-                config_json["default_user"] = body.username;
-                this.write_config(config_json);
-                cli.log(`${chalk.green('[Success]')} you are logged in successfully.`);
             }
-            else {
-                cli.log(`${chalk.red('[Error]')} your username or password is wrong!`);
+            catch (error) {
+                const errorInfo = handleApiError(error, 'Login failed. Please check your credentials and try again.', {
+                    endpoint: 'accounts/login/',
+                    operation: 'Login'
+                });
+                cli.log(`${chalk.red('[Error]')} ${errorInfo.message}`);
+                logErrorDetails(errorInfo, cli);
             }
         }
         else {
             try {
+                if (!this.axiosConfig.headers) {
+                    this.axiosConfig.headers = {};
+                }
                 this.axiosConfig.headers.Authorization = `Token ${flags.token}`;
                 const { data } = await axios.get("accounts/info/", this.axiosConfig);
                 if (!isObject(config_json.users)) {
                     config_json.users = {};
                 }
-                // @ts-ignore
-                config_json.users[data.user.email] = {
-                    "token": flags.token
+                const email = data.user.email;
+                config_json.users[email] = {
+                    token: flags.token
                 };
-                config_json["default_user"] = data.user.email;
+                config_json.default_user = email;
                 await this.write_config(config_json);
-                cli.log(`${chalk.green('[Success]')} you are logged in successfully.`);
+                cli.log(`${chalk.green('[Success]')} You are logged in successfully as '${email}' using API token.`);
             }
-            catch (e) {
-                if (process.env.CHABOK_DEBUG == "true") {
-                    // @ts-ignore
-                    cli.log(e);
-                }
-                cli.log(`${chalk.red('[Error]')} your token is wrong!`);
+            catch (error) {
+                const errorInfo = handleApiError(error, 'Invalid API token. Please verify your token and try again.', {
+                    endpoint: 'accounts/info/',
+                    operation: 'Token Login'
+                });
+                cli.log(`${chalk.red('[Error]')} ${errorInfo.message}`);
+                logErrorDetails(errorInfo, cli);
             }
         }
     }

package/dist/commands/service/list.js

@@ -1,32 +1,45 @@
 import Command from "../../base.js";
 import { ux } from "@oclif/core";
+import chalk from "chalk";
+import { isEmptyObject, handleApiError, logErrorDetails } from "../../helper.js";
 export default class ServiceList extends Command {
     static description = "show account services list";
     static flags = {
         ...Command.flags,
     };
     async run() {
-        const { args, flags } = await this.parse(ServiceList);
+        const { flags } = await this.parse(ServiceList);
         const cli = this;
-        await this.init_run();
-        const config_json = await this.read_config();
-        let all_services = await this.get_services();
-        if (all_services.length > 0) {
-            const services_data = all_services.map((service) => {
-                // const shamshiate = shamsi.gregorianToJalali(
-                //   new Date(project.created)
-                // );
-                return {
-                    Name: service.name,
-                };
-            });
-            ux.table(services_data, {
-                Name: {},
-            }, flags);
+        try {
+            await this.init_run();
+            const config_json = await this.read_config();
+            if (isEmptyObject(config_json.users)) {
+                cli.log(`${chalk.red('[Error]')} Please login first using 'chabok login'.`);
+                return;
+            }
+            const all_services = await this.get_services();
+            if (all_services.length > 0) {
+                const services_data = all_services.map((service) => {
+                    return {
+                        Name: service.name,
+                    };
+                });
+                ux.table(services_data, {
+                    Name: {},
+                }, flags);
+            }
+            else {
+                cli.log(`${chalk.yellow('[Info]')} No services found. Please create a service first.`);
+                return;
+            }
         }
-        else {
-            cli.log("first you should create service");
-            return;
+        catch (error) {
+            const errorInfo = handleApiError(error, 'Failed to fetch services list.', {
+                endpoint: 'services/',
+                operation: 'List Services'
+            });
+            cli.log(`${chalk.red('[Error]')} ${errorInfo.message}`);
+            logErrorDetails(errorInfo, cli);
         }
     }
 }

package/dist/commands/service/logs.d.ts

@@ -6,5 +6,5 @@ export default class ServiceLogs extends Command {
         help: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<void>;
     };
     run(): Promise<void>;
-    send_request(cli: any, selected_service: any): Promise<void>;
+    send_request(cli: Command, selected_service: string): Promise<void>;
 }

package/dist/commands/service/logs.js

@@ -1,6 +1,6 @@
 import { Flags } from '@oclif/core';
 import Command from "../../base.js";
-import { isEmptyObject } from "../../helper.js";
+import { isEmptyObject, handleApiError, logErrorDetails } from "../../helper.js";
 import chalk from "chalk";
 import inquirer from 'inquirer';
 import axios from "axios";
@@ -11,7 +11,7 @@ export default class ServiceLogs extends Command {
         service: Flags.string({ char: 's', description: 'service name' }),
     };
     async run() {
-        const { args, flags } = await this.parse(ServiceLogs);
+        const { flags } = await this.parse(ServiceLogs);
         const cli = this;
         await this.init_run();
         const config_json = await this.read_config();
@@ -21,9 +21,9 @@ export default class ServiceLogs extends Command {
             return;
         }
         if (!flags.service) {
-            let all_services = await this.get_services();
+            const all_services = await this.get_services();
             if (all_services.length > 0) {
-                let { service } = await inquirer.prompt({
+                const { service } = await inquirer.prompt({
                     type: 'list',
                     message: 'Please select a service:',
                     name: 'service',
@@ -36,24 +36,33 @@ export default class ServiceLogs extends Command {
                 return;
             }
         }
-        await this.send_request(cli, selected_service);
+        if (selected_service) {
+            await this.send_request(cli, selected_service);
+        }
     }
     async send_request(cli, selected_service) {
         try {
-            if (selected_service) {
-                const { data } = await axios.get("services/" + selected_service + "/logs/", this.axiosConfig);
-                if (data.success) {
-                    cli.log(data.logs);
-                }
+            const { data } = await axios.get(`services/${selected_service}/logs/`, this.axiosConfig);
+            if (data.success && data.logs) {
+                cli.log(data.logs);
+            }
+            else {
+                cli.log(`${chalk.yellow('[Warning]')} No logs available for service '${selected_service}'. The service may not have generated any logs yet.`);
             }
         }
-        catch (e) {
-            if (e.response.status == 404) {
-                cli.log(chalk.blue("Selected Service Not Founded."));
+        catch (error) {
+            const errorInfo = handleApiError(error, 'Failed to fetch service logs.', {
+                endpoint: `services/${selected_service}/logs/`,
+                serviceName: selected_service,
+                operation: 'Fetch Logs'
+            });
+            if (errorInfo.status === 404) {
+                cli.log(`${chalk.red('[Error]')} Service '${selected_service}' not found. Please verify the service name using 'chabok service list' and try again.`);
             }
             else {
-                console.log(e.data);
+                cli.log(`${chalk.red('[Error]')} ${errorInfo.message}`);
             }
+            logErrorDetails(errorInfo, cli);
         }
     }
 }

package/dist/commands/service/resize.d.ts

@@ -9,5 +9,5 @@ export default class ServiceResize extends Command {
         help: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<void>;
     };
     run(): Promise<void>;
-    send_request(cli: any, selected_service: any, ram: any, cpu: any, disk: any): Promise<void>;
+    send_request(cli: Command, selected_service: string, ram: string, cpu: string, disk: string): Promise<void>;
 }