@cloudbase/cli 2.0.2 → 2.0.3

package/src/function/layer/delete.ts

@@ -1,21 +1,21 @@
-import fs from 'fs'
-import path from 'path'
-import { CloudBaseError } from '../../error'
-import { CloudApiService } from '../../utils'
-
-const scfService = new CloudApiService('scf')
-
-export interface ILayerDeleteOptions {
-    name: string
-    version: number
-}
-
-// 创建文件层
-export async function deleteLayer(options: ILayerDeleteOptions): Promise<void> {
-    const { name, version } = options
-
-    return scfService.request('DeleteLayerVersion', {
-        LayerName: name,
-        LayerVersion: version
-    })
-}
+import fs from 'fs'
+import path from 'path'
+import { CloudBaseError } from '../../error'
+import { CloudApiService } from '../../utils'
+
+const scfService = new CloudApiService('scf')
+
+export interface ILayerDeleteOptions {
+    name: string
+    version: number
+}
+
+// 创建文件层
+export async function deleteLayer(options: ILayerDeleteOptions): Promise<void> {
+    const { name, version } = options
+
+    return scfService.request('DeleteLayerVersion', {
+        LayerName: name,
+        LayerVersion: version
+    })
+}

package/src/function/layer/download.ts

@@ -1,54 +1,54 @@
-import fs from 'fs'
-import path from 'path'
-import unzipper from 'unzipper'
-import { CloudApiService, fetchStream, checkFullAccess, delSync } from '../../utils'
-import { CloudBaseError } from '../../error'
-
-const scfService = new CloudApiService('scf')
-
-export interface ILayerDownloadOptions {
-    name: string
-    version: number
-    destPath: string
-    force?: boolean
-    unzip?: boolean
-}
-
-// 下载文件层 ZIP 文件
-export async function downloadLayer(options: ILayerDownloadOptions): Promise<void> {
-    const { name, version, destPath, unzip = false } = options
-    const res = await scfService.request('GetLayerVersion', {
-        LayerName: name,
-        LayerVersion: version
-    })
-    const url = res?.Location
-    const zipPath = path.join(destPath, `${name}-${version}.zip`)
-    if (checkFullAccess(zipPath)) {
-        throw new CloudBaseError(`文件已存在：${zipPath}`)
-    }
-
-    // 下载文件
-    const streamRes = await fetchStream(url)
-    const dest = fs.createWriteStream(zipPath)
-    streamRes.body.pipe(dest)
-    return new Promise(resolve => {
-        // 解压文件
-        dest.on('close', () => {
-            // 不解压 ZIP 文件
-            if (!unzip) {
-                resolve()
-                return
-            }
-
-            const unzipStream = unzipper.Extract({
-                path: destPath
-            })
-            fs.createReadStream(zipPath).pipe(unzipStream)
-            unzipStream.on('close', () => {
-                // 删除 ZIP 文件
-                delSync([zipPath])
-                resolve()
-            })
-        })
-    })
-}
+import fs from 'fs'
+import path from 'path'
+import unzipper from 'unzipper'
+import { CloudApiService, fetchStream, checkFullAccess, delSync } from '../../utils'
+import { CloudBaseError } from '../../error'
+
+const scfService = new CloudApiService('scf')
+
+export interface ILayerDownloadOptions {
+    name: string
+    version: number
+    destPath: string
+    force?: boolean
+    unzip?: boolean
+}
+
+// 下载文件层 ZIP 文件
+export async function downloadLayer(options: ILayerDownloadOptions): Promise<void> {
+    const { name, version, destPath, unzip = false } = options
+    const res = await scfService.request('GetLayerVersion', {
+        LayerName: name,
+        LayerVersion: version
+    })
+    const url = res?.Location
+    const zipPath = path.join(destPath, `${name}-${version}.zip`)
+    if (checkFullAccess(zipPath)) {
+        throw new CloudBaseError(`文件已存在：${zipPath}`)
+    }
+
+    // 下载文件
+    const streamRes = await fetchStream(url)
+    const dest = fs.createWriteStream(zipPath)
+    streamRes.body.pipe(dest)
+    return new Promise(resolve => {
+        // 解压文件
+        dest.on('close', () => {
+            // 不解压 ZIP 文件
+            if (!unzip) {
+                resolve()
+                return
+            }
+
+            const unzipStream = unzipper.Extract({
+                path: destPath
+            })
+            fs.createReadStream(zipPath).pipe(unzipStream)
+            unzipStream.on('close', () => {
+                // 删除 ZIP 文件
+                delSync([zipPath])
+                resolve()
+            })
+        })
+    })
+}

