@cloudbase/cli 2.0.12 → 2.1.0

package/src/utils/log.ts

@@ -1,82 +0,0 @@
-import chalk from 'chalk'
-import logSymbols from 'log-symbols'
-import { format } from 'util'
-import { Console } from 'console'
-import terminalLink from 'terminal-link'
-
-export class Logger {
-    c = {
-        _times: new Map(),
-        log(a: string, ...args: string[]) {
-            this.debug(format(a, ...args))
-        }
-    }
-
-    verboseEnabled: boolean
-
-    constructor(options: { verbose?: boolean } = {}) {
-        const { verbose } = options
-        this.verboseEnabled = verbose
-    }
-
-    breakLine() {
-        console.log()
-    }
-
-    log(...args) {
-        console.log(...args)
-    }
-
-    info(msg: string) {
-        console.log(`${logSymbols.info} ${msg}`)
-    }
-
-    success(msg: string) {
-        console.log(`${logSymbols.success} ${msg}`)
-    }
-
-    warn(msg: string) {
-        console.log(`${logSymbols.warning} ${msg}`)
-    }
-
-    error(msg: string) {
-        console.log(`${logSymbols.error} ${msg}`)
-    }
-
-    verbose(...args: any) {
-        if (this.verboseEnabled) {
-            const msg = args.join(' ▶️ ')
-            console.log(
-                `${chalk.bold('[debug]')} ${chalk.gray(`[${new Date().toISOString()}]`)} ${msg}`
-            )
-        }
-    }
-
-    genClickableLink(link: string) {
-        if (terminalLink.isSupported) {
-            const clickablelink = terminalLink(link, link)
-            return chalk.bold.cyan(clickablelink)
-        }
-        return chalk.bold.underline.cyan(link)
-    }
-
-    printClickableLink(link: string) {
-        const clickLink = this.genClickableLink(link)
-        this.info(clickLink)
-    }
-
-    async time(label: string, fn: Promise<any> | (() => Promise<any>)) {
-        const promise = typeof fn === 'function' ? fn() : fn
-        if (this.verboseEnabled) {
-            this.c.log(label)
-            Console.prototype.time.call(this.c, label)
-            const r = await promise
-            Console.prototype.timeEnd.call(this.c, label)
-            return r
-        }
-
-        return promise
-    }
-}
-
-export const logger = new Logger()

package/src/utils/net/cloud-api-request.ts

@@ -1,62 +0,0 @@
-import { getCredentialWithoutCheck, getRegion, Credential, getProxy } from '@cloudbase/toolbox'
-import { CloudApiService as _CloudApiService } from '@cloudbase/cloud-api'
-import { CloudBaseError } from '../../error'
-import { REQUEST_TIMEOUT } from '../../constant'
-
-let commonCredential: Credential
-
-// token 将在 n 分钟内过期
-const isTokenExpired = (credential: Credential, gap = 120) =>
-    credential.accessTokenExpired && Number(credential.accessTokenExpired) < Date.now() + gap * 1000
-
-export class CloudApiService {
-    // 缓存请求实例
-    static serviceCacheMap: Record<string, CloudApiService> = {}
-
-    // 单例模式
-    static getInstance(service: string) {
-        if (CloudApiService.serviceCacheMap?.[service]) {
-            return CloudApiService.serviceCacheMap[service]
-        }
-        const apiService = new CloudApiService(service)
-        CloudApiService.serviceCacheMap[service] = apiService
-        return apiService
-    }
-
-    region: string
-    apiService: _CloudApiService
-
-    constructor(service: string, baseParams?: Record<string, any>, version = '') {
-        // 初始化 API 实例
-        this.apiService = new _CloudApiService({
-            service,
-            version: service === 'tcr' ? version : '2019-09-24',
-            baseParams,
-            proxy: getProxy(),
-            timeout: REQUEST_TIMEOUT,
-            getCredential: async () => {
-                // 存在未过期的 token
-                if (commonCredential?.secretId && !isTokenExpired(commonCredential)) {
-                    return commonCredential
-                }
-
-                const credential = await getCredentialWithoutCheck()
-                if (!credential) {
-                    throw new CloudBaseError('无有效身份信息，请使用 cloudbase login 登录')
-                }
-
-                commonCredential = credential
-
-                return {
-                    ...credential,
-                    tokenExpired: Number(credential.accessTokenExpired)
-                }
-            }
-        })
-    }
-
-    async request(action: string, data: Record<string, any> = {}, method: 'POST' | 'GET' = 'POST') {
-        const region = this.region || (await getRegion())
-        return this.apiService.request({ action, data, method, region })
-    }
-}

