@cloudbase/cli 2.10.0 → 2.11.0-beta.0

package/lib/utils/mcp-config-modifier.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -75,133 +66,127 @@ function inferConfigFormat(filePath) {
     return filePath.toLowerCase().endsWith('.toml') ? 'toml' : 'json';
 }
 class MCPConfigModifier {
-    modifyMCPConfigs(extractDir, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                log.info((0, i18n_1.t)('🔧 正在修改 MCP 配置文件...'));
-                for (const [ide, files] of Object.entries(IDE_FILE_MAPPINGS)) {
-                    for (const descriptor of files) {
-                        if (!descriptor.isMcpConfig)
-                            continue;
-                        const filePath = path_1.default.join(extractDir, descriptor.path);
-                        log.debug((0, i18n_1.t)('检查文件: {{filePath}}', { filePath }));
-                        if (yield fs_extra_1.default.pathExists(filePath)) {
-                            log.debug((0, i18n_1.t)('找到 MCP 配置文件: {{filePath}}', { filePath }));
-                            const format = inferConfigFormat(descriptor.path);
-                            if (format === 'json') {
-                                yield this.modifyMCPJsonFile(filePath, log);
-                            }
-                            else if (format === 'toml') {
-                                yield this.modifyMCPTomlFile(filePath, log);
-                            }
+    async modifyMCPConfigs(extractDir, log) {
+        try {
+            log.info((0, i18n_1.t)('🔧 正在修改 MCP 配置文件...'));
+            for (const [ide, files] of Object.entries(IDE_FILE_MAPPINGS)) {
+                for (const descriptor of files) {
+                    if (!descriptor.isMcpConfig)
+                        continue;
+                    const filePath = path_1.default.join(extractDir, descriptor.path);
+                    log.debug((0, i18n_1.t)('检查文件: {{filePath}}', { filePath }));
+                    if (await fs_extra_1.default.pathExists(filePath)) {
+                        log.debug((0, i18n_1.t)('找到 MCP 配置文件: {{filePath}}', { filePath }));
+                        const format = inferConfigFormat(descriptor.path);
+                        if (format === 'json') {
+                            await this.modifyMCPJsonFile(filePath, log);
                         }
-                        else {
-                            log.debug((0, i18n_1.t)('文件不存在: {{filePath}}', { filePath }));
+                        else if (format === 'toml') {
+                            await this.modifyMCPTomlFile(filePath, log);
                         }
                     }
+                    else {
+                        log.debug((0, i18n_1.t)('文件不存在: {{filePath}}', { filePath }));
+                    }
                 }
-                log.info((0, i18n_1.t)('✅ MCP 配置文件修改完成'));
-            }
-            catch (error) {
-                log.warn((0, i18n_1.t)('⚠️  MCP 配置文件修改失败: {{error}}', { error: error.message }));
             }
-        });
+            log.info((0, i18n_1.t)('✅ MCP 配置文件修改完成'));
+        }
+        catch (error) {
+            log.warn((0, i18n_1.t)('⚠️  MCP 配置文件修改失败: {{error}}', { error: error.message }));
+        }
     }
-    modifyMCPJsonFile(filePath, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const content = yield fs_extra_1.default.readFile(filePath, 'utf-8');
-                const config = JSON.parse(content);
-                log.debug((0, i18n_1.t)('读取配置文件 {{filePath}}: {{config}}', { filePath, config: JSON.stringify(config) }));
-                let modified = false;
-                const modifyCommands = (obj) => {
-                    if (typeof obj !== 'object' || obj === null) {
-                        return obj;
-                    }
-                    if (Array.isArray(obj)) {
-                        return obj.map((item) => modifyCommands(item));
-                    }
-                    const result = Object.assign({}, obj);
-                    if (result.command === 'npx' && Array.isArray(result.args)) {
-                        const argsStr = result.args.join(' ');
-                        log.debug(`${(0, i18n_1.t)('检查命令')}: command=${result.command}, args=${JSON.stringify(result.args)}`);
-                        if (argsStr.includes('npm-global-exec@latest') &&
-                            argsStr.includes('@cloudbase/cloudbase-mcp@latest')) {
-                            log.debug((0, i18n_1.t)('匹配到需要修改的命令: {{argsStr}}', { argsStr }));
-                            result.command = 'cloudbase-mcp';
-                            result.args = [];
-                            result.env = {
-                                INTEGRATION_IDE: process.env.INTEGRATION_IDE || 'CloudBaseCLI'
-                            };
-                            modified = true;
-                            log.debug(`${(0, i18n_1.t)('修改配置文件')} ${filePath}: npx -> cloudbase-mcp`);
-                        }
-                        else {
-                            log.debug((0, i18n_1.t)('命令不匹配修改条件: {{argsStr}}', { argsStr }));
-                        }
+    async modifyMCPJsonFile(filePath, log) {
+        try {
+            const content = await fs_extra_1.default.readFile(filePath, 'utf-8');
+            const config = JSON.parse(content);
+            log.debug((0, i18n_1.t)('读取配置文件 {{filePath}}: {{config}}', { filePath, config: JSON.stringify(config) }));
+            let modified = false;
+            const modifyCommands = (obj) => {
+                if (typeof obj !== 'object' || obj === null) {
+                    return obj;
+                }
+                if (Array.isArray(obj)) {
+                    return obj.map((item) => modifyCommands(item));
+                }
+                const result = { ...obj };
+                if (result.command === 'npx' && Array.isArray(result.args)) {
+                    const argsStr = result.args.join(' ');
+                    log.debug(`${(0, i18n_1.t)('检查命令')}: command=${result.command}, args=${JSON.stringify(result.args)}`);
+                    if (argsStr.includes('npm-global-exec@latest') &&
+                        argsStr.includes('@cloudbase/cloudbase-mcp@latest')) {
+                        log.debug((0, i18n_1.t)('匹配到需要修改的命令: {{argsStr}}', { argsStr }));
+                        result.command = 'cloudbase-mcp';
+                        result.args = [];
+                        result.env = {
+                            INTEGRATION_IDE: process.env.INTEGRATION_IDE || 'CloudBaseCLI'
+                        };
+                        modified = true;
+                        log.debug(`${(0, i18n_1.t)('修改配置文件')} ${filePath}: npx -> cloudbase-mcp`);
                     }
-                    for (const [key, value] of Object.entries(result)) {
-                        result[key] = modifyCommands(value);
+                    else {
+                        log.debug((0, i18n_1.t)('命令不匹配修改条件: {{argsStr}}', { argsStr }));
                     }
-                    return result;
-                };
-                const modifiedConfig = modifyCommands(config);
-                if (modified) {
-                    yield fs_extra_1.default.writeJson(filePath, modifiedConfig, { spaces: 2 });
-                    log.debug((0, i18n_1.t)('✅ 已修改 {{filePath}}', { filePath }));
                 }
-                else {
-                    log.debug((0, i18n_1.t)('⚠️  配置文件 {{filePath}} 未发生修改', { filePath }));
+                for (const [key, value] of Object.entries(result)) {
+                    result[key] = modifyCommands(value);
                 }
+                return result;
+            };
+            const modifiedConfig = modifyCommands(config);
+            if (modified) {
+                await fs_extra_1.default.writeJson(filePath, modifiedConfig, { spaces: 2 });
+                log.debug((0, i18n_1.t)('✅ 已修改 {{filePath}}', { filePath }));
             }
-            catch (error) {
-                log.warn((0, i18n_1.t)('⚠️  修改配置文件 {{filePath}} 失败: {{error}}', { filePath, error: error.message }));
+            else {
+                log.debug((0, i18n_1.t)('⚠️  配置文件 {{filePath}} 未发生修改', { filePath }));
             }
-        });
+        }
+        catch (error) {
+            log.warn((0, i18n_1.t)('⚠️  修改配置文件 {{filePath}} 失败: {{error}}', { filePath, error: error.message }));
+        }
     }
-    modifyMCPTomlFile(filePath, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const content = yield fs_extra_1.default.readFile(filePath, 'utf-8');
-                const toml = yield Promise.resolve().then(() => __importStar(require('toml')));
-                const config = toml.parse(content);
-                let modified = false;
-                const modifyCommands = (obj) => {
-                    if (typeof obj !== 'object' || obj === null) {
-                        return obj;
-                    }
-                    if (Array.isArray(obj)) {
-                        return obj.map((item) => modifyCommands(item));
-                    }
-                    const result = Object.assign({}, obj);
-                    if (result.command === 'npx' && Array.isArray(result.args)) {
-                        const argsStr = result.args.join(' ');
-                        if (argsStr.includes('@cloudbase/cloudbase-mcp@latest')) {
-                            result.command = 'cloudbase-mcp';
-                            result.args = [];
-                            result.env = {
-                                INTEGRATION_IDE: process.env.INTEGRATION_IDE || 'CloudBaseCLI'
-                            };
-                            modified = true;
-                            log.debug(`${(0, i18n_1.t)('修改配置文件')} ${filePath}: npx -> cloudbase-mcp`);
-                        }
-                    }
-                    for (const [key, value] of Object.entries(result)) {
-                        result[key] = modifyCommands(value);
+    async modifyMCPTomlFile(filePath, log) {
+        try {
+            const content = await fs_extra_1.default.readFile(filePath, 'utf-8');
+            const toml = await Promise.resolve().then(() => __importStar(require('toml')));
+            const config = toml.parse(content);
+            let modified = false;
+            const modifyCommands = (obj) => {
+                if (typeof obj !== 'object' || obj === null) {
+                    return obj;
+                }
+                if (Array.isArray(obj)) {
+                    return obj.map((item) => modifyCommands(item));
+                }
+                const result = { ...obj };
+                if (result.command === 'npx' && Array.isArray(result.args)) {
+                    const argsStr = result.args.join(' ');
+                    if (argsStr.includes('@cloudbase/cloudbase-mcp@latest')) {
+                        result.command = 'cloudbase-mcp';
+                        result.args = [];
+                        result.env = {
+                            INTEGRATION_IDE: process.env.INTEGRATION_IDE || 'CloudBaseCLI'
+                        };
+                        modified = true;
+                        log.debug(`${(0, i18n_1.t)('修改配置文件')} ${filePath}: npx -> cloudbase-mcp`);
                     }
-                    return result;
-                };
-                const modifiedConfig = modifyCommands(config);
-                if (modified) {
-                    const tomlString = this.objectToToml(modifiedConfig);
-                    yield fs_extra_1.default.writeFile(filePath, tomlString, 'utf-8');
-                    log.debug(`✅ ${(0, i18n_1.t)('已修改')} ${filePath}`);
                 }
+                for (const [key, value] of Object.entries(result)) {
+                    result[key] = modifyCommands(value);
+                }
+                return result;
+            };
+            const modifiedConfig = modifyCommands(config);
+            if (modified) {
+                const tomlString = this.objectToToml(modifiedConfig);
+                await fs_extra_1.default.writeFile(filePath, tomlString, 'utf-8');
+                log.debug(`✅ ${(0, i18n_1.t)('已修改')} ${filePath}`);
             }
-            catch (error) {
-                log.warn((0, i18n_1.t)('⚠️  修改配置文件 {{filePath}} 失败: {{errorMessage}}', { filePath, errorMessage: error.message }));
-            }
-        });
+        }
+        catch (error) {
+            log.warn((0, i18n_1.t)('⚠️  修改配置文件 {{filePath}} 失败: {{errorMessage}}', { filePath, errorMessage: error.message }));
+        }
     }
     objectToToml(obj, prefix = '') {
         const lines = [];

package/lib/utils/net/cloud-api-request.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudApiService = void 0;
 const toolbox_1 = require("@cloudbase/toolbox");
@@ -35,29 +26,30 @@ class CloudApiService {
             baseParams,
             proxy: (0, toolbox_1.getProxy)(),
             timeout: constant_1.REQUEST_TIMEOUT,
-            getCredential: () => __awaiter(this, void 0, void 0, function* () {
+            getCredential: async () => {
                 if ((commonCredential === null || commonCredential === void 0 ? void 0 : commonCredential.secretId) && !isTokenExpired(commonCredential)) {
                     return commonCredential;
                 }
-                const credential = yield (0, toolbox_1.getCredentialWithoutCheck)();
+                const credential = await (0, toolbox_1.getCredentialWithoutCheck)();
                 if (!credential) {
                     throw new error_1.CloudBaseError((0, i18n_1.t)('无有效身份信息，请使用 cloudbase login 登录'));
                 }
                 commonCredential = credential;
-                return Object.assign(Object.assign({}, credential), { tokenExpired: Number(credential.accessTokenExpired) });
-            })
+                return {
+                    ...credential,
+                    tokenExpired: Number(credential.accessTokenExpired)
+                };
+            }
         });
     }
-    request(action, data = {}, method = 'POST') {
-        return __awaiter(this, void 0, void 0, function* () {
-            const region = this.region || (yield (0, toolbox_1.getRegion)());
-            const reqOptions = { action, data, method, region };
-            const startTime = new Date();
-            const res = yield this.apiService.request(reqOptions);
-            const endTime = new Date();
-            (0, debug_logger_1.debugLogger)(reqOptions, res, startTime, endTime);
-            return res;
-        });
+    async request(action, data = {}, method = 'POST') {
+        const region = this.region || (await (0, toolbox_1.getRegion)());
+        const reqOptions = { action, data, method, region };
+        const startTime = new Date();
+        const res = await this.apiService.request(reqOptions);
+        const endTime = new Date();
+        (0, debug_logger_1.debugLogger)(reqOptions, res, startTime, endTime);
+        return res;
     }
 }
 exports.CloudApiService = CloudApiService;

package/lib/utils/net/credential.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -23,39 +14,35 @@ const proxy_1 = require("./proxy");
 const http_request_1 = require("./http-request");
 const i18n_1 = require("../../i18n");
 const refreshTokenUrl = 'https://iaas.cloud.tencent.com/tcb_refresh';
-function refreshTmpToken(metaData) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const mac = yield (0, platform_1.getMacAddress)();
-        const hash = (0, tools_1.md5)(mac);
-        metaData.hash = hash;
-        const res = yield (0, http_request_1.fetch)(refreshTokenUrl, {
-            method: 'POST',
-            body: JSON.stringify(metaData),
-            headers: { 'Content-Type': 'application/json' }
-        });
-        if (res.code !== 0) {
-            throw new error_1.CloudBaseError(res.message, {
-                code: res.code
-            });
-        }
-        const { data: credential } = res;
-        return credential;
+async function refreshTmpToken(metaData) {
+    const mac = await (0, platform_1.getMacAddress)();
+    const hash = (0, tools_1.md5)(mac);
+    metaData.hash = hash;
+    const res = await (0, http_request_1.fetch)(refreshTokenUrl, {
+        method: 'POST',
+        body: JSON.stringify(metaData),
+        headers: { 'Content-Type': 'application/json' }
     });
+    if (res.code !== 0) {
+        throw new error_1.CloudBaseError(res.message, {
+            code: res.code
+        });
+    }
+    const { data: credential } = res;
+    return credential;
 }
 exports.refreshTmpToken = refreshTmpToken;
-function checkAndGetCredential(throwError = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const credential = yield (0, toolbox_1.checkAndGetCredential)({
-            proxy: (0, proxy_1.getProxy)(),
-            timeout: constant_1.REQUEST_TIMEOUT
-        });
-        if (!credential || lodash_1.default.isEmpty(credential)) {
-            if (throwError) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('无有效身份信息，请使用 cloudbase login 登录'));
-            }
-            return null;
-        }
-        return credential;
+async function checkAndGetCredential(throwError = false) {
+    const credential = await (0, toolbox_1.checkAndGetCredential)({
+        proxy: (0, proxy_1.getProxy)(),
+        timeout: constant_1.REQUEST_TIMEOUT
     });
+    if (!credential || lodash_1.default.isEmpty(credential)) {
+        if (throwError) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('无有效身份信息，请使用 cloudbase login 登录'));
+        }
+        return null;
+    }
+    return credential;
 }
 exports.checkAndGetCredential = checkAndGetCredential;

package/lib/utils/net/http-request.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -28,81 +19,73 @@ function handleTimeout(e) {
         throw e;
     }
 }
-function fetchWithDebugLogger(useTextTransform, ...args) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const startTime = new Date();
-        const rawRes = yield (0, node_fetch_1.default)(...args);
-        const res = useTextTransform ? yield rawRes.text() : rawRes;
-        const endTime = new Date();
-        (0, debug_logger_1.debugLogger)(args, res, startTime, endTime);
-        return res;
-    });
+async function fetchWithDebugLogger(useTextTransform, ...args) {
+    const startTime = new Date();
+    const rawRes = await (0, node_fetch_1.default)(...args);
+    const res = useTextTransform ? await rawRes.text() : rawRes;
+    const endTime = new Date();
+    (0, debug_logger_1.debugLogger)(args, res, startTime, endTime);
+    return res;
 }
-function fetch(url, config = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const proxy = (0, proxy_1.getProxy)();
-        if (proxy) {
-            config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
-        }
-        config.timeout = constant_1.REQUEST_TIMEOUT;
-        let json;
-        let text;
-        try {
-            const res = yield fetchWithDebugLogger(true, url, config);
-            text = res;
-            json = JSON.parse(text);
-        }
-        catch (e) {
-            handleTimeout(e);
-            json = text;
-        }
-        return json;
-    });
+async function fetch(url, config = {}) {
+    const proxy = (0, proxy_1.getProxy)();
+    if (proxy) {
+        config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
+    }
+    config.timeout = constant_1.REQUEST_TIMEOUT;
+    let json;
+    let text;
+    try {
+        const res = await fetchWithDebugLogger(true, url, config);
+        text = res;
+        json = JSON.parse(text);
+    }
+    catch (e) {
+        handleTimeout(e);
+        json = text;
+    }
+    return json;
 }
 exports.fetch = fetch;
-function postFetch(url, data) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const proxy = (0, proxy_1.getProxy)();
-        const config = {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify(data)
-        };
-        if (proxy) {
-            config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
-        }
-        config.timeout = constant_1.REQUEST_TIMEOUT;
-        let json;
-        let text;
-        try {
-            const res = yield fetchWithDebugLogger(true, url, config);
-            text = res;
-            json = JSON.parse(text);
-        }
-        catch (e) {
-            handleTimeout(e);
-            json = text;
-        }
-        return json;
-    });
+async function postFetch(url, data) {
+    const proxy = (0, proxy_1.getProxy)();
+    const config = {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(data)
+    };
+    if (proxy) {
+        config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
+    }
+    config.timeout = constant_1.REQUEST_TIMEOUT;
+    let json;
+    let text;
+    try {
+        const res = await fetchWithDebugLogger(true, url, config);
+        text = res;
+        json = JSON.parse(text);
+    }
+    catch (e) {
+        handleTimeout(e);
+        json = text;
+    }
+    return json;
 }
 exports.postFetch = postFetch;
