@chabokan.net/cli 0.6.0 → 0.7.3

package/README.md

@@ -19,7 +19,7 @@ $ npm install -g @chabokan.net/cli
 $ chabok COMMAND
 running command...
 $ chabok (-v|--version|version)
-@chabokan.net/cli/0.6.0 darwin-x64 node-v14.17.5
+@chabokan.net/cli/0.7.3 darwin-x64 node-v14.17.5
 $ chabok --help [COMMAND]
 USAGE
   $ chabok COMMAND
@@ -34,6 +34,7 @@ USAGE
 * [`chabok help [COMMAND]`](#chabok-help-command)
 * [`chabok login`](#chabok-login)
 * [`chabok logs`](#chabok-logs)
+* [`chabok resize`](#chabok-resize)
 * [`chabok restart`](#chabok-restart)
 * [`chabok start`](#chabok-start)
 * [`chabok stop`](#chabok-stop)
@@ -51,7 +52,7 @@ OPTIONS
   -u, --user=user  default user
 ```
 
-_See code: [src/commands/change-user.ts](https://github.com/chabokan/cli/blob/v0.6.0/src/commands/change-user.ts)_
+_See code: [src/commands/change-user.ts](https://github.com/chabokan/cli/blob/v0.7.3/src/commands/change-user.ts)_
 
 ## `chabok config-clear`
 
@@ -65,7 +66,7 @@ OPTIONS
   -h, --help  show CLI help
 ```
 
-_See code: [src/commands/config-clear.ts](https://github.com/chabokan/cli/blob/v0.6.0/src/commands/config-clear.ts)_
+_See code: [src/commands/config-clear.ts](https://github.com/chabokan/cli/blob/v0.7.3/src/commands/config-clear.ts)_
 
 ## `chabok deploy`
 
@@ -81,7 +82,7 @@ OPTIONS
   -s, --service=service  service name
 ```
 
-_See code: [src/commands/deploy.ts](https://github.com/chabokan/cli/blob/v0.6.0/src/commands/deploy.ts)_
+_See code: [src/commands/deploy.ts](https://github.com/chabokan/cli/blob/v0.7.3/src/commands/deploy.ts)_
 
 ## `chabok help [COMMAND]`
 
@@ -115,7 +116,7 @@ OPTIONS
   -u, --username=username  your username
 ```
 
-_See code: [src/commands/login.ts](https://github.com/chabokan/cli/blob/v0.6.0/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/chabokan/cli/blob/v0.7.3/src/commands/login.ts)_
 
 ## `chabok logs`
 
@@ -130,7 +131,25 @@ OPTIONS
   -s, --service=service  service name
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/chabokan/cli/blob/v0.6.0/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/chabokan/cli/blob/v0.7.3/src/commands/logs.ts)_
+
+## `chabok resize`
+
+resize a service
+
+```
+USAGE
+  $ chabok resize
+
+OPTIONS
+  -c, --cpu=cpu          CPU
+  -d, --disk=disk        DISK
+  -h, --help             show CLI help
+  -r, --ram=ram          RAM
+  -s, --service=service  service name
+```
+
+_See code: [src/commands/resize.ts](https://github.com/chabokan/cli/blob/v0.7.3/src/commands/resize.ts)_
 
 ## `chabok restart`
 
@@ -145,7 +164,7 @@ OPTIONS
   -s, --service=service  service name
 ```
 
-_See code: [src/commands/restart.ts](https://github.com/chabokan/cli/blob/v0.6.0/src/commands/restart.ts)_
+_See code: [src/commands/restart.ts](https://github.com/chabokan/cli/blob/v0.7.3/src/commands/restart.ts)_
 
 ## `chabok start`
 
@@ -160,7 +179,7 @@ OPTIONS
   -s, --service=service  service name
 ```
 
-_See code: [src/commands/start.ts](https://github.com/chabokan/cli/blob/v0.6.0/src/commands/start.ts)_
+_See code: [src/commands/start.ts](https://github.com/chabokan/cli/blob/v0.7.3/src/commands/start.ts)_
 
 ## `chabok stop`
 
@@ -175,5 +194,5 @@ OPTIONS
   -s, --service=service  service name
 ```
 
-_See code: [src/commands/stop.ts](https://github.com/chabokan/cli/blob/v0.6.0/src/commands/stop.ts)_
+_See code: [src/commands/stop.ts](https://github.com/chabokan/cli/blob/v0.7.3/src/commands/stop.ts)_
 <!-- commandsstop -->

package/lib/base.js

@@ -5,9 +5,10 @@ const command_1 = tslib_1.__importStar(require("@oclif/command"));
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const constants_1 = require("./constants");
 const helper_1 = require("./helper");
-const agent_1 = tslib_1.__importDefault(require("https-proxy-agent/dist/agent"));
+const proxy_http_agent_1 = require("proxy-http-agent");
 const fs = tslib_1.__importStar(require("fs"));
 const got_1 = tslib_1.__importDefault(require("got"));
+const https = tslib_1.__importStar(require("https"));
 class default_1 extends command_1.default {
     constructor() {
         super(...arguments);
@@ -24,16 +25,25 @@ class default_1 extends command_1.default {
         return await helper_1.get_all_services(filter, this.axiosConfig);
     }
     init_run() {
-        const gotConfig = {};
+        const main_agent = new https.Agent({
+            rejectUnauthorized: false
+        });
+        // @ts-ignore
+        const gotConfig = { https: main_agent };
+        this.axiosConfig.httpsAgent = main_agent;
         this.axiosConfig.baseURL = constants_1.BASE_API_URL;
         gotConfig.prefixUrl = this.axiosConfig.baseURL;
         const proxy = process.env.http_proxy || process.env.https_proxy;
         if (proxy) {
             this.log(`Using proxy server ${proxy}`);
             // @ts-ignore
-            const agent = new agent_1.default(proxy);
+            const agent = proxy_http_agent_1.getProxyHttpAgent({
+                proxy: proxy,
+                rejectUnauthorized: false
+            });
             this.axiosConfig.httpsAgent = agent;
             this.axiosConfig.proxy = false;
+            // @ts-ignore
             gotConfig.agent = { https: agent };
         }
         const config_json = helper_1.read_config_file();

package/lib/commands/deploy.d.ts

@@ -9,7 +9,7 @@ export default class Deploy extends Command {
     };
     run(): Promise<void>;
     prepare_archive(project_path: any): Promise<string>;
-    upload(archive_path: any, selected_service: any): Promise<{
+    upload(archive_path: any, selected_service: any, cli: any): Promise<{
         success: boolean;
         message: string;
     }>;

package/lib/commands/deploy.js

@@ -44,7 +44,7 @@ class Deploy extends base_1.default {
             }
         }
         let archive_path = await this.prepare_archive(project_path);
-        let upload_response = await this.upload(archive_path, selected_service);
+        let upload_response = await this.upload(archive_path, selected_service, cli);
         if (upload_response.success) {
             cli.log(chalk_1.default.green(upload_response.message));
         }
@@ -94,7 +94,7 @@ class Deploy extends base_1.default {
         }, fileList);
         return archivePath;
     }
-    async upload(archive_path, selected_service) {
+    async upload(archive_path, selected_service, cli) {
         let upload_response = {
             success: false,
             message: "some problem"
@@ -115,7 +115,7 @@ class Deploy extends base_1.default {
             clear: true,
         });
         try {
-            const response = await this.got.post(`services/${selected_service}/deploy/`, { body })
+            const response = await this.got.post(`ervices/${selected_service}/deploy/`, { body })
                 .on('uploadProgress', progress => {
                 bar.tick(progress.transferred - bar.curr);
             }).json();
@@ -123,9 +123,17 @@ class Deploy extends base_1.default {
                 upload_response.success = true;
                 upload_response.message = "Deployment finished successfully.";
             }
+            else {
+                if (process.env.CHABOK_DEBUG == "true") {
+                    cli.log(response);
+                }
+            }
             return upload_response;
         }
         catch (error) {
+            if (process.env.CHABOK_DEBUG == "true") {
+                cli.log(error);
+            }
             return upload_response;
         }
         finally {

package/lib/commands/resize.d.ts

@@ -0,0 +1,14 @@
+import { flags } from '@oclif/command';
+import Command from "../base";
+export default class Resize extends Command {
+    static description: string;
+    static flags: {
+        service: flags.IOptionFlag<string | undefined>;
+        ram: flags.IOptionFlag<string | undefined>;
+        cpu: flags.IOptionFlag<string | undefined>;
+        disk: flags.IOptionFlag<string | undefined>;
+        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
+    };
+    run(): Promise<void>;
+    send_request(cli: any, selected_service: any, ram: any, cpu: any, disk: any): Promise<void>;
+}

package/lib/commands/resize.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const command_1 = require("@oclif/command");
+const base_1 = tslib_1.__importDefault(require("../base"));
+const helper_1 = require("../helper");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const inquirer = tslib_1.__importStar(require("inquirer"));
+const axios_1 = tslib_1.__importDefault(require("axios"));
+class Resize extends base_1.default {
+    async run() {
+        const { args, flags } = this.parse(Resize);
+        const cli = this;
+        this.init_run();
+        const config_json = this.read_config();
+        let selected_service = flags.service;
+        let selected_ram = flags.ram;
+        let selected_cpu = flags.cpu;
+        let selected_disk = flags.disk;
+        if (helper_1.isEmptyObject(config_json.users)) {
+            cli.log(`${chalk_1.default.red('[Error]')} first you should login!`);
+            return;
+        }
+        if (!selected_service) {
+            let all_services = await this.get_services({ 'not_status': 'pending', 'has_custom_plan': 'true' });
+            if (all_services) {
+                let { service } = await inquirer.prompt({
+                    type: 'list',
+                    message: 'Please select a service:',
+                    name: 'service',
+                    choices: all_services
+                });
+                selected_service = service;
+            }
+        }
+        if (!selected_ram) {
+            let { ram } = await inquirer.prompt({
+                type: 'list',
+                message: 'Please select service ram:',
+                name: 'ram',
+                choices: [
+                    { value: "0.5", name: "0.5G" },
+                    { value: "1", name: "1G" },
+                    { value: "2", name: "2G" },
+                    { value: "4", name: "4G" },
+                    { value: "6", name: "6G" },
+                    { value: "8", name: "8G" },
+                ]
+            });
+            selected_ram = ram;
+        }
+        if (!selected_cpu) {
+            let { cpu } = await inquirer.prompt({
+                type: 'list',
+                message: 'Please select service cpu:',
+                name: 'cpu',
+                choices: [
+                    { value: "0.5", name: "0.5 Core" },
+                    { value: "1", name: "1 Core" },
+                    { value: "2", name: "2 Core" },
+                    { value: "3", name: "3 Core" },
+                    { value: "4", name: "4 Core" },
+                ]
+            });
+            selected_cpu = cpu;
+        }
+        if (!selected_disk) {
+            let { disk } = await inquirer.prompt({
+                type: 'list',
+                message: 'Please select service disk:',
+                name: 'disk',
+                choices: [
+                    { value: "5", name: "5G" },
+                    { value: "10", name: "10G" },
+                    { value: "15", name: "15G" },
+                    { value: "30", name: "30G" },
+                    { value: "40", name: "40G" },
+                    { value: "50", name: "50G" },
+                ]
+            });
+            selected_disk = disk;
+        }
+        let wrong_value = false;
+        if (selected_ram % 0.5 != 0) {
+            cli.log(`${chalk_1.default.red('[Error]')} ram amount should coefficient of 0.5`);
+            wrong_value = true;
+        }
+        if (selected_cpu % 0.5 != 0) {
+            cli.log(`${chalk_1.default.red('[Error]')} cpu amount should coefficient of 0.5`);
+            wrong_value = true;
+        }
+        if (selected_disk % 5 != 0) {
+            cli.log(`${chalk_1.default.red('[Error]')} disk amount should coefficient of 5`);
+            wrong_value = true;
+        }
+        if (selected_service && selected_ram && selected_cpu && selected_disk && !wrong_value) {
+            await this.send_request(cli, selected_service, selected_ram, selected_cpu, selected_disk);
+        }
+    }
+    async send_request(cli, selected_service, ram, cpu, disk) {
+        try {
+            if (selected_service) {
+                const { data } = await axios_1.default.post("services/" + selected_service + "/resize/", {
+                    "ram": ram,
+                    "cpu": cpu,
+                    "disk": disk,
+                }, this.axiosConfig);
+                if (data.success) {
+                    cli.log(`${chalk_1.default.green('[Success]')} service resized successfully.`);
+                }
+                else {
+                    cli.log(`${chalk_1.default.red('[Error]')} some problem in resize.`);
+                }
+            }
+        }
+        catch (e) {
+            if (e.response.status == 404) {
+                cli.log(chalk_1.default.blue("Selected Service Not Founded."));
+            }
+            else {
+                console.log(e.data);
+            }
+        }
+    }
+}
+exports.default = Resize;
+Resize.description = 'resize a service';
+Resize.flags = Object.assign(Object.assign({}, base_1.default.flags), { service: command_1.flags.string({ char: 's', description: 'service name' }), ram: command_1.flags.string({ char: 'r', description: 'RAM' }), cpu: command_1.flags.string({ char: 'c', description: 'CPU' }), disk: command_1.flags.string({ char: 'd', description: 'DISK' }) });

package/lib/helper.js

@@ -45,7 +45,7 @@ async function get_all_services(filter = {}, axiosConfig) {
         const { data } = await axios_1.default.get("services/" + url_filter, axiosConfig);
         data.services.forEach(function (item) {
             // @ts-ignore
-            all_services.push(item.main_name);
+            all_services.push({ "value": item.main_name, "name": `${item.main_name} (${item.platform.name})` });
         });
     }
     catch (e) {

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.6.0","commands":{"change-user":{"id":"change-user","description":"switch your default user between logged in users","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"user":{"name":"user","type":"option","char":"u","description":"default user"}},"args":[]},"config-clear":{"id":"config-clear","description":"clear config file, data such as auth will be removed.","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"deploy":{"id":"deploy","description":"this command help you build and deploy your service to chabokan in easy way.","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"path":{"name":"path","type":"option","char":"p","description":"service path in your computer"},"service":{"name":"service","type":"option","char":"s","description":"service name"}},"args":[]},"login":{"id":"login","description":"login to hub.chabokan.net account","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"username":{"name":"username","type":"option","char":"u","description":"your username"},"password":{"name":"password","type":"option","char":"p","description":"your password"},"token":{"name":"token","type":"option","char":"t","description":"login with api token"}},"args":[]},"logs":{"id":"logs","description":"read latest logs from service","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"service":{"name":"service","type":"option","char":"s","description":"service name"}},"args":[]},"restart":{"id":"restart","description":"restart a service","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"service":{"name":"service","type":"option","char":"s","description":"service name"}},"args":[]},"start":{"id":"start","description":"start a service","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"service":{"name":"service","type":"option","char":"s","description":"service name"}},"args":[]},"stop":{"id":"stop","description":"stop a service","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"service":{"name":"service","type":"option","char":"s","description":"service name"}},"args":[]}}}
+{"version":"0.7.3","commands":{"change-user":{"id":"change-user","description":"switch your default user between logged in users","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"user":{"name":"user","type":"option","char":"u","description":"default user"}},"args":[]},"config-clear":{"id":"config-clear","description":"clear config file, data such as auth will be removed.","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"deploy":{"id":"deploy","description":"this command help you build and deploy your service to chabokan in easy way.","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"path":{"name":"path","type":"option","char":"p","description":"service path in your computer"},"service":{"name":"service","type":"option","char":"s","description":"service name"}},"args":[]},"login":{"id":"login","description":"login to hub.chabokan.net account","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"username":{"name":"username","type":"option","char":"u","description":"your username"},"password":{"name":"password","type":"option","char":"p","description":"your password"},"token":{"name":"token","type":"option","char":"t","description":"login with api token"}},"args":[]},"logs":{"id":"logs","description":"read latest logs from service","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"service":{"name":"service","type":"option","char":"s","description":"service name"}},"args":[]},"resize":{"id":"resize","description":"resize a service","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"service":{"name":"service","type":"option","char":"s","description":"service name"},"ram":{"name":"ram","type":"option","char":"r","description":"RAM"},"cpu":{"name":"cpu","type":"option","char":"c","description":"CPU"},"disk":{"name":"disk","type":"option","char":"d","description":"DISK"}},"args":[]},"restart":{"id":"restart","description":"restart a service","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"service":{"name":"service","type":"option","char":"s","description":"service name"}},"args":[]},"start":{"id":"start","description":"start a service","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"service":{"name":"service","type":"option","char":"s","description":"service name"}},"args":[]},"stop":{"id":"stop","description":"stop a service","pluginName":"@chabokan.net/cli","pluginType":"core","aliases":[],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"service":{"name":"service","type":"option","char":"s","description":"service name"}},"args":[]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chabokan.net/cli",
   "description": "Chabokan Cli for PaaS Services",
-  "version": "0.6.0",
+  "version": "0.7.3",
   "author": "Mohammad Abdi",
   "bin": {
     "chabok": "./bin/run"
@@ -34,7 +34,10 @@
   ],
   "homepage": "https://github.com/chabokan/cli",
   "keywords": [
-    "oclif"
+    "chabokan",
+    "paas",
+    "hosting",
+    "cloud"
   ],
   "license": "MIT",
   "main": "lib/index.js",
@@ -70,6 +73,7 @@
     "inquirer": "^6.5.2",
     "progress": "^2.0.3",
     "tar": "^6.1.2",
-    "tslib": "^1.14.1"
+    "tslib": "^1.14.1",
+    "proxy-http-agent": "latest"
   }
 }