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

package/lib/commands/helpers/open.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-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 };
 };
@@ -49,32 +40,30 @@ let OpenLinkCommand = class OpenLinkCommand extends common_1.Command {
             withoutAuth: true
         };
     }
-    execute(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let openLink = null;
-            const link = params === null || params === void 0 ? void 0 : params[0];
-            if (link) {
-                openLink = links.find((item) => item.value === link);
-                if (!openLink) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('{{link}} 链接不存在！', { link }));
-                }
-            }
-            else {
-                const { selectLink } = yield inquirer_1.default.prompt({
-                    type: 'list',
-                    name: 'selectLink',
-                    message: (0, i18n_1.t)('请选择需要打开的链接'),
-                    choices: links
-                });
-                openLink = links.find((item) => item.value === selectLink);
-            }
+    async execute(params) {
+        let openLink = null;
+        const link = params === null || params === void 0 ? void 0 : params[0];
+        if (link) {
+            openLink = links.find((item) => item.value === link);
             if (!openLink) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请指定需要打开的链接！'));
+                throw new error_1.CloudBaseError((0, i18n_1.t)('{{link}} 链接不存在！', { link }));
             }
-            console.log((0, i18n_1.t)('在您的默认浏览器中打开 {{name}} 链接：', { name: openLink.name }));
-            console.log(chalk_1.default.underline.bold(openLink.url));
-            (0, open_1.default)(openLink.url);
-        });
+        }
+        else {
+            const { selectLink } = await inquirer_1.default.prompt({
+                type: 'list',
+                name: 'selectLink',
+                message: (0, i18n_1.t)('请选择需要打开的链接'),
+                choices: links
+            });
+            openLink = links.find((item) => item.value === selectLink);
+        }
+        if (!openLink) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请指定需要打开的链接！'));
+        }
+        console.log((0, i18n_1.t)('在您的默认浏览器中打开 {{name}} 链接：', { name: openLink.name }));
+        console.log(chalk_1.default.underline.bold(openLink.url));
+        (0, open_1.default)(openLink.url);
     }
 };
 __decorate([

package/lib/commands/hosting/hosting.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-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 };
 };
@@ -44,11 +35,9 @@ const HostingStatusMap = {
     create_fail: (0, i18n_1.t)('初始化失败'),
     destroy_fail: (0, i18n_1.t)('销毁失败')
 };
