@cloudbase/cli 2.0.0 → 2.0.3-alpha.0

package/src/utils/parallel.ts

@@ -1,82 +1,82 @@
-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)
-        })
-    }
-}
+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 +1,3 @@
-export * from './os'
-export * from './mac'
+export * from './os'
+export * from './mac'
 export * from './port'

package/src/utils/platform/mac.ts

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

package/src/utils/prompt/select.ts

@@ -1,60 +1,60 @@
-import { prompt } from 'enquirer'
-import { CloudBaseError } from '../../error'
-
-/**
- * @描述 分页的选择型 prompt
- * @泛型参数 O: listFetcher 的参数类型
- * @参数 listFetcher: 执行列表拉取逻辑的函数，一般认为参数 options 至少拥有 limit 和 offset 两个 number 属性
- * @参数 options: listFetcher 的参数
- * @参数 message: 展示的信息
- * @参数 filter 筛选返回列表的数据
- * @参数 mapper 对返回列表中元素的处理函数，用于处理列表数据到实际展示列表的映射
- * @返回值 select 类型返回 string，multiselect 返回 string[]
- */
-export const pagingSelectPromp =
-    async <T, O extends { limit?: number, offset?: number }>(
-        type: 'select' | 'multiselect',
-        listFetcher: (options: O) => Promise<any[]>,
-        options: O,
-        message: string,
-        filter: (item: any) => boolean = _ => true,
-        mapper: (item: any) => string = item => item) => {
-
-        let res: string[] | string = []
-
-        let offset = 0
-        let nextRoundList: string[]
-
-
-        while (true) {
-            const thisRoundList = nextRoundList || (await listFetcher({ ...options, limit: 10, offset: offset })).filter(filter).map(mapper)
-            offset += 10
-            nextRoundList = (await listFetcher({ ...options, limit: 10, offset: offset })).filter(filter).map(mapper)
-
-            if (!thisRoundList || !thisRoundList.length)
-                throw new CloudBaseError('列表没有数据')
-
-            if (type === 'select') {
-                let receiver: string = (await prompt<any>({
-                    type: type,
-                    name: 'receiver',
-                    message: message,
-                    choices: nextRoundList?.length ? [...thisRoundList, '下一页'] : [...thisRoundList]
-                })).receiver
-                res = receiver
-                if (receiver !== '下一页') break
-            } else {
-                let { receiver }: { receiver: string[] } = await prompt<any>({
-                    type: type,
-                    name: 'receiver',
-                    message: message,
-                    choices: nextRoundList?.length ? [...thisRoundList, '下一页'] : [...thisRoundList]
-                })
-                if (!receiver) receiver = []
-                res = [...res, ...receiver.filter(item => item !== '下一页')]
-                if (receiver.indexOf('下一页') === -1) break
-            }
-        }
-
-        return res
+import { prompt } from 'enquirer'
+import { CloudBaseError } from '../../error'
+
+/**
+ * @描述 分页的选择型 prompt
+ * @泛型参数 O: listFetcher 的参数类型
+ * @参数 listFetcher: 执行列表拉取逻辑的函数，一般认为参数 options 至少拥有 limit 和 offset 两个 number 属性
+ * @参数 options: listFetcher 的参数
+ * @参数 message: 展示的信息
+ * @参数 filter 筛选返回列表的数据
+ * @参数 mapper 对返回列表中元素的处理函数，用于处理列表数据到实际展示列表的映射
+ * @返回值 select 类型返回 string，multiselect 返回 string[]
+ */
+export const pagingSelectPromp =
+    async <T, O extends { limit?: number, offset?: number }>(
+        type: 'select' | 'multiselect',
+        listFetcher: (options: O) => Promise<any[]>,
+        options: O,
+        message: string,
+        filter: (item: any) => boolean = _ => true,
+        mapper: (item: any) => string = item => item) => {
+
+        let res: string[] | string = []
+
+        let offset = 0
+        let nextRoundList: string[]
+
+
+        while (true) {
+            const thisRoundList = nextRoundList || (await listFetcher({ ...options, limit: 10, offset: offset })).filter(filter).map(mapper)
+            offset += 10
+            nextRoundList = (await listFetcher({ ...options, limit: 10, offset: offset })).filter(filter).map(mapper)
+
+            if (!thisRoundList || !thisRoundList.length)
+                throw new CloudBaseError('列表没有数据')
+
+            if (type === 'select') {
+                let receiver: string = (await prompt<any>({
+                    type: type,
+                    name: 'receiver',
+                    message: message,
+                    choices: nextRoundList?.length ? [...thisRoundList, '下一页'] : [...thisRoundList]
+                })).receiver
+                res = receiver
+                if (receiver !== '下一页') break
+            } else {
+                let { receiver }: { receiver: string[] } = await prompt<any>({
+                    type: type,
+                    name: 'receiver',
+                    message: message,
+                    choices: nextRoundList?.length ? [...thisRoundList, '下一页'] : [...thisRoundList]
+                })
+                if (!receiver) receiver = []
+                res = [...res, ...receiver.filter(item => item !== '下一页')]
+                if (receiver.indexOf('下一页') === -1) break
+            }
+        }
+
+        return res
     }

package/src/utils/reporter/agree.ts

@@ -1,20 +1,20 @@
-import { postFetch } from '../net'
-import { getMacAddressMd5, getOSInfo } from '../platform'
-import { getUin } from '../store'
-
-const url = 'https://tcli.service.tcloudbase.com/agree-collect'
-
-export async function collectAgree(agree) {
-    const uin = await getUin()
-    const macMd5 = await getMacAddressMd5()
-    const os = await getOSInfo()
-    const data = {
-        macMd5,
-        agree,
-        uin,
-        os
-    }
-
-    return postFetch(url, data)
-}
-
+import { postFetch } from '../net'
+import { getMacAddressMd5, getOSInfo } from '../platform'
+import { getUin } from '../store'
+
+const url = 'https://tcli.service.tcloudbase.com/agree-collect'
+
+export async function collectAgree(agree) {
+    const uin = await getUin()
+    const macMd5 = await getMacAddressMd5()
+    const os = await getOSInfo()
+    const data = {
+        macMd5,
+        agree,
+        uin,
+        os
+    }
+
+    return postFetch(url, data)
+}
+

package/src/utils/reporter/download.ts

@@ -1,26 +1,26 @@
-import { postFetch } from '../net'
-import { getMacAddressMd5, getOSInfo } from '../platform'
-import { getUin } from '../store'
-
-const url = 'https://tcli.service.tcloudbase.com/download'
-
-export async function templateDownloadReport(templateId: string, templateName: string) {
-    const uin = await getUin()
-    const os = await getOSInfo()
-    const macMd5 = await getMacAddressMd5()
-
-    const data = {
-        os,
-        uin,
-        macMd5,
-        templateId,
-        templateName,
-        version: process.CLI_VERSION
-    }
-
-    try {
-        await postFetch(url, data)
-    } catch (e) {
-        // ignore error
-    }
-}
+import { postFetch } from '../net'
+import { getMacAddressMd5, getOSInfo } from '../platform'
+import { getUin } from '../store'
+
+const url = 'https://tcli.service.tcloudbase.com/download'
+
+export async function templateDownloadReport(templateId: string, templateName: string) {
+    const uin = await getUin()
+    const os = await getOSInfo()
+    const macMd5 = await getMacAddressMd5()
+
+    const data = {
+        os,
+        uin,
+        macMd5,
+        templateId,
+        templateName,
+        version: process.CLI_VERSION
+    }
+
+    try {
+        await postFetch(url, data)
+    } catch (e) {
+        // ignore error
+    }
+}

package/src/utils/reporter/index.ts

@@ -1,3 +1,3 @@
-export * from './agree'
-export * from './usage'
-export * from './download'
+export * from './agree'
+export * from './usage'
+export * from './download'