package/src/function/layer/index.ts

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

package/src/function/layer/list.ts

@@ -1,32 +1,32 @@
-import { CloudApiService } from '../../utils'
-
-const scfService = new CloudApiService('scf')
-
-export interface ILayerListOptions {
-    offset: number
-    limit: number
-}
-
-export interface IVersionListOptions {
-    name: string
-}
-
-// 列出文件层
-export async function listLayers(options: ILayerListOptions): Promise<any> {
-    const { offset, limit } = options
-
-    const res = await scfService.request('ListLayers', {
-        Offset: offset,
-        Limit: limit
-    })
-    return res?.Layers || []
-}
-
-// 获取文件层的版本列表
-export async function listLayerVersions(options: IVersionListOptions): Promise<any> {
-    const { name } = options
-    const res = await scfService.request('ListLayerVersions', {
-        LayerName: name
-    })
-    return res?.LayerVersions || []
-}
+import { CloudApiService } from '../../utils'
+
+const scfService = new CloudApiService('scf')
+
+export interface ILayerListOptions {
+    offset: number
+    limit: number
+}
+
+export interface IVersionListOptions {
+    name: string
+}
+
+// 列出文件层
+export async function listLayers(options: ILayerListOptions): Promise<any> {
+    const { offset, limit } = options
+
+    const res = await scfService.request('ListLayers', {
+        Offset: offset,
+        Limit: limit
+    })
+    return res?.Layers || []
+}
+
+// 获取文件层的版本列表
+export async function listLayerVersions(options: IVersionListOptions): Promise<any> {
+    const { name } = options
+    const res = await scfService.request('ListLayerVersions', {
+        LayerName: name
+    })
+    return res?.LayerVersions || []
+}

package/src/function/layer/sort.ts

@@ -1,24 +1,24 @@
-import { CloudApiService } from '../../utils'
-
-const scfService = new CloudApiService('scf')
-
-export interface ILayer {
-    LayerName: string
-    LayerVersion: number
-}
-
-export interface ISortOptions {
-    envId: string
-    functionName: string
-    layers: ILayer[]
-}
-
-// 函数文件层排序
-export async function sortLayer(options: ISortOptions): Promise<void> {
-    const { envId, functionName, layers } = options
-    return scfService.request('UpdateFunctionConfiguration', {
-        Layers: layers,
-        Namespace: envId,
-        FunctionName: functionName
-    })
-}
+import { CloudApiService } from '../../utils'
+
+const scfService = new CloudApiService('scf')
+
+export interface ILayer {
+    LayerName: string
+    LayerVersion: number
+}
+
+export interface ISortOptions {
+    envId: string
+    functionName: string
+    layers: ILayer[]
+}
+
+// 函数文件层排序
+export async function sortLayer(options: ISortOptions): Promise<void> {
+    const { envId, functionName, layers } = options
+    return scfService.request('UpdateFunctionConfiguration', {
+        Layers: layers,
+        Namespace: envId,
+        FunctionName: functionName
+    })
+}

package/src/function/trigger.ts