package/src/utils/net/credential.ts

@@ -1,53 +0,0 @@
-import _ from 'lodash'
-import { checkAndGetCredential as _getCredentail } from '@cloudbase/toolbox'
-import { CloudBaseError } from '../../error'
-import { REQUEST_TIMEOUT } from '../../constant'
-import { Credential, AuthSecret } from '../../types'
-
-import { md5 } from '../tools'
-import { getMacAddress } from '../platform'
-import { getProxy } from './proxy'
-import { fetch } from './http-request'
-
-
-const refreshTokenUrl = 'https://iaas.cloud.tencent.com/tcb_refresh'
-
-// 临时密钥过期后，进行续期
-export async function refreshTmpToken(
-    metaData: Credential & { isLogout?: boolean }
-): Promise<Credential> {
-    const mac = await getMacAddress()
-    const hash = md5(mac)
-    metaData.hash = hash
-
-    const res = await fetch(refreshTokenUrl, {
-        method: 'POST',
-        body: JSON.stringify(metaData),
-        headers: { 'Content-Type': 'application/json' }
-    })
-
-    if (res.code !== 0) {
-        throw new CloudBaseError(res.message, {
-            code: res.code
-        })
-    }
-
-    const { data: credential } = res
-    return credential
-}
-
-export async function checkAndGetCredential(throwError = false): Promise<AuthSecret> {
-    const credential = await _getCredentail({
-        proxy: getProxy(),
-        timeout: REQUEST_TIMEOUT
-    })
-
-    if (!credential || _.isEmpty(credential)) {
-        if (throwError) {
-            throw new CloudBaseError('无有效身份信息，请使用 cloudbase login 登录')
-        }
-        return null
-    }
-
-    return credential
-}

package/src/utils/net/http-request.ts

@@ -1,84 +0,0 @@
-import _fetch, { RequestInit } from 'node-fetch'
-import {HttpsProxyAgent} from 'https-proxy-agent'
-import { REQUEST_TIMEOUT } from '../../constant'
-import { CloudBaseError } from '../../error'
-import { getProxy } from './proxy'
-
-function handleTimeout(e) {
-    if (e.type === 'request-timeout') {
-        throw new CloudBaseError(
-            '请求超时，请检查你的网络，如果终端无法直接访问公网，请设置终端 HTTP 请求代理！'
-        )
-    } else {
-        // 其他错误，抛出
-        throw e
-    }
-}
-
-// 使用 fetch + 代理
-export async function fetch(url: string, config: RequestInit = {}) {
-    const proxy = getProxy()
-    if (proxy) {
-        config.agent = new HttpsProxyAgent(proxy)
-    }
-
-    config.timeout = REQUEST_TIMEOUT
-
-    let json
-    let text
-    try {
-        const res = await _fetch(url, config)
-        text = await res.text()
-        json = JSON.parse(text)
-    } catch (e) {
-        handleTimeout(e)
-        json = text
-    }
-    return json
-}
-
-// 使用 fetch + 代理
-export async function postFetch(url: string, data?: Record<string, any>) {
-    const proxy = getProxy()
-    const config: RequestInit = {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(data)
-    }
-
-    if (proxy) {
-        config.agent = new HttpsProxyAgent(proxy)
-    }
-
-    config.timeout = REQUEST_TIMEOUT
-
-    let json
-    let text
-    try {
-        const res = await _fetch(url, config)
-        text = await res.text()
-        json = JSON.parse(text)
-    } catch (e) {
-        handleTimeout(e)
-        json = text
-    }
-    return json
-}
-
-export async function fetchStream(url, config: Record<string, any> = {}) {
-    const proxy = getProxy()
-    if (proxy) {
-        config.agent = new HttpsProxyAgent(proxy)
-    }
-
-    config.timeout = REQUEST_TIMEOUT
-
-    try {
-        const res = await _fetch(url, config)
-        return res
-    } catch (e) {
-        handleTimeout(e)
-    }
-}

