@cloudbase/cli 2.0.12 → 2.1.0

package/src/commands/functions/deploy.ts

@@ -1,293 +0,0 @@
-import path from 'path'
-import inquirer from 'inquirer'
-import { getRegion } from '@cloudbase/toolbox'
-import { Command, ICommand } from '../common'
-import { CloudBaseError } from '../../error'
-import { createFunction } from '../../function'
-import { queryGateway, createGateway } from '../../gateway'
-import {
-    logger,
-    random,
-    isDirectory,
-    loadingFactory,
-    genClickableLink,
-    highlightCommand,
-    checkFullAccess,
-    AsyncTaskParallelController
-} from '../../utils'
-import { ICreateFunctionOptions } from '../../types'
-import { DefaultFunctionDeployConfig } from '../../constant'
-import { InjectParams, CmdContext, ArgsParams, Log, Logger } from '../../decorators'
-
-const regionIdMap = {
-    'ap-guangzhou': 1,
-    'ap-shanghai': 4,
-    'ap-beijing': 8
-}
-
-@ICommand()
-export class FunctionDeploy extends Command {
-    get options() {
-        return {
-            cmd: 'fn',
-            childCmd: 'deploy [name]',
-            deprecateCmd: 'functions:deploy [name]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--code-secret <codeSecret>',
-                    desc: '传入此参数将保护代码，格式为 36 位大小写字母和数字'
-                },
-                {
-                    flags: '--force',
-                    desc: '如果存在同名函数，上传后覆盖同名函数'
-                },
-                {
-                    flags: '--path <path>',
-                    desc: '自动创建HTTP 访问服务访问路径'
-                },
-                {
-                    flags: '--all',
-                    desc: '部署配置文件中的包含的全部云函数'
-                },
-                {
-                    flags: '--dir <dir>',
-                    desc: '指定云函数的文件夹路径'
-                }
-            ],
-            desc: '部署云函数'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsParams() params, @Log() log: Logger) {
-        const { envId, config, options } = ctx
-        const { functions } = config
-        const { force, codeSecret, path: access, all, dir } = options
-        const functionRootPath = path.join(process.cwd(), config.functionRoot)
-        const name = params?.[0]
-
-        if (access && checkFullAccess(access)) {
-            log.warn('--path 参数已更换为HTTP 访问服务路径，请使用 --dir 指定部署函数的文件夹路径')
-        }
-
-        if (access && access[0] !== '/') {
-            throw new CloudBaseError('HTTP 访问服务路径必须以 / 开头')
-        }
-
-        // 当没有指定函数名称或函数路径时，询问处理否部署全部云函数
-        if ((!name && !dir) || all) {
-            return this.deployAllFunction({
-                all,
-                envId,
-                force,
-                access,
-                functions,
-                codeSecret,
-                functionRootPath
-            })
-        }
-
-        // 校验函数路径是否存在
-        if (dir) {
-            checkFullAccess(dir, true)
-            if (!isDirectory(dir)) {
-                throw new CloudBaseError('--dir 参数必须指定为云函数的文件夹路径')
-            }
-        }
-
-        let newFunction
-        if (functions && functions.length > 0) {
-            newFunction = functions.find((item) => item.name === name)
-        }
-
-        // 没有配置，使用默认配置
-        if (!newFunction || !newFunction.name) {
-            log.info('未找到函数发布配置，使用默认配置 => 运行时：Nodejs10.15/在线安装依赖')
-            newFunction = {
-                name,
-                ...DefaultFunctionDeployConfig
-            }
-        }
-
-        const loading = loadingFactory()
-
-        loading.start('云函数部署中...')
-
-        try {
-            await createFunction({
-                force,
-                envId,
-                codeSecret,
-                functionRootPath,
-                func: newFunction,
-                accessPath: access,
-                functionPath: dir
-            })
-            loading.succeed(`[${newFunction.name}] 云函数部署成功！`)
-            // await genApiGateway(envId, name)
-            this.printSuccessTips(envId)
-        } catch (e) {
-            // 询问是否覆盖同名函数
-            loading.stop()
-            await this.handleDeployFail(e, {
-                envId,
-                codeSecret,
-                functionRootPath,
-                func: newFunction,
-                accessPath: access,
-                functionPath: dir
-            })
-        }
-
-        if (access || newFunction.path) {
-            const link = genClickableLink(
-                `https://${envId}.service.tcloudbase.com${access || newFunction.path}`
-            )
-            console.log(`\n云函数HTTP 访问服务访问链接：${link}`)
-        }
-    }
-
-    async deployAllFunction(options: any) {
-        const { functions = [], envId, force, codeSecret, functionRootPath, all, access } = options
-
-        // 指定 all 参数，直接部署全部云函数
-        if (!all) {
-            const { isBatch } = await inquirer.prompt({
-                type: 'confirm',
-                name: 'isBatch',
-                message: '没有指定需要部署的云函数，是否部署配置文件中的全部云函数？',
-                default: false
-            })
-
-            // 用户不部署全部函数，报错
-            if (!isBatch) {
-                throw new CloudBaseError(
-                    '请指定需要部署的云函数的名称或通过 --path 参数指定需要部署的函数的路径！'
-                )
-            }
-        }
-
-        // 批量部署云函数
-        const loading = loadingFactory()
-        const tasks = functions.map((func) => async () => {
-            loading.start('云函数部署中')
-            try {
-                await createFunction({
-                    func,
-                    envId,
-                    force,
-                    codeSecret,
-                    functionRootPath,
-                    accessPath: access
-                })
-                loading.succeed(`[${func.name}] 云函数部署成功`)
-            } catch (e) {
-                loading.stop()
-                await this.handleDeployFail(e, {
-                    func,
-                    envId,
-                    codeSecret,
-                    functionRootPath,
-                    accessPath: access
-                })
-            }
-        })
-
-        if (tasks.length > 5) {
-            logger.info('函数数量较多，将使用队列部署')
-        }
-
-        // 控制函数创建并发
-        const asyncTaskController = new AsyncTaskParallelController(5, 50)
-        asyncTaskController.loadTasks(tasks)
-        const results = await asyncTaskController.run()
-
-        // 输出信息
-        const success = results.filter((_) => !_)
-        logger.success(`成功部署 ${success?.length} 个函数`)
-        // 部署失败
-        const err = results.filter((_) => _)
-        err?.length && logger.error(`${err?.length} 个云函数部署失败`)
-    }
-
-    async handleDeployFail(e: CloudBaseError, options: ICreateFunctionOptions) {
-        const { envId, codeSecret, functionRootPath, func, functionPath, accessPath } = options
-        const loading = loadingFactory()
-
-        if (e.code === 'ResourceInUse.FunctionName' || e.code === 'ResourceInUse.Function') {
-            const { force } = await inquirer.prompt({
-                type: 'confirm',
-                name: 'force',
-                message: `存在同名云函数：[${func.name}]，是否覆盖原函数代码与配置`,
-                default: false
-            })
-
-            if (force) {
-                loading.start('云函数部署中...')
-                try {
-                    await createFunction({
-                        func,
-                        envId,
-                        codeSecret,
-                        accessPath,
-                        force: true,
-                        functionPath,
-                        functionRootPath
-                    })
-                    loading.succeed(`[${func.name}] 云函数部署成功！`)
-                    // await genApiGateway(envId, name)
-                    await this.printSuccessTips(envId)
-                } catch (e) {
-                    loading.stop()
-                    throw e
-                }
-                return
-            }
-        }
-
-        throw e
-    }
-
-    @InjectParams()
-    async printSuccessTips(envId: string, @Log() log?: Logger) {
-        let url = `https://console.cloud.tencent.com/tcb/scf?envId=${envId}`
-        const region = await getRegion()
-        url += `&rid=${regionIdMap[region]}`
-        const link = genClickableLink(url)
-        log.breakLine()
-        log.info(`控制台查看函数详情或创建HTTP 访问服务链接 🔗：${link}`)
-        log.info(`使用 ${highlightCommand('cloudbase functions:list')} 命令查看已部署云函数`)
-    }
-
-    // 创建函数 API 网关
-    async genApiGateway(envId: string, name: string) {
-        const loading = loadingFactory()
-        // 检查是否绑定了 HTTP 网关
-        const res = await queryGateway({
-            name,
-            envId
-        })
-        // 未开启，不生成 HTTP 调用了链接
-        if (res?.EnableService === false) return
-        loading.start('生成云函数HTTP 访问服务中...')
-
-        let path
-        if (res?.APISet?.length > 0) {
-            path = res.APISet[0]?.Path
-        } else {
-            path = `/${random(12)}`
-            await createGateway({
-                envId,
-                name,
-                path
-            })
-        }
-        loading.stop()
-        const link = genClickableLink(`https://${envId}.service.tcloudbase.com${path}`)
-        console.log(`\n云函数HTTP 访问服务链接：${link}`)
-    }
-}

