@cloudbase/cli 2.0.12 → 2.0.13

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)
-    }
-}

package/src/commands/functions/layer/bind.ts

@@ -1,182 +0,0 @@
-import { prompt } from 'enquirer'
-import {
-    listLayers,
-    listLayerVersions,
-    attachLayer,
-    getFunctionDetail,
-    unAttachLayer,
-    listFunction
-} from '../../../function'
-import { Command, ICommand } from '../../common'
-import { loadingFactory } from '../../../utils'
-import { CloudBaseError } from '../../../error'
-import { InjectParams, EnvId, ArgsOptions, ArgsParams } from '../../../decorators'
-import { layerCommonOptions } from './common'
-
-const LayerStatusMap = {
-    Active: '正常',
-    Publishing: '发布中',
-    PublishFailed: '发布失败',
-    Deleted: '已删除'
-}
-
-@ICommand()
-export class AttachFileLayer extends Command {
-    get options() {
-        return {
-            ...layerCommonOptions('bind <name>'),
-            deprecateCmd: 'functions:layer:bind <name>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--code-secret, <codeSecret>',
-                    desc: '代码加密的函数的 CodeSecret'
-                }
-            ],
-            desc: '绑定文件层到云函数'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsParams() params, @ArgsOptions() options) {
-        const { codeSecret } = options
-        const fnName = params?.[0]
-
-        const loading = loadingFactory()
-        loading.start('数据加载中...')
-
-        // 检查函数是否存在当前环境中
-        const envFunctions = await listFunction({
-            envId
-        })
-        const exist = envFunctions.find((fn) => fn.FunctionName === fnName)
-        if (!exist) {
-            throw new CloudBaseError(`当前环境不存在此函数 [${fnName}]`)
-        }
-
-        let layers: any[] = await listLayers({
-            offset: 0,
-            limit: 200
-        })
-
-        loading.stop()
-
-        layers = layers.map((item) => ({
-            name: `[${LayerStatusMap[item.Status] || '异常'}] ${item.LayerName}`,
-            value: item.LayerName
-        }))
-
-        if (!layers.length) {
-            throw new CloudBaseError('没有可用的文件层，请先创建文件层！')
-        }
-
-        const { layer } = await prompt<any>({
-            type: 'select',
-            name: 'layer',
-            message: '选择文件层名称',
-            choices: layers,
-            result(choices) {
-                const keys = Object.values(this.map(choices)) as string[]
-                return keys[0]
-            }
-        })
-
-        let versions = await listLayerVersions({
-            name: layer
-        })
-
-        versions = versions.map((item) => String(item.LayerVersion))
-
-        if (!versions.length) {
-            throw new CloudBaseError('没有可用的文件层版本，请先创建文件层版本！')
-        }
-
-        const { version } = await prompt<any>({
-            type: 'select',
-            name: 'version',
-            message: '选择文件层版本',
-            choices: versions
-        })
-
-        loading.start('文件层绑定中...')
-        await attachLayer({
-            envId,
-            functionName: fnName,
-            layerName: layer,
-            layerVersion: Number(version),
-            codeSecret
-        })
-
-        loading.succeed('文件层绑定成功！')
-    }
-}
-
-@ICommand()
-export class UnAttachFileLayer extends Command {
-    get options() {
-        return {
-            ...layerCommonOptions('unbind <name>'),
-            deprecateCmd: 'functions:layer:unbind <name>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--code-secret, <codeSecret>',
-                    desc: '代码加密的函数的 CodeSecret'
-                }
-            ],
-            desc: '删除云函数绑定的文件层'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsParams() params, @ArgsOptions() options) {
-        const { codeSecret } = options
-        const fnName = params?.[0]
-
-        const loading = loadingFactory()
-        loading.start('数据加载中...')
-
-        const detail = await getFunctionDetail({
-            envId,
-            codeSecret,
-            functionName: fnName
-        })
-
-        if (!detail?.Layers?.length) {
-            throw new CloudBaseError('该云函数未绑定文件层！')
-        }
-
-        loading.stop()
-
-        const layers = detail.Layers.map((item) => ({
-            name: `名称：${item.LayerName} / 版本： ${item.LayerVersion}`,
-            value: item
-        }))
-
-        const { layer } = await prompt<any>({
-            type: 'select',
-            name: 'layer',
-            message: '选择文件层',
-            choices: layers,
-            result(choice) {
-                return this.map(choice)[choice]
-            }
-        })
-
-        loading.start('文件层解绑中...')
-        await unAttachLayer({
-            envId,
-            functionName: fnName,
-            layerName: layer.LayerName,
-            layerVersion: layer.LayerVersion,
-            codeSecret
-        })
-        loading.succeed('文件层解绑成功！')
-    }
-}

package/src/commands/functions/layer/common.ts

@@ -1,8 +0,0 @@
-export const layerCommonOptions = (sub: string) => ({
-    cmd: 'fn',
-    childCmd: {
-        cmd: 'layer',
-        desc: '云函数层管理'
-    },
-    childSubCmd: sub
-})

package/src/commands/functions/layer/create.ts

