@cloudbase/cli 2.10.0-beta.0 → 2.11.0-beta.0

package/lib/utils/env.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,195 +19,183 @@ const tcbService = net_1.CloudApiService.getInstance('tcb');
 const ENV_INIT_TIP = (0, i18n_1.t)('环境初始化中，预计需要三分钟');
 const CREATE_ENV = 'CREATE';
 const consoleUrl = `${url_1.EUrl.TcbConsole}/env/index?action=CreateEnv&from=cli`;
-function getSelectedEnv(inputEnvId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const isInitNow = yield checkTcbService();
-        let envData = [];
-        if (isInitNow) {
-            envData = yield (0, output_1.execWithLoading)(() => {
-                return new Promise((resolve) => {
-                    const timer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                        const envs = yield (0, env_1.listEnvs)();
-                        if (envs.length) {
-                            clearInterval(timer);
-                            resolve(envs);
-                        }
-                    }), 2000);
-                });
-            }, {
-                startTip: (0, i18n_1.t)('获取环境列表中')
+async function getSelectedEnv(inputEnvId) {
+    const isInitNow = await checkTcbService();
+    let envData = [];
+    if (isInitNow) {
+        envData = await (0, output_1.execWithLoading)(() => {
+            return new Promise((resolve) => {
+                const timer = setInterval(async () => {
+                    const envs = await (0, env_1.listEnvs)();
+                    if (envs.length) {
+                        clearInterval(timer);
+                        resolve(envs);
+                    }
+                }, 2000);
             });
+        }, {
+            startTip: (0, i18n_1.t)('获取环境列表中')
+        });
+    }
+    else {
+        envData = await (0, output_1.execWithLoading)(() => (0, env_1.listEnvs)(), {
+            startTip: (0, i18n_1.t)('获取环境列表中')
+        });
+    }
+    envData = envData || [];
+    if ((envData === null || envData === void 0 ? void 0 : envData.length) && inputEnvId) {
+        const inputEnvIdExist = envData.find((_) => _.EnvId === inputEnvId);
+        if (!inputEnvIdExist) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('你指定的环境 Id {{envId}} 不存在，请指定正确的环境 Id！', { envId: inputEnvId }));
         }
-        else {
-            envData = yield (0, output_1.execWithLoading)(() => (0, env_1.listEnvs)(), {
-                startTip: (0, i18n_1.t)('获取环境列表中')
-            });
+        return inputEnvId;
+    }
+    const envs = envData
+        .map((item) => {
+        let name = `${item.Alias} - [${item.EnvId}:${item.PackageName || (0, i18n_1.t)('按量计费')}]`;
+        if (item.Status !== "NORMAL") {
+            name += `（${constant_1.STATUS_TEXT[item.Status]}）`;
         }
-        envData = envData || [];
-        if ((envData === null || envData === void 0 ? void 0 : envData.length) && inputEnvId) {
-            const inputEnvIdExist = envData.find((_) => _.EnvId === inputEnvId);
-            if (!inputEnvIdExist) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('你指定的环境 Id {{envId}} 不存在，请指定正确的环境 Id！', { envId: inputEnvId }));
-            }
-            return inputEnvId;
+        return {
+            name,
+            value: item.EnvId
+        };
+    })
+        .sort((prev, next) => prev.value.charCodeAt(0) - next.value.charCodeAt(0));
+    const choices = [
+        ...envs,
+        {
+            name: envData.length ? (0, i18n_1.t)('创建新环境') : (0, i18n_1.t)('无可用环境，创建新环境'),
+            value: CREATE_ENV
         }
-        const envs = envData
-            .map((item) => {
-            let name = `${item.Alias} - [${item.EnvId}:${item.PackageName || (0, i18n_1.t)('按量计费')}]`;
-            if (item.Status !== "NORMAL") {
-                name += `（${constant_1.STATUS_TEXT[item.Status]}）`;
-            }
-            return {
-                name,
-                value: item.EnvId
-            };
-        })
-            .sort((prev, next) => prev.value.charCodeAt(0) - next.value.charCodeAt(0));
-        const choices = [
-            ...envs,
-            {
-                name: envData.length ? (0, i18n_1.t)('创建新环境') : (0, i18n_1.t)('无可用环境，创建新环境'),
-                value: CREATE_ENV
-            }
-        ];
-        let { env } = yield (0, enquirer_1.prompt)({
-            choices,
-            type: 'select',
-            name: 'env',
-            message: (0, i18n_1.t)('请选择关联环境'),
-            result(choice) {
-                return this.map(choice)[choice];
-            }
-        });
-        if (env === CREATE_ENV) {
-            log_1.logger.success((0, i18n_1.t)('已打开控制台，请前往控制台创建环境'));
-            const { envId } = yield (0, toolbox_1.getDataFromWeb)((port) => `${consoleUrl}&port=${port}`, 'getData');
-            if (!envId) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('接收环境 Id 信息失败，请重新运行 init 命令！'));
-            }
-            log_1.logger.success((0, i18n_1.t)('创建环境成功，环境 Id: {{envId}}', { envId }));
-            env = envId;
+    ];
+    let { env } = await (0, enquirer_1.prompt)({
+        choices,
+        type: 'select',
+        name: 'env',
+        message: (0, i18n_1.t)('请选择关联环境'),
+        result(choice) {
+            return this.map(choice)[choice];
         }
-        yield checkEnvStatus(env);
-        return env;
     });
