@cloudbase/cli 2.10.0 → 2.11.0-beta.0

package/lib/commands/self-update.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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 };
 };
@@ -40,33 +31,31 @@ let SelfUpdateCommand = class SelfUpdateCommand extends common_1.Command {
             ]
         };
     }
-    execute(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const version = ctx.options.version || 'latest';
-            const channel = ctx.options.channel || 'stable';
-            const base = ctx.options.downloadBase || process.env.DOWNLOAD_BASE || 'https://static.cloudbase.net/cli';
-            const home = os_1.default.homedir();
-            const root = path_1.default.join(home, '.local/share/cloudbase-cli');
-            const installer = path_1.default.join(root, 'current', 'install.sh');
-            let installerCmd;
-            try {
-                if (fs_1.default.existsSync(installer)) {
-                    installerCmd = `${installer}`;
-                }
-                else {
-                    installerCmd = `bash -c "curl -fsSL ${base}/install | bash"`;
-                }
-                const env = [
-                    `DOWNLOAD_BASE=${base}`,
-                    `CHANNEL=${channel}`,
-                    `VERSION=${version}`
-                ].join(' ');
-                (0, child_process_1.execSync)(`${env} ${installerCmd}`, { stdio: 'inherit' });
+    async execute(ctx) {
+        const version = ctx.options.version || 'latest';
+        const channel = ctx.options.channel || 'stable';
+        const base = ctx.options.downloadBase || process.env.DOWNLOAD_BASE || 'https://static.cloudbase.net/cli';
+        const home = os_1.default.homedir();
+        const root = path_1.default.join(home, '.local/share/cloudbase-cli');
+        const installer = path_1.default.join(root, 'current', 'install.sh');
+        let installerCmd;
+        try {
+            if (fs_1.default.existsSync(installer)) {
+                installerCmd = `${installer}`;
             }
-            catch (e) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('自更新失败：{{error}}', { error: (e === null || e === void 0 ? void 0 : e.message) || e }));
+            else {
+                installerCmd = `bash -c "curl -fsSL ${base}/install | bash"`;
             }
-        });
+            const env = [
+                `DOWNLOAD_BASE=${base}`,
+                `CHANNEL=${channel}`,
+                `VERSION=${version}`
+            ].join(' ');
+            (0, child_process_1.execSync)(`${env} ${installerCmd}`, { stdio: 'inherit' });
+        }
+        catch (e) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('自更新失败：{{error}}', { error: (e === null || e === void 0 ? void 0 : e.message) || e }));
+        }
     }
 };
 SelfUpdateCommand = __decorate([
@@ -83,49 +72,47 @@ let RollbackCommand = class RollbackCommand extends common_1.Command {
             options: []
         };
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const home = os_1.default.homedir();
-            const root = path_1.default.join(home, '.local/share/cloudbase-cli');
-            const versionsDir = path_1.default.join(root, 'versions');
-            if (!fs_1.default.existsSync(versionsDir)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('未找到已安装版本目录，无法回滚'));
-            }
-            const entries = fs_1.default.readdirSync(versionsDir)
-                .filter((n) => !n.startsWith('.') && fs_1.default.statSync(path_1.default.join(versionsDir, n)).isDirectory())
-                .sort();
-            if (entries.length < 2) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('没有可回滚的历史版本'));
-            }
-            const target = entries[entries.length - 2];
-            const currentLink = path_1.default.join(root, 'current');
-            try {
-                const binDir = path_1.default.join(os_1.default.homedir(), '.local/bin');
-                const targetDir = path_1.default.join(versionsDir, target);
-                const map = [
-                    ['cloudbase', 'bin/cloudbase'],
-                    ['tcb', 'bin/tcb'],
-                    ['cloudbase-mcp', 'bin/cloudbase-mcp']
-                ];
-                for (const [name, rel] of map) {
-                    const link = path_1.default.join(binDir, name);
-                    try {
-                        fs_1.default.unlinkSync(link);
-                    }
-                    catch (_) { }
-                    fs_1.default.symlinkSync(path_1.default.join(targetDir, rel), link);
-                }
+    async execute() {
+        const home = os_1.default.homedir();
+        const root = path_1.default.join(home, '.local/share/cloudbase-cli');
+        const versionsDir = path_1.default.join(root, 'versions');
+        if (!fs_1.default.existsSync(versionsDir)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('未找到已安装版本目录，无法回滚'));
+        }
+        const entries = fs_1.default.readdirSync(versionsDir)
+            .filter((n) => !n.startsWith('.') && fs_1.default.statSync(path_1.default.join(versionsDir, n)).isDirectory())
+            .sort();
+        if (entries.length < 2) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('没有可回滚的历史版本'));
+        }
+        const target = entries[entries.length - 2];
+        const currentLink = path_1.default.join(root, 'current');
+        try {
+            const binDir = path_1.default.join(os_1.default.homedir(), '.local/bin');
+            const targetDir = path_1.default.join(versionsDir, target);
+            const map = [
+                ['cloudbase', 'bin/cloudbase'],
+                ['tcb', 'bin/tcb'],
+                ['cloudbase-mcp', 'bin/cloudbase-mcp']
+            ];
+            for (const [name, rel] of map) {
+                const link = path_1.default.join(binDir, name);
                 try {
-                    fs_1.default.unlinkSync(currentLink);
+                    fs_1.default.unlinkSync(link);
                 }
                 catch (_) { }
-                fs_1.default.symlinkSync(targetDir, currentLink);
-                console.log((0, i18n_1.t)('已回滚到版本: {{version}}', { version: target }));
+                fs_1.default.symlinkSync(path_1.default.join(targetDir, rel), link);
             }
-            catch (e) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('回滚失败：{{error}}', { error: (e === null || e === void 0 ? void 0 : e.message) || e }));
+            try {
+                fs_1.default.unlinkSync(currentLink);
             }
