@cloudbase/cli 2.0.3 → 2.0.5

package/src/env/index.ts

@@ -1,63 +1,63 @@
-import { CloudApiService, getMangerService } from '../utils/net'
-export * from './domain'
-export * from './login'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-// 初始化云开发服务
-// 当用户没开通云开发服务时，需要调用此接口初始化云开发服务
-export async function initTcb(skey: string) {
-    const res: any = await tcbService.request('InitTcb', {
-        Skey: skey
-    })
-    return res
-}
-
-// 创建新环境
-export async function createEnv({ alias, paymentMode }) {
-    const { env } = await getMangerService()
-
-    return env.createEnv({
-        paymentMode,
-        name: alias
-    })
-}
-
-// 获取环境信息
-export async function getEnvInfo(envId: string) {
-    const { EnvList } = await tcbService.request('DescribeEnvs', {
-        EnvId: envId
-    })
-
-    return EnvList?.length ? EnvList[0] : {}
-}
-
-// 列出所有环境
-export async function listEnvs(options: { source?: string[] } = {}): Promise<any[]> {
-    const { source } = options
-    const res: any = await tcbService.request('DescribeEnvs', {
-        IsVisible: false,
-        Channels: ['dcloud']
-    })
-    let { EnvList = [] } = res
-    // 过滤为指定 source 环境
-    if (source && Array.isArray(source)) {
-        EnvList = EnvList.filter((item) => source.includes(item.Source))
-    }
-    return EnvList
-}
-
-// 修改环境信息
-export async function updateEnvInfo({ envId, alias }) {
-    await tcbService.request('ModifyEnv', {
-        EnvId: envId,
-        Alias: alias
-    })
-}
-
-// 获取 Qcloud 环境数量上限
-export async function getEnvLimit(source = 'qcloud') {
-    return tcbService.request('DescribeEnvLimit', {
-        Source: source
-    })
-}
+import { CloudApiService, getMangerService } from '../utils/net'
+export * from './domain'
+export * from './login'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+// 初始化云开发服务
+// 当用户没开通云开发服务时，需要调用此接口初始化云开发服务
+export async function initTcb(skey: string) {
+    const res: any = await tcbService.request('InitTcb', {
+        Skey: skey
+    })
+    return res
+}
+
+// 创建新环境
+export async function createEnv({ alias, paymentMode }) {
+    const { env } = await getMangerService()
+
+    return env.createEnv({
+        paymentMode,
+        name: alias
+    })
+}
+
+// 获取环境信息
+export async function getEnvInfo(envId: string) {
+    const { EnvList } = await tcbService.request('DescribeEnvs', {
+        EnvId: envId
+    })
+
+    return EnvList?.length ? EnvList[0] : {}
+}
+
+// 列出所有环境
+export async function listEnvs(options: { source?: string[] } = {}): Promise<any[]> {
+    const { source } = options
+    const res: any = await tcbService.request('DescribeEnvs', {
+        IsVisible: false,
+        Channels: ['dcloud']
+    })
+    let { EnvList = [] } = res
+    // 过滤为指定 source 环境
+    if (source && Array.isArray(source)) {
+        EnvList = EnvList.filter((item) => source.includes(item.Source))
+    }
+    return EnvList
+}
+
+// 修改环境信息
+export async function updateEnvInfo({ envId, alias }) {
+    await tcbService.request('ModifyEnv', {
+        EnvId: envId,
+        Alias: alias
+    })
+}
+
+// 获取 Qcloud 环境数量上限
+export async function getEnvLimit(source = 'qcloud') {
+    return tcbService.request('DescribeEnvLimit', {
+        Source: source
+    })
+}

package/src/env/login.ts