-function fetchStream(url, config = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const proxy = (0, proxy_1.getProxy)();
-        if (proxy) {
-            config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
-        }
-        config.timeout = constant_1.REQUEST_TIMEOUT;
-        try {
-            const res = yield fetchWithDebugLogger(false, url, config);
-            return res;
-        }
-        catch (e) {
-            handleTimeout(e);
-        }
-    });
+async function fetchStream(url, config = {}) {
+    const proxy = (0, proxy_1.getProxy)();
+    if (proxy) {
+        config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
+    }
+    config.timeout = constant_1.REQUEST_TIMEOUT;
+    try {
+        const res = await fetchWithDebugLogger(false, url, config);
+        return res;
+    }
+    catch (e) {
+        handleTimeout(e);
+    }
 }
 exports.fetchStream = fetchStream;

package/lib/utils/net/manager-service.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,35 +8,31 @@ const manager_node_1 = __importDefault(require("@cloudbase/manager-node"));
 const toolbox_1 = require("@cloudbase/toolbox");
 const credential_1 = require("./credential");
 const proxy_1 = require("./proxy");
-function getMangerService(envId = '') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { secretId, secretKey, token } = yield (0, credential_1.checkAndGetCredential)(true);
-        const region = yield (0, toolbox_1.getRegion)();
-        const app = new manager_node_1.default({
-            token,
-            envId,
-            region,
-            secretId,
-            secretKey,
-            proxy: (0, proxy_1.getProxy)()
-        });
-        return app;
+async function getMangerService(envId = '') {
+    const { secretId, secretKey, token } = await (0, credential_1.checkAndGetCredential)(true);
+    const region = await (0, toolbox_1.getRegion)();
+    const app = new manager_node_1.default({
+        token,
+        envId,
+        region,
+        secretId,
+        secretKey,
+        proxy: (0, proxy_1.getProxy)()
     });
+    return app;
 }
 exports.getMangerService = getMangerService;
-function getStorageService(envId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { secretId, secretKey, token } = yield (0, credential_1.checkAndGetCredential)(true);
-        const region = yield (0, toolbox_1.getRegion)();
-        const app = new manager_node_1.default({
-            token,
-            envId,
-            secretId,
-            region,
-            secretKey,
-            proxy: (0, proxy_1.getProxy)()
-        });
-        return app.storage;
+async function getStorageService(envId) {
+    const { secretId, secretKey, token } = await (0, credential_1.checkAndGetCredential)(true);
+    const region = await (0, toolbox_1.getRegion)();
+    const app = new manager_node_1.default({
+        token,
+        envId,
+        secretId,
+        region,
+        secretKey,
+        proxy: (0, proxy_1.getProxy)()
     });
+    return app.storage;
 }
 exports.getStorageService = getStorageService;