@cloudbase/cli 2.0.0 → 2.0.1

package/src/hosting.ts

@@ -1,212 +1,212 @@
-import path from 'path'
-import {
-    CloudApiService,
-    firstLetterToLowerCase,
-    isDirectory,
-    genClickableLink,
-    checkReadable,
-    getStorageService
-} from './utils'
-import { CloudBaseError } from './error'
-
-interface IBaseOptions {
-    envId: string
-}
-
-interface IHostingFileOptions extends IBaseOptions {
-    filePath: string
-    cloudPath: string
-    isDir: boolean
-    onProgress?: (data: any) => void
-    onFileFinish?: (...args) => void
-}
-
-interface IHostingCloudOptions extends IBaseOptions {
-    cloudPath: string
-    isDir: boolean
-}
-
-const HostingStatusMap = {
-    init: '初始化中',
-    process: '处理中',
-    online: '上线',
-    destroying: '销毁中',
-    offline: '下线',
-    create_fail: '初始化失败', // eslint-disable-line
-    destroy_fail: '销毁失败' // eslint-disable-line
-}
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export async function getHostingInfo(options: IBaseOptions) {
-    const { envId } = options
-    const res = await tcbService.request('DescribeStaticStore', {
-        EnvId: envId
-    })
-    const data = firstLetterToLowerCase(res)
-    return data
-}
-
-export async function checkHostingStatus(envId: string) {
-    const hostings = await getHostingInfo({ envId })
-
-    const link = genClickableLink('https://console.cloud.tencent.com/tcb')
-
-    if (!hostings.data || !hostings.data.length) {
-        throw new CloudBaseError(
-            `您还没有开启静态网站服务，请先到云开发控制台开启静态网站服务！\n👉 ${link}`,
-            {
-                code: 'INVALID_OPERATION'
-            }
-        )
-    }
-
-    const website = hostings.data[0]
-
-    if (website.status !== 'online') {
-        throw new CloudBaseError(
-            `静态网站服务【${HostingStatusMap[website.status]}】，无法进行此操作！`,
-            {
-                code: 'INVALID_OPERATION'
-            }
-        )
-    }
-
-    return website
-}
-
-export async function enableHosting(options: IBaseOptions) {
-    const { envId } = options
-    const hostings = await getHostingInfo(options)
-    if (hostings?.data?.length) {
-        const website = hostings.data[0]
-        // offline 状态的服务可重新开启
-        if (website.status !== 'offline') {
-            throw new CloudBaseError('静态网站服务已开启，请勿重复操作！')
-        }
-    }
-
-    const res = await tcbService.request('CreateStaticStore', {
-        EnvId: envId
-    })
-    const code = res.Result === 'succ' ? 0 : -1
-    return {
-        code,
-        requestId: res.RequestId
-    }
-}
-
-// 展示文件信息
-export async function hostingList(options: IBaseOptions) {
-    const { envId } = options
-    const hosting = await checkHostingStatus(envId)
-    const { bucket, regoin } = hosting
-    const storageService = await getStorageService(envId)
-
-    const list = await storageService.walkCloudDirCustom({
-        prefix: '',
-        bucket,
-        region: regoin
-    })
-
-    return list
-}
-
-export async function destroyHosting(options: IBaseOptions) {
-    const { envId } = options
-    const files = await hostingList(options)
-
-    if (files?.length) {
-        throw new CloudBaseError('静态网站文件不为空，无法销毁！', {
-            code: 'INVALID_OPERATION'
-        })
-    }
-
-    const hostings = await getHostingInfo(options)
-
-    if (!hostings.data || !hostings.data.length) {
-        throw new CloudBaseError('静态网站服务未开启！', {
-            code: 'INVALID_OPERATION'
-        })
-    }
-
-    const website = hostings.data[0]
-
-    // destroy_fail 状态可重试
-    if (website.status !== 'online' && website.status !== 'destroy_fail') {
-        throw new CloudBaseError(
-            `静态网站服务【${HostingStatusMap[website.status]}】，无法进行此操作！`,
-            {
-                code: 'INVALID_OPERATION'
-            }
-        )
-    }
-
-    const res = await tcbService.request('DestroyStaticStore', {
-        EnvId: envId
-    })
-
-    const code = res.Result === 'succ' ? 0 : -1
-    return {
-        code,
-        requestId: res.RequestId
-    }
-}
-
-// 上传文件
-export async function hostingDeploy(options: IHostingFileOptions) {
-    const { envId, filePath, cloudPath, onProgress, onFileFinish } = options
-    const resolvePath = path.resolve(filePath)
-    // 检查路径是否存在
-    checkReadable(resolvePath, true)
-
-    const hosting = await checkHostingStatus(envId)
-    const { bucket, regoin } = hosting
-    const storageService = await getStorageService(envId)
-
-    if (isDirectory(resolvePath)) {
-        await storageService.uploadDirectoryCustom({
-            localPath: resolvePath,
-            cloudPath,
-            bucket,
-            region: regoin,
-            onProgress,
-            onFileFinish,
-            fileId: false
-        })
-    } else {
-        const assignCloudPath = cloudPath || path.parse(resolvePath).base
-        await storageService.uploadFileCustom({
-            localPath: resolvePath,
-            cloudPath: assignCloudPath,
-            bucket,
-            region: regoin,
-            onProgress,
-            fileId: false
-        })
-    }
-}
-
-// 删除文件
-export async function hostingDelete(options: IHostingCloudOptions) {
-    const { envId, cloudPath, isDir } = options
-    const hosting = await checkHostingStatus(envId)
-    const { bucket, regoin } = hosting
-    const storageService = await getStorageService(envId)
-
-    if (isDir) {
-        await storageService.deleteDirectoryCustom({
-            cloudPath,
-            bucket,
-            region: regoin
-        })
-    } else {
-        await storageService.deleteFileCustom([cloudPath], bucket, regoin)
-    }
-}
-
-// 删除文件
-export async function walkLocalDir(envId: string, dir: string) {
-    const storageService = await getStorageService(envId)
-    return storageService.walkLocalDir(dir)
-}
+import path from 'path'
+import {
+    CloudApiService,
+    firstLetterToLowerCase,
+    isDirectory,
+    genClickableLink,
+    checkReadable,
+    getStorageService
+} from './utils'
+import { CloudBaseError } from './error'
+
+interface IBaseOptions {
+    envId: string
+}
+
+interface IHostingFileOptions extends IBaseOptions {
+    filePath: string
+    cloudPath: string
+    isDir: boolean
+    onProgress?: (data: any) => void
+    onFileFinish?: (...args) => void
+}
+
+interface IHostingCloudOptions extends IBaseOptions {
+    cloudPath: string
+    isDir: boolean
+}
+
+const HostingStatusMap = {
+    init: '初始化中',
+    process: '处理中',
+    online: '上线',
+    destroying: '销毁中',
+    offline: '下线',
+    create_fail: '初始化失败', // eslint-disable-line
+    destroy_fail: '销毁失败' // eslint-disable-line
+}
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export async function getHostingInfo(options: IBaseOptions) {
+    const { envId } = options
+    const res = await tcbService.request('DescribeStaticStore', {
+        EnvId: envId
+    })
+    const data = firstLetterToLowerCase(res)
+    return data
+}
+
+export async function checkHostingStatus(envId: string) {
+    const hostings = await getHostingInfo({ envId })
+
+    const link = genClickableLink('https://console.cloud.tencent.com/tcb')
+
+    if (!hostings.data || !hostings.data.length) {
+        throw new CloudBaseError(
+            `您还没有开启静态网站服务，请先到云开发控制台开启静态网站服务！\n👉 ${link}`,
+            {
+                code: 'INVALID_OPERATION'
+            }
+        )
+    }
+
+    const website = hostings.data[0]
+
+    if (website.status !== 'online') {
+        throw new CloudBaseError(
+            `静态网站服务【${HostingStatusMap[website.status]}】，无法进行此操作！`,
+            {
+                code: 'INVALID_OPERATION'
+            }
+        )
+    }
+
+    return website
+}
+
+export async function enableHosting(options: IBaseOptions) {
+    const { envId } = options
+    const hostings = await getHostingInfo(options)
+    if (hostings?.data?.length) {
+        const website = hostings.data[0]
+        // offline 状态的服务可重新开启
+        if (website.status !== 'offline') {
+            throw new CloudBaseError('静态网站服务已开启，请勿重复操作！')
+        }
+    }
+
+    const res = await tcbService.request('CreateStaticStore', {
+        EnvId: envId
+    })
+    const code = res.Result === 'succ' ? 0 : -1
+    return {
+        code,
+        requestId: res.RequestId
+    }
+}
+
+// 展示文件信息
+export async function hostingList(options: IBaseOptions) {
+    const { envId } = options
+    const hosting = await checkHostingStatus(envId)
+    const { bucket, regoin } = hosting
+    const storageService = await getStorageService(envId)
+
+    const list = await storageService.walkCloudDirCustom({
+        prefix: '',
+        bucket,
+        region: regoin
+    })
+
+    return list
+}
+
+export async function destroyHosting(options: IBaseOptions) {
+    const { envId } = options
+    const files = await hostingList(options)
+
+    if (files?.length) {
+        throw new CloudBaseError('静态网站文件不为空，无法销毁！', {
+            code: 'INVALID_OPERATION'
+        })
+    }
+
+    const hostings = await getHostingInfo(options)
+
+    if (!hostings.data || !hostings.data.length) {
+        throw new CloudBaseError('静态网站服务未开启！', {
+            code: 'INVALID_OPERATION'
+        })
+    }
+
+    const website = hostings.data[0]
+
+    // destroy_fail 状态可重试
+    if (website.status !== 'online' && website.status !== 'destroy_fail') {
+        throw new CloudBaseError(
+            `静态网站服务【${HostingStatusMap[website.status]}】，无法进行此操作！`,
+            {
+                code: 'INVALID_OPERATION'
+            }
+        )
+    }
+
+    const res = await tcbService.request('DestroyStaticStore', {
+        EnvId: envId
+    })
+
+    const code = res.Result === 'succ' ? 0 : -1
+    return {
+        code,
+        requestId: res.RequestId
+    }
+}
+
+// 上传文件
+export async function hostingDeploy(options: IHostingFileOptions) {
+    const { envId, filePath, cloudPath, onProgress, onFileFinish } = options
+    const resolvePath = path.resolve(filePath)
+    // 检查路径是否存在
+    checkReadable(resolvePath, true)
+
+    const hosting = await checkHostingStatus(envId)
+    const { bucket, regoin } = hosting
+    const storageService = await getStorageService(envId)
+
+    if (isDirectory(resolvePath)) {
+        await storageService.uploadDirectoryCustom({
+            localPath: resolvePath,
+            cloudPath,
+            bucket,
+            region: regoin,
+            onProgress,
+            onFileFinish,
+            fileId: false
+        })
+    } else {
+        const assignCloudPath = cloudPath || path.parse(resolvePath).base
+        await storageService.uploadFileCustom({
+            localPath: resolvePath,
+            cloudPath: assignCloudPath,
+            bucket,
+            region: regoin,
+            onProgress,
+            fileId: false
+        })
+    }
+}
+
+// 删除文件
+export async function hostingDelete(options: IHostingCloudOptions) {
+    const { envId, cloudPath, isDir } = options
+    const hosting = await checkHostingStatus(envId)
+    const { bucket, regoin } = hosting
+    const storageService = await getStorageService(envId)
+
+    if (isDir) {
+        await storageService.deleteDirectoryCustom({
+            cloudPath,
+            bucket,
+            region: regoin
+        })
+    } else {
+        await storageService.deleteFileCustom([cloudPath], bucket, regoin)
+    }
+}
+
+// 删除文件
+export async function walkLocalDir(envId: string, dir: string) {
+    const storageService = await getStorageService(envId)
+    return storageService.walkLocalDir(dir)
+}

