@cloudbase/cli 1.12.7-alpha.2 → 2.0.0

package/src/utils/template.ts

@@ -1,170 +1,170 @@
-import fs from 'fs'
-import _ from 'lodash'
-import path from 'path'
-import fse from 'fs-extra'
-import { prompt } from 'enquirer'
-import { searchConfig, unzipStream, ConfigParser } from '@cloudbase/toolbox'
-import { CloudBaseError } from '../error'
-import { fetch, fetchStream } from './net'
-
-import { logger } from './log'
-import { checkFullAccess } from './fs'
-import { execWithLoading } from './output'
-import { templateDownloadReport } from './reporter'
-
-const listUrl = 'https://tcli.service.tcloudbase.com/templates'
-
-const getTemplateAddress = (templatePath: string) =>
-    `https://7463-tcli-1258016615.tcb.qcloud.la/cloudbase-templates/${templatePath}.zip`
-
-/**
- * 将初始化项目的过程拆成多步，以在 new 命令和 tcb 命令中复用
- */
-
-// 获取并下载模板，返回项目地址
-export async function downloadTemplate(
-    options: {
-        appName?: string
-        newProject?: boolean
-        templateUri?: string
-        projectPath?: string
-    } = {}
-) {
-    let { templateUri, appName, newProject, projectPath = process.cwd() } = options
-    // 拉取模板
-    const templates = await execWithLoading(() => fetch(listUrl), {
-        startTip: '获取应用模板列表中'
-    })
-
-    let templateName
-    let tempateId
-
-    if (templateUri) {
-        tempateId = templateUri
-    } else {
-        // 确定模板名称
-        const { selectTemplateName } = await prompt<any>({
-            type: 'select',
-            name: 'selectTemplateName',
-            message: '请选择应用模板',
-            choices: templates.map((item) => item.name)
-        })
-        templateName = selectTemplateName
-    }
-
-    const selectedTemplate = templateName
-        ? templates.find((item) => item.name === templateName)
-        : templates.find((item) => item.path === tempateId)
-
-    if (!selectedTemplate) {
-        logger.info(`模板 \`${templateName || tempateId}\` 不存在`)
-        return
-    }
-
-    /**
-     * 新建项目
-     */
-    if (newProject) {
-        // appName 不存在时，输入应用
-        if (!appName) {
-            const { projectName } = await prompt<any>({
-                type: 'input',
-                name: 'projectName',
-                message: '请输入项目名称',
-                initial: selectedTemplate.path
-            })
-            appName = projectName
-        }
-
-        // 确定项目权限
-        projectPath = path.join(process.cwd(), appName)
-
-        if (checkFullAccess(projectPath)) {
-            const { cover } = await prompt<any>({
-                type: 'confirm',
-                name: 'cover',
-                message: `已存在同名文件夹：${appName}，是否覆盖？`,
-                initial: false
-            })
-            // 不覆盖，操作终止
-            if (!cover) {
-                throw new CloudBaseError('操作终止！')
-            } else {
-                // 覆盖操作不会删除不冲突的文件夹或文件
-                // 删除原有文件夹，防止生成的项目包含用户原有文件
-                fse.removeSync(projectPath)
-            }
-        }
-    }
-
-    // 下载并解压文件
-    await execWithLoading(
-        async () => {
-            await templateDownloadReport(selectedTemplate.path, selectedTemplate.name)
-            await extractTemplate(projectPath, selectedTemplate.path, selectedTemplate.url)
-        },
-        {
-            startTip: '下载文件中'
-        }
-    )
-
-    return projectPath
-}
-
-// 下载并解压
-export async function extractTemplate(
-    projectPath: string,
-    templatePath: string,
-    remoteUrl?: string
-) {
-    // 文件下载链接
-    const url = remoteUrl || getTemplateAddress(templatePath)
-
-    return fetchStream(url).then(async (res) => {
-        if (!res) {
-            throw new CloudBaseError('请求异常')
-        }
-
-        if (res.status !== 200) {
-            throw new CloudBaseError('未找到文件')
-        }
-
-        // 解压缩文件
-        await unzipStream(res.body, projectPath)
-    })
-}
-
-// 初始化项目配置
-export async function initProjectConfig(
-    envId: string,
-    region: string,
-    projectPath: string = process.cwd()
-) {
-    // 配置文件初始化，写入环境id
-    let filepath = (await searchConfig(projectPath))?.filepath
-
-    // 配置文件不存在
-    if (!filepath) {
-        fs.writeFileSync(
-            path.join(projectPath, 'cloudbaserc.json'),
-            JSON.stringify({
-                envId,
-                region,
-                version: '2.0',
-                $schema: 'https://framework-1258016615.tcloudbaseapp.com/schema/latest.json'
-            })
-        )
-    } else {
-        // 设置环境 Id
-        const configContent = fs.readFileSync(filepath).toString()
-        fs.writeFileSync(filepath, configContent.replace('{{envId}}', envId))
-
-        // 设置 region
-        const configPath = filepath || path.join(projectPath, 'cloudbaserc.json')
-        const parser = new ConfigParser({
-            configPath
-        })
-        // 把 region 写入到配置文件中
-        parser.update('region', region)
-    }
-}
+import fs from 'fs'
+import _ from 'lodash'
+import path from 'path'
+import fse from 'fs-extra'
+import { prompt } from 'enquirer'
+import { searchConfig, unzipStream, ConfigParser } from '@cloudbase/toolbox'
+import { CloudBaseError } from '../error'
+import { fetch, fetchStream } from './net'
+
+import { logger } from './log'
+import { checkFullAccess } from './fs'
+import { execWithLoading } from './output'
+import { templateDownloadReport } from './reporter'
+
+const listUrl = 'https://tcli.service.tcloudbase.com/templates'
+
+const getTemplateAddress = (templatePath: string) =>
+    `https://7463-tcli-1258016615.tcb.qcloud.la/cloudbase-templates/${templatePath}.zip`
+
+/**
+ * 将初始化项目的过程拆成多步，以在 new 命令和 tcb 命令中复用
+ */
+
+// 获取并下载模板，返回项目地址
+export async function downloadTemplate(
+    options: {
+        appName?: string
+        newProject?: boolean
+        templateUri?: string
+        projectPath?: string
+    } = {}
+) {
+    let { templateUri, appName, newProject, projectPath = process.cwd() } = options
+    // 拉取模板
+    const templates = await execWithLoading(() => fetch(listUrl), {
+        startTip: '获取应用模板列表中'
+    })
+
+    let templateName
+    let tempateId
+
+    if (templateUri) {
+        tempateId = templateUri
+    } else {
+        // 确定模板名称
+        const { selectTemplateName } = await prompt<any>({
+            type: 'select',
+            name: 'selectTemplateName',
+            message: '请选择应用模板',
+            choices: templates.map((item) => item.name)
+        })
+        templateName = selectTemplateName
+    }
+
+    const selectedTemplate = templateName
+        ? templates.find((item) => item.name === templateName)
+        : templates.find((item) => item.path === tempateId)
+
+    if (!selectedTemplate) {
+        logger.info(`模板 \`${templateName || tempateId}\` 不存在`)
+        return
+    }
+
+    /**
+     * 新建项目
+     */
+    if (newProject) {
+        // appName 不存在时，输入应用
+        if (!appName) {
+            const { projectName } = await prompt<any>({
+                type: 'input',
+                name: 'projectName',
+                message: '请输入项目名称',
+                initial: selectedTemplate.path
+            })
+            appName = projectName
+        }
+
+        // 确定项目权限
+        projectPath = path.join(process.cwd(), appName)
+
+        if (checkFullAccess(projectPath)) {
+            const { cover } = await prompt<any>({
+                type: 'confirm',
+                name: 'cover',
+                message: `已存在同名文件夹：${appName}，是否覆盖？`,
+                initial: false
+            })
+            // 不覆盖，操作终止
+            if (!cover) {
+                throw new CloudBaseError('操作终止！')
+            } else {
+                // 覆盖操作不会删除不冲突的文件夹或文件
+                // 删除原有文件夹，防止生成的项目包含用户原有文件
+                fse.removeSync(projectPath)
+            }
+        }
+    }
+
+    // 下载并解压文件
+    await execWithLoading(
+        async () => {
+            await templateDownloadReport(selectedTemplate.path, selectedTemplate.name)
+            await extractTemplate(projectPath, selectedTemplate.path, selectedTemplate.url)
+        },
+        {
+            startTip: '下载文件中'
+        }
+    )
+
+    return projectPath
+}
+
+// 下载并解压
+export async function extractTemplate(
+    projectPath: string,
+    templatePath: string,
+    remoteUrl?: string
+) {
+    // 文件下载链接
+    const url = remoteUrl || getTemplateAddress(templatePath)
+
+    return fetchStream(url).then(async (res) => {
+        if (!res) {
+            throw new CloudBaseError('请求异常')
+        }
+
+        if (res.status !== 200) {
+            throw new CloudBaseError('未找到文件')
+        }
+
+        // 解压缩文件
+        await unzipStream(res.body, projectPath)
+    })
+}
+
+// 初始化项目配置
+export async function initProjectConfig(
+    envId: string,
+    region: string,
+    projectPath: string = process.cwd()
+) {
+    // 配置文件初始化，写入环境id
+    let filepath = (await searchConfig(projectPath))?.filepath
+
+    // 配置文件不存在
+    if (!filepath) {
+        fs.writeFileSync(
+            path.join(projectPath, 'cloudbaserc.json'),
+            JSON.stringify({
+                envId,
+                region,
+                version: '2.0',
+                $schema: 'https://framework-1258016615.tcloudbaseapp.com/schema/latest.json'
+            })
+        )
+    } else {
+        // 设置环境 Id
+        const configContent = fs.readFileSync(filepath).toString()
+        fs.writeFileSync(filepath, configContent.replace('{{envId}}', envId))
+
+        // 设置 region
+        const configPath = filepath || path.join(projectPath, 'cloudbaserc.json')
+        const parser = new ConfigParser({
+            configPath
+        })
+        // 把 region 写入到配置文件中
+        parser.update('region', region)
+    }
+}