package/src/commands/functions/detail.ts

@@ -1,138 +0,0 @@
-import chalk from 'chalk'
-import { Command, ICommand } from '../common'
-import { CloudBaseError } from '../../error'
-import { getFunctionDetail } from '../../function'
-import { loadingFactory, printHorizontalTable } from '../../utils'
-import { InjectParams, ArgsParams, CmdContext, Log, Logger } from '../../decorators'
-
-const StatusMap = {
-    Active: '部署完成',
-    Creating: '创建中',
-    CreateFailed: '创建失败',
-    Updating: '更新中',
-    UpdateFailed: '更新失败'
-}
-
-@ICommand()
-export class FunctionDetail extends Command {
-    get options() {
-        return {
-            cmd: 'fn',
-            childCmd: 'detail <name>',
-            deprecateCmd: 'functions:detail <name>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--code-secret <codeSecret>',
-                    desc: '代码加密的函数的 CodeSecret'
-                }
-            ],
-            desc: '获取云函数信息'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsParams() params) {
-        const { envId, options } = ctx
-        const { codeSecret } = options
-        const name = params?.[0]
-
-        if (!name) {
-            throw new CloudBaseError('请指定云函数名称！')
-        }
-
-        const loading = loadingFactory()
-        loading.start('获取函数信息中...')
-
-        try {
-            const data = await getFunctionDetail({
-                envId,
-                functionName: name,
-                codeSecret
-            })
-
-            loading.stop()
-            this.logDetail(data, name)
-        } catch (e) {
-            if (e.code === 'ResourceNotFound.FunctionName') {
-                throw new CloudBaseError(`[${name}] 函数不存在`)
-            }
-            throw e
-        } finally {
-            loading.stop()
-        }
-    }
-
-    @InjectParams()
-    logDetail(info, name, @Log() log?: Logger) {
-        const ResMap = {
-            Namespace: '环境 Id',
-            FunctionName: '函数名称',
-            Status: '状态',
-            CodeSize: '代码大小（B）',
-            Environment: '环境变量(key=value)',
-            Handler: '执行方法',
-            MemorySize: '内存配置(MB)',
-            Runtime: '运行环境',
-            Timeout: '超时时间(S)',
-            VpcConfig: '网络配置',
-            Triggers: '触发器',
-            ModTime: '修改时间',
-            InstallDependency: '自动安装依赖'
-        }
-
-        const head = ['信息', '值']
-
-        const tableData = Object.keys(ResMap).map((key) => {
-            if (key === 'Status') {
-                return [ResMap[key], StatusMap[info[key]]]
-            }
-            // 将环境变量数组转换成 key=value 的形式
-            if (key === 'Environment') {
-                const data =
-                    info[key].Variables.map((item) => `${item.Key}=${item.Value}`).join('; ') ||
-                    '无'
-                return [ResMap[key], data]
-            }
-
-            if (key === 'Triggers') {
-                let data = info[key]
-                    .map((item) => `${item.TriggerName}：${item.TriggerDesc}`)
-                    .join('\n')
-                data = data.length ? `${data}\n` : '无'
-                return [ResMap[key], data]
-            }
-
-            if (key === 'VpcConfig') {
-                const { vpc, subnet }: any = info[key]
-                if (typeof vpc === 'string') {
-                    return [ResMap[key], `${vpc}/${subnet}`]
-                } else if (vpc && subnet) {
-                    const data = `${vpc.VpcId}(${vpc.VpcName} | ${subnet.CidrBlock}) / ${subnet.SubnetId}(${subnet.SubnetName})`
-
-                    return [ResMap[key], data]
-                } else {
-                    return [ResMap[key], '无']
-                }
-            }
-
-            if (key === 'CodeInfo') {
-                return [ResMap[key], info[key]]
-            }
-
-            return [ResMap[key], info[key]]
-        })
-
-        if (info.StatusDesc) {
-            tableData.push(['状态描述', info.StatusDesc])
-        }
-
-        log.info(chalk.green(`云函数 [${name}] 详情：`))
-        printHorizontalTable(head, tableData)
-        log.info('函数代码（Java 函数以及入口大于 1 M 的函数不会显示）\n')
-        log.log(info['CodeInfo'])
-    }
-}