package/src/index.ts

@@ -1,13 +1,13 @@
-import 'reflect-metadata'
-import { registerCommands } from './commands/common'
-import './commands'
-
-export { smartDeploy } from './commands'
-
-registerCommands()
-
-// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
-if (typeof globalThis === undefined) {
-    // eslint-disable-next-line no-undef
-    ;(globalThis as any) = global
-}
+import 'reflect-metadata'
+import { registerCommands } from './commands/common'
+import './commands'
+
+export { smartDeploy } from './commands'
+
+registerCommands()
+
+// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
+if (typeof globalThis === undefined) {
+    // eslint-disable-next-line no-undef
+    ;(globalThis as any) = global
+}

package/src/logger.ts

@@ -1,17 +1,17 @@
-import chalk from 'chalk'
-import logSymbols from 'log-symbols'
-
-export function errorLog(msg: string) {
-    // 空格，兼容中文字符编码长度问题
-    console.log(`${logSymbols.error} ${msg}`)
-}
-
-export function successLog(msg: string) {
-    // 空格，兼容中文字符编码长度问题
-    console.log(`${logSymbols.success} ${msg}`)
-}
-
-export function warnLog(msg: string) {
-    // 空格，兼容中文字符编码长度问题
-    console.log(`${logSymbols.warning} ${msg}`)
-}
+import chalk from 'chalk'
+import logSymbols from 'log-symbols'
+
+export function errorLog(msg: string) {
+    // 空格，兼容中文字符编码长度问题
+    console.log(`${logSymbols.error} ${msg}`)
+}
+
+export function successLog(msg: string) {
+    // 空格，兼容中文字符编码长度问题
+    console.log(`${logSymbols.success} ${msg}`)
+}
+
+export function warnLog(msg: string) {
+    // 空格，兼容中文字符编码长度问题
+    console.log(`${logSymbols.warning} ${msg}`)
+}

