@chabokan.net/cli 0.8.10 → 0.8.15

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @chabokan.net/cli
 $ chabok COMMAND
 running command...
 $ chabok (--version|-v)
-@chabokan.net/cli/0.8.10 darwin-arm64 node-v20.13.1
+@chabokan.net/cli/0.8.15 darwin-arm64 node-v20.13.1
 $ chabok --help [COMMAND]
 USAGE
   $ chabok COMMAND
@@ -69,7 +69,7 @@ DESCRIPTION
   show accounts list
 ```
 
-_See code: [src/commands/account/list.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/account/list.ts)_
+_See code: [src/commands/account/list.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/account/list.ts)_
 
 ## `chabok account remove`
 
@@ -86,7 +86,7 @@ DESCRIPTION
   remove account from list
 ```
 
-_See code: [src/commands/account/remove.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/account/remove.ts)_
+_See code: [src/commands/account/remove.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/account/remove.ts)_
 
 ## `chabok account use`
 
@@ -104,7 +104,7 @@ DESCRIPTION
   switch your default user between logged in users
 ```
 
-_See code: [src/commands/account/use.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/account/use.ts)_
+_See code: [src/commands/account/use.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/account/use.ts)_
 
 ## `chabok autocomplete [SHELL]`
 
@@ -154,7 +154,7 @@ DESCRIPTION
   this command help you build and deploy your service to chabokan in easy way.
 ```
 
-_See code: [src/commands/deploy.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/deploy.ts)_
+_See code: [src/commands/deploy.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/deploy.ts)_
 
 ## `chabok help [COMMAND]`
 
@@ -194,7 +194,7 @@ DESCRIPTION
   login to hub.chabokan.net account
 ```
 
-_See code: [src/commands/login.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/login.ts)_
 
 ## `chabok plugins`
 
@@ -501,7 +501,7 @@ DESCRIPTION
   show account services list
 ```
 
-_See code: [src/commands/service/list.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/service/list.ts)_
+_See code: [src/commands/service/list.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/service/list.ts)_
 
 ## `chabok service logs`
 
@@ -519,7 +519,7 @@ DESCRIPTION
   read latest logs from service
 ```
 
-_See code: [src/commands/service/logs.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/service/logs.ts)_
+_See code: [src/commands/service/logs.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/service/logs.ts)_
 
 ## `chabok service resize`
 
@@ -540,7 +540,7 @@ DESCRIPTION
   resize a service
 ```
 
-_See code: [src/commands/service/resize.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/service/resize.ts)_
+_See code: [src/commands/service/resize.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/service/resize.ts)_
 
 ## `chabok service restart`
 
@@ -558,7 +558,7 @@ DESCRIPTION
   restart a service
 ```
 
-_See code: [src/commands/service/restart.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/service/restart.ts)_
+_See code: [src/commands/service/restart.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/service/restart.ts)_
 
 ## `chabok service start`
 
@@ -576,7 +576,7 @@ DESCRIPTION
   start a service
 ```
 
-_See code: [src/commands/service/start.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/service/start.ts)_
+_See code: [src/commands/service/start.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/service/start.ts)_
 
 ## `chabok service stop`
 