@@ -1,80 +1,80 @@
-import crypto from 'crypto'
-import { CloudApiService } from '../utils/net'
-import { CloudBaseError } from '../error'
-
-const publicRsaKey = `
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0ZLB0ZpWWFsHPnDDw++Nc2wI3
-nl2uyOrIJ5FUfxt4GAmt1Faf5pgMxAnL9exEUrrUDUX8Ri1R0KyfnHQQwCvKt8T8
-bgILIJe9UB8e9dvFqgqH2oA8Vqwi0YqDcvFLFJk2BJbm/0QYtZ563FumW8LEXAgu
-UeHi/0OZN9vQ33jWMQIDAQAB
------END PUBLIC KEY-----
-`
-function rsaEncrypt(data: string): string {
-    const buffer = Buffer.from(data)
-    const encrypted = crypto.publicEncrypt(
-        {
-            key: publicRsaKey,
-            padding: crypto.constants.RSA_PKCS1_PADDING
-        },
-        buffer
-    )
-    return encrypted.toString('base64')
-}
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-// 拉取登录配置列表
-export async function getLoginConfigList({ envId }) {
-    const { ConfigList = [] }: any = await tcbService.request('DescribeLoginConfigs', {
-        EnvId: envId
-    })
-
-    return ConfigList
-}
-
-// 创建登录方式
-export async function createLoginConfig({ envId, platform, appId, appSecret }) {
-    const validPlatform = ['WECHAT-OPEN', 'WECHAT-PUBLIC', 'ANONYMOUS']
-    if (!validPlatform.includes(platform)) {
-        throw new CloudBaseError(
-            `Invalid platform value: ${platform}. Now only support 'WECHAT-OPEN', 'WECHAT-PUBLIC', 'ANONYMOUS`
-        )
-    }
-    const params: any = {
-        EnvId: envId,
-        // 平台 “ANONYMOUS" "WECHAT-OPEN" "WECHAT-PUBLIC"
-        Platform: platform,
-        PlatformId: appId,
-        PlatformSecret: rsaEncrypt(appSecret),
-        Status: 'ENABLE'
-    }
-
-    await tcbService.request('CreateLoginConfig', params)
-}
-
-// 更新登录方式
-export async function updateLoginConfig({
-    configId,
-    envId,
-    status = 'ENABLE',
-    appId = '',
-    appSecret = ''
-}) {
-    const validStatus = ['ENABLE', 'DISABLE']
-    if (!validStatus.includes(status)) {
-        throw new CloudBaseError(
-            `Invalid status value: ${status}. Only support 'ENABLE', 'DISABLE'`
-        )
-    }
-    const params: any = {
-        EnvId: envId,
-        ConfigId: configId,
-        Status: status
-    }
-
-    appId && (params.PlatformId = appId)
-    appSecret && (params.PlatformSecret = rsaEncrypt(appSecret))
-
-    await tcbService.request('UpdateLoginConfig', params)
-}
+import crypto from 'crypto'
+import { CloudApiService } from '../utils/net'
+import { CloudBaseError } from '../error'
+
+const publicRsaKey = `
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0ZLB0ZpWWFsHPnDDw++Nc2wI3
+nl2uyOrIJ5FUfxt4GAmt1Faf5pgMxAnL9exEUrrUDUX8Ri1R0KyfnHQQwCvKt8T8
+bgILIJe9UB8e9dvFqgqH2oA8Vqwi0YqDcvFLFJk2BJbm/0QYtZ563FumW8LEXAgu
+UeHi/0OZN9vQ33jWMQIDAQAB
+-----END PUBLIC KEY-----
+`
+function rsaEncrypt(data: string): string {
+    const buffer = Buffer.from(data)
+    const encrypted = crypto.publicEncrypt(
+        {
+            key: publicRsaKey,
+            padding: crypto.constants.RSA_PKCS1_PADDING
+        },
+        buffer
+    )
+    return encrypted.toString('base64')
+}
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+// 拉取登录配置列表
+export async function getLoginConfigList({ envId }) {
+    const { ConfigList = [] }: any = await tcbService.request('DescribeLoginConfigs', {
+        EnvId: envId
+    })
+
+    return ConfigList
+}
+
+// 创建登录方式
+export async function createLoginConfig({ envId, platform, appId, appSecret }) {
+    const validPlatform = ['WECHAT-OPEN', 'WECHAT-PUBLIC', 'ANONYMOUS']
+    if (!validPlatform.includes(platform)) {
+        throw new CloudBaseError(
+            `Invalid platform value: ${platform}. Now only support 'WECHAT-OPEN', 'WECHAT-PUBLIC', 'ANONYMOUS`
+        )
+    }
+    const params: any = {
+        EnvId: envId,
+        // 平台 “ANONYMOUS" "WECHAT-OPEN" "WECHAT-PUBLIC"
+        Platform: platform,
+        PlatformId: appId,
+        PlatformSecret: rsaEncrypt(appSecret),
+        Status: 'ENABLE'
+    }
+
+    await tcbService.request('CreateLoginConfig', params)
+}
+
+// 更新登录方式
+export async function updateLoginConfig({
+    configId,
+    envId,
+    status = 'ENABLE',
+    appId = '',
+    appSecret = ''
+}) {
+    const validStatus = ['ENABLE', 'DISABLE']
+    if (!validStatus.includes(status)) {
+        throw new CloudBaseError(
+            `Invalid status value: ${status}. Only support 'ENABLE', 'DISABLE'`
+        )
+    }
+    const params: any = {
+        EnvId: envId,
+        ConfigId: configId,
+        Status: status
+    }
+
+    appId && (params.PlatformId = appId)
+    appSecret && (params.PlatformSecret = rsaEncrypt(appSecret))
+
+    await tcbService.request('UpdateLoginConfig', params)
+}