package/src/utils/net/index.ts

@@ -1,5 +0,0 @@
-export * from './proxy'
-export * from './credential'
-export * from './http-request'
-export * from './manager-service'
-export * from './cloud-api-request'

package/src/utils/net/manager-service.ts

@@ -1,36 +0,0 @@
-import CloudBase from '@cloudbase/manager-node'
-import { StorageService } from '@cloudbase/manager-node/types/storage'
-import { getRegion } from '@cloudbase/toolbox'
-import { checkAndGetCredential } from './credential'
-import { getProxy } from './proxy'
-
-export async function getMangerService(envId = ''): Promise<CloudBase> {
-    const { secretId, secretKey, token } = await checkAndGetCredential(true)
-    const region = await getRegion()
-
-    const app = new CloudBase({
-        token,
-        envId,
-        region,
-        secretId,
-        secretKey,
-        proxy: getProxy()
-    })
-
-    return app
-}
-
-export async function getStorageService(envId: string): Promise<StorageService> {
-    const { secretId, secretKey, token } = await checkAndGetCredential(true)
-    const region = await getRegion()
-
-    const app = new CloudBase({
-        token,
-        envId,
-        secretId,
-        region,
-        secretKey,
-        proxy: getProxy()
-    })
-    return app.storage
-}

package/src/utils/net/proxy.ts

@@ -1,6 +0,0 @@
-// 解析 Proxy 配置
-export function getProxy(): string {
-    const httpProxy = process.env.http_proxy || process.env.HTTP_PROXY
-    const isTestMode = process.env.TCB_TEST_MODE
-    return isTestMode ? process.env.TCB_TEST_PROXY || httpProxy : httpProxy
-}

package/src/utils/notice.ts

@@ -1,28 +0,0 @@
-import { postFetch } from './net'
-import { commonStore } from './store'
-
-const url = 'https://tcli.service.tcloudbase.com/notify'
-
-// 获取通知，最多每天获取一次
-const ONE_DAY = 86400000
-
-export async function getNotification() {
-    // 不再获取通知
-    return null
-    const now = Date.now()
-    // 上次记录的时间
-    const lastTime = await commonStore.get('lastNotifyTime')
-    const diff = now - Number(lastTime)
-    const day = new Date(lastTime).getDay()
-    const today = new Date().getDay()
-    // 日期不同，且时差小于 1 天
-    if (day === today && diff < ONE_DAY) return null
-    const lastUid = await commonStore.get('lastNotificationUid')
-    const data = await postFetch(url)
-    const uid = data?.uid || 0
-    // 消息已读
-    if (Number(lastUid) >= Number(uid)) return
-    await commonStore.set('readNotificationUid', data.uid)
-    await commonStore.set('lastNotifyTime', Date.now())
-    return data
-}

package/src/utils/output/highlight.ts

@@ -1,5 +0,0 @@
-import chalk from 'chalk'
-
-export function highlightCommand(command: string) {
-    return chalk.bold.cyan(command)
-}

package/src/utils/output/index.ts

@@ -1,3 +0,0 @@
-export * from './loading'
-export * from './link'
-export * from './highlight'

package/src/utils/output/link.ts

@@ -1,10 +0,0 @@
-import chalk from 'chalk'
-import terminalLink from 'terminal-link'
-
-export function genClickableLink(link: string) {
-    if (terminalLink.isSupported) {
-        const clickablelink = terminalLink(link, link)
-        return chalk.bold.cyan(clickablelink)
-    }
-    return chalk.bold.underline.cyan(link)
-}

package/src/utils/output/loading.ts