@@ -1,49 +0,0 @@
-import path from 'path'
-import { Command, ICommand } from '../../common'
-import { createLayer } from '../../../function'
-import { loadingFactory } from '../../../utils'
-import { InjectParams, EnvId, ArgsOptions, ArgsParams } from '../../../decorators'
-import { layerCommonOptions } from './common'
-
-@ICommand()
-export class CreateFileLayer extends Command {
-    get options() {
-        return {
-            ...layerCommonOptions('create <alias>'),
-            deprecateCmd: 'functions:layer:create <alias>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--file, <file>',
-                    desc: '文件路径'
-                }
-            ],
-            desc: '创建函数文件层'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options, @ArgsParams() params) {
-        const alias = params?.[0]
-        const { file } = options
-
-        const layerName = `${alias}_${envId}`
-        const filePath = path.resolve(file)
-        const runtimes = ['Nodejs8.9', 'Php7', 'Java8']
-
-        const loading = loadingFactory()
-
-        loading.start('文件层创建中...')
-
-        await createLayer({
-            layerName,
-            runtimes,
-            contentPath: filePath
-        })
-
-        loading.succeed('文件层创建成功！')
-    }
-}

package/src/commands/functions/layer/delete.ts

@@ -1,73 +0,0 @@
-import { prompt } from 'enquirer'
-import { Command, ICommand } from '../../common'
-import { loadingFactory } from '../../../utils'
-import { CloudBaseError } from '../../../error'
-import { InjectParams, EnvId } from '../../../decorators'
-import { deleteLayer, listLayers, listLayerVersions } from '../../../function'
-import { layerCommonOptions } from './common'
-
-@ICommand()
-export class DeleteFileLayer extends Command {
-    get options() {
-        return {
-            ...layerCommonOptions('delete'),
-            deprecateCmd: 'functions:layer:delete',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '删除当前环境的文件层'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId) {
-        const loading = loadingFactory()
-        loading.start('数据加载中...')
-
-        let layers: any[] = await listLayers({
-            offset: 0,
-            limit: 200
-        })
-
-        loading.stop()
-
-        // 只能删除当前环境的文件层
-        layers = layers
-            .filter((item) => item.LayerName.includes(`_${envId}`))
-            .map((item) => item.LayerName)
-
-        if (!layers.length) {
-            throw new CloudBaseError('当前环境没有可用的文件层，请先创建文件层！')
-        }
-
-        const { layer } = await prompt<any>({
-            type: 'select',
-            name: 'layer',
-            message: '选择文件层名称',
-            choices: layers
-        })
-
-        let versions = await listLayerVersions({
-            name: layer
-        })
-
-        versions = versions.map((item) => String(item.LayerVersion))
-
-        const { version } = await prompt<any>({
-            type: 'select',
-            name: 'version',
-            message: '选择文件层版本',
-            choices: versions
-        })
-
-        loading.start('文件层删除中...')
-        await deleteLayer({
-            name: layer,
-            version: Number(version)
-        })
-        loading.succeed('文件层删除成功！')
-    }
-}

package/src/commands/functions/layer/download.ts

@@ -1,92 +0,0 @@
-import path from 'path'
-import fse from 'fs-extra'
-import { prompt } from 'enquirer'
-import { loadingFactory } from '../../../utils'
-import { CloudBaseError } from '../../../error'
-import { Command, ICommand } from '../../common'
-import { InjectParams, EnvId, ArgsOptions } from '../../../decorators'
-import { downloadLayer, listLayers, listLayerVersions } from '../../../function'
-import { layerCommonOptions } from './common'
-
-@ICommand()
-export class DownloadFileLayer extends Command {
-    get options() {
-        return {
-            ...layerCommonOptions('download'),
-            deprecateCmd: 'functions:layer:download',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '--dest <dest>',
-                    desc: '下载文件存放的地址'
-                }
-            ],
-            desc: '下载云函数文件层'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options) {
-        const { dest } = options
-
-        const loading = loadingFactory()
-        loading.start('数据加载中...')
-
-        let layers: any[] = await listLayers({
-            offset: 0,
-            limit: 200
-        })
-
-        loading.stop()
-
-        // 只能下载当前环境的文件层
-        layers = layers
-            .filter((item) => item.LayerName.includes(`_${envId}`))
-            .map((item) => item.LayerName)
-
-        if (!layers.length) {
-            throw new CloudBaseError('当前环境没有可用的文件层，请先创建文件层！')
-        }
-
-        const { layer } = await prompt<any>({
-            type: 'select',
-            name: 'layer',
-            message: '选择文件层名称',
-            choices: layers
-        })
-
-        let versions = await listLayerVersions({
-            name: layer
-        })
-
-        versions = versions.map((item) => String(item.LayerVersion))
-
-        const { version } = await prompt<any>({
-            type: 'select',
-            name: 'version',
-            message: '选择文件层版本',
-            choices: versions
-        })
-
-        let destPath
-
-        if (!dest) {
-            destPath = path.resolve(process.cwd(), 'layers')
-        }
-
-        loading.start('文件下载中...')
-
-        await fse.ensureDir(destPath)
-        await downloadLayer({
-            destPath,
-            version: Number(version),
-            name: layer,
-            unzip: true
-        })
-
-        loading.succeed('文件下载成功！')
-    }
-}

package/src/commands/functions/layer/index.ts

@@ -1,7 +0,0 @@
-export * from './list'
-export * from './bind'
-export * from './delete'
-export * from './create'
-export * from './download'
-export * from './list'
-export * from './sort'