add error report and optimize loading function

Author: chhpt

.gitignore

@@ -67,3 +67,4 @@ example/**/tcb.json
 node_modules
 
 .vscode
+.idea

bin/cloudbase.js

@@ -1,12 +1,19 @@
 #!/usr/bin/env node
-const program = require('commander')
 const chalk = require('chalk')
+const Sentry = require('@sentry/node')
+const program = require('commander')
 const logSymbols = require('log-symbols')
 const updateNotifier = require('update-notifier')
 const pkg = require('../package.json')
 
 const isBeta = pkg.version.indexOf('-') > -1
 
+// Sentry 错误上报
+Sentry.init({
+    release: pkg.version,
+    dsn: 'https://fff0077d06624655ad70d1ee25df419e@report.url.cn/sentry/1782'
+})
+
 // 检查更新
 const ONE_DAY = 86400000
 // Beta 版 1 个小时检查一次，稳定版 1 天检查一次

package-lock.json

@@ -20,6 +20,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@sentry/node": "^5.5.0",
     "@zeit/ncc": "^0.13.0",
     "archiver": "^3.0.0",
     "arg": "^4.1.1",
@@ -28,6 +29,7 @@
     "commander": "^3.0.1",
     "configstore": "^5.0.0",
     "del": "^3.0.0",
+    "dot-prop": "^5.1.0",
     "form-data": "^2.5.0",
     "fs-extra": "^7.0.1",
     "get-stream": "^5.1.0",
@@ -43,7 +45,9 @@
     "portfinder": "^1.0.20",
     "query-string": "^6.8.1",
     "tar-fs": "^2.0.0",