package/src/utils/tools/encoding.ts

@@ -1,8 +1,8 @@
-import crypto from 'crypto'
-
-// MD5
-export function md5(str = ''): string {
-    const hash = crypto.createHash('md5')
-    hash.update(str)
-    return hash.digest('hex')
-}
+import crypto from 'crypto'
+
+// MD5
+export function md5(str = ''): string {
+    const hash = crypto.createHash('md5')
+    hash.update(str)
+    return hash.digest('hex')
+}

package/src/utils/tools/index.ts

@@ -1,4 +1,4 @@
-export * from './uid'
-export * from './time'
-export * from './object'
-export * from './encoding'
+export * from './uid'
+export * from './time'
+export * from './object'
+export * from './encoding'

package/src/utils/tools/object.ts

@@ -1,33 +1,33 @@
-import _ from 'lodash'
-
-// declare module 'lodash' {
-//     interface LoDashStatic {
-//         deep(v: any, m: any): any;
-//     }
-// }
-
-_.mixin({
-    deep: function(obj, mapper) {
-        return mapper(
-            _.mapValues(obj, function(v) {
-                if (_.isPlainObject(v)) {
-                    return _.deep(v, mapper)
-                }
-
-                if (_.isArray(v)) {
-                    return _.map(v, val => _.deep(val, mapper))
-                }
-
-                return v
-            })
-        )
-    }
-})
-
-export function firstLetterToLowerCase(data: Record<string, any>) {
-    return _.deep(data, function(x) {
-        return _.mapKeys(x, function(val, key) {
-            return key.charAt(0).toLowerCase() + key.slice(1)
-        })
-    })
-}
+import _ from 'lodash'
+
+// declare module 'lodash' {
+//     interface LoDashStatic {
+//         deep(v: any, m: any): any;
+//     }
+// }
+
+_.mixin({
+    deep: function(obj, mapper) {
+        return mapper(
+            _.mapValues(obj, function(v) {
+                if (_.isPlainObject(v)) {
+                    return _.deep(v, mapper)
+                }
+
+                if (_.isArray(v)) {
+                    return _.map(v, val => _.deep(val, mapper))
+                }
+
+                return v
+            })
+        )
+    }
+})
+
+export function firstLetterToLowerCase(data: Record<string, any>) {
+    return _.deep(data, function(x) {
+        return _.mapKeys(x, function(val, key) {
+            return key.charAt(0).toLowerCase() + key.slice(1)
+        })
+    })
+}