@@ -1,97 +1,97 @@
-import { CloudApiService } from '../utils'
-import { successLog } from '../logger'
-import { IFunctionTriggerOptions, IFunctionBatchOptions } from '../types'
-import { CloudBaseError } from '../error'
-
-const scfService = CloudApiService.getInstance('scf')
-
-// 创建函数触发器
-export async function createFunctionTriggers(options: IFunctionTriggerOptions): Promise<void> {
-    const { functionName, triggers = [], envId } = options
-
-    const parsedTriggers = triggers.map(item => {
-        if (item.type !== 'timer') {
-            throw new CloudBaseError(
-                `不支持的触发器类型 [${item.type}]，目前仅支持定时触发器（timer）！`
-            )
-        }
-        return {
-            TriggerName: item.name,
-            Type: item.type,
-            TriggerDesc: item.config
-        }
-    })
-
-    try {
-        await scfService.request('BatchCreateTrigger', {
-            FunctionName: functionName,
-            Namespace: envId,
-            Triggers: JSON.stringify(parsedTriggers),
-            Count: parsedTriggers.length
-        })
-    } catch (e) {
-        throw new CloudBaseError(`[${functionName}] 创建触发器失败：${e.message}`, {
-            action: e.action,
-            code: e.code
-        })
-    }
-}
-
-// 批量部署函数触发器
-export async function batchCreateTriggers(options: IFunctionBatchOptions): Promise<void> {
-    const { functions, envId } = options
-
-    const promises = functions.map(func =>
-        (async () => {
-            try {
-                await createFunctionTriggers({
-                    functionName: func.name,
-                    triggers: func.triggers,
-                    envId
-                })
-                successLog(`[${func.name}] 创建云函数触发器成功！`)
-            } catch (e) {
-                throw new CloudBaseError(e.message)
-            }
-        })()
-    )
-
-    await Promise.all(promises)
-}
-
-// 删除函数触发器
-export async function deleteFunctionTrigger(options: IFunctionTriggerOptions): Promise<void> {
-    const { functionName, triggerName, envId } = options
-    try {
-        await scfService.request('DeleteTrigger', {
-            FunctionName: functionName,
-            Namespace: envId,
-            TriggerName: triggerName,
-            Type: 'timer'
-        })
-        successLog(`[${functionName}] 删除云函数触发器 ${triggerName} 成功！`)
-    } catch (e) {
-        throw new CloudBaseError(`[${functionName}] 删除触发器失败：${e.message}`)
-    }
-}
-
-export async function batchDeleteTriggers(options: IFunctionBatchOptions): Promise<void> {
-    const { functions, envId } = options
-    const promises = functions.map(func =>
-        (async () => {
-            try {
-                func.triggers.forEach(async trigger => {
-                    await deleteFunctionTrigger({
-                        functionName: func.name,
-                        triggerName: trigger.name,
-                        envId
-                    })
-                })
-            } catch (e) {
-                throw new CloudBaseError(e.message)
-            }
-        })()
-    )
-
-    await Promise.all(promises)
-}
+import { CloudApiService } from '../utils'
+import { successLog } from '../logger'
+import { IFunctionTriggerOptions, IFunctionBatchOptions } from '../types'
+import { CloudBaseError } from '../error'
+
+const scfService = CloudApiService.getInstance('scf')
+
+// 创建函数触发器
+export async function createFunctionTriggers(options: IFunctionTriggerOptions): Promise<void> {
+    const { functionName, triggers = [], envId } = options
+
+    const parsedTriggers = triggers.map(item => {
+        if (item.type !== 'timer') {
+            throw new CloudBaseError(
+                `不支持的触发器类型 [${item.type}]，目前仅支持定时触发器（timer）！`
+            )
+        }
+        return {
+            TriggerName: item.name,
+            Type: item.type,
+            TriggerDesc: item.config
+        }
+    })
+
+    try {
+        await scfService.request('BatchCreateTrigger', {
+            FunctionName: functionName,
+            Namespace: envId,
+            Triggers: JSON.stringify(parsedTriggers),
+            Count: parsedTriggers.length
+        })
+    } catch (e) {
+        throw new CloudBaseError(`[${functionName}] 创建触发器失败：${e.message}`, {
+            action: e.action,
+            code: e.code
+        })
+    }
+}
+
+// 批量部署函数触发器
+export async function batchCreateTriggers(options: IFunctionBatchOptions): Promise<void> {
+    const { functions, envId } = options
+
+    const promises = functions.map(func =>
+        (async () => {
+            try {
+                await createFunctionTriggers({
+                    functionName: func.name,
+                    triggers: func.triggers,
+                    envId
+                })
+                successLog(`[${func.name}] 创建云函数触发器成功！`)
+            } catch (e) {
+                throw new CloudBaseError(e.message)
+            }
+        })()
+    )
+
+    await Promise.all(promises)
+}
+
+// 删除函数触发器
+export async function deleteFunctionTrigger(options: IFunctionTriggerOptions): Promise<void> {
+    const { functionName, triggerName, envId } = options
+    try {
+        await scfService.request('DeleteTrigger', {
+            FunctionName: functionName,
+            Namespace: envId,
+            TriggerName: triggerName,
+            Type: 'timer'
+        })
+        successLog(`[${functionName}] 删除云函数触发器 ${triggerName} 成功！`)
+    } catch (e) {
+        throw new CloudBaseError(`[${functionName}] 删除触发器失败：${e.message}`)
+    }
+}
+
+export async function batchDeleteTriggers(options: IFunctionBatchOptions): Promise<void> {
+    const { functions, envId } = options
+    const promises = functions.map(func =>
+        (async () => {
+            try {
+                func.triggers.forEach(async trigger => {
+                    await deleteFunctionTrigger({
+                        functionName: func.name,
+                        triggerName: trigger.name,
+                        envId
+                    })
+                })
+            } catch (e) {
+                throw new CloudBaseError(e.message)
+            }
+        })()
+    )
+
+    await Promise.all(promises)
+}

