@cloudbase/cli 1.12.7-alpha.4 → 2.0.0

package/src/run/service/showLogs.ts

@@ -0,0 +1,98 @@
+import { callTcbrApi } from '../../utils'
+import { EnumDeployStatus } from '../../constant'
+import chalk from 'chalk'
+
+export async function getBuildStatus(envId: string, serviceName: string) {
+    const { data: deployRes } = await callTcbrApi('DescribeCloudRunDeployRecord', {
+        EnvId: envId,
+        ServerName: serviceName,
+    })
+    if (deployRes?.DeployRecords) {
+        if (deployRes?.DeployRecords[0].Status === EnumDeployStatus.Deploying) {
+            return Promise.resolve('pending')
+        } else {
+            return Promise.resolve('completed')
+        }
+    } else {
+        return Promise.resolve('pending')
+    }
+}
+
+
+async function getBuildId(envId: string, serviceName: string): Promise<number> {
+    const { data: deployRes } = await callTcbrApi('DescribeCloudRunDeployRecord', {
+        EnvId: envId,
+        ServerName: serviceName,
+    })
+    if (deployRes?.DeployRecords) {
+        if (deployRes.DeployRecords[0].Status !== 'deploying') {
+            return Promise.resolve(deployRes.DeployRecords[0].BuildId)
+        }
+    }
+}
+
+async function getRunId(envId: string, serviceName: string) {
+    return new Promise<string>((resolve) => {
+        const timer = setInterval(async () => {
+            const { data: deployRes } = await callTcbrApi('DescribeCloudRunDeployRecord', {
+                EnvId: envId,
+                ServerName: serviceName,
+            })
+            if (deployRes?.DeployRecords) {
+                clearInterval(timer)
+                resolve(deployRes.DeployRecords[0].RunId)
+            }
+        }, 3000)
+    })
+}
+
+
+// 多次获取 processLog
+async function showProcessLogs(envId: string, runId: string, serviceName: string) {
+    return new Promise<void>(resolve => {
+        const timer = setInterval(async () => {
+            if (await getBuildStatus(envId, serviceName) === 'completed') {
+                clearInterval(timer)
+                resolve()
+            } else {
+                const { data: processLogs } = await callTcbrApi('DescribeCloudRunProcessLog', {
+                    EnvId: envId,
+                    RunId: runId,
+                })
+                if (processLogs?.Logs) {
+                    console.log(processLogs?.Logs.join('\n'))
+                }
+            }
+        }, 5000)
+    })
+}
+
+// buildLog 仅在完成后获取一次（未完成 BuildId 为0）
+async function showBuildLogs(envId: string, serviceName: string, serverVersion = '', offset = 0) {
+    const buildId = await getBuildId(envId, serviceName)
+
+    const { data } = await callTcbrApi('DescribeCloudRunBuildLog', {
+        EnvId: envId,
+        BuildId: buildId,
+        ServerName: serviceName,
+        ServerVersion: serverVersion || '',
+        Offset: offset || 0,
+    })
+
+    if (data?.Log?.Text) {
+        console.log(data?.Log?.Text)
+    }
+    return Promise.resolve()
+}
+
+export async function getLogs(options) {
+
+    const runId = await getRunId(options.envId, options.serviceName)
+
+    console.log(chalk.blue('============ 日志开始 ==============='))
+    await showProcessLogs(options.envId, runId, options.serviceName)
+    if (await getBuildStatus(options.envId, options.serviceName) === 'completed') {
+        await showBuildLogs(options.envId, options.serviceName)
+    }
+    console.log(chalk.blue('============ 日志结束 ==============='))
+}

package/src/run/service/update.ts

