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

package/lib/utils/template.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 };
 };
@@ -27,105 +18,99 @@ const reporter_1 = require("./reporter");
 const i18n_1 = require("../i18n");
 const listUrl = 'https://tcli.service.tcloudbase.com/templates';
 const getTemplateAddress = (templatePath) => `https://7463-tcli-1258016615.tcb.qcloud.la/cloudbase-templates/${templatePath}.zip`;
-function downloadTemplate(options = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let { templateUri, appName, newProject, projectPath = process.cwd() } = options;
-        const templates = yield (0, output_1.execWithLoading)(() => (0, net_1.fetch)(listUrl), {
-            startTip: (0, i18n_1.t)('获取应用模板列表中')
+async function downloadTemplate(options = {}) {
+    let { templateUri, appName, newProject, projectPath = process.cwd() } = options;
+    const templates = await (0, output_1.execWithLoading)(() => (0, net_1.fetch)(listUrl), {
+        startTip: (0, i18n_1.t)('获取应用模板列表中')
+    });
+    let templateName;
+    let tempateId;
+    if (templateUri) {
+        tempateId = templateUri;
+    }
+    else {
+        const { selectTemplateName } = await (0, enquirer_1.prompt)({
+            type: 'select',
+            name: 'selectTemplateName',
+            message: (0, i18n_1.t)('请选择应用模板'),
+            choices: templates.map((item) => item.name)
         });
-        let templateName;
-        let tempateId;
-        if (templateUri) {
-            tempateId = templateUri;
-        }
-        else {
-            const { selectTemplateName } = yield (0, enquirer_1.prompt)({
-                type: 'select',
-                name: 'selectTemplateName',
-                message: (0, i18n_1.t)('请选择应用模板'),
-                choices: templates.map((item) => item.name)
+        templateName = selectTemplateName;
+    }
+    const selectedTemplate = templateName
+        ? templates.find((item) => item.name === templateName)
+        : templates.find((item) => item.path === tempateId);
+    if (!selectedTemplate) {
+        log_1.logger.info((0, i18n_1.t)('模板 `{{template}}` 不存在', { template: templateName || tempateId }));
+        return;
+    }
+    if (newProject) {
+        if (!appName) {
+            const { projectName } = await (0, enquirer_1.prompt)({
+                type: 'input',
+                name: 'projectName',
+                message: (0, i18n_1.t)('请输入项目名称'),
+                initial: selectedTemplate.path
             });
-            templateName = selectTemplateName;
-        }
-        const selectedTemplate = templateName
-            ? templates.find((item) => item.name === templateName)
-            : templates.find((item) => item.path === tempateId);
-        if (!selectedTemplate) {
-            log_1.logger.info((0, i18n_1.t)('模板 `{{template}}` 不存在', { template: templateName || tempateId }));
-            return;
+            appName = projectName;
         }
-        if (newProject) {
-            if (!appName) {
-                const { projectName } = yield (0, enquirer_1.prompt)({
-                    type: 'input',
-                    name: 'projectName',
-                    message: (0, i18n_1.t)('请输入项目名称'),
-                    initial: selectedTemplate.path
-                });
-                appName = projectName;
+        projectPath = path_1.default.join(process.cwd(), appName);
+        if ((0, fs_2.checkFullAccess)(projectPath)) {
+            const { cover } = await (0, enquirer_1.prompt)({
+                type: 'confirm',
+                name: 'cover',
+                message: (0, i18n_1.t)('已存在同名文件夹：{{name}}，是否覆盖？', { name: appName }),
+                initial: false
+            });
+            if (!cover) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('操作终止！'));
             }
-            projectPath = path_1.default.join(process.cwd(), appName);
-            if ((0, fs_2.checkFullAccess)(projectPath)) {
-                const { cover } = yield (0, enquirer_1.prompt)({
-                    type: 'confirm',
-                    name: 'cover',
-                    message: (0, i18n_1.t)('已存在同名文件夹：{{name}}，是否覆盖？', { name: appName }),
-                    initial: false
-                });
-                if (!cover) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('操作终止！'));
-                }
-                else {
-                    fs_extra_1.default.removeSync(projectPath);
-                }
+            else {
+                fs_extra_1.default.removeSync(projectPath);
             }
         }
-        yield (0, output_1.execWithLoading)(() => __awaiter(this, void 0, void 0, function* () {
-            yield (0, reporter_1.templateDownloadReport)(selectedTemplate.path, selectedTemplate.name);
-            yield extractTemplate(projectPath, selectedTemplate.path, selectedTemplate.url);
-        }), {
-            startTip: (0, i18n_1.t)('下载文件中')
-        });
-        return projectPath;
+    }
+    await (0, output_1.execWithLoading)(async () => {
+        await (0, reporter_1.templateDownloadReport)(selectedTemplate.path, selectedTemplate.name);
+        await extractTemplate(projectPath, selectedTemplate.path, selectedTemplate.url);
+    }, {
+        startTip: (0, i18n_1.t)('下载文件中')
     });
+    return projectPath;
 }
 exports.downloadTemplate = downloadTemplate;
-function extractTemplate(projectPath, templatePath, remoteUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const url = remoteUrl || getTemplateAddress(templatePath);
-        return (0, net_1.fetchStream)(url).then((res) => __awaiter(this, void 0, void 0, function* () {
-            if (!res) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请求异常'));
-            }
-            if (res.status !== 200) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('未找到文件'));
-            }
-            yield (0, toolbox_1.unzipStream)(res.body, projectPath);
-        }));
+async function extractTemplate(projectPath, templatePath, remoteUrl) {
+    const url = remoteUrl || getTemplateAddress(templatePath);
+    return (0, net_1.fetchStream)(url).then(async (res) => {
+        if (!res) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请求异常'));
+        }
+        if (res.status !== 200) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('未找到文件'));
+        }
+        await (0, toolbox_1.unzipStream)(res.body, projectPath);
     });
 }
 exports.extractTemplate = extractTemplate;
