@cloudbase/cli 1.12.7-alpha.4 → 2.0.0

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
+})

package/src/utils/store/db.ts

@@ -1,68 +1,68 @@
-import os from 'os'
-import fse from 'fs-extra'
-import low from 'lowdb'
-import path from 'path'
-import FileAsync from 'lowdb/adapters/FileAsync'
-import FileSync from 'lowdb/adapters/FileSync'
-import xdgBasedir from 'xdg-basedir'
-
-// 系统配置目录
-const configDir = xdgBasedir.config || path.join(os.tmpdir(), '.config')
-// cloudbase 配置目录
-export const cloudbaseConfigDir = path.join(configDir, '.cloudbase')
-
-// 确保目录存在
-
-fse.ensureDirSync(cloudbaseConfigDir)
-
-export function getAsyncDB(file: string) {
-    const dbPath = path.join(cloudbaseConfigDir, `${file}.json`)
-    const adapter = new FileAsync(dbPath)
-    const db = low(adapter)
-    return db
-}
-
-export function getSyncDB(file: string) {
-    const dbPath = path.join(cloudbaseConfigDir, `${file}.json`)
-    const adapter = new FileSync(dbPath)
-    const db = low(adapter)
-    return db
-}
-
-export class LocalStore {
-    db: any
-    dbKey: string
-    defaults: any
-
-    constructor(defaults: any, dbKey = 'common') {
-        this.defaults = defaults
-        this.dbKey = dbKey
-    }
-
-    async getDB() {
-        const db = this.db || (await getAsyncDB(this.dbKey))
-        this.db = db
-        return db
-    }
-
-    async get(key: string): Promise<any> {
-        const defaultValue = this.defaults[key]
-        const db = await this.getDB()
-        return db.get(key).value() || defaultValue
-    }
-
-    async set(key: string, value: any) {
-        const db = await this.getDB()
-        await db.set(key, value).write()
-    }
-
-    async push(key: string, value: any) {
-        const db = await this.getDB()
-        await db.get(key).push(value).write()
-    }
-
-    async delete(key) {
-        const db = await this.getDB()
-        await db.unset(key).write()
-    }
-}
+import os from 'os'
+import fse from 'fs-extra'
+import low from 'lowdb'
+import path from 'path'
+import FileAsync from 'lowdb/adapters/FileAsync'
+import FileSync from 'lowdb/adapters/FileSync'
+import xdgBasedir from 'xdg-basedir'
+
+// 系统配置目录
+const configDir = xdgBasedir.config || path.join(os.tmpdir(), '.config')
+// cloudbase 配置目录
+export const cloudbaseConfigDir = path.join(configDir, '.cloudbase')
+
+// 确保目录存在
+
+fse.ensureDirSync(cloudbaseConfigDir)
+
+export function getAsyncDB(file: string) {
+    const dbPath = path.join(cloudbaseConfigDir, `${file}.json`)
+    const adapter = new FileAsync(dbPath)
+    const db = low(adapter)
+    return db
+}
+
+export function getSyncDB(file: string) {
+    const dbPath = path.join(cloudbaseConfigDir, `${file}.json`)
+    const adapter = new FileSync(dbPath)
+    const db = low(adapter)
+    return db
+}
+
+export class LocalStore {
+    db: any
+    dbKey: string
+    defaults: any
+
+    constructor(defaults: any, dbKey = 'common') {
+        this.defaults = defaults
+        this.dbKey = dbKey
+    }
+
+    async getDB() {
+        const db = this.db || (await getAsyncDB(this.dbKey))
+        this.db = db
+        return db
+    }
+
+    async get(key: string): Promise<any> {
+        const defaultValue = this.defaults[key]
+        const db = await this.getDB()
+        return db.get(key).value() || defaultValue
+    }
+
+    async set(key: string, value: any) {
+        const db = await this.getDB()
+        await db.set(key, value).write()
+    }
+
+    async push(key: string, value: any) {
+        const db = await this.getDB()
+        await db.get(key).push(value).write()
+    }
+
+    async delete(key) {
+        const db = await this.getDB()
+        await db.unset(key).write()
+    }
+}

package/src/utils/store/index.ts

@@ -1,5 +1,5 @@
-export * from './auth'
-export * from './db'
-export * from './auth'
-export * from './usage'
+export * from './auth'
+export * from './db'
+export * from './auth'
+export * from './usage'
 export * from './common'

package/src/utils/store/usage.ts

@@ -1,12 +1,12 @@
-import { LocalStore } from './db'
-
-const DB_KEY = 'usage'
-
-export const usageStore = new LocalStore(
-    {
-        // 是否同意收集使用数据
-        agreeCollect: false,
-        commands: []
-    },
-    DB_KEY
-)
+import { LocalStore } from './db'
+
+const DB_KEY = 'usage'
+
+export const usageStore = new LocalStore(
+    {
+        // 是否同意收集使用数据
+        agreeCollect: false,
+        commands: []
+    },
+    DB_KEY
+)

package/src/utils/tcbrApi/callTcbrApi.ts

@@ -0,0 +1,28 @@
+import { CloudBaseError } from '@cloudbase/toolbox'
+import { CloudApiService } from './tcbr-cloud-api-request'
+
+const tcbrService = CloudApiService.getInstance('tcbr')
+
+export async function callTcbrApi(action: string, data: Record<string, any>) {
+    try {
+        const res = await tcbrService.request(action, data)
+        // 返回统一格式的 JSON 结果
+        return {
+            code: 0,
+            errmsg: 'success',
+            data: {
+                ...res
+            }
+        }
+    } catch (e) {
+        // 不直接 throw 因为调用 DescribeCloudRunServerDetail 如果传入了当前不存在的服务名会返回报错
+        // 对特殊错误特殊处理
+        if (e.code === 'AuthFailure.UnauthorizedOperation') {
+            console.log('\n', `requestId: ${e.requestId}`)
+            throw new CloudBaseError('您没有权限执行此操作，请检查 CAM 策略\n')
+        } else if (e.code === 'LimitExceeded') {
+            throw new CloudBaseError(`${e.original.Message}\n`)
+        }
+        return e
+    }
+}

package/src/utils/tcbrApi/index.ts

@@ -0,0 +1 @@
+export * from './callTcbrApi'