+    if (env === CREATE_ENV) {
+        log_1.logger.success((0, i18n_1.t)('已打开控制台，请前往控制台创建环境'));
+        const { envId } = await (0, toolbox_1.getDataFromWeb)((port) => `${consoleUrl}&port=${port}`, 'getData');
+        if (!envId) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('接收环境 Id 信息失败，请重新运行 init 命令！'));
+        }
+        log_1.logger.success((0, i18n_1.t)('创建环境成功，环境 Id: {{envId}}', { envId }));
+        env = envId;
+    }
+    await checkEnvStatus(env);
+    return env;
 }
 exports.getSelectedEnv = getSelectedEnv;
-function getSelectRegion() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { region } = yield (0, enquirer_1.prompt)({
-            choices: [
-                {
-                    name: (0, i18n_1.t)('上海'),
-                    value: 'ap-shanghai'
-                },
-                {
-                    name: (0, i18n_1.t)('广州'),
-                    value: 'ap-guangzhou'
-                }
-            ],
-            type: 'select',
-            name: 'region',
-            message: (0, i18n_1.t)('请选择环境所在地域'),
-            result(choice) {
-                return this.map(choice)[choice];
+async function getSelectRegion() {
+    const { region } = await (0, enquirer_1.prompt)({
+        choices: [
+            {
+                name: (0, i18n_1.t)('上海'),
+                value: 'ap-shanghai'
+            },
+            {
+                name: (0, i18n_1.t)('广州'),
+                value: 'ap-guangzhou'
             }
-        });
-        tcbService.region = region;
-        return region;
+        ],
+        type: 'select',
+        name: 'region',
+        message: (0, i18n_1.t)('请选择环境所在地域'),
+        result(choice) {
+            return this.map(choice)[choice];
+        }
     });
+    tcbService.region = region;
+    return region;
 }
 exports.getSelectRegion = getSelectRegion;
-function checkTcbService() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const app = yield (0, net_1.getMangerService)();
-        let Initialized;
-        try {
-            Initialized = (yield app.env.checkTcbService()).Initialized;
+async function checkTcbService() {
+    const app = await (0, net_1.getMangerService)();
+    let Initialized;
+    try {
+        Initialized = (await app.env.checkTcbService()).Initialized;
+    }
+    catch (e) {
+        if (!(0, toolbox_1.isCamRefused)(e)) {
+            throw e;
         }
-        catch (e) {
-            if (!(0, toolbox_1.isCamRefused)(e)) {
-                throw e;
-            }
-        }
-        if (!Initialized) {
-            const { jump } = yield (0, enquirer_1.prompt)({
-                type: 'confirm',
-                name: 'jump',
-                message: (0, i18n_1.t)('你还没有开通云开发服务，是否跳转到控制台开通云开发服务？（取消将无法继续操作）'),
-                initial: true
-            });
-            if (!jump) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('init 操作终止，请开通云开发服务后再进行操作！'));
-            }
-            (0, open_1.default)(consoleUrl);
-            log_1.logger.success((0, i18n_1.t)('已打开云开发控制台，请登录并在云开发控制台中开通服务！'));
-            yield (0, output_1.execWithLoading)(() => waitForServiceEnable(), {
-                startTip: (0, i18n_1.t)('等待云开发服务开通中'),
-                successTip: (0, i18n_1.t)('云开发服务开通成功！')
-            });
-            return true;
+    }
+    if (!Initialized) {
+        const { jump } = await (0, enquirer_1.prompt)({
+            type: 'confirm',
+            name: 'jump',
+            message: (0, i18n_1.t)('你还没有开通云开发服务，是否跳转到控制台开通云开发服务？（取消将无法继续操作）'),
+            initial: true
+        });
+        if (!jump) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('init 操作终止，请开通云开发服务后再进行操作！'));
         }
-        return false;
-    });
+        (0, open_1.default)(consoleUrl);
+        log_1.logger.success((0, i18n_1.t)('已打开云开发控制台，请登录并在云开发控制台中开通服务！'));
+        await (0, output_1.execWithLoading)(() => waitForServiceEnable(), {
+            startTip: (0, i18n_1.t)('等待云开发服务开通中'),
+            successTip: (0, i18n_1.t)('云开发服务开通成功！')
+        });
+        return true;
+    }
+    return false;
 }
 exports.checkTcbService = checkTcbService;
