@cloudbase/cli 2.0.12-alpha.1 → 2.0.13

package/src/commands/storage/storage.ts

@@ -1,464 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-import inquirer from 'inquirer'
-import logSymbols from 'log-symbols'
-import { StorageService } from '@cloudbase/manager-node/types/storage'
-import { Command, ICommand } from '../common'
-
-import {
-    loadingFactory,
-    printHorizontalTable,
-    formatDate,
-    createUploadProgressBar,
-    formateFileSize,
-    getMangerService,
-    isDirectory,
-    checkFullAccess
-} from '../../utils'
-
-import { CloudBaseError } from '../../error'
-import { InjectParams, EnvId, ArgsParams, ArgsOptions, Log, Logger } from '../../decorators'
-
-const AclMap = {
-    READONLY: '所有用户可读，仅创建者和管理员可写',
-    PRIVATE: '仅创建者及管理员可读写',
-    ADMINWRITE: '所有用户可读，仅管理员可写',
-    ADMINONLY: '仅管理员可读写'
-}
-
-async function getStorageService(envId: string): Promise<StorageService> {
-    const { storage } = await getMangerService(envId)
-    return storage
-}
-
-function checkCloudPath(cloudPath: string) {
-    if (cloudPath?.[0] === '/') {
-        throw new CloudBaseError('cloudPath 不能以 "/" 开头')
-    }
-}
-
-@ICommand()
-export class UploadCommand extends Command {
-    get options() {
-        return {
-            cmd: 'storage',
-            childCmd: 'upload <localPath> [cloudPath]',
-            deprecateCmd: 'storage:upload <localPath> [cloudPath]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                { flags: '--times <times>', desc: '设置上传重试次数，默认值为 1' },
-                {
-                    flags: '--interval <interval>',
-                    desc: '设置上传失败时，重试时间间隔(毫秒)，默认值为 500'
-                }
-            ],
-            desc: '上传文件/文件夹'
-        }
-    }
-
-    @InjectParams()
-    async execute(
-        @EnvId() envId,
-        @ArgsParams() params,
-        @ArgsOptions() options,
-        @Log() log: Logger
-    ) {
-        const localPath = params?.[0]
-        const cloudPath = params?.[1]
-        const retryCount = options?.times
-        const retryInterval = options?.interval
-        const resolveLocalPath = path.resolve(localPath)
-        if (!checkFullAccess(resolveLocalPath)) {
-            throw new CloudBaseError('文件未找到！')
-        }
-        if (retryCount > 10) {
-            throw new CloudBaseError('上传重试次数为 0-10 次之间')
-        }
-
-        const loading = loadingFactory()
-        loading.start('准备上传中...')
-        const storageService = await getStorageService(envId)
-        const isDir = fs.statSync(resolveLocalPath).isDirectory()
-
-        let totalFiles = 0
-
-        if (isDir) {
-            let files = await storageService.walkLocalDir(resolveLocalPath)
-            files = files.filter((item) => !isDirectory(item))
-            totalFiles = files.length
-        }
-
-        // 上传进度条
-        const onProgress = createUploadProgressBar(
-            () => {
-                !isDir && log.success('上传文件成功！')
-            },
-            () => {
-                loading.stop()
-            }
-        )
-
-        const successFiles = []
-        const failedFiles = []
-        if (isDir) {
-            await storageService.uploadDirectory({
-                localPath: resolveLocalPath,
-                cloudPath,
-                onProgress,
-                onFileFinish: (...args) => {
-                    const error = args[0]
-                    const fileInfo = (args as any)[2]
-                    if (error) {
-                        failedFiles.push(fileInfo.Key)
-                    } else {
-                        successFiles.push(fileInfo.Key)
-                    }
-                },
-                retryCount: retryCount || 1,
-                retryInterval,
-                parallel: 20
-            })
-
-            log.success(`文件共计 ${totalFiles} 个`)
-            log.success(`文件上传成功 ${successFiles.length} 个`)
-            // 上传成功的文件
-            if (totalFiles <= 50) {
-                printHorizontalTable(
-                    ['状态', '文件'],
-                    successFiles.map((item) => [logSymbols.success, item])
-                )
-            }
-
-            // 上传失败的文件
-            log.error(`文件上传失败 ${failedFiles.length} 个`)
-            if (failedFiles.length) {
-                if (totalFiles <= 50) {
-                    printHorizontalTable(
-                        ['状态', '文件'],
-                        failedFiles.map((item) => [logSymbols.error, item])
-                    )
-                } else {
-                    // 写入文件到本地
-                    const errorLogPath = path.resolve('./cloudbase-error.log')
-                    log.error('上传失败文件：')
-                    console.log(errorLogPath)
-                    fs.writeFileSync(errorLogPath, failedFiles.join('\n'))
-                }
-            }
-        } else {
-            const assignCloudPath = cloudPath || path.parse(resolveLocalPath).base
-            await storageService.uploadFile({
-                localPath: resolveLocalPath,
-                cloudPath: assignCloudPath,
-                onProgress
-            })
-        }
-    }
-}
-
-@ICommand()
-export class DownloadCommand extends Command {
-    get options() {
-        return {
-            cmd: 'storage',
-            childCmd: 'download <cloudPath> <localPath>',
-            deprecateCmd: 'storage:download <cloudPath> <localPath>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-d, --dir',
-                    desc: '下载目标是否为文件夹'
-                }
-            ],
-            desc: '下载文件/文件夹，文件夹需指定 --dir 选项'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options, @ArgsParams() params) {
-        const cloudPath = params?.[0]
-        const localPath = params?.[1]
-        const storageService = await getStorageService(envId)
-        const resolveLocalPath = path.resolve(localPath)
-
-        const { dir } = options
-        const fileText = dir ? '文件夹' : '文件'
-
-        if (dir && !checkFullAccess(resolveLocalPath)) {
-            throw new CloudBaseError('存储文件夹不存在！')
-        }
-
-        const loading = loadingFactory()
-
-        loading.start(`下载${fileText}中`)
-
-        if (dir) {
-            await storageService.downloadDirectory({
-                localPath: resolveLocalPath,
-                cloudPath,
-                parallel: 20
-            })
-        } else {
-            await storageService.downloadFile({
-                cloudPath,
-                localPath: resolveLocalPath
-            })
-        }
-
-        loading.succeed(`下载${fileText}成功！`)
-    }
-}
-
-@ICommand()
-export class DeleteFileCommand extends Command {
-    get options() {
-        return {
-            cmd: 'storage',
-            childCmd: 'delete [cloudPath]',
-            deprecateCmd: 'storage:delete [cloudPath]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-d, --dir',
-                    desc: '下载目标是否为文件夹'
-                }
-            ],
-            desc: '删除文件/文件夹，文件夹需指定 --dir 选项'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsOptions() options, @ArgsParams() params) {
-        let isDir = options.dir
-        const cloudPath = params?.[0]
-        const loading = loadingFactory()
-        const storageService = await getStorageService(envId)
-
-        // 删除所有文件，危险操作，需要提示
-        if (!cloudPath) {
-            const { confirm } = await inquirer.prompt({
-                type: 'confirm',
-                name: 'confirm',
-                message: '指定云端路径为空，将会删除所有文件，是否继续',
-                default: false
-            })
-            if (!confirm) {
-                throw new CloudBaseError('操作终止！')
-            }
-            isDir = true
-        }
-
-        // cloudPath 为 / 时，只能删除文件夹
-        if (cloudPath === '/') {
-            isDir = true
-        }
-
-        const fileText = isDir ? '文件夹' : '文件'
-        loading.start(`删除${fileText}中`)
-
-        if (isDir) {
-            await storageService.deleteDirectory(cloudPath)
-        } else {
-            await storageService.deleteFile([cloudPath])
-        }
-
-        loading.succeed(`删除${fileText}成功！`)
-    }
-}
-
-@ICommand()
-export class StorageListCommand extends Command {
-    get options() {
-        return {
-            cmd: 'storage',
-            childCmd: 'list [cloudPath]',
-            deprecateCmd: 'storage:list [cloudPath]',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-                // {
-                //     flags: '-m, --max',
-                //     desc: '传输数据的最大条数'
-                // },
-                // {
-                //     flags: '--markder',
-                //     desc: '起始路径名，后（不含）按照 UTF-8 字典序返回条目'
-                // }
-            ],
-            desc: '获取文件存储的文件列表，不指定路径时获取全部文件列表'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsParams() params) {
-        const cloudPath = params?.[0]
-        const storageService = await getStorageService(envId)
-
-        const loading = loadingFactory()
-        loading.start('获取文件列表中...')
-        const list = await storageService.listDirectoryFiles(cloudPath)
-        loading.stop()
-
-        const head = ['序号', 'Key', 'LastModified', 'ETag', 'Size(KB)']
-
-        const notDir = (item) => !(Number(item.Size) === 0 && /\/$/g.test(item.Key))
-
-        const tableData = list
-            .filter(notDir)
-            .map((item, index) => [
-                index + 1,
-                item.Key,
-                formatDate(item.LastModified, 'yyyy-MM-dd hh:mm:ss'),
-                item.ETag,
-                String(formateFileSize(item.Size, 'KB'))
-            ])
-        printHorizontalTable(head, tableData)
-    }
-}
-
-@ICommand()
-export class GetUrlCommand extends Command {
-    get options() {
-        return {
-            cmd: 'storage',
-            childCmd: 'url <cloudPath>',
-            deprecateCmd: 'storage:url <cloudPath>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '获取文件临时访问地址'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsParams() params, @Log() log: Logger) {
-        const cloudPath = params?.[0]
-        const storageService = await getStorageService(envId)
-
-        const fileList = await storageService.getTemporaryUrl([cloudPath])
-        const { url } = fileList[0]
-
-        log.success(`文件临时访问地址：${url}`)
-    }
-}
-
-@ICommand()
-export class StorageDetailCommand extends Command {
-    get options() {
-        return {
-            cmd: 'storage',
-            childCmd: 'detail <cloudPath>',
-            deprecateCmd: 'storage:detail <cloudPath>',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '获取文件信息'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @ArgsParams() params) {
-        const cloudPath = params?.[0]
-        const storageService = await getStorageService(envId)
-
-        const fileInfo = await storageService.getFileInfo(cloudPath)
-        const date = formatDate(fileInfo.Date, 'yyyy-MM-dd hh:mm:ss')
-
-        const logInfo = `文件大小：${fileInfo.Size}\n文件类型：${fileInfo.Type}\n修改日期：${date}\nETag：${fileInfo.ETag}
-            `
-        console.log(logInfo)
-    }
-}
-
-@ICommand()
-export class GetAclCommand extends Command {
-    get options() {
-        return {
-            cmd: 'storage',
-            childCmd: 'get-acl',
-            deprecateCmd: 'storage:get-acl',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '获取文件存储权限信息'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId) {
-        const storageService = await getStorageService(envId)
-        const acl = await storageService.getStorageAcl()
-
-        console.log(`当前权限【${AclMap[acl]}】`)
-    }
-}
-
-@ICommand()
-export class setAclCommand extends Command {
-    get options() {
-        return {
-            cmd: 'storage',
-            childCmd: 'set-acl',
-            deprecateCmd: 'storage:set-acl',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            desc: '设置文件存储权限信息'
-        }
-    }
-
-    @InjectParams()
-    async execute(@EnvId() envId, @Log() log: Logger) {
-        const storageService = await getStorageService(envId)
-
-        const { acl } = await inquirer.prompt({
-            type: 'list',
-            name: 'acl',
-            message: '选择权限',
-            choices: [
-                {
-                    name: '所有用户可读，仅创建者和管理员可写',
-                    value: 'READONLY'
-                },
-                {
-                    name: '仅创建者及管理员可读写',
-                    value: 'PRIVATE'
-                },
-                {
-                    name: '所有用户可读，仅管理员可写',
-                    value: 'ADMINWRITE'
-                },
-                {
-                    name: '仅管理员可读写',
-                    value: 'ADMINONLY'
-                }
-            ]
-        })
-
-        await storageService.setStorageAcl(acl)
-        log.success('设置存储权限成功！')
-    }
-}

package/src/commands/third/index.ts

@@ -1 +0,0 @@
-export * from './thirdAttach'

package/src/commands/third/thirdAttach.ts

@@ -1,49 +0,0 @@
-import { Command } from '../common'
-import { loadingFactory } from '../../utils'
-import { deleteThirdPartAttach } from '../../third'
-import { InjectParams, ArgsOptions } from '../../decorators'
-
-export class DeleteThirdAttach extends Command {
-    get options() {
-        return {
-            cmd: 'third',
-            childCmd: 'deleteThirdAttach',
-            deprecateCmd: 'third:deleteThirdAttach',
-            options: [
-                {
-                    flags: '--source <source>',
-                    desc: '第三方来源'
-                },
-                {
-                    flags: '--thirdAppId <thirdAppId>',
-                    desc: '第三方appId'
-                }
-            ],
-            desc: '解除第三方绑定',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@ArgsOptions() options) {
-        const { source, thirdAppId } = options
-
-        let typeFlag
-        if (source === 'qq') {
-            typeFlag = 1
-        }
-
-        if (!typeFlag) {
-            throw new Error('请指定对应的source')
-        }
-
-        const loading = loadingFactory()
-        loading.start('数据加载中...')
-        const data = await deleteThirdPartAttach({
-            TypeFlag: typeFlag,
-            ThirdPartAppid: thirdAppId
-        })
-        loading.stop()
-        console.log(data)
-    }
-}

package/src/completion/index.ts

@@ -1,13 +0,0 @@
-import { ALL_COMMANDS } from '../constant'
-
-export function handleCompletion({ reply, line }) {
-    // 命令
-    const cmd = line.replace(/^cloudbase\s|^tcb\s/, '')
-
-    const commands = ALL_COMMANDS.filter(item => item.indexOf(cmd) > -1)
-    if (commands.length > 0) {
-        reply(commands)
-    } else {
-        reply(['-h', '-v'])
-    }
-}

package/src/constant.ts

@@ -1,154 +0,0 @@
-// cloudbase cli 配置的字段名
-export class ConfigItems {
-    static credential = 'credential'
-    static ssh = 'ssh'
-}
-
-// Node.js 默认部署配置
-export const DefaultFunctionDeployConfig = {
-    timeout: 3,
-    handler: 'index.main',
-    runtime: 'Nodejs10.15',
-    installDependency: true,
-    ignore: ['node_modules', 'node_modules/**/*', '.git']
-}
-
-// cloudbase 配置文件默认配置
-export const DefaultCloudBaseConfig = {
-    functionRoot: './functions',
-    functions: []
-}
-
-// 请求超时时间
-export const REQUEST_TIMEOUT = 15000
-
-export const enum ENV_STATUS {
-    // 创建中
-    UNAVAILABLE = 'UNAVAILABLE',
-    // 正常
-    NORMAL = 'NORMAL',
-    // 销毁隔离
-    ISOLATE = 'ISOLATE',
-    // 异常
-    ABNORMAL = 'ABNORMAL',
-    ERROR = 'ERROR'
-}
-
-export const STATUS_TEXT = {
-    UNAVAILABLE: '创建中',
-    NORMAL: '正常',
-    ISOLATE: '隔离中',
-    ABNORMAL: '异常',
-    ERROR: '异常'
-}
-
-export const ALL_COMMANDS = [
-    'login',
-    'logout',
-    'init',
-    'open',
-    'env list',
-    'env rename',
-    'env create',
-    'env domain list',
-    'env domain create',
-    'env domain delete',
-    'env login list',
-    'env login create',
-    'env login update',
-    'fn list',
-    'fn download',
-    'fn deploy',
-    'fn delete',
-    'fn detail',
-    'fn code update',
-    'fn config update',
-    'fn copy',
-    'fn log',
-    'fn trigger create',
-    'fn trigger delete',
-    'fn invoke',
-    'fn publish-version',
-    'fn list-function-versions',
-    'fn put-provisioned-concurrency',
-    'fn get-provisioned-concurrency',
-    'fn delete-provisioned-concurrency',
-    'fn config-route',
-    'functions run',
-    'storage upload',
-    'storage download',
-    'storage delete',
-    'storage list',
-    'storage url',
-    'storage detail',
-    'storage get-acl',
-    'storage set-acl',
-    'hosting detail',
-    'hosting deploy',
-    'hosting delete',
-    'hosting list',
-    'access create',
-    'access delete',
-    'access list',
-    'access domain bind',
-    'access domain unbind',
-    'access domain list',
-    'run standalonegateway create',
-    'run standalonegateway list',
-    'run standalonegateway destroy',
-    'run standalonegateway package list',
-    'run standalonegateway turn on',
-    'run standalonegateway turn off',
-]
-
-export const StatusMap = {
-    Active: '部署完成',
-    Creating: '创建中',
-    CreateFailed: '创建失败',
-    Updating: '更新中',
-    UpdateFailed: '更新失败',
-    Publishing: '函数版本发布中',
-    PublishFailed: '函数版本发布失败',
-    Deleting: '函数删除中',
-    DeleteFailed: '函数删除失败'
-}
-
-export const ConcurrencyTaskStatus = {
-    Done: '已完成',
-    InProgress: '进行中',
-    Failed: '失败'
-}
-
-export const enum EnumEnvCheck {
-    EnvFit = 0,
-    EnvNewCmdOld,
-    EnvOldCmdNew,
-}
-
-export const enum EnumDeployStatus {
-    Deploying = 'deploying',
-    DeploySuccess = 'running',
-    DeployFailed = 'deploy_failed'
-}
-
-// tcbr 服务配置 cpu 和 mem 的约束
-export const CPU_MEM_OPTS: { cpu: number; mems: number[] }[] = [
-    { cpu: 0.25, mems: [0.5] },
-    { cpu: 0.5, mems: [1] },
-    { cpu: 1, mems: [2] },
-    { cpu: 2, mems: [4] },
-    { cpu: 4, mems: [8] },
-    { cpu: 8, mems: [16] },
-    { cpu: 16, mems: [32] },
-]
-
-export const DEFAULT_CPU_MEM_SET: { PolicyType: 'mem' | 'cpu', PolicyThreshold: number }[] = [
-    {
-        PolicyType: 'mem',
-        PolicyThreshold: 60
-    },
-    {
-        PolicyType: 'cpu',
-        PolicyThreshold: 60
-    },
-]

package/src/decorators/captureError.ts

@@ -1,25 +0,0 @@
-/**
- * 捕获操作发生的异常，显示错误提示，并在输出中显示详细的错误堆栈信息
- */
-export const CaptureError = (): MethodDecorator => (
-    target: any,
-    key: string | symbol,
-    descriptor: TypedPropertyDescriptor<any>
-) => {
-    const rawFunc: Function = descriptor.value
-
-    descriptor.value = async function (...args) {
-        try {
-            const res = await rawFunc.apply(this, args)
-            return res
-        } catch (e) {
-            const errMsg =
-                e?.message ||
-                (typeof e?.toString === 'function' ? e.toString() : '') ||
-                'Unknown Error'
-            // output.showErrorWithMessage(errMsg, e?.stack || errMsg)
-        }
-    }
-
-    return descriptor
-}