[update] change tab auto completion and fix data report

Author: chhpt

bin/cloudbase.js

@@ -8,13 +8,18 @@ const Sentry = require('@sentry/node')
 const logSymbols = require('log-symbols')
 const didYouMean = require('didyoumean')
 const updateNotifier = require('update-notifier')
+const omelette = require('omelette')
 
 const pkg = require('../package.json')
 const store = require('../lib/utils/store')
 const { ALL_COMMANDS } = require('../lib/constant')
 const { getProxy } = require('../lib/utils/tools/proxy')
 const { handleCompletion } = require('../lib/completion')
 
+const completion = omelette('cloudbase|tcb <action>')
+completion.on('action', handleCompletion)
+completion.init()
+
 let processArgv = process.argv
 const isBeta = pkg.version.indexOf('-') > -1
 process.CLI_VERSION = pkg.version

lib/commands/command.js

@@ -11,10 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
 const commander_1 = __importDefault(require("commander"));
-const node_1 = __importDefault(require("@sentry/node"));
+const Sentry = __importStar(require("@sentry/node"));
 const events_1 = require("events");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
@@ -64,8 +71,8 @@ class Command extends events_1.EventEmitter {
     }
     preHandle() {
         return __awaiter(this, void 0, void 0, function* () {
+            const loading = utils_1.loadingFactory();
             try {
-                const loading = utils_1.loadingFactory();
                 loading.start('数据加载中...');
                 const res = yield utils_1.getNotification();
                 loading.stop();
@@ -76,7 +83,8 @@ class Command extends events_1.EventEmitter {
                 console.log(content, '\n');
             }
             catch (e) {
-                node_1.default.captureException(e);
+                loading.stop();
+                Sentry.captureException(e);
             }
         });
     }
@@ -90,7 +98,7 @@ class Command extends events_1.EventEmitter {
                 yield utils_1.collectUsage(cmd);
             }
             catch (e) {
-                node_1.default.captureException(e);
+                Sentry.captureException(e);
             }
         });
     }

lib/commands/completion/index.js

@@ -4,16 +4,16 @@ const command_1 = require("../command");
 const tab_1 = require("./tab");
 const commands = [
     {
-        cmd: 'completion:install',
+        cmd: 'completion:setup',
         options: [],
-        desc: '安装自动补全',
+        desc: '启动自动补全命令',
         handler: tab_1.installCompletion,
         requiredEnvId: false
     },
     {
-        cmd: 'completion:uninstall',
+        cmd: 'completion:clean',
         options: [],
-        desc: '登出腾讯云账号',
+        desc: '清楚自动补全命令',
         handler: tab_1.unInstallCompletion,
         requiredEnvId: false
     }

lib/commands/completion/tab.js

@@ -12,15 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const tabtab_1 = __importDefault(require("tabtab"));
+const omelette_1 = __importDefault(require("omelette"));
 const error_1 = require("../../error");
+const logger_1 = require("../../logger");
+const completion = omelette_1.default('cloudbase|tcb <action>');
 function installCompletion() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            yield tabtab_1.default.install({
-                name: 'tcb',
-                completer: 'tcb'
+            process.on('exit', () => {
+                logger_1.successLog('安装完成，重启终端后生效！');
             });
+            completion.setupShellInitFile();
         }
         catch (e) {
             throw new error_1.CloudBaseError('安装失败！');
@@ -31,10 +33,10 @@ exports.installCompletion = installCompletion;
 function unInstallCompletion() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            yield tabtab_1.default.uninstall({
-                name: 'tcb',
-                completer: 'tcb'
+            process.on('exit', () => {
+                logger_1.successLog('卸载完成，重启终端后生效！');
             });
+            completion.cleanupShellInitFile();
         }
         catch (e) {
             throw new error_1.CloudBaseError('卸载失败！');

lib/commands/env/create.js

@@ -48,6 +48,15 @@ function create(ctx, alias) {
             message: '请选择环境计费模式：',
             default: 'postpay'
         });
+        const { confirm } = yield inquirer_1.default.prompt({
+            type: 'confirm',
+            name: 'confirm',
+            message: '因支付权限问题，仅支持通过 API 秘钥登陆的主账户使用 CLI 创建包年包月免费环境，其他用户需要登陆控制台支付相关订单才能完成环境创建，是否继续？',
+            default: false
+        });
+        if (!confirm) {
+            throw new error_1.CloudBaseError('创建环境流程终止');
+        }
         loading.start('环境创建中...');
         try {
             const res = yield env_1.createEnv({

lib/completion/index.js

@@ -1,25 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const tabtab_1 = __importDefault(require("tabtab"));
 const constant_1 = require("../constant");
-const completion = env => {
-    if (!env.complete)
-        return;
-    const args = process.argv.slice(5);
-    const cmd = args[0];
+function handleCompletion({ reply, line }) {
+    const cmd = line.replace(/^cloudbase\s|^tcb\s/, '');
     const commands = constant_1.ALL_COMMANDS.filter(item => item.indexOf(cmd) > -1);
     if (commands.length > 0) {
-        return tabtab_1.default.log(commands);
+        reply(commands);
     }
     else {
-        return tabtab_1.default.log(['-h', '-v']);
+        reply(['-h', '-v']);
     }
-};
-function handleCompletion() {
-    const env = tabtab_1.default.parseEnv(process.env);
-    completion(env);
 }
 exports.handleCompletion = handleCompletion;

lib/constant.js

@@ -21,8 +21,8 @@ exports.ALL_COMMANDS = [
     'logout',
     'init',
     'open',
-    'completion:install',
-    'completion:uninstall',
+    'completion:setup',
+    'completion:clean',
     'env:list',
     'env:rename',
     'env:create',

package-lock.json

@@ -45,12 +45,12 @@
         "make-dir": "^3.0.0",
         "node-fetch": "^2.6.0",
         "node-ssh": "^6.0.0",
+        "omelette": "^0.4.12",
         "open": "^7.0.0",
         "ora": "^4.0.2",
         "portfinder": "^1.0.20",
         "progress": "^2.0.3",
         "query-string": "^6.8.1",
-        "tabtab": "^3.0.2",
         "tar-fs": "^2.0.0",
         "terminal-link": "^2.1.1",
         "unzipper": "^0.10.5",

package.json

@@ -1,7 +1,7 @@
 /* eslint-disable no-dupe-class-members */
 import chalk from 'chalk'
 import program from 'commander'
-import Sentry from '@sentry/node'
+import * as Sentry from '@sentry/node'
 import { EventEmitter } from 'events'
 import { CloudBaseError } from '../error'
 import { ICloudBaseConfig } from '../types'
@@ -99,8 +99,8 @@ export class Command extends EventEmitter {
     }
 
     private async preHandle() {
+        const loading = loadingFactory()
         try {
-            const loading = loadingFactory()
             loading.start('数据加载中...')
             const res = await getNotification()
             loading.stop()
@@ -109,6 +109,7 @@ export class Command extends EventEmitter {
             console.log(chalk.bold.cyan(title))
             console.log(content, '\n')
         } catch (e) {
+            loading.stop()
             Sentry.captureException(e)
         }
     }