@cloudbase/cli 2.0.0 → 2.0.1

package/src/utils/net/credential.ts

@@ -1,53 +1,53 @@
-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
-}
+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 +1,84 @@
-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)
-    }
-}
+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 +1,5 @@
-export * from './proxy'
-export * from './credential'
-export * from './http-request'
-export * from './manager-service'
+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 +1,36 @@
-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
-}
+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 +1,6 @@
-// 解析 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
-}
+// 解析 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 +1,28 @@
-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
-}
+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 +1,5 @@
-import chalk from 'chalk'
-
-export function highlightCommand(command: string) {
-    return chalk.bold.cyan(command)
-}
+import chalk from 'chalk'
+
+export function highlightCommand(command: string) {
+    return chalk.bold.cyan(command)
+}

package/src/utils/output/index.ts

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

package/src/utils/output/link.ts

@@ -1,10 +1,10 @@
-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)
-}
+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 +1,82 @@
-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
-    }
-}
+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
+    }
+}