package/src/commands/functions/index.ts

@@ -1,16 +0,0 @@
-export * from './deploy'
-export * from './list'
-export * from './delete'
-export * from './config-update'
-export * from './invoke'
-export * from './log'
-export * from './detail'
-export * from './copy'
-export * from './run'
-export * from './trigger-create'
-export * from './trigger-delete'
-export * from './code-update'
-export * from './code-download'
-export * from './version'
-export * from './concurrency'
-export * from './alias'

package/src/commands/functions/invoke.ts

@@ -1,121 +0,0 @@
-import chalk from 'chalk'
-import inquirer from 'inquirer'
-import { Command, ICommand } from '../common'
-import { CloudBaseError } from '../../error'
-import { batchInvokeFunctions, invokeFunction } from '../../function'
-import { InjectParams, CmdContext, ArgsParams, Log, Logger } from '../../decorators'
-
-@ICommand()
-export class InvokeFunction extends Command {
-    get options() {
-        return {
-            cmd: 'fn',
-            childCmd: 'invoke [name]',
-            deprecateCmd: 'functions:invoke [name]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--params <params>',
-                    desc: '调用函数的入参，JSON 字符串形式'
-                }
-            ],
-            desc: '触发云端部署的云函数'
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsParams() argsParams, @Log() log: Logger) {
-        const {
-            envId,
-            config: { functions },
-            options
-        } = ctx
-        const name = argsParams?.[0]
-        let isBatchInvoke = false
-
-        // 不指定云函数名称，触发配置文件中的所有函数
-        if (!name) {
-            const { isBatch } = await inquirer.prompt({
-                type: 'confirm',
-                name: 'isBatch',
-                message: '无云函数名称，是否需要触发配置文件中的全部云函数？',
-                default: false
-            })
-
-            isBatchInvoke = isBatch
-
-            if (!isBatchInvoke) {
-                throw new CloudBaseError('请指定云函数名称！')
-            }
-        }
-
-        let params
-        const jsonStringParams = options.params
-        if (jsonStringParams) {
-            try {
-                params = JSON.parse(jsonStringParams)
-            } catch (e) {
-                console.log(e)
-                throw new CloudBaseError('jsonStringParams 参数不是正确的 JSON 字符串')
-            }
-        }
-
-        if (isBatchInvoke) {
-            return batchInvokeFunctions({
-                envId,
-                functions,
-                log: true
-            })
-        }
-
-        const func = functions.find((item) => item.name === name)
-
-        const configParams = func?.params ? func.params : undefined
-
-        const result = await invokeFunction({
-            envId,
-            functionName: name,
-            params: params || configParams
-        })
-
-        if (result.InvokeResult === 0) {
-            log.success(`[${name}] 调用成功\n`)
-        } else {
-            log.error(`[${name}] 调用失败\n`)
-        }
-
-        const ResMap = {
-            Duration: '运行时间',
-            MemUsage: '内存占用',
-            BillDuration: '计费时间',
-            FunctionRequestId: '请求 Id ',
-            RetMsg: '返回结果',
-            ErrMsg: '错误信息',
-            Log: '调用日志'
-        }
-
-        const formatInfo = {
-            ...result,
-            Duration: Number(result.Duration).toFixed(2) + 'ms',
-            MemUsage: Number(Number(result.MemUsage) / Math.pow(1024, 2)).toFixed(2) + 'MB',
-            BillDuration: result.BillDuration + 'ms'
-        }
-
-        const logInfo = Object.keys(ResMap)
-            .map((key) => {
-                if (key === 'Log') {
-                    return `${chalk.bold.cyan(ResMap[key])}：\n${formatInfo[key]}`
-                } else if (result.InvokeResult === 0 && key === 'ErrMsg') {
-                    return false
-                } else {
-                    return `${chalk.bold.cyan(ResMap[key])}：${formatInfo[key]}`
-                }
-            })
-            .filter((item) => item)
-            .join('\n')
-        console.log(logInfo)
-    }
-}