package/src/function/update.ts

@@ -1,35 +1,35 @@
-import { CloudBaseError } from '../error'
-import { ICreateFunctionOptions } from '../types'
-import { getFunctionService } from './base'
-
-// 更新云函数代码
-export async function updateFunctionCode(options: ICreateFunctionOptions) {
-    const { functionRootPath = '', envId, base64Code = '', codeSecret } = options
-    // 兼容处理 config
-    const func = {
-        ...options?.func?.config,
-        ...options.func
-    }
-
-    const funcName = func.name
-
-    // 校验 CodeSecret 格式
-    if (codeSecret && !/^[A-Za-z0-9+=/]{1,160}$/.test(codeSecret)) {
-        throw new CloudBaseError('CodeSecret 格式错误，格式为 1-160 位大小字母，数字+=/')
-    }
-
-    const scfService = await getFunctionService(envId)
-
-    try {
-        await scfService.updateFunctionCode({
-            func,
-            functionRootPath,
-            base64Code,
-            codeSecret
-        })
-    } catch (e) {
-        throw new CloudBaseError(`[${funcName}] 函数代码更新失败： ${e.message}`, {
-            code: e.code
-        })
-    }
-}
+import { CloudBaseError } from '../error'
+import { ICreateFunctionOptions } from '../types'
+import { getFunctionService } from './base'
+
+// 更新云函数代码
+export async function updateFunctionCode(options: ICreateFunctionOptions) {
+    const { functionRootPath = '', envId, base64Code = '', codeSecret } = options
+    // 兼容处理 config
+    const func = {
+        ...options?.func?.config,
+        ...options.func
+    }
+
+    const funcName = func.name
+
+    // 校验 CodeSecret 格式
+    if (codeSecret && !/^[A-Za-z0-9+=/]{1,160}$/.test(codeSecret)) {
+        throw new CloudBaseError('CodeSecret 格式错误，格式为 1-160 位大小字母，数字+=/')
+    }
+
+    const scfService = await getFunctionService(envId)
+
+    try {
+        await scfService.updateFunctionCode({
+            func,
+            functionRootPath,
+            base64Code,
+            codeSecret
+        })
+    } catch (e) {
+        throw new CloudBaseError(`[${funcName}] 函数代码更新失败： ${e.message}`, {
+            code: e.code
+        })
+    }
+}