-    "update-notifier": "^3.0.1"
+    "update-notifier": "^3.0.1",
+    "write-file-atomic": "^3.0.1",
+    "xdg-basedir": "^4.0.0"
   },
   "devDependencies": {
     "@types/configstore": "^4.0.0",

package.json

@@ -4,11 +4,10 @@ import crypto from 'crypto'
 import portfinder from 'portfinder'
 import queryString from 'query-string'
 import open from 'open'
-import ora from 'ora'
 import Logger from '../logger'
 import { Credential } from '../types'
 import { getPlatformRelease } from '../utils/os-release'
-import { fetch } from '../utils'
+import { fetch, loading } from '../utils'
 
 const logger = new Logger('Auth')
 
@@ -83,7 +82,7 @@ async function createLocalServer(): Promise<ServerRes> {
 // 打开云开发控制台，获取授权
 export async function getAuthTokenFromWeb(): Promise<Credential> {
     return new Promise(async (resolve, reject) => {
-        const authSpinner = ora('正在打开腾讯云获取授权').start()
+        loading.start('正在打开腾讯云获取授权')
 
         try {
             const { server, port } = await createLocalServer()
@@ -94,7 +93,7 @@ export async function getAuthTokenFromWeb(): Promise<Credential> {
             const CliAuthUrl = `${CliAuthBaseUrl}?port=${port}&hash=${hash}&mac=${mac}&os=${os}`
             await open(CliAuthUrl)
 
-            authSpinner.succeed(
+            loading.succeed(
                 '已打开云开发 CLI 授权页面，请在云开发 CLI 授权页面同意授权！'
             )
 
@@ -124,7 +123,7 @@ export async function getAuthTokenFromWeb(): Promise<Credential> {
             )
         } catch (err) {
             logger.error(err.message)
-            authSpinner.fail('获取授权失败！')
+            loading.fail('获取授权失败！')
             reject(err)
         }
     })

src/auth/auth.ts

@@ -1,7 +1,6 @@
 import program from 'commander'
-import ora from 'ora'
 import inquirer from 'inquirer'
-import { printCliTable, getEnvId } from '../../utils'
+import { printCliTable, getEnvId, loading } from '../../utils'
 import { CloudBaseError } from '../../error'
 import { successLog } from '../../logger'
 import { getEnvAuthDomains, createEnvDomain, deleteEnvDomain } from '../../env'
@@ -82,18 +81,18 @@ program
         const { configFile } = options.parent
         const assignEnvId = await getEnvId(envId, configFile)
 
-        const loadSpinner = ora('拉取环境安全域名中...').start()
+        loading.start('拉取环境安全域名中')
 
         const domains = await getEnvAuthDomains({
             envId: assignEnvId
         })
 
         if (domains.length === 0) {
-            loadSpinner.fail('域名安全为空！')
+            loading.fail('域名安全为空！')
             return
         }
 
-        loadSpinner.succeed('拉取环境安全域名成功！')
+        loading.succeed('拉取环境安全域名成功！')
 
         const domainList = domains.map(item => item.Domain)
 

src/commands/env/domain.ts

@@ -1,9 +1,8 @@
 import program from 'commander'
-import ora from 'ora'
-import { listEnvs, createEnv, getEnvInfo } from '../../env'
-import { printCliTable } from '../../utils'
+import { listEnvs, createEnv, getEnvInfo, updateEnvInfo } from '../../env'
+import { printCliTable, loading, getEnvId } from '../../utils'
 import { CloudBaseError } from '../../error'
-import { successLog, warnLog } from '../../logger'
+import { warnLog, successLog } from '../../logger'
 
 import './domain'
 import './login'
@@ -71,21 +70,44 @@ program
             throw new CloudBaseError('环境名称不能为空！')
         }
 
+        loading.start('创建环境中')
+
         const res = await createEnv({
             alias
         })
 
+        loading.succeed('创建环境成功！')
+        loading.start('环境初始化中')
+
         if (res.Status === 'NORMAL') {
-            successLog('创建环境成功！')
+            loading.start('环境初始化成功')
             return
         }
 
         // 检查环境是否初始化成功
-        const initSpinner = ora('环境初始化中...').start()
         try {
             await checkEnvAvailability(res.EnvId)
-            initSpinner.succeed('环境初始化成功')
+            loading.succeed('环境初始化成功')
         } catch (e) {
-            initSpinner.fail(e.message)
+            loading.fail(e.message)
         }
     })
+
+program
+    .command('env:rename <name> [envId]')
+    .description('重命名环境')
+    .action(async function(name: string, envId: string, options) {
+        if (!name) {
+            throw new CloudBaseError('环境名称不能为空！')
+        }
+
+        const { configFile } = options.parent
+        const assignEnvId = await getEnvId(envId, configFile)
+
+        await updateEnvInfo({
+            envId: assignEnvId,
+            alias: name
+        })
+
+        successLog('更新环境名成功 ！')
+    })

src/commands/env/index.ts

@@ -1,9 +1,9 @@
-import ora from 'ora'
 import path from 'path'
 import { FunctionContext } from '../../types'
 import { CloudBaseError } from '../../error'
 import { updateFunctionCode } from '../../function'
 import { getEnvInfo } from '../../env'
+import { loading } from '../../utils'
 
 export async function codeUpdate(ctx: FunctionContext, options) {
     const { name, envId, config, functions } = ctx
@@ -25,17 +25,17 @@ export async function codeUpdate(ctx: FunctionContext, options) {
         throw new CloudBaseError(`函数 ${name} 配置不存在`)
     }
 
-    const spinner = ora(`[${func.name}] 函数代码更新中...`).start()
+    loading.start(`[${func.name}] 函数代码更新中...`)
     try {
         await updateFunctionCode({
             func,
             envId,
             codeSecret,
             functionRootPath: path.join(process.cwd(), config.functionRoot)
         })
-        spinner.succeed(`[${func.name}] 函数代码更新成功！`)
+        loading.succeed(`[${func.name}] 函数代码更新成功！`)
     } catch (e) {
-        spinner.stop()
+        loading.stop()
         throw e
     }
 }