@cloudbase/cli 2.0.3 → 2.0.4-alpha.0

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'

package/src/utils/reporter/usage.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/usage'
-
-export async function collectUsage(command: string) {
-    const uin = await getUin()
-    const macMd5 = await getMacAddressMd5()
-    const os = await getOSInfo()
-    const data = {
-        os,
-        uin,
-        macMd5,
-        command,
-        version: process.CLI_VERSION
-    }
-
-    return postFetch(url, data)
-}
+import { postFetch } from '../net'
+import { getMacAddressMd5, getOSInfo } from '../platform'
+import { getUin } from '../store'
+
+const url = 'https://tcli.service.tcloudbase.com/usage'
+
+export async function collectUsage(command: string) {
+    const uin = await getUin()
+    const macMd5 = await getMacAddressMd5()
+    const os = await getOSInfo()
+    const data = {
+        os,
+        uin,
+        macMd5,
+        command,
+        version: process.CLI_VERSION
+    }
+
+    return postFetch(url, data)
+}

package/src/utils/store/auth.ts

@@ -1,49 +1,49 @@
-import os from 'os'
-import fs from 'fs'
-import path from 'path'
-import { checkFullAccess } from '../fs'
-import { LocalStore } from './db'
-import { ConfigItems } from '../../constant'
-
-class AuthStore extends LocalStore {
-    constructor(defaults) {
-        super(defaults, 'auth')
-        this.defaults = defaults
-        this.moveOldConfig()
-    }
-
-    // TODO: 迁移并删除旧的配置文件中的数据（在后续迭代中删除）
-    async moveOldConfig() {
-        const db = await this.getDB()
-        const oldConfigPath = path.resolve(
-            os.homedir(),
-            '.config',
-            'configstore',
-            '@cloudbase',
-            'cli.json'
-        )
-
-        if (checkFullAccess(oldConfigPath)) {
-            try {
-                const content = JSON.parse(fs.readFileSync(oldConfigPath, 'utf8'))
-                const { credential, ssh } = content
-                await db.set(ConfigItems.credential, credential).write()
-                await db.set(ConfigItems.ssh, ssh).write()
-                fs.unlinkSync(oldConfigPath)
-            } catch (e) {
-                fs.unlinkSync(oldConfigPath)
-            }
-        }
-    }
-}
-
-export const authStore = new AuthStore({
-    _: '这是您的 CloudBase 身份凭据文件，请不要分享给他人！',
-    [ConfigItems.credential]: {},
-    [ConfigItems.ssh]: {}
-})
-
-export async function getUin() {
-    const credential = await authStore.get(ConfigItems.credential)
-    return credential?.uin || '无'
-}
+import os from 'os'
+import fs from 'fs'
+import path from 'path'
+import { checkFullAccess } from '../fs'
+import { LocalStore } from './db'
+import { ConfigItems } from '../../constant'
+
+class AuthStore extends LocalStore {
+    constructor(defaults) {
+        super(defaults, 'auth')
+        this.defaults = defaults
+        this.moveOldConfig()
+    }
+
+    // TODO: 迁移并删除旧的配置文件中的数据（在后续迭代中删除）
+    async moveOldConfig() {
+        const db = await this.getDB()
+        const oldConfigPath = path.resolve(
+            os.homedir(),
+            '.config',
+            'configstore',
+            '@cloudbase',
+            'cli.json'
+        )
+
+        if (checkFullAccess(oldConfigPath)) {
+            try {
+                const content = JSON.parse(fs.readFileSync(oldConfigPath, 'utf8'))
+                const { credential, ssh } = content
+                await db.set(ConfigItems.credential, credential).write()
+                await db.set(ConfigItems.ssh, ssh).write()
+                fs.unlinkSync(oldConfigPath)
+            } catch (e) {
+                fs.unlinkSync(oldConfigPath)
+            }
+        }
+    }
+}
+
+export const authStore = new AuthStore({
+    _: '这是您的 CloudBase 身份凭据文件，请不要分享给他人！',
+    [ConfigItems.credential]: {},
+    [ConfigItems.ssh]: {}
+})
+
+export async function getUin() {
+    const credential = await authStore.get(ConfigItems.credential)
+    return credential?.uin || '无'
+}

package/src/utils/store/common.ts

@@ -1,8 +1,8 @@
-import { LocalStore } from './db'
-
-export const commonStore = new LocalStore({
-    // 已读最新消息的 uid
-    lastNotificationUid: 1,
-    // 上次通知时间
-    lastNotifyTime: 0
-})
+import { LocalStore } from './db'
+
+export const commonStore = new LocalStore({
+    // 已读最新消息的 uid
+    lastNotificationUid: 1,
+    // 上次通知时间
+    lastNotifyTime: 0
+})