package/src/error.ts

@@ -1,36 +1,36 @@
-interface Options {
-    exit?: number
-    original?: Error | undefined
-    code?: string | number
-    requestId?: string
-    action?: string
-    meta?: Record<string, any>
-}
-
-export class CloudBaseError extends Error {
-    readonly exit: number
-    readonly message: string
-    readonly name = 'CloudBaseError'
-    readonly original: Error | undefined
-    readonly code: string | number
-    readonly requestId: string
-    readonly action: string
-    readonly meta: any
-
-    constructor(message: string, options: Options = {}) {
-        super()
-        this.message = message
-        const {
-            code = '',
-            action = '',
-            original = null,
-            requestId = '',
-            meta = {}
-        } = options
-        this.original = original
-        this.code = code
-        this.requestId = requestId
-        this.action = action
-        this.meta = meta
-    }
-}
+interface Options {
+    exit?: number
+    original?: Error | undefined
+    code?: string | number
+    requestId?: string
+    action?: string
+    meta?: Record<string, any>
+}
+
+export class CloudBaseError extends Error {
+    readonly exit: number
+    readonly message: string
+    readonly name = 'CloudBaseError'
+    readonly original: Error | undefined
+    readonly code: string | number
+    readonly requestId: string
+    readonly action: string
+    readonly meta: any
+
+    constructor(message: string, options: Options = {}) {
+        super()
+        this.message = message
+        const {
+            code = '',
+            action = '',
+            original = null,
+            requestId = '',
+            meta = {}
+        } = options
+        this.original = original
+        this.code = code
+        this.requestId = requestId
+        this.action = action
+        this.meta = meta
+    }
+}

package/src/function/alias.ts

@@ -1,43 +1,43 @@
-import { CloudBaseError } from '../error'
-import { IUpdateFunctionAliasConfig, IGetFunctionAlias, IGetFunctionAliasRes } from '../types'
-import { getFunctionService } from './base'
-
-// 设置函数流量配置信息（ALIAS 配置）
-export async function setFunctionAliasConfig(options: IUpdateFunctionAliasConfig) {
-    const { envId, functionName, name, functionVersion, description, routingConfig } = options
-
-    const scfService = await getFunctionService(envId)
-
-    try {
-        await scfService.updateFunctionAliasConfig({
-            functionName,
-            name,
-            functionVersion,
-            description,
-            routingConfig
-        })
-    } catch (e) {
-        throw new CloudBaseError(`[${functionName}] 设置函数流量配置失败： ${e.message}`, {
-            code: e.code
-        })
-    }
-}
-
-// 查询函数别名配置信息
-export async function getFunctionAliasConfig(options: IGetFunctionAlias): Promise<IGetFunctionAliasRes> {
-    const { envId, functionName, name } = options
-
-    const scfService = await getFunctionService(envId)
-
-    try {
-        return scfService.getFunctionAlias({
-            functionName,
-            name
-        })
-    } catch (e) {
-        throw new CloudBaseError(`[${functionName}] 查询函数别名配置失败： ${e.message}`, {
-            code: e.code
-        })
-    }
-}
-
+import { CloudBaseError } from '../error'
+import { IUpdateFunctionAliasConfig, IGetFunctionAlias, IGetFunctionAliasRes } from '../types'
+import { getFunctionService } from './base'
+
+// 设置函数流量配置信息（ALIAS 配置）
+export async function setFunctionAliasConfig(options: IUpdateFunctionAliasConfig) {
+    const { envId, functionName, name, functionVersion, description, routingConfig } = options
+
+    const scfService = await getFunctionService(envId)
+
+    try {
+        await scfService.updateFunctionAliasConfig({
+            functionName,
+            name,
+            functionVersion,
+            description,
+            routingConfig
+        })
+    } catch (e) {
+        throw new CloudBaseError(`[${functionName}] 设置函数流量配置失败： ${e.message}`, {
+            code: e.code
+        })
+    }
+}
+
+// 查询函数别名配置信息
+export async function getFunctionAliasConfig(options: IGetFunctionAlias): Promise<IGetFunctionAliasRes> {
+    const { envId, functionName, name } = options
+
+    const scfService = await getFunctionService(envId)
+
+    try {
+        return scfService.getFunctionAlias({
+            functionName,
+            name
+        })
+    } catch (e) {
+        throw new CloudBaseError(`[${functionName}] 查询函数别名配置失败： ${e.message}`, {
+            code: e.code
+        })
+    }
+}
+