-function initProjectConfig(envId, region, projectPath = process.cwd()) {
+async function initProjectConfig(envId, region, projectPath = process.cwd()) {
     var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        let filepath = (_a = (yield (0, toolbox_1.searchConfig)(projectPath))) === null || _a === void 0 ? void 0 : _a.filepath;
-        if (!filepath) {
-            fs_1.default.writeFileSync(path_1.default.join(projectPath, 'cloudbaserc.json'), JSON.stringify({
-                envId,
-                region,
-                version: '2.0',
-                $schema: 'https://framework-1258016615.tcloudbaseapp.com/schema/latest.json'
-            }));
-        }
-        else {
-            const configContent = fs_1.default.readFileSync(filepath).toString();
-            fs_1.default.writeFileSync(filepath, configContent.replace('{{envId}}', envId));
-            const configPath = filepath || path_1.default.join(projectPath, 'cloudbaserc.json');
-            const parser = new toolbox_1.ConfigParser({
-                configPath
-            });
-            parser.update('region', region);
-        }
-    });
+    let filepath = (_a = (await (0, toolbox_1.searchConfig)(projectPath))) === null || _a === void 0 ? void 0 : _a.filepath;
+    if (!filepath) {
+        fs_1.default.writeFileSync(path_1.default.join(projectPath, 'cloudbaserc.json'), JSON.stringify({
+            envId,
+            region,
+            version: '2.0',
+            $schema: 'https://framework-1258016615.tcloudbaseapp.com/schema/latest.json'
+        }));
+    }
+    else {
+        const configContent = fs_1.default.readFileSync(filepath).toString();
+        fs_1.default.writeFileSync(filepath, configContent.replace('{{envId}}', envId));
+        const configPath = filepath || path_1.default.join(projectPath, 'cloudbaserc.json');
+        const parser = new toolbox_1.ConfigParser({
+            configPath
+        });
+        parser.update('region', region);
+    }
 }
 exports.initProjectConfig = initProjectConfig;

package/lib/utils/tools/common.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 };
 };
@@ -18,56 +9,54 @@ const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const unzipper_1 = __importDefault(require("unzipper"));
 const i18n_1 = require("../../i18n");