package/src/utils/tools/time.ts

@@ -1,38 +1,38 @@
-export function formatDate(dateParam: string | number | Date, fmtParam: string) {
-    let date: Date
-    let fmt = fmtParam
-    if (date instanceof Date === false) {
-        date = new Date(dateParam)
-    }
-    if (/(y+)/.test(fmt)) {
-        fmt = fmt.replace(RegExp.$1, String(date.getFullYear()).substr(4 - RegExp.$1.length))
-    }
-
-    let expMap = {
-        'M+': date.getMonth() + 1,
-        'd+': date.getDate(),
-        'h+': date.getHours(),
-        'm+': date.getMinutes(),
-        's+': date.getSeconds(),
-        S: date.getMilliseconds()
-    }
-    for (let exp in expMap) {
-        if (new RegExp('(' + exp + ')').test(fmt)) {
-            fmt = fmt.replace(
-                RegExp.$1,
-                RegExp.$1.length === 1
-                    ? expMap[exp]
-                    : ('00' + expMap[exp]).substr(String(expMap[exp]).length)
-            )
-        }
-    }
-    return fmt
-}
-
-export async function sleep(time: number) {
-    return new Promise<void>(resolve => {
-        setTimeout(() => {
-            resolve()
-        }, time)
-    })
-}
+export function formatDate(dateParam: string | number | Date, fmtParam: string) {
+    let date: Date
+    let fmt = fmtParam
+    if (date instanceof Date === false) {
+        date = new Date(dateParam)
+    }
+    if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, String(date.getFullYear()).substr(4 - RegExp.$1.length))
+    }
+
+    let expMap = {
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': date.getHours(),
+        'm+': date.getMinutes(),
+        's+': date.getSeconds(),
+        S: date.getMilliseconds()
+    }
+    for (let exp in expMap) {
+        if (new RegExp('(' + exp + ')').test(fmt)) {
+            fmt = fmt.replace(
+                RegExp.$1,
+                RegExp.$1.length === 1
+                    ? expMap[exp]
+                    : ('00' + expMap[exp]).substr(String(expMap[exp]).length)
+            )
+        }
+    }
+    return fmt
+}
+
+export async function sleep(time: number) {
+    return new Promise<void>(resolve => {
+        setTimeout(() => {
+            resolve()
+        }, time)
+    })
+}

