@cloudbase/cli 2.0.12-alpha.1 → 2.0.13

package/.history/package_20220712151717.json

@@ -1,88 +0,0 @@
-{
-    "name": "@cloudbase/cli",
-    "version": "2.0.12-alpha.0",
-    "description": "cli tool for cloudbase",
-    "main": "lib/index.js",
-    "scripts": {
-        "build": "rimraf lib types && tsc",
-        "watch": "rimraf lib types && tsc -w",
-        "dev": "rimraf lib types && tsc -w",
-        "eslint": "eslint \"./**/*.ts\"",
-        "test": "jest --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
-        "tsc": "tsc",
-        "pkg": "pkg ./bin/cloudbase.js --out-path ./pkg",
-        "postinstall": "node ./post-install.js || exit 0"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/TencentCloudBase/cloud-base-cli.git"
-    },
-    "bin": {
-        "tcb": "bin/tcb.js",
-        "cloudbase": "bin/cloudbase.js"
-    },
-    "husky": {
-        "hooks": {
-            "pre-commit": "npm run build && git add ."
-        }
-    },
-    "author": "cwuyiqing@gmail.com",
-    "license": "ISC",
-    "dependencies": {
-        "@cloudbase/cloud-api": "^0.5.5",
-        "@cloudbase/framework-core": "^1.6.1",
-        "@cloudbase/lowcode-cli": "0.14.5-alpha.1",
-        "@cloudbase/manager-node": "4.0.1",
-        "@cloudbase/toolbox": "^0.7.3",
-        "@sentry/node": "^5.10.2",
-        "address": "^1.1.2",
-        "chalk": "^2.4.2",
-        "cli-table3": "^0.5.1",
-        "commander": "7",
-        "del": "^5.1.0",
-        "didyoumean": "^1.2.2",
-        "enquirer": "^2.3.6",
-        "execa": "^4.0.3",
-        "fs-extra": "^8.1.0",
-        "https-proxy-agent": "^5.0.1",
-        "inquirer": "^6.5.0",
-        "lodash": "^4.17.21",
-        "log-symbols": "^3.0.0",
-        "lowdb": "^1.0.0",
-        "make-dir": "^3.0.0",
-        "node-fetch": "^2.6.0",
-        "open": "^7.0.0",
-        "ora": "^4.0.2",
-        "portfinder": "^1.0.28",
-        "progress": "^2.0.3",
-        "query-string": "^6.8.1",
-        "reflect-metadata": "^0.1.13",
-        "semver": "^7.3.7",
-        "tar-fs": "^2.0.1",
-        "terminal-link": "^2.1.1",
-        "unzipper": "^0.10.10",
-        "update-notifier": "^4.0.0",
-        "xdg-basedir": "^4.0.0",
-        "yargs": "^16.2.0",
-        "yargs-parser": "^21.0.1"
-    },
-    "devDependencies": {
-        "@types/jest": "^27",
-        "@types/koa__router": "^8.0.11",
-        "@types/lodash": "^4.14.182",
-        "@types/node": "^12.12.38",
-        "@types/node-fetch": "^2.5.4",
-        "@types/react": "^17.0.37",
-        "@types/semver": "^7.3.9",
-        "@types/webpack-dev-server": "^3.11.1",
-        "@typescript-eslint/eslint-plugin": "^4.8.1",
-        "@typescript-eslint/parser": "^4.8.1",
-        "eslint": "^7.14.0",
-        "eslint-config-alloy": "^3.8.2",
-        "husky": "^3.0.9",
-        "jest": "^27",
-        "rimraf": "^3.0.2",
-        "ts-jest": "^27",
-        "typescript": "^4.7.2"
-    }
-}

package/.history/src/commands/lowcode/app_20220624162613.ts

@@ -1,34 +0,0 @@
-import _ from 'lodash'
-import { Command, ICommand } from '../common'
-import { watchApp } from '@cloudbase/lowcode-cli'
-import { InjectParams, Log, Logger, CmdContext, ArgsOptions } from '../../decorators'
-
-@ICommand()
-export class LowCodeWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--wx-devtool-path <wxDevtoolPath>',
-                    desc: '微信开发者工具的安装路径'
-                }
-            ],
-            desc: '开启云开发低码的本地构建模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        await watchApp({
-            watchPort: 8288,
-            wxDevtoolPath: options?.wxDevtoolPath,
-        })
-    }
-}