@@ -594,7 +594,7 @@ DESCRIPTION
   stop a service
 ```
 
-_See code: [src/commands/service/stop.ts](https://github.com/chabokan/cli/blob/v0.8.10/src/commands/service/stop.ts)_
+_See code: [src/commands/service/stop.ts](https://github.com/chabokan/cli/blob/v0.8.15/src/commands/service/stop.ts)_
 
 ## `chabok version`
 

package/dist/base.d.ts

@@ -1,15 +1,17 @@
 import { Command } from '@oclif/core';
+import { AxiosRequestConfig } from 'axios';
+import type { ConfigFile } from './types.js';
 export default abstract class extends Command {
     static flags: {
         help: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<void>;
     };
-    axiosConfig: any;
+    axiosConfig: AxiosRequestConfig;
     got: import("got").Got<never>;
-    read_config(): Promise<{
-        users: {};
-        default_user: string;
-    }>;
-    write_config(object: any): Promise<void>;
-    get_services(filter?: {}): Promise<any>;
+    read_config(): Promise<ConfigFile>;
+    write_config(object: ConfigFile): Promise<void>;
+    get_services(filter?: Record<string, string>): Promise<Array<{
+        value: string;
+        name: string;
+    }>>;
     init_run(): Promise<void>;
 }

package/dist/base.js

@@ -11,14 +11,15 @@ export default class default_1 extends Command {
         help: Flags.help({ char: 'h' }),
     };
     axiosConfig = {
-        ...axios.defaults
+        ...axios.defaults,
+        headers: {}
     };
     got = got.extend();
     async read_config() {
         return read_config_file();
     }
     async write_config(object) {
-        fs.writeFileSync(GLOBAL_CONF_PATH, JSON.stringify(object));
+        fs.writeFileSync(GLOBAL_CONF_PATH, JSON.stringify(object, null, 2));
     }
     async get_services(filter = {}) {
         return await get_all_services(filter, this.axiosConfig);
@@ -28,20 +29,19 @@ export default class default_1 extends Command {
         const main_agent = new https.Agent({
             rejectUnauthorized: false
         });
-        // @ts-ignore
-        const gotConfig = {};
+        const gotConfig = {
+            prefixUrl: BASE_API_URL,
+            agent: { https: main_agent }
+        };
         this.axiosConfig.httpsAgent = main_agent;
         this.axiosConfig.baseURL = BASE_API_URL;
-        gotConfig.prefixUrl = this.axiosConfig.baseURL;
-        gotConfig.agent = { https: main_agent };
         const proxy = process.env.http_proxy || process.env.https_proxy;
         if (proxy) {
             this.log(`Using proxy server ${proxy}`);
-            // @ts-ignore
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-call
             const agent = new HttpsProxyAgent(proxy);
             this.axiosConfig.httpsAgent = agent;
             this.axiosConfig.proxy = false;
-            // @ts-ignore
             gotConfig.agent = { https: agent };
         }
         const config_json = read_config_file();
@@ -49,9 +49,12 @@ export default class default_1 extends Command {
         if (isEmptyObject(config_json) || isEmptyObject(config_json.users)) {
             return;
         }
-        // @ts-ignore
-        const token = config_json.users[config_json.default_user]["token"] || null;
+        const defaultUser = config_json.default_user;
+        const token = defaultUser && config_json.users[defaultUser]?.token;
         if (token) {
+            if (!this.axiosConfig.headers) {
+                this.axiosConfig.headers = {};
+            }
             this.axiosConfig.headers.Authorization = `Token ${token}`;
             gotConfig.headers = { Authorization: `Token ${token}` };
         }

package/dist/commands/account/list.js

@@ -1,28 +1,37 @@
 import Command from "../../base.js";
 import { ux } from "@oclif/core";
+import chalk from "chalk";
 export default class AccountList extends Command {
     static description = "show accounts list";
     static flags = {
         ...Command.flags,
     };
     async run() {
-        const { args, flags } = await this.parse(AccountList);
+        const { flags } = await this.parse(AccountList);
         const cli = this;
-        await this.init_run();
-        const config_json = await this.read_config();
-        if (Object.keys(config_json.users).length > 0) {
-            const accounts_data = Object.keys(config_json.users).map((account) => {
-                return {
-                    Name: account,
-                };
-            });
-            ux.table(accounts_data, {
-                Name: {},
-            }, flags);
+        try {
+            await this.init_run();
+            const config_json = await this.read_config();
+            if (Object.keys(config_json.users).length > 0) {
+                const accounts_data = Object.keys(config_json.users).map((account) => {
+                    return {
+                        Name: account,
+                    };
+                });
+                ux.table(accounts_data, {
+                    Name: {},
+                }, flags);
+            }
+            else {
+                cli.log(`${chalk.yellow('[Info]')} No accounts found. Please login first using 'chabok login'.`);
+                return;
+            }
         }
-        else {
-            cli.log("first you should login");
-            return;
+        catch (error) {
+            cli.log(`${chalk.red('[Error]')} Failed to list accounts. Please try again.`);
+            if (process.env.CHABOK_DEBUG === "true") {
+                cli.log(error);
+            }
         }
     }
 }

package/dist/commands/account/remove.js

@@ -11,24 +11,28 @@ export default class AccountRemove extends Command {
     };
     async run() {
         const cli = this;
-        const { args, flags } = await this.parse(AccountRemove);
+        const { flags } = await this.parse(AccountRemove);
         const config_json = read_config_file();
         if (isEmptyObject(config_json.users)) {
             cli.log(`${chalk.red("[Error]")} first you should login!`);
             return;
         }
-        let { user } = await inquirer.prompt({
+        const { user } = await inquirer.prompt({
             type: "list",
             message: "Please select a user:",
             name: "user",
             choices: Object.keys(config_json.users),
         });
-        // @ts-ignore
-        delete config_json.users[user];
-        if (config_json["default_user"] == user) {
-            config_json["default_user"] = "";
+        if (user in config_json.users) {
+            delete config_json.users[user];
+            if (config_json.default_user === user) {
+                config_json.default_user = "";
+            }
+            fs.writeFileSync(GLOBAL_CONF_PATH, JSON.stringify(config_json, null, 2));
+            cli.log(`${chalk.green("[Success]")} user deleted successfully.`);
+        }
+        else {
+            cli.log(`${chalk.red("[Error]")} selected user does not exist!`);
         }
-        fs.writeFileSync(GLOBAL_CONF_PATH, JSON.stringify(config_json));
-        cli.log(`${chalk.green("[Success]")} user deleted successfully.`);
     }
 }

package/dist/commands/account/use.js

@@ -13,7 +13,7 @@ export default class AccountUse extends Command {
     };
     async run() {
         const cli = this;
-        const { args, flags } = await this.parse(AccountUse);
+        const { flags } = await this.parse(AccountUse);
         const config_json = read_config_file();
         let default_user = flags.user;
         if (isEmptyObject(config_json.users)) {
@@ -21,7 +21,7 @@ export default class AccountUse extends Command {
             return;
         }
         if (!flags.user) {
-            let { user } = await inquirer.prompt({
+            const { user } = await inquirer.prompt({
                 type: "list",
                 message: "Please select a user:",
                 name: "user",
@@ -29,13 +29,13 @@ export default class AccountUse extends Command {
             });
             default_user = user;
         }
-        if (default_user in config_json.users) {
-            config_json["default_user"] = default_user;
-            fs.writeFileSync(GLOBAL_CONF_PATH, JSON.stringify(config_json));
+        if (default_user && default_user in config_json.users) {
+            config_json.default_user = default_user;
+            fs.writeFileSync(GLOBAL_CONF_PATH, JSON.stringify(config_json, null, 2));
             cli.log(`${chalk.green("[Success]")} user changed successfully.`);
         }
         else {
-            cli.log(`${chalk.red("[Error]")} selected user not exist!`);
+            cli.log(`${chalk.red("[Error]")} selected user does not exist!`);
         }
     }
 }

package/dist/commands/deploy.d.ts

@@ -1,4 +1,5 @@
 import Command from "../base.js";
+import type { ChabokFile } from "../types.js";
 export default class Deploy extends Command {
     static description: string;
     static flags: {
@@ -7,8 +8,8 @@ export default class Deploy extends Command {
         help: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<void>;
     };
     run(): Promise<void>;
-    prepare_archive(project_path: any): Promise<string>;
-    upload(archive_path: any, selected_service: any, cli: any, chabok_file: any): Promise<{
+    prepare_archive(project_path: string): Promise<string>;
+    upload(archive_path: string, selected_service: string, cli: Command, chabok_file: ChabokFile): Promise<{
         success: boolean;
         message: string;
     }>;

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
+            });
         }
     }
 }