package/src/utils/tools/uid.ts

@@ -1,19 +1,19 @@
-import crypto from 'crypto'
-
-export function random(len = 8) {
-    if (!Number.isInteger(len)) {
-        throw new Error('len must be an integer')
-    }
-    return crypto
-        .randomBytes(len)
-        .toString('hex')
-        .substring(0, len)
-}
-
-export function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-        const r = (Math.random() * 16) | 0
-        const v = c === 'x' ? r : (r & 0x3) | 0x8
-        return v.toString(16)
-    })
-}
+import crypto from 'crypto'
+
+export function random(len = 8) {
+    if (!Number.isInteger(len)) {
+        throw new Error('len must be an integer')
+    }
+    return crypto
+        .randomBytes(len)
+        .toString('hex')
+        .substring(0, len)
+}
+
+export function uuidv4() {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+        const r = (Math.random() * 16) | 0
+        const v = c === 'x' ? r : (r & 0x3) | 0x8
+        return v.toString(16)
+    })
+}

package/src/utils/validator.ts

@@ -1,33 +1,65 @@
-import { CloudBaseError } from '../error'
-
-type SimpleValue = number | string | boolean
-
-export function assertTruthy(val: SimpleValue | SimpleValue[], errMsg: string) {
-    let ok
-    if (Array.isArray(val)) {
-        ok = val.every(item => Boolean(val))
-    } else {
-        ok = Boolean(val)
-    }
-
-    if (!ok) {
-        throw new CloudBaseError(errMsg)
-    }
-}
-
-export function assertHas(obj: any, prop: string, errMsg): void {
-    if (!obj[prop]) {
-        throw new CloudBaseError(errMsg)
-    }
-}
-
-
-export const validateIp = (ip: string): boolean => {
-    if (Object.prototype.toString.call(ip) !== '[object String]') return false
-    const fields = ip.split('.')
-    if (
-        fields.length !== 4 ||
-        fields.find(item => isNaN(Number(item)) || Number(item) < 0 || Number(item) > 255)
-    ) return false
-    return true
+import { CloudBaseError } from '../error'
+import { CPU_MEM_OPTS } from '../constant'
+import { convertNumber } from '../run'
+
+type SimpleValue = number | string | boolean
+
+export function assertTruthy(val: SimpleValue | SimpleValue[], errMsg: string) {
+    let ok
+    if (Array.isArray(val)) {
+        ok = val.every(item => Boolean(val))
+    } else {
+        ok = Boolean(val)
+    }
+
+    if (!ok) {
+        throw new CloudBaseError(errMsg)
+    }
+}
+
+export function assertHas(obj: any, prop: string, errMsg): void {
+    if (!obj[prop]) {
+        throw new CloudBaseError(errMsg)
+    }
+}
+
+
+export const validateIp = (ip: string): boolean => {
+    if (Object.prototype.toString.call(ip) !== '[object String]') return false
+    const fields = ip.split('.')
+    if (
+        fields.length !== 4 ||
+        fields.find(item => isNaN(Number(item)) || Number(item) < 0 || Number(item) > 255)
+    ) return false
+    return true
+}
+
+// 检查 cpu 和 mem 是否符合约束条件
+export const validateCpuMem = (cpuInput: number | string | undefined, memInput: number | string | undefined): { cpuOutput: number, memOutput: number } => {
+    if (cpuInput !== undefined && memInput !== undefined) {
+        let cpuSet = convertNumber(cpuInput)
+        let memSet = convertNumber(memInput)
+        let validMemSet = CPU_MEM_OPTS.find(({ cpu }) => cpu === cpuSet)
+        if (!validMemSet || !validMemSet.mems.length || !validMemSet.mems.includes(memSet)) {
+            throw new CloudBaseError(`cpu 与 mem 规格不匹配，当前规格：cpu: ${cpuInput}, mem: ${memInput}
+请使用下列规格组合之一：${CPU_MEM_OPTS.map(({ cpu, mems }) => `${cpu}-${mems.join('/')}`).join('，')}`)
+        }
+        return { cpuOutput: cpuSet, memOutput: memSet }
+    }
+    if (cpuInput) {
+        let cpuSet = convertNumber(cpuInput)
+        let validSet = CPU_MEM_OPTS.find(({ cpu }) => cpu === cpuSet)
+        if (!validSet) {
+            throw new CloudBaseError(`不支持当前 cpu 规格，请使用下列 cpu 规格之一：${CPU_MEM_OPTS.map(({ cpu }) => cpu).join('，')}`)
+        }
+        return { cpuOutput: cpuSet, memOutput: CPU_MEM_OPTS.find(({ cpu }) => cpu === cpuSet).mems[0] }
+    }
+    if (memInput) {
+        let memSet = convertNumber(memInput)
+        let validSet = CPU_MEM_OPTS.find(({ mems }) => mems.includes(memSet))
+        if (!validSet) {
+            throw new CloudBaseError(`不支持当前 mem 规格，请使用下列 mem 规格之一：${CPU_MEM_OPTS.map(({ mems }) => mems.join('/')).join('，')}`)
+        }
+        return { cpuOutput: validSet.cpu, memOutput: memSet }
+    }
 }