-function downloadAndExtractRemoteZip(downloadUrl, targetPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const downloadResponse = yield (0, toolbox_1.fetchStream)(downloadUrl);
-        if (!downloadResponse.ok) {
-            throw new Error((0, i18n_1.t)('下载失败，状态码: {{status}}', { status: downloadResponse.status }));
-        }
-        if (!downloadResponse.body) {
-            throw new Error((0, i18n_1.t)('下载响应中没有数据流'));
-        }
-        const dirPath = path_1.default.resolve(targetPath);
-        yield fs_extra_1.default.ensureDir(dirPath);
-        yield new Promise((resolve, reject) => {
-            let totalEntries = 0;
-            let processedEntries = 0;
-            downloadResponse
-                .body.pipe(unzipper_1.default.Parse())
-                .on('error', reject)
-                .on('entry', (entry) => __awaiter(this, void 0, void 0, function* () {
-                const filePath = path_1.default.join(dirPath, entry.path);
-                totalEntries++;
-                try {
-                    yield fs_extra_1.default.ensureDir(path_1.default.dirname(filePath));
-                    if (entry.type === 'Directory') {
-                        yield fs_extra_1.default.ensureDir(filePath);
+async function downloadAndExtractRemoteZip(downloadUrl, targetPath) {
+    const downloadResponse = await (0, toolbox_1.fetchStream)(downloadUrl);
+    if (!downloadResponse.ok) {
+        throw new Error((0, i18n_1.t)('下载失败，状态码: {{status}}', { status: downloadResponse.status }));
+    }
+    if (!downloadResponse.body) {
+        throw new Error((0, i18n_1.t)('下载响应中没有数据流'));
+    }
+    const dirPath = path_1.default.resolve(targetPath);
+    await fs_extra_1.default.ensureDir(dirPath);
+    await new Promise((resolve, reject) => {
+        let totalEntries = 0;
+        let processedEntries = 0;
+        downloadResponse
+            .body.pipe(unzipper_1.default.Parse())
+            .on('error', reject)
+            .on('entry', async (entry) => {
+            const filePath = path_1.default.join(dirPath, entry.path);
+            totalEntries++;
+            try {
+                await fs_extra_1.default.ensureDir(path_1.default.dirname(filePath));
+                if (entry.type === 'Directory') {
+                    await fs_extra_1.default.ensureDir(filePath);
+                    processedEntries++;
+                }
+                else {
+                    entry
+                        .pipe(fs_extra_1.default.createWriteStream(filePath))
+                        .on('error', reject)
+                        .on('finish', () => {
                         processedEntries++;
-                    }
-                    else {
-                        entry
-                            .pipe(fs_extra_1.default.createWriteStream(filePath))
-                            .on('error', reject)
-                            .on('finish', () => {
-                            processedEntries++;
-                        });
-                    }
+                    });
+                }
+            }
+            catch (err) {
+                reject(err);
+            }
+        })
+            .on('close', () => {
+            const checkProcessed = () => {
+                if (processedEntries === totalEntries) {
+                    resolve('');
                 }
-                catch (err) {
-                    reject(err);
+                else {
+                    setTimeout(checkProcessed, 10);
                 }
-            }))
-                .on('close', () => {
-                const checkProcessed = () => {
-                    if (processedEntries === totalEntries) {
-                        resolve('');
-                    }
-                    else {
-                        setTimeout(checkProcessed, 10);
-                    }
-                };
-                checkProcessed();
-            });
+            };
+            checkProcessed();
         });
     });
 }

package/lib/utils/tools/time.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.sleep = exports.formatDate = void 0;
 function formatDate(dateParam, fmtParam) {
@@ -37,13 +28,11 @@ function formatDate(dateParam, fmtParam) {
     return fmt;
 }
 exports.formatDate = formatDate;
-function sleep(time) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise(resolve => {
-            setTimeout(() => {
-                resolve();
-            }, time);
-        });
+async function sleep(time) {
+    return new Promise(resolve => {
+        setTimeout(() => {
+            resolve();
+        }, time);
     });
 }
 exports.sleep = sleep;

package/lib/utils/url.js

@@ -9,10 +9,16 @@ exports.EDomain = {
     Tcb: (0, i18n_1.isIntl)() ? 'tcb.tencentcloud.com' : 'tcb.cloud.tencent.com',
     Docs: 'docs.cloudbase.net'
 };
-exports.EUrl = Object.assign(Object.assign({}, ((domains) => Object.keys(domains).reduce((acc, key) => {
-    acc[key] = `https://${domains[key]}`;
-    return acc;
-}, {}))(exports.EDomain)), { Docs: `https://${exports.EDomain.Docs}` + ((0, i18n_1.isIntl)() ? '/en' : ''), DevPlatform: `https://${exports.EDomain.Tcb}/dev`, TcbConsole: `https://${exports.EDomain.Console}/tcb`, CloudAdmin: `https://${exports.EDomain.Tcb}/cloud-admin` });
+exports.EUrl = {
+    ...((domains) => Object.keys(domains).reduce((acc, key) => {
+        acc[key] = `https://${domains[key]}`;
+        return acc;
+    }, {}))(exports.EDomain),
+    Docs: `https://${exports.EDomain.Docs}` + ((0, i18n_1.isIntl)() ? '/en' : ''),
+    DevPlatform: `https://${exports.EDomain.Tcb}/dev`,
+    TcbConsole: `https://${exports.EDomain.Console}/tcb`,
+    CloudAdmin: `https://${exports.EDomain.Tcb}/cloud-admin`
+};
 function getGatewayUrl(envId) {
     return `https://${envId}.${exports.EDomain.Gateway}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.10.0-beta.0",
+    "version": "2.11.0-beta.0",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -55,7 +55,7 @@
         "@cloudbase/functions-framework": "1.16.0",
         "@cloudbase/iac-core": "0.0.3-alpha.11",
         "@cloudbase/lowcode-cli": "^0.23.0",
-        "@cloudbase/manager-node": "4.6.5",
+        "@cloudbase/manager-node": "4.7.0-beta.0",
         "@cloudbase/toolbox": "^0.7.9",
         "@dotenvx/dotenvx": "^1.48.3",
         "@musistudio/claude-code-router": "1.0.36",