package/src/run/create.ts

@@ -1,23 +1,23 @@
-import { CloudApiService } from '../utils'
-import {
-    ICreateRunOptions
-} from '../types'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const createRun = async (options: ICreateRunOptions) => {
-    const { Result } = await tcbService.request('EstablishCloudBaseRunServer', 
-        {
-            EnvId: options.envId,
-            ServiceName: options.name,
-            Remark: options.remark,
-            VpcInfo: options.vpcInfo,
-            LogType: options.logType,
-            IsPublic: options.isPublic,
-            ...(options.imageRepo ? { ImageRepo: options.imageRepo } : {}),
-            ...(options.logType === 'es' ? { EsInfo: options.esInfo } : {})
-        },
-    )
-
-    return Result
-}
+import { CloudApiService } from '../utils'
+import {
+    ICreateRunOptions
+} from '../types'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const createRun = async (options: ICreateRunOptions) => {
+    const { Result } = await tcbService.request('EstablishCloudBaseRunServer', 
+        {
+            EnvId: options.envId,
+            ServiceName: options.name,
+            Remark: options.remark,
+            VpcInfo: options.vpcInfo,
+            LogType: options.logType,
+            IsPublic: options.isPublic,
+            ...(options.imageRepo ? { ImageRepo: options.imageRepo } : {}),
+            ...(options.logType === 'es' ? { EsInfo: options.esInfo } : {})
+        },
+    )
+
+    return Result
+}