package/.history/src/commands/lowcode/app_20220627114205.ts

@@ -1,52 +0,0 @@
-import _ from 'lodash'
-import { Command, ICommand } from '../common'
-import { watchApp } from '@cloudbase/lowcode-cli'
-import { InjectParams, Log, Logger, CmdContext, ArgsOptions } from '../../decorators'
-
-@ICommand()
-export class LowCodeWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--wx-devtool-path <wxDevtoolPath>',
-                    desc: '微信开发者工具的安装路径'
-                }
-            ],
-            desc: '开启云开发低码的本地构建模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        await watchApp({
-            watchPort: 8288,
-            wxDevtoolPath: options?.wxDevtoolPath
-        })
-    }
-}
-
-@ICommand()
-export class DanielWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch-ws',
-            options: [],
-            desc: '开启云开发低码的本地开发模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        console.log('>>> 启动啦')
-    }
-}

package/.history/src/index_20220624162613.ts

@@ -1,13 +0,0 @@
-import 'reflect-metadata'
-import { registerCommands } from './commands/common'
-import './commands'
-
-export { smartDeploy } from './commands'
-
-registerCommands()
-
-// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
-if (typeof globalThis === undefined) {
-    // eslint-disable-next-line no-undef
-    ;(globalThis as any) = global
-}

package/.history/src/index_20220627113609.ts

@@ -1,15 +0,0 @@
-import 'reflect-metadata'
-import { registerCommands } from './commands/common'
-import './commands'
-
-export { smartDeploy } from './commands'
-
-registerCommands()
-
-// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
-if (typeof globalThis === undefined) {
-    // eslint-disable-next-line no-undef
-    ;(globalThis as any) = global
-}
-
-console.log("daniel tcb")

package/.history/src/index_20220627114102.ts

@@ -1,13 +0,0 @@
-import 'reflect-metadata'
-import { registerCommands } from './commands/common'
-import './commands'
-
-export { smartDeploy } from './commands'
-
-registerCommands()
-
-// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
-if (typeof globalThis === undefined) {
-    // eslint-disable-next-line no-undef
-    ;(globalThis as any) = global
-}

package/src/auth/index.ts

@@ -1,2 +0,0 @@
-export * from './login'
-export * from './logout'

package/src/auth/login.ts

@@ -1,91 +0,0 @@
-import _ from 'lodash'
-import { Credential } from '@cloudbase/toolbox'
-import { authSupevisor, checkAndGetCredential, execWithLoading, checkEnvAvaliable } from '../utils'
-import { ILoginOptions } from '../types'
-import { ENV_STATUS } from '../constant'
-import { Logger } from '../decorators'
-import { getEnvInfo } from '../env'
-
-const log = new Logger()
-
-// 登录返回 code 与信息
-const LoginRes = {
-    SUCCESS: {
-        code: 'SUCCESS',
-        msg: '登录成功！'
-    },
-    INVALID_TOKEN: {
-        code: 'INVALID_TOKEN',
-        msg: '无效的身份信息！'
-    },
-    CHECK_LOGIN_FAILED: {
-        code: 'CHECK_LOGIN_FAILED',
-        msg: '检查登录态失败'
-    },
-    INVALID_PARAM(msg) {
-        return {
-            code: 'INVALID_PARAM',
-            msg: `参数无效：${msg}`
-        }
-    }
-}
-
-// 打开腾讯云-云开发控制台，通过获取临时密钥登录，临时密钥可续期，最长时间为 1 个月
-export async function loginByWebAuth() {
-    const credential = await authSupevisor.loginByWebAuth()
-
-    if (_.isEmpty(credential)) {
-        return LoginRes.INVALID_TOKEN
-    }
-
-    return {
-        credential,
-        ...LoginRes.SUCCESS
-    }
-}
-
-// 使用密钥登录
-export async function loginWithKey(secretId?: string, secretKey?: string, token?: string) {
-    if (!secretId || !secretKey) {
-        return LoginRes.INVALID_PARAM('SecretID 或 SecretKey 不能为空')
-    }
-
-    const credential = await authSupevisor.loginByApiSecret(secretId, secretKey, token)
-
-    if (_.isEmpty(credential)) {
-        return LoginRes.INVALID_TOKEN
-    }
-
-    return LoginRes.SUCCESS
-}
-
-export async function login(
-    options: ILoginOptions = {}
-): Promise<{ code: string; msg: string; credential?: Credential }> {
-    const { secretId, secretKey, key, token } = options
-    return key ? loginWithKey(secretId, secretKey, token) : loginByWebAuth()
-}
-
-// 检查是否登录，没有登录时，自动拉起浏览器授权
-export async function checkLogin() {
-    const credential = await checkAndGetCredential()
-    // 没有登录，拉起 Web 登录
-    if (_.isEmpty(credential)) {
-        log.info('你还没有登录，请在控制台中授权登录')
-
-        const res = await execWithLoading(() => login(), {
-            startTip: '获取授权中...',
-            successTip: '授权登录成功！'
-        })
-
-        const envId = res?.credential?.envId
-
-        // 登录返回 envId，检查环境初始化
-        if (envId) {
-            const env = await getEnvInfo(envId)
-            if (env.Status === ENV_STATUS.UNAVAILABLE) {
-                await checkEnvAvaliable(envId)
-            }
-        }
-    }
-}