-function getHostingService(envId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { hosting } = yield (0, utils_1.getMangerService)(envId);
-        return hosting;
-    });
+async function getHostingService(envId) {
+    const { hosting } = await (0, utils_1.getMangerService)(envId);
+    return hosting;
 }
 let HostingDetail = class HostingDetail extends common_1.Command {
     get options() {
@@ -65,21 +54,19 @@ let HostingDetail = class HostingDetail extends common_1.Command {
             desc: (0, i18n_1.t)('查看静态网站服务信息')
         };
     }
-    execute(envId, log) {
+    async execute(envId, log) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const res = yield (0, hosting_1.getHostingInfo)({ envId });
-            const website = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a[0];
-            if (!website) {
-                yield (0, hosting_1.initHosting)({ envId });
-                return;
-            }
-            const link = (0, utils_1.genClickableLink)(`https://${website.cdnDomain}`);
-            if (website.status !== 'offline') {
-                log.info((0, i18n_1.t)('静态网站域名：{{link}}', { link }));
-            }
-            log.info((0, i18n_1.t)('静态网站状态：【{{status}}】', { status: HostingStatusMap[website.status] }));
-        });
+        const res = await (0, hosting_1.getHostingInfo)({ envId });
+        const website = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a[0];
+        if (!website) {
+            await (0, hosting_1.initHosting)({ envId });
+            return;
+        }
+        const link = (0, utils_1.genClickableLink)(`https://${website.cdnDomain}`);
+        if (website.status !== 'offline') {
+            log.info((0, i18n_1.t)('静态网站域名：{{link}}', { link }));
+        }
+        log.info((0, i18n_1.t)('静态网站状态：【{{status}}】', { status: HostingStatusMap[website.status] }));
     }
 };
 __decorate([
@@ -109,74 +96,72 @@ let HostingDeploy = class HostingDeploy extends common_1.Command {
             desc: (0, i18n_1.t)('部署静态网站文件')
         };
     }
-    execute(envId, params, log) {
+    async execute(envId, params, log) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const localPath = (params === null || params === void 0 ? void 0 : params[0]) || '.';
-            const cloudPath = (params === null || params === void 0 ? void 0 : params[1]) || '';
-            log.verbose((0, i18n_1.t)('本地目录'), localPath);
-            const resolveLocalPath = path_1.default.resolve(localPath);
-            (0, utils_1.checkFullAccess)(resolveLocalPath, true);
-            const isDir = (0, utils_1.isDirectory)(resolveLocalPath);
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('准备上传中...'));
-            let totalFiles = 0;
-            if (isDir) {
-                let files = yield (0, hosting_1.walkLocalDir)(envId, resolveLocalPath);
-                files = files.filter((item) => !(0, utils_1.isDirectory)(item));
-                totalFiles = files.length;
-            }
-            const onProgress = (0, utils_1.createUploadProgressBar)(() => {
-                !isDir && log.success((0, i18n_1.t)('文件部署成功！'));
-            }, () => {
-                loading.stop();
-            });
-            const successFiles = [];
-            const failedFiles = [];
-            yield (0, hosting_1.hostingDeploy)({
-                filePath: resolveLocalPath,
-                cloudPath,
-                envId,
-                isDir,
-                onProgress,
-                onFileFinish: (...args) => {
-                    const error = args[0];
-                    const fileInfo = args[2];
-                    if (error) {
-                        failedFiles.push(fileInfo.Key);
-                    }
-                    else {
-                        successFiles.push(fileInfo.Key);
-                    }
+        const localPath = (params === null || params === void 0 ? void 0 : params[0]) || '.';
+        const cloudPath = (params === null || params === void 0 ? void 0 : params[1]) || '';
+        log.verbose((0, i18n_1.t)('本地目录'), localPath);
+        const resolveLocalPath = path_1.default.resolve(localPath);
+        (0, utils_1.checkFullAccess)(resolveLocalPath, true);
+        const isDir = (0, utils_1.isDirectory)(resolveLocalPath);
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('准备上传中...'));
+        let totalFiles = 0;
+        if (isDir) {
+            let files = await (0, hosting_1.walkLocalDir)(envId, resolveLocalPath);
+            files = files.filter((item) => !(0, utils_1.isDirectory)(item));
+            totalFiles = files.length;
+        }
+        const onProgress = (0, utils_1.createUploadProgressBar)(() => {
+            !isDir && log.success((0, i18n_1.t)('文件部署成功！'));
+        }, () => {
+            loading.stop();
+        });
+        const successFiles = [];
+        const failedFiles = [];
+        await (0, hosting_1.hostingDeploy)({
+            filePath: resolveLocalPath,
+            cloudPath,
+            envId,
+            isDir,
+            onProgress,
+            onFileFinish: (...args) => {
+                const error = args[0];
+                const fileInfo = args[2];
+                if (error) {
+                    failedFiles.push(fileInfo.Key);
                 }
-            });
-            const info = yield (0, hosting_1.getHostingInfo)({
-                envId
-            });
-            const website = (_a = info === null || info === void 0 ? void 0 : info.data) === null || _a === void 0 ? void 0 : _a[0];
-            const link = (0, utils_1.genClickableLink)(`https://${website.cdnDomain}`);
-            log.success((0, i18n_1.t)('\n部署完成 👉 {{link}}', { link }));
-            if (isDir) {
-                log.success((0, i18n_1.t)('文件共计 {{totalFiles}} 个', { totalFiles }));
-                log.success((0, i18n_1.t)('文件上传成功 {{count}} 个', { count: successFiles.length }));
+                else {
+                    successFiles.push(fileInfo.Key);
+                }
+            }
+        });
+        const info = await (0, hosting_1.getHostingInfo)({
+            envId
+        });
+        const website = (_a = info === null || info === void 0 ? void 0 : info.data) === null || _a === void 0 ? void 0 : _a[0];
+        const link = (0, utils_1.genClickableLink)(`https://${website.cdnDomain}`);
+        log.success((0, i18n_1.t)('\n部署完成 👉 {{link}}', { link }));
+        if (isDir) {
+            log.success((0, i18n_1.t)('文件共计 {{totalFiles}} 个', { totalFiles }));
+            log.success((0, i18n_1.t)('文件上传成功 {{count}} 个', { count: successFiles.length }));
+            if (totalFiles <= 50) {
+                (0, utils_1.printHorizontalTable)([(0, i18n_1.t)('状态'), (0, i18n_1.t)('文件')], successFiles.map((item) => [log_symbols_1.default.success, item]));
+            }
+            log.error((0, i18n_1.t)('文件上传失败 {{count}} 个', { count: failedFiles.length }));
+            if (failedFiles.length) {
                 if (totalFiles <= 50) {
-                    (0, utils_1.printHorizontalTable)([(0, i18n_1.t)('状态'), (0, i18n_1.t)('文件')], successFiles.map((item) => [log_symbols_1.default.success, item]));
+                    (0, utils_1.printHorizontalTable)([(0, i18n_1.t)('状态'), (0, i18n_1.t)('文件')], failedFiles.map((item) => [log_symbols_1.default.error, item]));
                 }
-                log.error((0, i18n_1.t)('文件上传失败 {{count}} 个', { count: failedFiles.length }));
-                if (failedFiles.length) {
-                    if (totalFiles <= 50) {
-                        (0, utils_1.printHorizontalTable)([(0, i18n_1.t)('状态'), (0, i18n_1.t)('文件')], failedFiles.map((item) => [log_symbols_1.default.error, item]));
-                    }
-                    else {
-                        const errorLogPath = path_1.default.resolve('./cloudbase-error.log');
-                        log.error((0, i18n_1.t)('上传失败文件：'));
-                        console.log(errorLogPath);
-                        fs_1.default.writeFileSync(errorLogPath, failedFiles.join('\n'));
-                    }
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('部分文件上传失败，进程退出'));
+                else {
+                    const errorLogPath = path_1.default.resolve('./cloudbase-error.log');
+                    log.error((0, i18n_1.t)('上传失败文件：'));
+                    console.log(errorLogPath);
+                    fs_1.default.writeFileSync(errorLogPath, failedFiles.join('\n'));
                 }
+                throw new error_1.CloudBaseError((0, i18n_1.t)('部分文件上传失败，进程退出'));
             }
-        });
+        }
     }
 };
 __decorate([
@@ -211,41 +196,39 @@ let HostingDeleteFiles = class HostingDeleteFiles extends common_1.Command {
             desc: (0, i18n_1.t)('删除静态网站文件/文件夹，文件夹需指定 --dir 选项')
         };
     }
-    execute(envId, options, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cloudPath = (params === null || params === void 0 ? void 0 : params[0]) || '';
-            let isDir = options.dir;
-            if (!cloudPath) {
-                const { confirm } = yield inquirer_1.default.prompt({
-                    type: 'confirm',
-                    name: 'confirm',
-                    message: (0, i18n_1.t)('指定云端路径为空，将会删除所有文件，是否继续'),
-                    default: false
-                });
-                if (!confirm) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('操作终止！'));
-                }
-                isDir = true;
-            }
-            if (cloudPath === '/') {
-                isDir = true;
-            }
-            const fileText = isDir ? (0, i18n_1.t)('文件夹') : (0, i18n_1.t)('文件');
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('删除{{fileText}}中...', { fileText }));
-            try {
-                yield (0, hosting_1.hostingDelete)({
-                    envId,
-                    isDir,
-                    cloudPath
-                });
-                loading.succeed((0, i18n_1.t)('删除{{fileText}}成功！', { fileText }));
-            }
-            catch (e) {
-                loading.fail((0, i18n_1.t)('删除{{fileText}}失败！', { fileText }));
-                throw new error_1.CloudBaseError(e.message);
+    async execute(envId, options, params) {
+        const cloudPath = (params === null || params === void 0 ? void 0 : params[0]) || '';
+        let isDir = options.dir;
+        if (!cloudPath) {
+            const { confirm } = await inquirer_1.default.prompt({
+                type: 'confirm',
+                name: 'confirm',
+                message: (0, i18n_1.t)('指定云端路径为空，将会删除所有文件，是否继续'),
+                default: false
+            });
+            if (!confirm) {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('操作终止！'));
             }
-        });
+            isDir = true;
+        }
+        if (cloudPath === '/') {
+            isDir = true;
+        }
+        const fileText = isDir ? (0, i18n_1.t)('文件夹') : (0, i18n_1.t)('文件');
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('删除{{fileText}}中...', { fileText }));
+        try {
+            await (0, hosting_1.hostingDelete)({
+                envId,
+                isDir,
+                cloudPath
+            });
+            loading.succeed((0, i18n_1.t)('删除{{fileText}}成功！', { fileText }));
+        }
+        catch (e) {
+            loading.fail((0, i18n_1.t)('删除{{fileText}}失败！', { fileText }));
+            throw new error_1.CloudBaseError(e.message);
+        }
     }
 };
 __decorate([
@@ -276,33 +259,31 @@ let HostingList = class HostingList extends common_1.Command {
             desc: (0, i18n_1.t)('展示文件列表')
         };
     }
-    execute(envId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('获取文件列表中...'));
-            try {
-                const list = yield (0, hosting_1.hostingList)({
-                    envId
-                });
-                loading.stop();
-                const head = [(0, i18n_1.t)('序号'), (0, i18n_1.t)('Key'), (0, i18n_1.t)('LastModified'), (0, i18n_1.t)('ETag'), (0, i18n_1.t)('Size(KB)')];
-                const notDir = (item) => !(Number(item.Size) === 0 && /\/$/g.test(item.Key));
-                const tableData = list
-                    .filter(notDir)
-                    .map((item, index) => [
-                    index + 1,
-                    item.Key,
-                    (0, utils_1.formatDate)(item.LastModified, 'yyyy-MM-dd hh:mm:ss'),
-                    item.ETag,
-                    String((0, utils_1.formateFileSize)(item.Size, 'KB'))
-                ]);
-                (0, utils_1.printHorizontalTable)(head, tableData);
-            }
-            catch (e) {
-                loading.fail((0, i18n_1.t)('获取文件列表失败！'));
-                throw new error_1.CloudBaseError(e.message);
-            }
-        });
+    async execute(envId) {
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('获取文件列表中...'));
+        try {
+            const list = await (0, hosting_1.hostingList)({
+                envId
+            });
+            loading.stop();
+            const head = [(0, i18n_1.t)('序号'), (0, i18n_1.t)('Key'), (0, i18n_1.t)('LastModified'), (0, i18n_1.t)('ETag'), (0, i18n_1.t)('Size(KB)')];
+            const notDir = (item) => !(Number(item.Size) === 0 && /\/$/g.test(item.Key));
+            const tableData = list
+                .filter(notDir)
+                .map((item, index) => [
+                index + 1,
+                item.Key,
+                (0, utils_1.formatDate)(item.LastModified, 'yyyy-MM-dd hh:mm:ss'),
+                item.ETag,
+                String((0, utils_1.formateFileSize)(item.Size, 'KB'))
+            ]);
+            (0, utils_1.printHorizontalTable)(head, tableData);
+        }
+        catch (e) {
+            loading.fail((0, i18n_1.t)('获取文件列表失败！'));
+            throw new error_1.CloudBaseError(e.message);
+        }
     }
 };
 __decorate([
@@ -334,33 +315,31 @@ let HostingDownloadCommand = class HostingDownloadCommand extends common_1.Comma
             desc: (0, i18n_1.t)('下载文件/文件夹，文件夹需指定 --dir 选项')
         };
     }