package/src/run/delete.ts

@@ -1,15 +1,15 @@
-import { CloudApiService } from '../utils'
-import {
-    IDeleteRun
-} from '../types'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const deleteRun = async (options: IDeleteRun) => {
-    const { Result } = await tcbService.request('DeleteCloudBaseRunServer', {
-        EnvId: options.envId,
-        ServerName: options.serverName
-    })
-
-    return Result
-}
+import { CloudApiService } from '../utils'
+import {
+    IDeleteRun
+} from '../types'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const deleteRun = async (options: IDeleteRun) => {
+    const { Result } = await tcbService.request('DeleteCloudBaseRunServer', {
+        EnvId: options.envId,
+        ServerName: options.serverName
+    })
+
+    return Result
+}

package/src/run/image/build.ts

@@ -1,36 +1,36 @@
-import { createReadStream, createWriteStream, readdirSync } from 'fs'
-import { join } from 'path'
-import { zip } from 'compressing'
-import { CloudApiService, fetchStream } from '../../utils'
-import {
-    IBuildImage
-} from '../../types'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-// 提交构建任务
-export const createBuild = async (options: IBuildImage) => {
-    const { PackageName, PackageVersion, UploadHeaders, UploadUrl } = await tcbService.request('DescribeCloudBaseBuildService', {
-        EnvId: options.envId,
-        ServiceName: options.serviceName,
-    })
-
-    return { PackageName, PackageVersion, UploadHeaders, UploadUrl }
-}
-
-// 上传zip压缩包
-export const uploadZip = async (path: string, url: string, headers: { [key: string]: string }) => {
-    let body = createReadStream(path)
-
-    await fetchStream(url, {
-        method: 'PUT',
-        headers: {
-            Accept: '*/*',
-            'Accept-Encoding': 'gzip, deflate, br',
-            'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8,zh-TW;q=0.7,en-US;q=0.6',
-            // [headers['Key']]: headers['Value'],
-            'Content-Type': 'application/x-zip-compressed'
-        },
-        body
-    })
-}
+import { createReadStream, createWriteStream, readdirSync } from 'fs'
+import { join } from 'path'
+import { zip } from 'compressing'
+import { CloudApiService, fetchStream } from '../../utils'
+import {
+    IBuildImage
+} from '../../types'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+// 提交构建任务
+export const createBuild = async (options: IBuildImage) => {
+    const { PackageName, PackageVersion, UploadHeaders, UploadUrl } = await tcbService.request('DescribeCloudBaseBuildService', {
+        EnvId: options.envId,
+        ServiceName: options.serviceName,
+    })
+
+    return { PackageName, PackageVersion, UploadHeaders, UploadUrl }
+}
+
+// 上传zip压缩包
+export const uploadZip = async (path: string, url: string, headers: { [key: string]: string }) => {
+    let body = createReadStream(path)
+
+    await fetchStream(url, {
+        method: 'PUT',
+        headers: {
+            Accept: '*/*',
+            'Accept-Encoding': 'gzip, deflate, br',
+            'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8,zh-TW;q=0.7,en-US;q=0.6',
+            // [headers['Key']]: headers['Value'],
+            'Content-Type': 'application/x-zip-compressed'
+        },
+        body
+    })
+}

package/src/run/image/delete.ts

@@ -1,14 +1,14 @@
-import { CloudApiService } from '../../utils'
-import { IDeleteImage } from '../../types'
-import { option } from 'yargs'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const deleteImage = async (options: IDeleteImage) => {
-    const { Result } = await tcbService.request('DeleteCloudBaseRunImage', {
-        EnvId: options.envId,
-        ImageUrl: options.imageUrl
-    })
-
-    return Result
+import { CloudApiService } from '../../utils'
+import { IDeleteImage } from '../../types'
+import { option } from 'yargs'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const deleteImage = async (options: IDeleteImage) => {
+    const { Result } = await tcbService.request('DeleteCloudBaseRunImage', {
+        EnvId: options.envId,
+        ImageUrl: options.imageUrl
+    })
+
+    return Result
 }