feat: support custom config file

Author: chhpt

bin/cloudbase.js

@@ -26,14 +26,21 @@ notifier.notify({
 // 注册命令
 require('../lib')
 
-program.version(pkg.version)
+program.option(
+    '--config-file <path>',
+    '设置配置文件，默认为 ./cloudbaserc.js 或 .cloudbaserc.json'
+)
+
+program.version(pkg.version, '-V, --version', '输出当前 CloudBase CLI 版本')
 
 // 处理无效命令
 program.action(cmd => {
     console.log(chalk.bold.red('Error: ') + `${cmd} 不是有效的命令！`)
     console.log(`使用 ${chalk.bold('cloudbase -h')} 查看所有命令~`)
 })
 
+// 修改 help 提示信息
+program._helpDescription = '输出帮助信息'
 program.on('--help', function() {
     const tips = `\nTips:
 

lib/commands/env-domain.js lib/commands/env/domain.jslib/commands/env-domain.js renamed to lib/commands/env/domain.js

@@ -6,15 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = __importDefault(require("commander"));
 const ora_1 = __importDefault(require("ora"));
 const inquirer_1 = __importDefault(require("inquirer"));
-const utils_1 = require("../utils");
-const error_1 = require("../error");
-const logger_1 = require("../logger");
-const env_1 = require("../env");
+const utils_1 = require("../../utils");
+const error_1 = require("../../error");
+const logger_1 = require("../../logger");
+const env_1 = require("../../env");
 commander_1.default
     .command('env:domain:list [envId]')
     .description('列出环境的安全域名列表')
-    .action(async function (envId) {
-    const assignEnvId = await utils_1.getEnvId(envId);
+    .action(async function (envId, options) {
+    const { configFile } = options.parent;
+    const assignEnvId = await utils_1.getEnvId(envId, configFile);
     const domains = await env_1.getEnvAuthDomains({
         envId: assignEnvId
     });
@@ -34,8 +35,9 @@ commander_1.default
 commander_1.default
     .command('env:domain:create <domain> [envId]')
     .description('添加环境安全域名，多个以斜杠 / 分隔')
-    .action(async function (domain, envId) {
-    const assignEnvId = await utils_1.getEnvId(envId);
+    .action(async function (domain, envId, options) {
+    const { configFile } = options.parent;
+    const assignEnvId = await utils_1.getEnvId(envId, configFile);
     const domains = domain.split('/');
     const { confirm } = await inquirer_1.default.prompt({
         type: 'confirm',
@@ -68,8 +70,9 @@ commander_1.default
 commander_1.default
     .command('env:domain:delete [envId]')
     .description('删除环境的安全域名')
-    .action(async function (envId) {
-    const assignEnvId = await utils_1.getEnvId(envId);
+    .action(async function (envId, options) {
+    const { configFile } = options.parent;
+    const assignEnvId = await utils_1.getEnvId(envId, configFile);
     const loadSpinner = ora_1.default('拉取环境安全域名中...').start();
     const domains = await env_1.getEnvAuthDomains({
         envId: assignEnvId
@@ -101,7 +104,7 @@ commander_1.default
         .map(item => item.Id);
     const deleted = await env_1.deleteEnvDomain({
         domainIds,
-        envId: assignEnvId,
+        envId: assignEnvId
     });
     logger_1.successLog(`成功删除了 ${deleted} 个域名！`);
 });

lib/commands/env/index.js

@@ -0,0 +1,82 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander_1 = __importDefault(require("commander"));
+const ora_1 = __importDefault(require("ora"));
+const env_1 = require("../../env");
+const utils_1 = require("../../utils");
+const error_1 = require("../../error");
+const logger_1 = require("../../logger");
+require("./domain");
+require("./login");
+commander_1.default
+    .command('env:list')
+    .description('列出云开发所有环境')
+    .action(async function () {
+    const data = await env_1.listEnvs();
+    const head = [
+        'EnvId',
+        'Alias',
+        'PackageName',
+        'Source',
+        'CreateTime',
+        'Status'
+    ];
+    const tableData = data.map(item => [
+        item.EnvId,
+        item.Alias,
+        item.PackageName,
+        item.Source === 'miniapp' ? '小程序' : '云开发',
+        item.CreateTime,
+        item.Status === 'NORMAL' ? '正常' : '不可用'
+    ]);
+    utils_1.printCliTable(head, tableData);
+    const unavalibleEnv = data.find(item => item.Status === 'UNAVAILABLE');
+    if (unavalibleEnv) {
+        logger_1.warnLog(`您的环境中存在不可用的环境：[${unavalibleEnv.EnvId}]，请留意！`);
+    }
+});
+async function checkEnvAvailability(envId) {
+    const MAX_TRY = 10;
+    let retry = 0;
+    return new Promise((resolve, reject) => {
+        const timer = setInterval(async () => {
+            const envInfo = await env_1.getEnvInfo(envId);
+            if (envInfo.Status === 'NORMAL') {
+                clearInterval(timer);
+                resolve();
+            }
+            else {
+                retry++;
+            }
+            if (retry > MAX_TRY) {
+                reject(new error_1.CloudBaseError('环境初始化查询超时，请稍后通过 cloudbase env:list 查看环境状态'));
+            }
+        }, 1000);
+    });
+}
+commander_1.default
+    .command('env:create <alias>')
+    .description('创建新的云环境')
+    .action(async function (alias) {
+    if (!alias) {
+        throw new error_1.CloudBaseError('环境名称不能为空！');
+    }
+    const res = await env_1.createEnv({
+        alias
+    });
+    if (res.Status === 'NORMAL') {
+        logger_1.successLog('创建环境成功！');
+        return;
+    }
+    const initSpinner = ora_1.default('环境初始化中...').start();
+    try {
+        await checkEnvAvailability(res.EnvId);
+        initSpinner.succeed('环境初始化成功');
+    }
+    catch (e) {
+        initSpinner.fail(e.message);
+    }
+});

lib/commands/env-login.js lib/commands/env/login.jslib/commands/env-login.js renamed to lib/commands/env/login.js

@@ -5,14 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = __importDefault(require("commander"));
 const inquirer_1 = __importDefault(require("inquirer"));
-const utils_1 = require("../utils");
-const logger_1 = require("../logger");
-const env_1 = require("../env");
+const utils_1 = require("../../utils");
+const logger_1 = require("../../logger");
+const env_1 = require("../../env");
 commander_1.default
     .command('env:login:list [envId]')
     .description('列出环境登录配置')
-    .action(async function (envId) {
-    const assignEnvId = await utils_1.getEnvId(envId);
+    .action(async function (envId, options) {
+    const { configFile } = options.parent;
+    const assignEnvId = await utils_1.getEnvId(envId, configFile);
     const configList = await env_1.getLoginConfigList({
         envId: assignEnvId
     });
@@ -34,8 +35,9 @@ commander_1.default
 commander_1.default
     .command('env:login:config [envId]')
     .description('配置环境登录方式')
-    .action(async function (envId) {
-    const assignEnvId = await utils_1.getEnvId(envId);
+    .action(async function (envId, options) {
+    const { configFile } = options.parent;
+    const assignEnvId = await utils_1.getEnvId(envId, configFile);
     const configList = await env_1.getLoginConfigList({
         envId: assignEnvId
     });

lib/commands/env.js lib/commands/envc.jslib/commands/env.js renamed to lib/commands/envc.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ora_1 = __importDefault(require("ora"));
+const path_1 = __importDefault(require("path"));
+const error_1 = require("../../error");
+const function_1 = require("../../function");
+async function codeUpdate(ctx) {
+    const { name, envId, config, functions } = ctx;
+    if (!name) {
+        throw new error_1.CloudBaseError('请指定函数名称！');
+    }
+    const func = functions.find(item => item.name === name);
+    if (!func || !func.name) {
+        throw new error_1.CloudBaseError(`函数 ${name} 配置不存在`);
+    }
+    const spinner = ora_1.default(`[${func.name}] 函数代码更新中...`).start();
+    try {
+        await function_1.updateFunctionCode({
+            func,
+            envId,
+            functionRootPath: path_1.default.join(process.cwd(), config.functionRoot)
+        });
+        spinner.succeed(`[${func.name}] 函数代码更新成功！`);
+    }
+    catch (e) {
+        spinner.stop();
+        throw e;
+    }
+}
+exports.codeUpdate = codeUpdate;

lib/commands/functions/code-update.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const inquirer_1 = __importDefault(require("inquirer"));
+const error_1 = require("../../error");
+const function_1 = require("../../function");
+const logger_1 = require("../../logger");
+async function configUpdate(ctx) {
+    const { name, envId, functions } = ctx;
+    let isBathUpdate = false;
+    if (!name) {
+        const { isBatch } = await inquirer_1.default.prompt({
+            type: 'confirm',
+            name: 'isBatch',
+            message: '无云函数名称，是否需要更新配置文件中的【全部云函数】的配置？',
+            default: false
+        });
+        isBathUpdate = isBatch;
+        if (!isBathUpdate) {
+            throw new error_1.CloudBaseError('请指定云函数名称！');
+        }
+    }
+    if (isBathUpdate) {
+        await function_1.batchUpdateFunctionConfig({
+            envId,
+            functions,
+            log: true
+        });
+        return;
+    }
+    const functionItem = functions.find(item => item.name === name);
+    if (!functionItem) {
+        throw new error_1.CloudBaseError('未找到相关函数配置，请检查函数名是否正确');
+    }
+    await function_1.updateFunctionConfig({
+        envId,
+        functionName: name,
+        config: functionItem.config
+    });
+    logger_1.successLog(`[${name}] 更新云函数配置成功！`);
+}
+exports.configUpdate = configUpdate;

lib/commands/functions/config-update.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const function_1 = require("../../function");
+const logger_1 = require("../../logger");
+const error_1 = require("../../error");
+async function copy(ctx, newFunctionName, targentEnvId, options) {
+    const { name, envId } = ctx;
+    const { force } = options;
+    if (!name || !newFunctionName) {
+        throw new error_1.CloudBaseError('请指定函数名称！');
+    }
+    await function_1.copyFunction({
+        force,
+        envId,
+        newFunctionName,
+        functionName: name,
+        targetEnvId: targentEnvId || envId
+    });
+    logger_1.successLog('拷贝函数成功');
+}
+exports.copy = copy;

lib/commands/functions/copy.js

@@ -0,0 +1,46 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const inquirer_1 = __importDefault(require("inquirer"));
+const error_1 = require("../../error");
+const function_1 = require("../../function");
+const logger_1 = require("../../logger");
+async function deleteFunc(ctx) {
+    const { name, envId, functions } = ctx;
+    let isBatchDelete = false;
+    if (!name) {
+        const answer = await inquirer_1.default.prompt({
+            type: 'confirm',
+            name: 'isBatch',
+            message: '无云函数名称，是否需要删除配置文件中的全部云函数？',
+            default: false
+        });
+        if (answer.isBatch) {
+            const { reConfirm } = await inquirer_1.default.prompt({
+                type: 'confirm',
+                name: 'reConfirm',
+                message: '确定要删除配置文件中的全部云函数？',
+                default: false
+            });
+            isBatchDelete = reConfirm;
+        }
+        if (!isBatchDelete) {
+            throw new error_1.CloudBaseError('请指定需要删除的云函数名称！');
+        }
+    }
+    if (isBatchDelete) {
+        const names = functions.map(item => item.name);
+        return await function_1.batchDeleteFunctions({
+            names,
+            envId
+        });
+    }
+    await function_1.deleteFunction({
+        envId,
+        functionName: name
+    });
+    logger_1.successLog(`删除函数 [${name}] 成功！`);
+}
+exports.deleteFunc = deleteFunc;