-    execute(envId, options, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let cloudPath = params === null || params === void 0 ? void 0 : params[0];
-            const localPath = (params === null || params === void 0 ? void 0 : params[1]) || '.';
-            const hostingService = yield getHostingService(envId);
-            const resolveLocalPath = path_1.default.resolve(localPath);
-            const { dir } = options;
-            const fileText = dir ? (0, i18n_1.t)('文件夹') : (0, i18n_1.t)('文件');
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('下载{{fileText}}中', { fileText }));
-            if (/^\/.+/.test(cloudPath)) {
-                cloudPath = cloudPath.slice(1);
-            }
-            if (dir) {
-                yield hostingService.downloadDirectory({
-                    cloudPath,
-                    localPath: resolveLocalPath
-                });
-            }
-            else {
-                yield hostingService.downloadFile({
-                    cloudPath,
-                    localPath: resolveLocalPath
-                });
-            }
-            loading.succeed((0, i18n_1.t)('下载{{fileText}}成功！', { fileText }));
-        });
+    async execute(envId, options, params) {
+        let cloudPath = params === null || params === void 0 ? void 0 : params[0];
+        const localPath = (params === null || params === void 0 ? void 0 : params[1]) || '.';
+        const hostingService = await getHostingService(envId);
+        const resolveLocalPath = path_1.default.resolve(localPath);
+        const { dir } = options;
+        const fileText = dir ? (0, i18n_1.t)('文件夹') : (0, i18n_1.t)('文件');
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('下载{{fileText}}中', { fileText }));
+        if (/^\/.+/.test(cloudPath)) {
+            cloudPath = cloudPath.slice(1);
+        }
+        if (dir) {
+            await hostingService.downloadDirectory({
+                cloudPath,
+                localPath: resolveLocalPath
+            });
+        }
+        else {
+            await hostingService.downloadFile({
+                cloudPath,
+                localPath: resolveLocalPath
+            });
+        }
+        loading.succeed((0, i18n_1.t)('下载{{fileText}}成功！', { fileText }));
     }
 };
 __decorate([

package/lib/commands/index.js

@@ -36,3 +36,4 @@ __exportStar(require("./ai"), exports);
 __exportStar(require("./pull"), exports);
 __exportStar(require("./self-update"), exports);
 __exportStar(require("./config"), exports);
+__exportStar(require("./ag"), exports);