-function checkEnvStatus(envId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const env = yield (0, env_1.getEnvInfo)(envId);
-        if (env.Status === "UNAVAILABLE") {
-            yield checkEnvAvaliable(envId);
-        }
-        else if (env.Status !== "NORMAL") {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('所有环境状态异常'));
-        }
-    });
+async function checkEnvStatus(envId) {
+    const env = await (0, env_1.getEnvInfo)(envId);
+    if (env.Status === "UNAVAILABLE") {
+        await checkEnvAvaliable(envId);
+    }
+    else if (env.Status !== "NORMAL") {
+        throw new error_1.CloudBaseError((0, i18n_1.t)('所有环境状态异常'));
+    }
 }
 exports.checkEnvStatus = checkEnvStatus;
-function checkEnvAvaliable(envId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let count = 0;
-        yield (0, output_1.execWithLoading)((flush) => {
-            const increase = setInterval(() => {
-                flush(`${ENV_INIT_TIP}  ${++count}S`);
-            }, 1000);
-            return new Promise((resolve) => {
-                const timer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                    const env = yield (0, env_1.getEnvInfo)(envId);
-                    if (env.Status === "NORMAL") {
-                        clearInterval(timer);
-                        clearInterval(increase);
-                        resolve();
-                    }
-                }), 3000);
-            });
-        }, {
-            startTip: ENV_INIT_TIP,
-            successTip: (0, i18n_1.t)('环境 {{envId}} 初始化成功', { envId })
+async function checkEnvAvaliable(envId) {
+    let count = 0;
+    await (0, output_1.execWithLoading)((flush) => {
+        const increase = setInterval(() => {
+            flush(`${ENV_INIT_TIP}  ${++count}S`);
+        }, 1000);
+        return new Promise((resolve) => {
+            const timer = setInterval(async () => {
+                const env = await (0, env_1.getEnvInfo)(envId);
+                if (env.Status === "NORMAL") {
+                    clearInterval(timer);
+                    clearInterval(increase);
+                    resolve();
+                }
+            }, 3000);
         });
+    }, {
+        startTip: ENV_INIT_TIP,
+        successTip: (0, i18n_1.t)('环境 {{envId}} 初始化成功', { envId })
     });
 }
 exports.checkEnvAvaliable = checkEnvAvaliable;
-function waitForServiceEnable() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve) => {
-            const timer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                const app = yield (0, net_1.getMangerService)();
-                try {
-                    const { Initialized } = yield app.env.checkTcbService();
-                    if (Initialized) {
-                        clearInterval(timer);
-                        setTimeout(() => {
-                            resolve();
-                        }, 5000);
-                    }
+async function waitForServiceEnable() {
+    return new Promise((resolve) => {
+        const timer = setInterval(async () => {
+            const app = await (0, net_1.getMangerService)();
+            try {
+                const { Initialized } = await app.env.checkTcbService();
+                if (Initialized) {
+                    clearInterval(timer);
+                    setTimeout(() => {
+                        resolve();
+                    }, 5000);
                 }
-                catch (e) {
-                    if (!(0, toolbox_1.isCamRefused)(e)) {
-                        throw e;
-                    }
+            }
+            catch (e) {
+                if (!(0, toolbox_1.isCamRefused)(e)) {
+                    throw e;
                 }
-            }), 3000);
-        });
+            }
+        }, 3000);
     });
 }