@@ -1,82 +0,0 @@
-import ora from 'ora'
-
-class Loading {
-    private spinner: ReturnType<typeof ora>
-
-    constructor() {
-        // @ts-ignore
-        process.on('tcbExit', this.stop.bind(this))
-        // @ts-ignore
-        process.on('tcbError', this.stop.bind(this))
-        this.spinner = ora({
-            discardStdin: false
-        })
-    }
-
-    // eslint-disable-next-line
-    set text(text: string) {
-        this.spinner.text = text
-    }
-
-    start(text: string) {
-        this.spinner = this.spinner.start(text)
-    }
-
-    stop() {
-        if (this.spinner) {
-            this.spinner = this.spinner.stop()
-        }
-    }
-
-    succeed(text: string) {
-        if (this.spinner) {
-            this.spinner = this.spinner.succeed(text)
-        }
-    }
-
-    fail(text: string) {
-        if (this.spinner) {
-            this.spinner = this.spinner.fail(text)
-        }
-    }
-}
-
-export const loadingFactory = (): Loading => {
-    return new Loading()
-}
-
-type Task<T> = (flush: (text: string) => void, ...args: any[]) => Promise<T>
-
-export interface ILoadingOptions {
-    startTip?: string
-    successTip?: string
-    failTip?: string
-}
-
-/**
- * 执行异步任务，显示 loading 动画
- * @param task
- * @param options
- */
-export const execWithLoading = async <T>(
-    task: Task<T>,
-    options: ILoadingOptions = {}
-): Promise<T> => {
-    const { startTip, successTip, failTip } = options
-    const loading = loadingFactory()
-
-    // 刷新 loading 提示
-    const flush = (text: string) => {
-        loading.text = text
-    }
-
-    try {
-        loading.start(startTip)
-        const res = await task(flush)
-        successTip ? loading.succeed(successTip) : loading.stop()
-        return res
-    } catch (e) {
-        failTip ? loading.fail(failTip) : loading.stop()
-        throw e
-    }
-}

package/src/utils/parallel.ts

@@ -1,82 +0,0 @@
-export type AsyncTask = () => Promise<any>
-
-/**
- * 异步任务并发控制器，以一定的并发数执行所有任务
- * 不具备队列性质，异步任务随机执行
- * 单个任务异常，错误会返回，单不会退出执行
- * 所有任务执行
- */
-export class AsyncTaskParallelController {
-    // 任务最大并发数
-    maxParallel: number
-    // 异步任务队列
-    tasks: AsyncTask[]
-    // 检查间隔时间，单位 ms
-    checkInterval: number
-    // 所有任务数量
-    totalTasks: number
-
-    constructor(maxParallel: number, checkInterval = 20) {
-        this.tasks = []
-        this.maxParallel = Number(maxParallel) || 20
-        this.checkInterval = checkInterval
-    }
-
-    loadTasks(tasks: AsyncTask[]) {
-        this.tasks.push(...tasks)
-        this.totalTasks = this.tasks.length
-    }
-
-    push(task: AsyncTask) {
-        this.tasks.push(task)
-        this.totalTasks = this.tasks.length
-    }
-
-    // 开始执行任务
-    async run(): Promise<any[]> {
-        // 存储任务执行结果
-        const results = []
-        // 记录已经运行的任务
-        const taskHasRun = []
-        // 记录任务是否执行完成
-        const taskDone = []
-        // 当前正在运行的任务数量
-        let runningTask = 0
-
-        return new Promise((resolve) => {
-            // 使用定时器，不阻塞线程
-            const timer = setInterval(() => {
-                // 全部任务运行完成
-                const taskDoneLength = taskDone.filter((item) => item).length
-                if (runningTask === 0 && taskDoneLength === this.totalTasks) {
-                    clearInterval(timer)
-                    resolve(results)
-                }
-
-                // 当前运行任务数超过最大并发，不再执行新的任务
-                if (runningTask >= this.maxParallel) {
-                    return
-                }
-
-                // 遍历任务列表，开始执行还没有执行的任务
-                this.tasks.forEach((task, index) => {
-                    if (!taskHasRun[index] && runningTask < this.maxParallel) {
-                        runningTask++
-                        taskHasRun[index] = 1
-                        task()
-                            .then((res) => {
-                                results[index] = res
-                            })
-                            .catch((err) => {
-                                results[index] = err
-                            })
-                            .then(() => {
-                                runningTask--
-                                taskDone[index] = 1
-                            })
-                    }
-                })
-            }, this.checkInterval)
-        })
-    }
-}

