fix hosting bugs

chhpt · chhpt · commit 630bd334eaeb · 2019-12-06T11:39:26.000+08:00
diff --git a/lib/commands/hosting.js b/lib/commands/hosting.js
@@ -14,79 +14,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
 const commander_1 = __importDefault(require("commander"));
-const inquirer_1 = __importDefault(require("inquirer"));
 const hosting_1 = require("../hosting");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
-const logger_1 = require("../logger");
 const HostingStatusMap = {
     init: '初始化中',
     process: '处理中',
-    online: '上线',
+    online: '已上线',
     destroying: '销毁中',
-    offline: '下线',
+    offline: '已下线',
     create_fail: '初始化失败',
     destroy_fail: '销毁失败'
 };
-commander_1.default
-    .command('hosting:enable')
-    .option('-e, --envId [envId]', '环境 Id')
-    .description('开启静态网站服务')
-    .action((options) => __awaiter(void 0, void 0, void 0, function* () {
-    const { parent: { configFile }, envId } = options;
-    const assignEnvId = yield utils_1.getEnvId(envId, configFile);
-    const res = yield hosting_1.enableHosting({ envId: assignEnvId });
-    if (res.code === 0) {
-        logger_1.successLog('静态网站服务开启成功！');
-    }
-    else {
-        throw new error_1.CloudBaseError('静态网站服务失败！');
-    }
-}));
 commander_1.default
     .command('hosting:detail')