package/lib/utils/function-packer.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 };
 };
@@ -32,18 +23,16 @@ class FunctionPacker {
         this.ignore = ignore;
         this.funcPath = path_1.default.join(root, name);
     }
-    getFileCode() {
-        return __awaiter(this, void 0, void 0, function* () {
-            (0, toolbox_1.checkFullAccess)(this.funcPath, true);
-            this.tmpPath = path_1.default.join(this.root, `.cloudbase_tmp_${(0, tools_1.random)()}`);
-            this.funcDistPath = path_1.default.join(this.tmpPath, this.name);
-            yield (0, make_dir_1.default)(this.funcDistPath);
-            const zipPath = path_1.default.resolve(this.funcDistPath, 'dist.zip');
-            yield (0, toolbox_1.zipDir)(this.funcPath, zipPath, this.ignore);
-            const base64 = fs_1.default.readFileSync(zipPath).toString('base64');
-            this.clean();
-            return base64;
-        });
+    async getFileCode() {
+        (0, toolbox_1.checkFullAccess)(this.funcPath, true);
+        this.tmpPath = path_1.default.join(this.root, `.cloudbase_tmp_${(0, tools_1.random)()}`);
+        this.funcDistPath = path_1.default.join(this.tmpPath, this.name);
+        await (0, make_dir_1.default)(this.funcDistPath);
+        const zipPath = path_1.default.resolve(this.funcDistPath, 'dist.zip');
+        await (0, toolbox_1.zipDir)(this.funcPath, zipPath, this.ignore);
+        const base64 = fs_1.default.readFileSync(zipPath).toString('base64');
+        this.clean();
+        return base64;
     }
     getJavaFileCode() {
         const { funcPath } = this;
@@ -55,29 +44,27 @@ class FunctionPacker {
         const packagePath = jarExist ? `${funcPath}.jar` : `${funcPath}.zip`;
         return fs_1.default.readFileSync(packagePath).toString('base64');
     }
-    build(type) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (type === CodeType.JavaFile) {
-                try {
-                    const code = yield this.getJavaFileCode();
-                    return code;
-                }
-                catch (error) {
-                    this.clean();
-                    throw new toolbox_1.CloudBaseError((0, i18n_1.t)('函数代码打包失败：\n {{error}}', { error: error.message }));
-                }
+    async build(type) {
+        if (type === CodeType.JavaFile) {
+            try {
+                const code = await this.getJavaFileCode();
+                return code;
+            }
+            catch (error) {
+                this.clean();
+                throw new toolbox_1.CloudBaseError((0, i18n_1.t)('函数代码打包失败：\n {{error}}', { error: error.message }));
             }
-            if (type === CodeType.File) {
-                try {
-                    const code = yield this.getFileCode();
-                    return code;
-                }
-                catch (error) {
-                    this.clean();
-                    throw new toolbox_1.CloudBaseError((0, i18n_1.t)('函数代码打包失败：\n {{error}}', { error: error.message }));
-                }
+        }
+        if (type === CodeType.File) {
+            try {
+                const code = await this.getFileCode();
+                return code;
             }
-        });
+            catch (error) {
+                this.clean();
+                throw new toolbox_1.CloudBaseError((0, i18n_1.t)('函数代码打包失败：\n {{error}}', { error: error.message }));
+            }
+        }
     }
     clean() {
         this.funcDistPath && del_1.default.sync([this.funcDistPath], { force: true });

package/lib/utils/log.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 };
 };
@@ -67,18 +58,16 @@ class Logger {
         const clickLink = this.genClickableLink(link);
         this.info(clickLink);
     }
-    time(label, fn) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const promise = typeof fn === 'function' ? fn() : fn;
-            if (this.verboseEnabled) {
-                this.c.log(label);
-                console_1.Console.prototype.time.call(this.c, label);
-                const r = yield promise;
-                console_1.Console.prototype.timeEnd.call(this.c, label);
-                return r;
-            }
-            return promise;
-        });
+    async time(label, fn) {
+        const promise = typeof fn === 'function' ? fn() : fn;
+        if (this.verboseEnabled) {
+            this.c.log(label);
+            console_1.Console.prototype.time.call(this.c, label);
+            const r = await promise;
+            console_1.Console.prototype.timeEnd.call(this.c, label);
+            return r;
+        }
+        return promise;
     }
 }
 exports.Logger = Logger;