-        });
+            catch (_) { }
+            fs_1.default.symlinkSync(targetDir, currentLink);
+            console.log((0, i18n_1.t)('已回滚到版本: {{version}}', { version: target }));
+        }
+        catch (e) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('回滚失败：{{error}}', { error: (e === null || e === void 0 ? void 0 : e.message) || e }));
+        }
     }
 };
 RollbackCommand = __decorate([

package/lib/commands/smart.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 };
 };
@@ -48,77 +39,73 @@ const Hosting = __importStar(require("../hosting"));
 const Function = __importStar(require("../function"));
 const auth_1 = require("../auth");
 const i18n_1 = require("../i18n");
-function smartDeploy() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const loading = (0, utils_1.loadingFactory)();
-        loading.start((0, i18n_1.t)('环境检测中'));
-        yield (0, auth_1.checkLogin)();
-        yield (0, utils_1.checkTcbService)();
-        const files = fs_1.default.readdirSync(process.cwd());
-        loading.stop();
-        const home = os_1.default.homedir();
-        const current = process.cwd();
-        let relative = current;
-        if (current.indexOf(home) > -1) {
-            relative = path_1.default.relative(home, current);
-        }
-        let region = yield (0, toolbox_1.getRegion)(true);
-        if (!files.length) {
-            utils_1.logger.info((0, i18n_1.t)('当前目录为空，初始化云开发项目\n'));
-            region = yield (0, utils_1.getSelectRegion)();
-            const envId = yield (0, utils_1.getSelectedEnv)();
-            const projectPath = yield (0, utils_1.downloadTemplate)();
-            yield (0, utils_1.initProjectConfig)(envId, region, projectPath);
-            utils_1.logger.success((0, i18n_1.t)('初始化项目成功！\n'));
-        }
-        const { setup } = yield (0, enquirer_1.prompt)({
-            type: 'confirm',
-            name: 'setup',
-            message: (0, i18n_1.t)('是否使用云开发部署当前项目 <{{path}}> ？', { path: chalk_1.default.bold.cyan(relative) }),
-            initial: true
-        });
-        if (!setup) {
-            return;
-        }
-        const config = yield (0, utils_1.getCloudBaseConfig)();
-        let envId = config === null || config === void 0 ? void 0 : config.envId;
-        if (!(config === null || config === void 0 ? void 0 : config.region) && !region) {
-            region = yield (0, utils_1.getSelectRegion)();
-        }
-        if (!envId) {
-            envId = yield (0, utils_1.getSelectedEnv)();
-            fs_1.default.writeFileSync(path_1.default.join(process.cwd(), 'cloudbaserc.json'), JSON.stringify({
-                envId,
-                region,
-                version: '2.0',
-                $schema: 'https://framework-1258016615.tcloudbaseapp.com/schema/latest.json'
-            }));
-        }
-        const parser = new toolbox_1.ConfigParser();
-        parser.update('region', region);
-        yield callFramework(envId);
+async function smartDeploy() {
+    const loading = (0, utils_1.loadingFactory)();
+    loading.start((0, i18n_1.t)('环境检测中'));
+    await (0, auth_1.checkLogin)();
+    await (0, utils_1.checkTcbService)();
+    const files = fs_1.default.readdirSync(process.cwd());
+    loading.stop();
+    const home = os_1.default.homedir();
+    const current = process.cwd();
+    let relative = current;
+    if (current.indexOf(home) > -1) {
+        relative = path_1.default.relative(home, current);
+    }
+    let region = await (0, toolbox_1.getRegion)(true);
+    if (!files.length) {
+        utils_1.logger.info((0, i18n_1.t)('当前目录为空，初始化云开发项目\n'));
+        region = await (0, utils_1.getSelectRegion)();
+        const envId = await (0, utils_1.getSelectedEnv)();
+        const projectPath = await (0, utils_1.downloadTemplate)();
+        await (0, utils_1.initProjectConfig)(envId, region, projectPath);
+        utils_1.logger.success((0, i18n_1.t)('初始化项目成功！\n'));
+    }
+    const { setup } = await (0, enquirer_1.prompt)({
+        type: 'confirm',
+        name: 'setup',
+        message: (0, i18n_1.t)('是否使用云开发部署当前项目 <{{path}}> ？', { path: chalk_1.default.bold.cyan(relative) }),
+        initial: true
     });
+    if (!setup) {
+        return;
+    }
+    const config = await (0, utils_1.getCloudBaseConfig)();
+    let envId = config === null || config === void 0 ? void 0 : config.envId;
+    if (!(config === null || config === void 0 ? void 0 : config.region) && !region) {
+        region = await (0, utils_1.getSelectRegion)();
+    }
+    if (!envId) {
+        envId = await (0, utils_1.getSelectedEnv)();
+        fs_1.default.writeFileSync(path_1.default.join(process.cwd(), 'cloudbaserc.json'), JSON.stringify({
+            envId,
+            region,
+            version: '2.0',
+            $schema: 'https://framework-1258016615.tcloudbaseapp.com/schema/latest.json'
+        }));
+    }
+    const parser = new toolbox_1.ConfigParser();
+    parser.update('region', region);
+    await callFramework(envId);
 }
 exports.smartDeploy = smartDeploy;
-function callFramework(envId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const loginState = yield utils_1.authSupevisor.getLoginState();
-        const { token, secretId, secretKey } = loginState;
-        const config = yield (0, utils_1.getCloudBaseConfig)();
-        yield (0, framework_core_1.run)({
-            projectPath: process.cwd(),
-            cloudbaseConfig: {
-                secretId,
-                secretKey,
-                token,
-                envId
-            },
-            config,
-            logLevel: process.argv.includes('--verbose') ? 'debug' : 'info',
-            resourceProviders: {
-                hosting: Hosting,
-                function: Function
-            }
-        }, 'deploy', '');
-    });
+async function callFramework(envId) {
+    const loginState = await utils_1.authSupevisor.getLoginState();
+    const { token, secretId, secretKey } = loginState;
+    const config = await (0, utils_1.getCloudBaseConfig)();
+    await (0, framework_core_1.run)({
+        projectPath: process.cwd(),
+        cloudbaseConfig: {
+            secretId,
+            secretKey,
+            token,
+            envId
+        },
+        config,
+        logLevel: process.argv.includes('--verbose') ? 'debug' : 'info',
+        resourceProviders: {
+            hosting: Hosting,
+            function: Function
+        }
+    }, 'deploy', '');
 }