-    .option('-e, --envId [envId] [envId]', '环境 Id')
+    .option('-e, --envId [envId]', '环境 Id')
     .description('查看静态网站服务信息')
     .action((options) => __awaiter(void 0, void 0, void 0, function* () {
     const { parent: { configFile }, envId } = options;
     const assignEnvId = yield utils_1.getEnvId(envId, configFile);
     const res = yield hosting_1.getHostingInfo({ envId: assignEnvId });
     const website = res.data && res.data[0];
     if (!website) {
-        throw new error_1.CloudBaseError('你还没有开启静态网站服务，请使用 cloudbase hosting:enable 命令启用静态网站服务！');
+        throw new error_1.CloudBaseError('您还没有开启静态网站服务，请先到云开发控制台开启静态网站服务！\n 👉 https://console.cloud.tencent.com/tcb');
     }
     const url = `https://${website.cdnDomain}`;
-    console.log(`静态网站域名：${chalk_1.default.bold.underline(url)}\n静态网站状态：${HostingStatusMap[website.status]}`);
-}));
-commander_1.default
-    .command('hosting:destroy')
-    .option('-e, --envId [envId]', '环境 Id')
-    .description('关闭静态网站服务')
-    .action((options) => __awaiter(void 0, void 0, void 0, function* () {
-    const { parent: { configFile }, envId } = options;
-    const assignEnvId = yield utils_1.getEnvId(envId, configFile);
-    const { confirm } = yield inquirer_1.default.prompt({
-        type: 'confirm',
-        name: 'confirm',
-        message: '确定要关闭静态网站服务吗，关闭后您的所有静态网站资源将被销毁，无法恢复！',
-        default: false
-    });
-    if (!confirm) {
-        throw new error_1.CloudBaseError('操作终止！');
+    if (website.status === 'offline') {
+        console.log(`静态网站状态：${HostingStatusMap[website.status]}`);
     }
-    const loading = utils_1.loadingFactory();
-    loading.start('静态网站销毁中');
-    try {
-        const res = yield hosting_1.destroyHosting({ envId: assignEnvId });
-        if (res.code === 0) {
-            loading.succeed('静态网站服务销毁中...');
-        }
-        else {
-            loading.fail('静态网站服务销毁失败！');
-        }
-    }
-    catch (e) {
-        loading.fail(e.message || '静态网站服务销毁失败！');
+    else {
+        console.log(`静态网站域名：${chalk_1.default.bold.underline(url)}\n静态网站状态：${HostingStatusMap[website.status]}`);
     }
 }));
 commander_1.default
diff --git a/lib/hosting.js b/lib/hosting.js
@@ -55,7 +55,7 @@ function checkHostingStatus(envId) {
     return __awaiter(this, void 0, void 0, function* () {
         const hostings = yield getHostingInfo({ envId });
         if (!hostings.data || !hostings.data.length) {
-            throw new error_1.CloudBaseError('静态网站服务未开启！', {
+            throw new error_1.CloudBaseError('您还没有开启静态网站服务，请先到云开发控制台开启静态网站服务！\n 👉 https://console.cloud.tencent.com/tcb', {
                 code: 'INVALID_OPERATION'
             });
         }
@@ -74,8 +74,8 @@ function enableHosting(options) {
         const hostings = yield getHostingInfo(options);
         if (hostings.data && hostings.data.length) {
             const website = hostings.data[0];
-            if (website.status !== 'destroy' || website.status !== 'destroy_fail') {
-                throw new error_1.CloudBaseError('静态网站服务已开启！');
+            if (website.status !== 'offline') {
+                throw new error_1.CloudBaseError('静态网站服务已开启，请勿重复操作！');
             }
         }
         const res = yield tcbService.request('CreateStaticStore', {
diff --git a/src/commands/hosting.ts b/src/commands/hosting.ts
@@ -1,49 +1,22 @@
 import chalk from 'chalk'
 import program from 'commander'
-import inquirer from 'inquirer'
-import {
-    enableHosting,
-    getHostingInfo,
-    destroyHosting,
-    hostingDeploy,
-    hostingDelete,
-    hostingList
-} from '../hosting'
+import { getHostingInfo, hostingDeploy, hostingDelete, hostingList } from '../hosting'
 import { CloudBaseError } from '../error'
 import { getEnvId, loadingFactory, isDirectory, printHorizontalTable, formatDate } from '../utils'
-import { successLog } from '../logger'
 
 const HostingStatusMap = {
     init: '初始化中',
     process: '处理中',
-    online: '上线',
+    online: '已上线',
     destroying: '销毁中',
-    offline: '下线',
+    offline: '已下线',
     create_fail: '初始化失败', // eslint-disable-line
     destroy_fail: '销毁失败' // eslint-disable-line
 }
 
-program
-    .command('hosting:enable')
-    .option('-e, --envId [envId]', '环境 Id')
-    .description('开启静态网站服务')
-    .action(async (options: any) => {
-        const {
-            parent: { configFile },
-            envId
-        } = options
-        const assignEnvId = await getEnvId(envId, configFile)
-        const res = await enableHosting({ envId: assignEnvId })
-        if (res.code === 0) {
-            successLog('静态网站服务开启成功！')
-        } else {
-            throw new CloudBaseError('静态网站服务失败！')
-        }
-    })
-
 program
     .command('hosting:detail')
-    .option('-e, --envId [envId] [envId]', '环境 Id')
+    .option('-e, --envId [envId]', '环境 Id')
     .description('查看静态网站服务信息')
     .action(async (options: any) => {
         const {
@@ -54,51 +27,23 @@ program
         const res = await getHostingInfo({ envId: assignEnvId })
 
         const website = res.data && res.data[0]
+
         if (!website) {
             throw new CloudBaseError(
-                '你还没有开启静态网站服务，请使用 cloudbase hosting:enable 命令启用静态网站服务！'
+                '您还没有开启静态网站服务，请先到云开发控制台开启静态网站服务！\n 👉 https://console.cloud.tencent.com/tcb'
             )
         }
         const url = `https://${website.cdnDomain}`
-        console.log(
-            `静态网站域名：${chalk.bold.underline(url)}\n静态网站状态：${
-                HostingStatusMap[website.status]
-            }`
-        )
-    })
 
-program
-    .command('hosting:destroy')
-    .option('-e, --envId [envId]', '环境 Id')
-    .description('关闭静态网站服务')
-    .action(async (options: any) => {
-        const {
-            parent: { configFile },
-            envId
-        } = options
-        const assignEnvId = await getEnvId(envId, configFile)
-        // 危险操作，再次确认
-        const { confirm } = await inquirer.prompt({
-            type: 'confirm',
-            name: 'confirm',
-            message: '确定要关闭静态网站服务吗，关闭后您的所有静态网站资源将被销毁，无法恢复！',
-            default: false
-        })
-        if (!confirm) {
-            throw new CloudBaseError('操作终止！')
-        }
-
-        const loading = loadingFactory()
-        loading.start('静态网站销毁中')
-        try {
-            const res = await destroyHosting({ envId: assignEnvId })
-            if (res.code === 0) {
-                loading.succeed('静态网站服务销毁中...')
-            } else {
-                loading.fail('静态网站服务销毁失败！')
-            }
-        } catch (e) {
-            loading.fail(e.message || '静态网站服务销毁失败！')
+        // offline 状态不展示域名
+        if (website.status === 'offline') {
+            console.log(`静态网站状态：${HostingStatusMap[website.status]}`)
+        } else {
+            console.log(
+                `静态网站域名：${chalk.bold.underline(url)}\n静态网站状态：${
+                    HostingStatusMap[website.status]
+                }`
+            )
         }
     })
 
diff --git a/src/hosting.ts b/src/hosting.ts
@@ -2,7 +2,6 @@ import path from 'path'
 import CloudBase from '@cloudbase/manager-node'
 import { StorageService } from '@cloudbase/manager-node/types/storage'
 import { CloudApiService, firstLetterToLowerCase, checkPathExist, isDirectory } from './utils'
-import { list } from './storage'
 import { CloudBaseError } from './error'
 import { checkAndGetCredential, getProxy } from './utils'
 
@@ -58,17 +57,23 @@ async function checkHostingStatus(envId: string) {
     const hostings = await getHostingInfo({ envId })
 
     if (!hostings.data || !hostings.data.length) {
-        throw new CloudBaseError('静态网站服务未开启！', {
-            code: 'INVALID_OPERATION'
-        })
+        throw new CloudBaseError(
+            '您还没有开启静态网站服务，请先到云开发控制台开启静态网站服务！\n 👉 https://console.cloud.tencent.com/tcb',
+            {
+                code: 'INVALID_OPERATION'
+            }
+        )
     }
 
     const website = hostings.data[0]
 
     if (website.status !== 'online') {
-        throw new CloudBaseError(`静态网站服务【${HostingStatusMap[website.status]}】，请稍后重试！`, {
-            code: 'INVALID_OPERATION'
-        })
+        throw new CloudBaseError(
+            `静态网站服务【${HostingStatusMap[website.status]}】，请稍后重试！`,
+            {
+                code: 'INVALID_OPERATION'
+            }
+        )
     }
 
     return website
@@ -79,8 +84,9 @@ export async function enableHosting(options: IBaseOptions) {
     const hostings = await getHostingInfo(options)
     if (hostings.data && hostings.data.length) {
         const website = hostings.data[0]
-        if (website.status !== 'destroy' || website.status !== 'destroy_fail') {
-            throw new CloudBaseError('静态网站服务已开启！')
+        // offline 状态的服务可重新开启
+        if (website.status !== 'offline') {
+            throw new CloudBaseError('静态网站服务已开启，请勿重复操作！')
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function checkHostingStatus(envId) {`
`55`	`55`	`return __awaiter(this, void 0, void 0, function* () {`
`56`	`56`	`const hostings = yield getHostingInfo({ envId });`
`57`	`57`	`if (!hostings.data \|\| !hostings.data.length) {`
`58`		`- throw new error_1.CloudBaseError('静态网站服务未开启！', {`
	`58`	`+ throw new error_1.CloudBaseError('您还没有开启静态网站服务，请先到云开发控制台开启静态网站服务！\n 👉 https://console.cloud.tencent.com/tcb', {`
`59`	`59`	`code: 'INVALID_OPERATION'`
`60`	`60`	`});`
`61`	`61`	`}`
`@@ -74,8 +74,8 @@ function enableHosting(options) {`
`74`	`74`	`const hostings = yield getHostingInfo(options);`
`75`	`75`	`if (hostings.data && hostings.data.length) {`
`76`	`76`	`const website = hostings.data[0];`
`77`		`- if (website.status !== 'destroy' \|\| website.status !== 'destroy_fail') {`
`78`		`- throw new error_1.CloudBaseError('静态网站服务已开启！');`
	`77`	`+ if (website.status !== 'offline') {`
	`78`	`+ throw new error_1.CloudBaseError('静态网站服务已开启，请勿重复操作！');`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`const res = yield tcbService.request('CreateStaticStore', {`