@@ -0,0 +1,81 @@
+import { CloudBaseError, logger } from '@cloudbase/toolbox'
+import inquirer from 'inquirer'
+import { describeCloudRunServerDetail } from '..'
+import { callTcbrApi } from '../../utils'
+import { tcbrServiceOptions } from './common'
+import { getBuildStatus, getLogs } from './showLogs'
+
+export async function updateCloudRunServer(serviceConfigOptions) {
+    try {
+        const res = await callTcbrApi('UpdateCloudRunServer', serviceConfigOptions)
+        return res
+    } catch (error) {
+        console.log(error)
+    }
+}
+
+export async function updateTcbrService(options) {
+    const { data: serviceDetail } = await describeCloudRunServerDetail({
+        envId: options.envId,
+        serviceName: options.serviceName
+    })
+    if(serviceDetail === undefined) {
+        // 服务不存在
+        throw new CloudBaseError('当前服务不存在，请使用 tcb run service:create 创建服务')
+    }
+    // 查询是否存在发布单
+    /* const { IsExist: isExist } = await describeWxCloudBaseRunReleaseOrder({ 
+                                            envId: options.envId, 
+                                            serviceName: options.serviceName
+                                        })
+    if(isExist) {
+        throw new CloudBaseError('服务正在更新部署，请稍后再试，或查看实时部署日志')
+    } */
+    const status = await getBuildStatus(options.envId, options.serviceName)
+    if(status === 'pending') {
+        throw new CloudBaseError('服务正在更新部署，请稍后再试，或查看实时部署日志')
+    }
+
+    // 获取上次的服务配置信息
+    const previousServerConfig = serviceDetail?.ServerConfig
+
+    const newServiceOptions = await tcbrServiceOptions(options, true, true, previousServerConfig)
+
+    // 二次确认
+    if(!options.noConfirm) {
+        const { confirm } = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'confirm',
+                message: '确定要更新服务吗？',
+            }
+        ])
+        if(!confirm) {
+            return
+        }
+    }
+
+    const updateRes: any = await updateCloudRunServer(newServiceOptions)
+
+    if(updateRes instanceof Error) {
+        // 当前有发布任务在运行中
+        throw new CloudBaseError('当前已有部署发布任务运行中，请稍后再试，或查看实时部署日志')
+    }
+
+    const taskId = updateRes.data?.TaskId
+
+    if(options.json) {
+        console.log(JSON.stringify(updateRes, null, 2))
+    }
+
+    if(process.argv.includes('--verbose')) {
+        await getLogs({
+            envId: options.envId,
+            taskId,
+            serviceName: options.serviceName
+        })
+        console.log(`本次任务的 TaskID： ${taskId}`)
+    } else {
+        logger.success('更新服务成功, 本次任务的 TaskID: ' + taskId)
+    }
+}

package/src/run/standalonegateway/create.ts

@@ -1,24 +1,24 @@
-import { ICreateStandaloneGateway } from '../../types'
-import { CloudBaseError } from '../../error'
-import { CloudApiService } from '../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const createStandaloneGateway = async (options: ICreateStandaloneGateway) => {
-    const res = await tcbService.request('CreateStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayAlias: options.gatewayAlias,
-        GatewayDesc: options.gatewayDesc,
-        VpcId: options.vpcId,
-        SubnetIds: options.subnetIds,
-        PackageVersion: options.packageVersion
-    })
-    const { GatewayName } = res
-    if (GatewayName === undefined) {
-        const {
-            Error: { Message }
-        } = res
-        throw new CloudBaseError(Message)
-    }
-    return GatewayName
-}
+import { ICreateStandaloneGateway } from '../../types'
+import { CloudBaseError } from '../../error'
+import { CloudApiService } from '../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const createStandaloneGateway = async (options: ICreateStandaloneGateway) => {
+    const res = await tcbService.request('CreateStandaloneGateway', {
+        EnvId: options.envId,
+        GatewayAlias: options.gatewayAlias,
+        GatewayDesc: options.gatewayDesc,
+        VpcId: options.vpcId,
+        SubnetIds: options.subnetIds,
+        PackageVersion: options.packageVersion
+    })
+    const { GatewayName } = res
+    if (GatewayName === undefined) {
+        const {
+            Error: { Message }
+        } = res
+        throw new CloudBaseError(Message)
+    }
+    return GatewayName
+}

package/src/run/standalonegateway/destroy.ts

@@ -1,19 +1,19 @@
-import { IDestroyStandaloneGateway } from '../../types'
-import { CloudBaseError } from '../../error'
-import { CloudApiService } from '../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const destroyStandalonegateway = async (options: IDestroyStandaloneGateway) => {
-    const res = await tcbService.request('DestroyStandaloneGateway', {
-        EnvId: options.envId,
-        IsForce: true,
-        GatewayName: options.gatewayName
-    })
-
-    const { Error: Message } = res
-    if (Message !== undefined) {
-        throw new CloudBaseError(JSON.stringify(Message))
-    }
-    return res
-}
+import { IDestroyStandaloneGateway } from '../../types'
+import { CloudBaseError } from '../../error'
+import { CloudApiService } from '../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const destroyStandalonegateway = async (options: IDestroyStandaloneGateway) => {
+    const res = await tcbService.request('DestroyStandaloneGateway', {
+        EnvId: options.envId,
+        IsForce: true,
+        GatewayName: options.gatewayName
+    })
+
+    const { Error: Message } = res
+    if (Message !== undefined) {
+        throw new CloudBaseError(JSON.stringify(Message))
+    }
+    return res
+}

package/src/run/standalonegateway/index.ts

@@ -1,5 +1,5 @@
-export * from './list'
-export * from './create'
-export * from './destroy'
-export * from './package'
+export * from './list'
+export * from './create'
+export * from './destroy'
+export * from './package'
 export * from './turn'

package/src/run/standalonegateway/list.ts

