@cloudbase/cli 1.12.7-alpha.4 → 2.0.0

package/src/commands/third/thirdAttach.ts

@@ -1,49 +1,49 @@
-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)
-    }
-}
+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 +1,13 @@
-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'])
-    }
-}
+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

@@ -117,4 +117,38 @@ 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 +1,25 @@
-/**
- * 捕获操作发生的异常，显示错误提示，并在输出中显示详细的错误堆栈信息
- */
-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
-}
+/**
+ * 捕获操作发生的异常，显示错误提示，并在输出中显示详细的错误堆栈信息
+ */
+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
+}

package/src/decorators/constants.ts

@@ -1,12 +1,12 @@
-export const PARAM_METADATA = 'PARAM_METADATA'
-
-export enum ParamTypes {
-    Credential = '__Credential__',
-    Log = '__Log__',
-    // 参数选项
-    CmdContext = '__CmdContext__',
-    EnvId = '__EnvId__',
-    Config = '__Config__',
-    ArgsOptions = '__ArgsOptions__',
-    ArgsParams = '__ArgsParams__'
-}
+export const PARAM_METADATA = 'PARAM_METADATA'
+
+export enum ParamTypes {
+    Credential = '__Credential__',
+    Log = '__Log__',
+    // 参数选项
+    CmdContext = '__CmdContext__',
+    EnvId = '__EnvId__',
+    Config = '__Config__',
+    ArgsOptions = '__ArgsOptions__',
+    ArgsParams = '__ArgsParams__'
+}

package/src/decorators/deprecate.ts

@@ -1,25 +1,25 @@
-import { Logger } from '../utils'
-
-/**
- * 废弃命令
- * @param tip
- */
-export const Deprecate = (options: { tip: string; allowExecute: boolean }): MethodDecorator => (
-    target: any,
-    key: string,
-    descriptor: TypedPropertyDescriptor<any>
-) => {
-    const { tip, allowExecute } = options
-    const rawFunc: Function = descriptor.value
-
-    descriptor.value = function (...args) {
-        const log = new Logger()
-        log.error(tip || '此命令已废弃！')
-
-        if (allowExecute) {
-            rawFunc.apply(this, args)
-        }
-    }
-
-    return descriptor
-}
+import { Logger } from '../utils'
+
+/**
+ * 废弃命令
+ * @param tip
+ */
+export const Deprecate = (options: { tip: string; allowExecute: boolean }): MethodDecorator => (
+    target: any,
+    key: string,
+    descriptor: TypedPropertyDescriptor<any>
+) => {
+    const { tip, allowExecute } = options
+    const rawFunc: Function = descriptor.value
+
+    descriptor.value = function (...args) {
+        const log = new Logger()
+        log.error(tip || '此命令已废弃！')
+
+        if (allowExecute) {
+            rawFunc.apply(this, args)
+        }
+    }
+
+    return descriptor
+}

package/src/decorators/guard.ts

@@ -1,42 +1,42 @@
-import { authSupevisor, getCloudBaseConfig } from '../utils'
-
-export interface AuthGuardOptions {
-    // 无法通过 guard 认证时的提示信息
-    tips?: string
-    // 校验配置文件是否存在
-    ensureConfig?: boolean
-}
-
-/**
- * Auth 装饰器，用于在执行操作前检验是否登录
- * 没有登录时，终止操作，显示登录提示
- */
-export const AuthGuard = (options: AuthGuardOptions = {}): MethodDecorator => (
-    target: any,
-    key: string | symbol,
-    descriptor: TypedPropertyDescriptor<any>
-) => {
-    const { tips, ensureConfig = true } = options
-    const rawFunc: Function = descriptor.value
-    // 修改原函数行为
-    descriptor.value = async function (...args) {
-        const credential = target?.credential
-        const loginState = await authSupevisor.getLoginState()
-
-        // 未登录，终止运行
-        if (!credential && !loginState) {
-            return
-        }
-
-        if (ensureConfig) {
-            const config = await getCloudBaseConfig()
-            if (!config?.envId) {
-                return
-            }
-        }
-
-        return rawFunc.apply(this, args)
-    }
-
-    return descriptor
-}
+import { authSupevisor, getCloudBaseConfig } from '../utils'
+
+export interface AuthGuardOptions {
+    // 无法通过 guard 认证时的提示信息
+    tips?: string
+    // 校验配置文件是否存在
+    ensureConfig?: boolean
+}
+
+/**
+ * Auth 装饰器，用于在执行操作前检验是否登录
+ * 没有登录时，终止操作，显示登录提示
+ */
+export const AuthGuard = (options: AuthGuardOptions = {}): MethodDecorator => (
+    target: any,
+    key: string | symbol,
+    descriptor: TypedPropertyDescriptor<any>
+) => {
+    const { tips, ensureConfig = true } = options
+    const rawFunc: Function = descriptor.value
+    // 修改原函数行为
+    descriptor.value = async function (...args) {
+        const credential = target?.credential
+        const loginState = await authSupevisor.getLoginState()
+
+        // 未登录，终止运行
+        if (!credential && !loginState) {
+            return
+        }
+
+        if (ensureConfig) {
+            const config = await getCloudBaseConfig()
+            if (!config?.envId) {
+                return
+            }
+        }
+
+        return rawFunc.apply(this, args)
+    }
+
+    return descriptor
+}