package/src/function/version.ts

@@ -1,39 +1,39 @@
-import { CloudBaseError } from '../error'
-import { IPublishVersionParams, IListFunctionVersionParams, IFunctionVersionsRes } from '../types'
-import { getFunctionService } from './base'
-
-// 发布云函数新版本
-export async function publishVersion(options: IPublishVersionParams) {
-    const { envId, functionName, description = '' } = options
-
-    const scfService = await getFunctionService(envId)
-
-    try {
-        await scfService.publishVersion({
-            functionName,
-            description
-        })
-    } catch (e) {
-        throw new CloudBaseError(`[${functionName}] 函数发布新版本失败： ${e.message}`, {
-            code: e.code
-        })
-    }
-}
-
-// 查看函数所有版本
-export async function listFunctionVersions(options: IListFunctionVersionParams): Promise<IFunctionVersionsRes> {
-    const { envId, functionName, offset = 0, limit = 20 } = options
-    const scfService = await getFunctionService(envId)
-
-    try {
-        return scfService.listVersionByFunction({
-            functionName,
-            offset,
-            limit
-        })
-    } catch (e) {
-        throw new CloudBaseError(`[${functionName}] 查看寒函数版本列表失败： ${e.message}`, {
-            code: e.code
-        })
-    }
+import { CloudBaseError } from '../error'
+import { IPublishVersionParams, IListFunctionVersionParams, IFunctionVersionsRes } from '../types'
+import { getFunctionService } from './base'
+
+// 发布云函数新版本
+export async function publishVersion(options: IPublishVersionParams) {
+    const { envId, functionName, description = '' } = options
+
+    const scfService = await getFunctionService(envId)
+
+    try {
+        await scfService.publishVersion({
+            functionName,
+            description
+        })
+    } catch (e) {
+        throw new CloudBaseError(`[${functionName}] 函数发布新版本失败： ${e.message}`, {
+            code: e.code
+        })
+    }
+}
+
+// 查看函数所有版本
+export async function listFunctionVersions(options: IListFunctionVersionParams): Promise<IFunctionVersionsRes> {
+    const { envId, functionName, offset = 0, limit = 20 } = options
+    const scfService = await getFunctionService(envId)
+
+    try {
+        return scfService.listVersionByFunction({
+            functionName,
+            offset,
+            limit
+        })
+    } catch (e) {
+        throw new CloudBaseError(`[${functionName}] 查看寒函数版本列表失败： ${e.message}`, {
+            code: e.code
+        })
+    }
 }

package/src/function/vpc.ts

@@ -1,22 +1,22 @@
-import { CloudApiService } from '../utils'
-
-const vpcService = CloudApiService.getInstance('vpc')
-
-// 获取 vpc 信息
-export async function getVpcs() {
-    const { VpcSet } = await vpcService.request('DescribeVpcs')
-    return VpcSet
-}
-
-// 获取子网
-export async function getSubnets(vpcId: string) {
-    const { SubnetSet } = await vpcService.request('DescribeSubnets', {
-        Filters: [
-            {
-                Name: 'vpc-id',
-                Values: [vpcId]
-            }
-        ]
-    })
-    return SubnetSet
-}
+import { CloudApiService } from '../utils'
+
+const vpcService = CloudApiService.getInstance('vpc')
+
+// 获取 vpc 信息
+export async function getVpcs() {
+    const { VpcSet } = await vpcService.request('DescribeVpcs')
+    return VpcSet
+}
+
+// 获取子网
+export async function getSubnets(vpcId: string) {
+    const { SubnetSet } = await vpcService.request('DescribeSubnets', {
+        Filters: [
+            {
+                Name: 'vpc-id',
+                Values: [vpcId]
+            }
+        ]
+    })
+    return SubnetSet
+}