@@ -1,74 +1,74 @@
-import { IListStandaloneGateway } from '../../types'
-import { CloudBaseError } from '../../error'
-import { CloudApiService } from '../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const listStandalonegateway = async (options: IListStandaloneGateway) => {
-    const res = await tcbService.request('DescribeStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayName: options.gatewayName,
-        GatewayAlias: options.gatewayAlias
-    })
-    // const res = {
-    //     StandaloneGatewayList: [
-    //         {
-    //             CPU: 2,
-    //             GateWayStatus: 'Success',
-    //             GatewayAlias: 'StandaloneGateway',
-    //             GatewayDesc: 'gateway',
-    //             GatewayName: 'x-tcb-cbr-gateway-4e9w8r711205c5',
-    //             InternalClbIp: '10.0.0.30',
-    //             Mem: 4,
-    //             PackageVersion: 'starter',
-    //             PublicClbIp: '1.15.159.47',
-    //             ServiceInfo: [
-    //                 {
-    //                     ServiceName: 'coylexie',
-    //                     Status: 'off'
-    //                 },
-    //                 {
-    //                     ServiceName: 'test',
-    //                     Status: 'on'
-    //                 }
-    //             ],
-    //             SubnetIds: ['subnet-g6ey7mid'],
-    //             VpcId: 'vpc-n73jhksu'
-    //         }
-    //     ],
-    //     Total: 1,
-    //     Error: {
-    //         Message: 'No Error'
-    //     }
-    // }
-    const { StandaloneGatewayList } = res
-    if (StandaloneGatewayList !== undefined) {
-        return StandaloneGatewayList.map((item) => [
-            item['GatewayName'],
-            item['GateWayStatus'],
-            item['GatewayAlias'],
-            item['PackageVersion'],
-            // item['Mem'],
-            // item['CPU'],
-            beautifySubnetList(item['SubnetIds']),
-            item['PublicClbIp'],
-            item['InternalClbIp'],
-            beautifyServiceList(item['ServiceInfo'])
-            // item['GatewayDesc'],
-        ])
-    } else {
-        const {
-            Error: { Message }
-        } = res
-        throw new CloudBaseError(Message)
-    }
-}
-
-const beautifySubnetList = (list: Array<string>) => list.join('\n')
-
-const beautifyServiceList = (list: Array<Record<string, string>>) =>
-    list
-        .map(
-            (item) => '服务 ' + item['ServiceName'] + (item['Status'] === 'on' ? ' 开启' : ' 未开启')
-        )
-        .join('\n')
+import { IListStandaloneGateway } from '../../types'
+import { CloudBaseError } from '../../error'
+import { CloudApiService } from '../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const listStandalonegateway = async (options: IListStandaloneGateway) => {
+    const res = await tcbService.request('DescribeStandaloneGateway', {
+        EnvId: options.envId,
+        GatewayName: options.gatewayName,
+        GatewayAlias: options.gatewayAlias
+    })
+    // const res = {
+    //     StandaloneGatewayList: [
+    //         {
+    //             CPU: 2,
+    //             GateWayStatus: 'Success',
+    //             GatewayAlias: 'StandaloneGateway',
+    //             GatewayDesc: 'gateway',
+    //             GatewayName: 'x-tcb-cbr-gateway-4e9w8r711205c5',
+    //             InternalClbIp: '10.0.0.30',
+    //             Mem: 4,
+    //             PackageVersion: 'starter',
+    //             PublicClbIp: '1.15.159.47',
+    //             ServiceInfo: [
+    //                 {
+    //                     ServiceName: 'coylexie',
+    //                     Status: 'off'
+    //                 },
+    //                 {
+    //                     ServiceName: 'test',
+    //                     Status: 'on'
+    //                 }
+    //             ],
+    //             SubnetIds: ['subnet-g6ey7mid'],
+    //             VpcId: 'vpc-n73jhksu'
+    //         }
+    //     ],
+    //     Total: 1,
+    //     Error: {
+    //         Message: 'No Error'
+    //     }
+    // }
+    const { StandaloneGatewayList } = res
+    if (StandaloneGatewayList !== undefined) {
+        return StandaloneGatewayList.map((item) => [
+            item['GatewayName'],
+            item['GateWayStatus'],
+            item['GatewayAlias'],
+            item['PackageVersion'],
+            // item['Mem'],
+            // item['CPU'],
+            beautifySubnetList(item['SubnetIds']),
+            item['PublicClbIp'],
+            item['InternalClbIp'],
+            beautifyServiceList(item['ServiceInfo'])
+            // item['GatewayDesc'],
+        ])
+    } else {
+        const {
+            Error: { Message }
+        } = res
+        throw new CloudBaseError(Message)
+    }
+}
+
+const beautifySubnetList = (list: Array<string>) => list.join('\n')
+
+const beautifyServiceList = (list: Array<Record<string, string>>) =>
+    list
+        .map(
+            (item) => '服务 ' + item['ServiceName'] + (item['Status'] === 'on' ? ' 开启' : ' 未开启')
+        )
+        .join('\n')