package/src/decorators/index.ts

@@ -1,7 +1,7 @@
-export * from './params'
-export * from './guard'
-export * from './injectParams'
-export * from './captureError'
-export * from './params/'
-export * from './deprecate'
-export { Logger } from '../utils'
+export * from './params'
+export * from './guard'
+export * from './injectParams'
+export * from './captureError'
+export * from './params/'
+export * from './deprecate'
+export { Logger } from '../utils'

package/src/decorators/injectParams.ts

@@ -1,54 +1,54 @@
-import { PARAM_METADATA, ParamTypes } from './constants'
-import { ICommandContext } from '../types'
-
-/**
- * 在方法中注入 params 中定义的各种参数
- */
-export function InjectParams(): MethodDecorator {
-    return function (target: any, key: string | symbol, descriptor: TypedPropertyDescriptor<any>) {
-        const rawFunc: Function = descriptor.value
-
-        // 解析需要注入的参数
-        const paramMetadata = Reflect.getMetadata(PARAM_METADATA, target[key])
-
-        if (paramMetadata) {
-            descriptor.value = async function (...args) {
-                // 命令 context
-                const ctx: ICommandContext = args[0] || {}
-
-                for (const paramKey in paramMetadata) {
-                    if (Object.prototype.hasOwnProperty.call(paramMetadata, paramKey)) {
-                        const { getter, index } = paramMetadata[paramKey]
-                        switch (paramKey) {
-                            // 从 context 中注入命令行参数
-                            case ParamTypes.CmdContext:
-                                args[index] = ctx
-                                break
-                            case ParamTypes.Config:
-                                args[index] = ctx.config
-                                break
-                            case ParamTypes.ArgsParams:
-                                args[index] = ctx.params
-                                break
-                            case ParamTypes.ArgsOptions:
-                                args[index] = ctx.options
-                                break
-                            case ParamTypes.EnvId:
-                                args[index] = ctx.envId
-                                break
-                            default: {
-                                // 注入其他与命令行不相关的参数
-                                const injectValue = await getter(target)
-                                args[index] = injectValue
-                            }
-                        }
-                    }
-                }
-
-                return rawFunc.apply(this, args)
-            }
-        }
-
-        return descriptor
-    }
-}
+import { PARAM_METADATA, ParamTypes } from './constants'
+import { ICommandContext } from '../types'
+
+/**
+ * 在方法中注入 params 中定义的各种参数
+ */
+export function InjectParams(): MethodDecorator {
+    return function (target: any, key: string | symbol, descriptor: TypedPropertyDescriptor<any>) {
+        const rawFunc: Function = descriptor.value
+
+        // 解析需要注入的参数
+        const paramMetadata = Reflect.getMetadata(PARAM_METADATA, target[key])
+
+        if (paramMetadata) {
+            descriptor.value = async function (...args) {
+                // 命令 context
+                const ctx: ICommandContext = args[0] || {}
+
+                for (const paramKey in paramMetadata) {
+                    if (Object.prototype.hasOwnProperty.call(paramMetadata, paramKey)) {
+                        const { getter, index } = paramMetadata[paramKey]
+                        switch (paramKey) {
+                            // 从 context 中注入命令行参数
+                            case ParamTypes.CmdContext:
+                                args[index] = ctx
+                                break
+                            case ParamTypes.Config:
+                                args[index] = ctx.config
+                                break
+                            case ParamTypes.ArgsParams:
+                                args[index] = ctx.params
+                                break
+                            case ParamTypes.ArgsOptions:
+                                args[index] = ctx.options
+                                break
+                            case ParamTypes.EnvId:
+                                args[index] = ctx.envId
+                                break
+                            default: {
+                                // 注入其他与命令行不相关的参数
+                                const injectValue = await getter(target)
+                                args[index] = injectValue
+                            }
+                        }
+                    }
+                }
+
+                return rawFunc.apply(this, args)
+            }
+        }
+
+        return descriptor
+    }
+}