package/src/utils/platform/index.ts

@@ -1,3 +0,0 @@
-export * from './os'
-export * from './mac'
-export * from './port'

package/src/utils/platform/mac.ts

@@ -1,21 +0,0 @@
-import address from 'address'
-import { md5 } from '../tools'
-
-// 获取本机 Mac 地址
-export function getMacAddress(): Promise<string> {
-    return new Promise(resolve => {
-        address.mac((err, mac) => {
-            if (err) {
-                resolve('')
-                return
-            }
-            resolve(mac)
-        })
-    })
-}
-
-export async function getMacAddressMd5(): Promise<string> {
-    const mac = await getMacAddress()
-    const macMD5 = md5(mac)
-    return macMD5
-}

package/src/utils/platform/os.ts

@@ -1,64 +0,0 @@
-import os from 'os'
-
-const macOSMap = new Map([
-    [19, 'Catalina'],
-    [18, 'Mojave'],
-    [17, 'High Sierra'],
-    [16, 'Sierra'],
-    [15, 'El Capitan'],
-    [14, 'Yosemite'],
-    [13, 'Mavericks'],
-    [12, 'Mountain Lion'],
-    [11, 'Lion'],
-    [10, 'Snow Leopard'],
-    [9, 'Leopard'],
-    [8, 'Tiger'],
-    [7, 'Panther'],
-    [6, 'Jaguar'],
-    [5, 'Puma']
-])
-
-const winMap = new Map([
-    ['10.0', '10'],
-    ['6.3', '8.1'],
-    ['6.2', '8'],
-    ['6.1', '7'],
-    ['6.0', 'Vista'],
-    ['5.2', 'Server 2003'],
-    ['5.1', 'XP'],
-    ['5.0', '2000'],
-    ['4.9', 'ME'],
-    ['4.1', '98'],
-    ['4.0', '95']
-])
-
-export function getPlatformRelease(platform: string, release: string) {
-    // macOS
-    if (platform === 'darwin') {
-        const releaseNum = Number(release.split('.')[0])
-        const name = macOSMap.get(releaseNum)
-        const version = '10.' + (releaseNum - 4)
-        return `${name} ${version}`
-    }
-
-    // windows
-    if (platform === 'win32') {
-        const version = (/\d+\.\d/.exec(release) || [])[0]
-
-        return `Windows ${winMap.get(version)}`
-    }
-
-    // 其他 Linux
-    return 'Linux'
-}
-
-// 获取 hostname 和平台信息
-export function getOSInfo() {
-    const hostname = os.hostname()
-    const platform = os.platform()
-    const release = os.release()
-
-    const platformRelease = getPlatformRelease(platform, release)
-
-    return [hostname, platformRelease].join('/')
-}

package/src/utils/platform/port.ts

@@ -1,10 +0,0 @@
-import portfinder from 'portfinder'
-const PORT = 9012
-
-// 获取本地可用端口
-export async function getPort(): Promise<number> {
-    const port: number = await portfinder.getPortPromise({
-        port: PORT
-    })
-    return port
-}

package/src/utils/progress-bar.ts

@@ -1,38 +0,0 @@
-import ProgressBar from 'progress'
-
-// 打印文件传输进度条
-export function createUploadProgressBar(onFinished: Function, onStart?: Function) {
-    let bar
-    let lastLoaded = 0
-    let finished = false
-
-    return function (data) {
-        const { total, loaded, percent } = data
-        if (lastLoaded === 0 && onStart) {
-            onStart()
-        }
-
-        if (+percent === 1) {
-            if (finished) return
-            finished = true
-            setTimeout(() => {
-                onFinished()
-            }, 500)
-            bar.tick(total - lastLoaded)
-            return
-        }
-        const tick = loaded - lastLoaded
-        lastLoaded = loaded
-        if (bar) {
-            bar.tick(tick)
-        } else {
-            bar = new ProgressBar('文件传输中 [:bar] :percent :etas', {
-                total,
-                complete: '=',
-                incomplete: ' ',
-                width: 50
-            })
-            bar.tick(tick)
-        }
-    }
-}