package/src/run/standalonegateway/package/list.ts

@@ -1,24 +1,24 @@
-import { IListPackageStandaloneGateway } from '../../../types'
-import { CloudBaseError } from '../../../error'
-import { CloudApiService } from '../../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const listPackageStandalonegateway = async (options: IListPackageStandaloneGateway) => {
-    const res = await tcbService.request('DescribeStandaloneGatewayPackage', {
-        EnvId: options.envId,
-        PackageVersion: options.packageVersion
-    })
-    const { StandaloneGatewayPackageList } = res
-    if (StandaloneGatewayPackageList === undefined) {
-        const {
-            Error: { Message }
-        } = res
-        throw new CloudBaseError(Message)
-    }
-    return StandaloneGatewayPackageList.map((item) => [
-        item['CPU'],
-        item['Mem'],
-        item['PackageVersion']
-    ])
-}
+import { IListPackageStandaloneGateway } from '../../../types'
+import { CloudBaseError } from '../../../error'
+import { CloudApiService } from '../../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const listPackageStandalonegateway = async (options: IListPackageStandaloneGateway) => {
+    const res = await tcbService.request('DescribeStandaloneGatewayPackage', {
+        EnvId: options.envId,
+        PackageVersion: options.packageVersion
+    })
+    const { StandaloneGatewayPackageList } = res
+    if (StandaloneGatewayPackageList === undefined) {
+        const {
+            Error: { Message }
+        } = res
+        throw new CloudBaseError(Message)
+    }
+    return StandaloneGatewayPackageList.map((item) => [
+        item['CPU'],
+        item['Mem'],
+        item['PackageVersion']
+    ])
+}

package/src/run/standalonegateway/turn/index.ts

@@ -1,2 +1,2 @@
-export * from './on'
+export * from './on'
 export * from './off'

package/src/run/standalonegateway/turn/off.ts

@@ -1,19 +1,19 @@
-import { ITurnOffStandaloneGateway } from '../../../types'
-import { CloudBaseError } from '../../../error'
-import { CloudApiService } from '../../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const turnOffStandalonegateway = async (options: ITurnOffStandaloneGateway) => {
-    const res = await tcbService.request('TurnOffStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayName: options.gatewayName,
-        ServiceNameList: options.serviceList
-    })
-
-    const { Error: Message } = res
-    if (Message !== undefined) {
-        throw new CloudBaseError(JSON.stringify(Message))
-    }
-    return res
-}
+import { ITurnOffStandaloneGateway } from '../../../types'
+import { CloudBaseError } from '../../../error'
+import { CloudApiService } from '../../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const turnOffStandalonegateway = async (options: ITurnOffStandaloneGateway) => {
+    const res = await tcbService.request('TurnOffStandaloneGateway', {
+        EnvId: options.envId,
+        GatewayName: options.gatewayName,
+        ServiceNameList: options.serviceList
+    })
+
+    const { Error: Message } = res
+    if (Message !== undefined) {
+        throw new CloudBaseError(JSON.stringify(Message))
+    }
+    return res
+}

package/src/run/standalonegateway/turn/on.ts

@@ -1,19 +1,19 @@
-import { ITurnOnStandaloneGateway } from '../../../types'
-import { CloudBaseError } from '../../../error'
-import { CloudApiService } from '../../../utils'
-
-const tcbService = CloudApiService.getInstance('tcb')
-
-export const turnOnStandalonegateway = async (options: ITurnOnStandaloneGateway) => {
-    const res = await tcbService.request('TurnOnStandaloneGateway', {
-        EnvId: options.envId,
-        GatewayName: options.gatewayName,
-        ServiceNameList: options.serviceList
-    })
-    
-    const { Error: Message } = res
-    if (Message !== undefined) {
-        throw new CloudBaseError(JSON.stringify(Message))
-    }
-    return res
-}
+import { ITurnOnStandaloneGateway } from '../../../types'
+import { CloudBaseError } from '../../../error'
+import { CloudApiService } from '../../../utils'
+
+const tcbService = CloudApiService.getInstance('tcb')
+
+export const turnOnStandalonegateway = async (options: ITurnOnStandaloneGateway) => {
+    const res = await tcbService.request('TurnOnStandaloneGateway', {
+        EnvId: options.envId,
+        GatewayName: options.gatewayName,
+        ServiceNameList: options.serviceList
+    })
+    
+    const { Error: Message } = res
+    if (Message !== undefined) {
+        throw new CloudBaseError(JSON.stringify(Message))
+    }
+    return res
+}