package/src/decorators/params/common.ts

@@ -1,28 +1,28 @@
-import { ParamTypes, PARAM_METADATA } from '../constants'
-
-type GetterFunction = (target: any) => Promise<any> | any
-
-/**
- * 创建参数装饰器
- * @param paramtype 参数类型名
- * @param getter decorator 取值函数
- */
-export const createParamDecorator = (paramtype: ParamTypes, getter: GetterFunction) => {
-    return () => {
-        return (target: any, key: string | symbol, index: number) => {
-            const data = Reflect.getMetadata(PARAM_METADATA, target[key]) || {}
-
-            Reflect.defineMetadata(
-                PARAM_METADATA,
-                {
-                    ...data,
-                    [paramtype]: {
-                        index,
-                        getter
-                    }
-                },
-                target[key]
-            )
-        }
-    }
-}
+import { ParamTypes, PARAM_METADATA } from '../constants'
+
+type GetterFunction = (target: any) => Promise<any> | any
+
+/**
+ * 创建参数装饰器
+ * @param paramtype 参数类型名
+ * @param getter decorator 取值函数
+ */
+export const createParamDecorator = (paramtype: ParamTypes, getter: GetterFunction) => {
+    return () => {
+        return (target: any, key: string | symbol, index: number) => {
+            const data = Reflect.getMetadata(PARAM_METADATA, target[key]) || {}
+
+            Reflect.defineMetadata(
+                PARAM_METADATA,
+                {
+                    ...data,
+                    [paramtype]: {
+                        index,
+                        getter
+                    }
+                },
+                target[key]
+            )
+        }
+    }
+}

package/src/decorators/params/index.ts

@@ -1,35 +1,35 @@
-import { createParamDecorator } from './common'
-import { ParamTypes } from '../constants'
-import { authSupevisor, getArgs, Logger } from '../../utils'
-
-const EmptyValue = () => {}
-
-// 注入登录态信息
-export const Credential = createParamDecorator(ParamTypes.Credential, async () => {
-    const credential = await authSupevisor.getLoginState()
-    return credential
-})
-
-// 日志打印
-export const Log = createParamDecorator(ParamTypes.Log, () => {
-    const args = getArgs()
-    const verbose = process.VERBOSE || args.verbose
-    const log = new Logger({
-        verbose
-    })
-
-    return log
-})
-
-// 命令行相关
-export const CmdContext = createParamDecorator(ParamTypes.CmdContext, EmptyValue)
-
-export const ArgsOptions = createParamDecorator(ParamTypes.ArgsOptions, EmptyValue)
-
-export const ArgsParams = createParamDecorator(ParamTypes.ArgsParams, EmptyValue)
-
-// 获取环境 Id
-export const EnvId = createParamDecorator(ParamTypes.EnvId, EmptyValue)
-
-// 注入环境配置
-export const Config = createParamDecorator(ParamTypes.Config, EmptyValue)
+import { createParamDecorator } from './common'
+import { ParamTypes } from '../constants'
+import { authSupevisor, getArgs, Logger } from '../../utils'
+
+const EmptyValue = () => {}
+
+// 注入登录态信息
+export const Credential = createParamDecorator(ParamTypes.Credential, async () => {
+    const credential = await authSupevisor.getLoginState()
+    return credential
+})
+
+// 日志打印
+export const Log = createParamDecorator(ParamTypes.Log, () => {
+    const args = getArgs()
+    const verbose = process.VERBOSE || args.verbose
+    const log = new Logger({
+        verbose
+    })
+
+    return log
+})
+
+// 命令行相关
+export const CmdContext = createParamDecorator(ParamTypes.CmdContext, EmptyValue)
+
+export const ArgsOptions = createParamDecorator(ParamTypes.ArgsOptions, EmptyValue)
+
+export const ArgsParams = createParamDecorator(ParamTypes.ArgsParams, EmptyValue)
+
+// 获取环境 Id
+export const EnvId = createParamDecorator(ParamTypes.EnvId, EmptyValue)
+
+// 注入环境配置
+export const Config = createParamDecorator(ParamTypes.Config, EmptyValue)