package/src/auth/logout.ts

@@ -1,7 +0,0 @@
-import { authSupevisor } from '../utils'
-
-// 注销登录信息
-export async function logout() {
-    process.emit('logout')
-    await authSupevisor.logout()
-}

package/src/commands/account/index.ts

@@ -1,2 +0,0 @@
-export * from './login'
-export * from './logout'

package/src/commands/account/login.ts

@@ -1,192 +0,0 @@
-import _ from 'lodash'
-import chalk from 'chalk'
-import inquirer from 'inquirer'
-import { Command, ICommand } from '../common'
-import { login } from '../../auth'
-import { listEnvs } from '../../env'
-import { CloudBaseError } from '../../error'
-import { InjectParams, ArgsOptions, Log, Logger } from '../../decorators'
-import {
-    loadingFactory,
-    usageStore,
-    collectAgree,
-    genClickableLink,
-    checkAndGetCredential
-} from '../../utils'
-
-function printSuggestion() {
-    const tips = `可使用下面命令继续操作：
-
-${chalk.gray('–')} 创建免费环境
-
-  ${chalk.cyan('$ tcb env create envName')}
-
-${chalk.gray('–')} 初始化云开发项目
-
-  ${chalk.cyan('$ tcb new')}
-
-${chalk.gray('–')} 部署云函数
-
-  ${chalk.cyan('$ tcb fn deploy')}
-
-${chalk.gray('–')} 查看命令使用介绍
-
-  ${chalk.cyan('$ tcb -h')}
-
-Tips：可以使用简写命令 tcb 代替 cloudbase`
-    console.log(tips)
-}
-
-async function askForCollectDataConfirm() {
-    const agree = await usageStore.get('agreeCollect')
-    if (agree) return
-    // 询问
-    const { confirm } = await inquirer.prompt({
-        type: 'confirm',
-        name: 'confirm',
-        message: '是否同意 Cloudbase CLI 收集您的使用数据以改进产品？',
-        default: true
-    })
-
-    if (confirm) {
-        await usageStore.set('agreeCollect', true)
-    }
-
-    await collectAgree(confirm)
-}
-
-@ICommand()
-export class LoginCommand extends Command {
-    get options() {
-        return {
-            cmd: 'login',
-            options: [
-                {
-                    flags: '-k, --key',
-                    desc: '使用永久密钥登录'
-                },
-                {
-                    flags: '--apiKeyId <apiKeyId>',
-                    desc: '腾讯云 API 秘钥 Id'
-                },
-                {
-                    flags: '--apiKey <apiKey>',
-                    desc: '腾讯云 API 秘钥 Key'
-                },
-                {
-                    flags: '--token [token]',
-                    desc: '腾讯云 API 临时秘钥 Token'
-                }
-            ],
-            desc: '登录腾讯云账号',
-            requiredEnvId: false,
-            withoutAuth: true
-        }
-    }
-
-    @InjectParams()
-    async execute(@ArgsOptions() options, @Log() log: Logger) {
-        log.verbose(options)
-        const { apiKeyId, apiKey, token } = options
-        const loading = loadingFactory()
-        loading.start('检验登录状态')
-
-        const credential = await checkAndGetCredential()
-
-        if (!_.isEmpty(credential)) {
-            loading.succeed('您已登录，无需再次登录！')
-            return
-        } else {
-            loading.stop()
-        }
-
-        // 通过参数传入 API Key，适用于 CI 场景
-        if (apiKey && apiKeyId) {
-            loading.start('正在验证腾讯云密钥...')
-
-            const res = await login({
-                token,
-                key: true,
-                secretKey: apiKey,
-                secretId: apiKeyId
-            })
-
-            if (res.code === 'SUCCESS') {
-                loading.succeed('登录成功！')
-                printSuggestion()
-            } else {
-                loading.fail('腾讯云密钥验证失败，请检查密钥是否正确或终端网络是否可用！')
-                return process.exit(1)
-            }
-        } else if (options.key) {
-            // 兼容临时密钥和永久密钥登录
-            const clickableLink = genClickableLink('https://console.cloud.tencent.com/cam/capi')
-            console.log(`您可以访问 ${clickableLink} 获取 API 秘钥`)
-
-            // 使用永久密钥登录
-            const { secretId } = await inquirer.prompt({
-                type: 'input',
-                name: 'secretId',
-                message: '请输入腾讯云 SecretID：'
-            })
-
-            const { secretKey } = await inquirer.prompt({
-                type: 'input',
-                name: 'secretKey',
-                message: '请输入腾讯云 SecretKey：'
-            })
-
-            if (!secretId || !secretKey) {
-                throw new CloudBaseError('SecretID 或 SecretKey 不能为空')
-            }
-
-            loading.start('正在验证腾讯云密钥...')
-
-            const res = await login({
-                key: true,
-                secretId,
-                secretKey
-            })
-
-            if (res.code === 'SUCCESS') {
-                loading.succeed('登录成功！')
-                await askForCollectDataConfirm()
-                printSuggestion()
-            } else {
-                loading.fail('腾讯云密钥验证失败，请检查密钥是否正确或终端网络是否可用！')
-                return process.exit(1)
-            }
-        } else {
-            // 使用临时密钥登录-支持自动续期
-            loading.start('获取授权中...')
-            const res = await login()
-
-            if (res.code === 'SUCCESS') {
-                loading.succeed('登录成功！')
-                await askForCollectDataConfirm()
-                printSuggestion()
-            } else {
-                loading.fail(res.msg)
-                console.log('Web 授权登录失败，秘钥校验失败！')
-                return process.exit(1)
-            }
-        }
-
-        // 检测用户是否存在，不存在则初始化
-        try {
-            const envs = await listEnvs()
-            if (!envs.length) {
-                log.warn('您还没有可用的环境，请使用 cloudbase env:create $name 创建环境')
-            }
-        } catch (e) {
-            // 用户不存在
-            // 主账户可以直接使用 env:create 完成初始化工作
-            if (e.code === 'ResourceNotFound.UserNotExists') {
-                log.error('您还没有可用的环境，请使用 cloudbase env:create $name 创建环境！')
-            } else {
-                console.error(e)
-                throw e
-            }
-        }
-    }
-}

package/src/commands/account/logout.ts

@@ -1,24 +0,0 @@
-import { ICommand, Command } from '../common'
-
-import { logout } from '../../auth'
-import { InjectParams, Log, Logger } from '../../decorators'
-
-@ICommand()
-export class LogoutCommand extends Command {
-    get options() {
-        return {
-            cmd: 'logout',
-            options: [],
-            desc: '登出腾讯云账号',
-            requiredEnvId: false,
-            withoutAuth: true
-        }
-    }
-
-    @InjectParams()
-    async execute(@Log() log: Logger) {
-        await logout()
-
-        log.success('注销登录成功！')
-    }
-}