@cloudbase/cli 1.12.7-alpha.4 → 2.0.0

package/src/utils/function-packer.ts

@@ -1,97 +1,97 @@
-import fs from 'fs'
-import del from 'del'
-import path from 'path'
-import makeDir from 'make-dir'
-import { random } from './tools'
-import { CloudBaseError, zipDir, checkFullAccess } from '@cloudbase/toolbox'
-
-export enum CodeType {
-    File,
-    JavaFile
-}
-
-/**
- * 将函数代码转换成 Base64 编码
- * 普通文件：Node，PHP
- * Java 文件：Jar，ZIP
- */
-export class FunctionPacker {
-    // 项目根目录
-    root: string
-    // 函数名
-    name: string
-    // 代码文件类型
-    type: CodeType
-    funcPath: string
-    funcDistPath: string
-    // 临时目录
-    tmpPath: string
-    // 忽略文件模式
-    ignore: string | string[]
-
-    constructor(root: string, name: string, ignore: string | string[]) {
-        this.name = name
-        this.root = root
-        this.ignore = ignore
-        this.funcPath = path.join(root, name)
-    }
-
-    async getFileCode() {
-        checkFullAccess(this.funcPath, true)
-        // 构建临时文件夹存放函数打包结果
-        this.tmpPath = path.join(this.root, `.cloudbase_tmp_${random()}`)
-        this.funcDistPath = path.join(this.tmpPath, this.name)
-        // 生成存放 zip 文件的文件夹
-        await makeDir(this.funcDistPath)
-        const zipPath = path.resolve(this.funcDistPath, 'dist.zip')
-        // 生成 zip 文件
-
-        await zipDir(this.funcPath, zipPath, this.ignore)
-        // 将 zip 文件转换成 base64
-        const base64 = fs.readFileSync(zipPath).toString('base64')
-        // 清除打包文件
-        this.clean()
-        return base64
-    }
-
-    // 获取 Java 代码
-    getJavaFileCode() {
-        const { funcPath } = this
-        // Java 代码为 jar 或 zip 包
-        const jarExist = checkFullAccess(`${funcPath}.jar`)
-        const zipExist = checkFullAccess(`${funcPath}.zip`)
-        if (!jarExist && !zipExist) {
-            return null
-        }
-        const packagePath = jarExist ? `${funcPath}.jar` : `${funcPath}.zip`
-        return fs.readFileSync(packagePath).toString('base64')
-    }
-
-    async build(type: CodeType) {
-        if (type === CodeType.JavaFile) {
-            try {
-                const code = await this.getJavaFileCode()
-                return code
-            } catch (error) {
-                this.clean()
-                throw new CloudBaseError(`函数代码打包失败：\n ${error.message}`)
-            }
-        }
-
-        if (type === CodeType.File) {
-            try {
-                const code = await this.getFileCode()
-                return code
-            } catch (error) {
-                this.clean()
-                throw new CloudBaseError(`函数代码打包失败：\n ${error.message}`)
-            }
-        }
-    }
-
-    clean() {
-        // allow deleting the current working directory and outside
-        this.funcDistPath && del.sync([this.funcDistPath], { force: true })
-        this.tmpPath && del.sync([this.tmpPath], { force: true })
-    }
-}
+import fs from 'fs'
+import del from 'del'
+import path from 'path'
+import makeDir from 'make-dir'
+import { random } from './tools'
+import { CloudBaseError, zipDir, checkFullAccess } from '@cloudbase/toolbox'
+
+export enum CodeType {
+    File,
+    JavaFile
+}
+
+/**
+ * 将函数代码转换成 Base64 编码
+ * 普通文件：Node，PHP
+ * Java 文件：Jar，ZIP
+ */
+export class FunctionPacker {
+    // 项目根目录
+    root: string
+    // 函数名
+    name: string
+    // 代码文件类型
+    type: CodeType
+    funcPath: string
+    funcDistPath: string
+    // 临时目录
+    tmpPath: string
+    // 忽略文件模式
+    ignore: string | string[]
+
+    constructor(root: string, name: string, ignore: string | string[]) {
+        this.name = name
+        this.root = root
+        this.ignore = ignore
+        this.funcPath = path.join(root, name)
+    }
+
+    async getFileCode() {
+        checkFullAccess(this.funcPath, true)
+        // 构建临时文件夹存放函数打包结果
+        this.tmpPath = path.join(this.root, `.cloudbase_tmp_${random()}`)
+        this.funcDistPath = path.join(this.tmpPath, this.name)
+        // 生成存放 zip 文件的文件夹
+        await makeDir(this.funcDistPath)
+        const zipPath = path.resolve(this.funcDistPath, 'dist.zip')
+        // 生成 zip 文件
+
+        await zipDir(this.funcPath, zipPath, this.ignore)
+        // 将 zip 文件转换成 base64
+        const base64 = fs.readFileSync(zipPath).toString('base64')
+        // 清除打包文件
+        this.clean()
+        return base64
+    }
+
+    // 获取 Java 代码
+    getJavaFileCode() {
+        const { funcPath } = this
+        // Java 代码为 jar 或 zip 包
+        const jarExist = checkFullAccess(`${funcPath}.jar`)
+        const zipExist = checkFullAccess(`${funcPath}.zip`)
+        if (!jarExist && !zipExist) {
+            return null
+        }
+        const packagePath = jarExist ? `${funcPath}.jar` : `${funcPath}.zip`
+        return fs.readFileSync(packagePath).toString('base64')
+    }
+
+    async build(type: CodeType) {
+        if (type === CodeType.JavaFile) {
+            try {
+                const code = await this.getJavaFileCode()
+                return code
+            } catch (error) {
+                this.clean()
+                throw new CloudBaseError(`函数代码打包失败：\n ${error.message}`)
+            }
+        }
+
+        if (type === CodeType.File) {
+            try {
+                const code = await this.getFileCode()
+                return code
+            } catch (error) {
+                this.clean()
+                throw new CloudBaseError(`函数代码打包失败：\n ${error.message}`)
+            }
+        }
+    }
+
+    clean() {
+        // allow deleting the current working directory and outside
+        this.funcDistPath && del.sync([this.funcDistPath], { force: true })
+        this.tmpPath && del.sync([this.tmpPath], { force: true })
+    }
+}

package/src/utils/index.ts

@@ -18,4 +18,8 @@ export * from './config'
 export * from './auth'
 export * from './store'
 export * from './notice'
-export * from './parallel'
+export * from './parallel'
+
+export * from './tcbrApi'
+export * from './checkTcbrEnv'
+export * from './commonParamsCheck'

package/src/utils/log.ts

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