@cloudbase/cli 2.6.0-alpha.7 → 2.6.0-pre-alpha.0

package/lib/commands/fun/base.js

@@ -125,6 +125,10 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                 {
                     flags: '--includeNodeModules',
                     desc: '包含本地 node_modules 目录，默认为 false 不包含'
+                },
+                {
+                    flags: '--functionsConfigFile <functionsConfigFile>',
+                    desc: '多函数定义配置文件，默认为 ./cloudbase-functions.json'
                 }
             ],
             requiredEnvId: false,
@@ -137,18 +141,44 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
             let { serviceName, appId, source, includeNodeModules = false } = options;
             const target = 'main';
             source = path_1.default.resolve(source || process.cwd());
-            const loadResult = yield (0, functions_framework_1.loadUserFunction)(source, target);
-            if (!(loadResult === null || loadResult === void 0 ? void 0 : loadResult.userFunction)) {
-                if (loadResult.reason.includes('is not a loadable module')) {
-                    log.error(`${source} 不是一个有效的函数式托管代码目录，可以通过 --source <source> 指定代码目录路径`);
+            const functionsConfigFile = options.functionsConfigFile || 'cloudbase-functions.json';
+            let multiFunctionsConfig = null;
+            if (functionsConfigFile && (yield fs_extra_1.default.exists(path_1.default.resolve(source, functionsConfigFile)))) {
+                try {
+                    multiFunctionsConfig = (0, functions_framework_1.loadFunctionsConfig)(functionsConfigFile);
                 }
-                else if (loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason.includes('is not defined in the provided module')) {
-                    log.error(`主文件并未导出目标函数 ${target}，请导出 ${target} 目标函数`);
+                catch (err) {
+                    log.error(`多函数定义配置文件 ${functionsConfigFile} 配置文件有误，请检查`);
+                    log.error(err);
+                    return;
                 }
-                else {
-                    log.error(loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason);
+            }
+            const loadResult = yield (0, functions_framework_1.loadFunctions)({
+                target,
+                sourceLocation: source,
+                multiFunctionsConfig
+            });
+            if (Array.isArray(loadResult)) {
+                for (const loadItem of loadResult) {
+                    if (!(loadItem === null || loadItem === void 0 ? void 0 : loadItem.userFunction)) {
+                        log.error(`加载函数 ${loadItem === null || loadItem === void 0 ? void 0 : loadItem.name} 失败: "${loadItem === null || loadItem === void 0 ? void 0 : loadItem.reason}"`);
+                        return;
+                    }
+                }
+            }
+            else {
+                if (!(loadResult === null || loadResult === void 0 ? void 0 : loadResult.userFunction)) {
+                    if (loadResult.reason.includes('is not a loadable module')) {
+                        log.error(`${source} 不是一个有效的函数式托管代码目录，可以通过 --source <source> 指定代码目录路径`);
+                    }
+                    else if (loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason.includes('is not defined in the provided module')) {
+                        log.error(`主文件并未导出目标函数 ${target}，请导出 ${target} 目标函数`);
+                    }
+                    else {
+                        log.error(loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason);
+                    }
+                    return;
                 }
-                return;
             }
             if (!envId) {
                 envId = yield _selectEnv();
@@ -309,6 +339,10 @@ let FunRunCommand = class FunRunCommand extends common_1.Command {
                 {
                     flags: '--logDirname <logDirname>',
                     desc: '日志文件目录，默认为 ./logs'
+                },
+                {
+                    flags: '--functionsConfigFile <functionsConfigFile>',
+                    desc: '多函数定义配置文件，默认为 ./cloudbase-functions.json'
                 }
             ],
             requiredEnvId: false,
@@ -321,7 +355,6 @@ let FunRunCommand = class FunRunCommand extends common_1.Command {
             const watchFlag = ['--watch', '-w'];
             const defaultIgnoreFiles = ['logs/*.*'];
             if (watchFlag.some((flag) => args.includes(flag))) {
-                debugger;
                 const cmd = args.filter((arg) => !watchFlag.includes(arg)).join(' ');
                 (0, nodemon_1.default)({
                     script: '',

package/lib/commands/index.js

@@ -29,3 +29,4 @@ __exportStar(require("./lowcode"), exports);
 __exportStar(require("./run"), exports);
 __exportStar(require("./db"), exports);
 __exportStar(require("./fun"), exports);
+__exportStar(require("./runf"), exports);

package/lib/commands/lowcode/comps.js

@@ -166,7 +166,7 @@ let LowCodeBuildComps = class LowCodeBuildComps extends common_1.Command {
         return __awaiter(this, void 0, void 0, function* () {
             const config = ctx.config.lowcodeCustomComponents;
             if (config) {
-                yield lowcodeCli.graceBuildComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd) }));
+                yield lowcodeCli.graceBuildComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd), envId: ctx.envId || ctx.config.envId }));
                 return;
             }
             throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
@@ -218,7 +218,7 @@ let LowCodeDebugComps = class LowCodeDebugComps extends common_1.Command {
             if (config) {
                 const cmdConfig = (0, utils_2.getCmdConfig)(ctx.config, this.options);
                 const mergesOptions = (0, utils_2.getMergedOptions)(cmdConfig, options);
-                yield lowcodeCli.graceDebugComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), debugPort: (mergesOptions === null || mergesOptions === void 0 ? void 0 : mergesOptions.debugPort) || 8388, logger: log, wxDevtoolPath: mergesOptions === null || mergesOptions === void 0 ? void 0 : mergesOptions.wxDevtoolPath, debugBaseUrl: (_a = privateSettings === null || privateSettings === void 0 ? void 0 : privateSettings.endpoints) === null || _a === void 0 ? void 0 : _a.editor }));
+                yield lowcodeCli.graceDebugComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), debugPort: (mergesOptions === null || mergesOptions === void 0 ? void 0 : mergesOptions.debugPort) || 8388, logger: log, wxDevtoolPath: mergesOptions === null || mergesOptions === void 0 ? void 0 : mergesOptions.wxDevtoolPath, debugBaseUrl: (_a = privateSettings === null || privateSettings === void 0 ? void 0 : privateSettings.endpoints) === null || _a === void 0 ? void 0 : _a.editor, envId: ctx.envId || ctx.config.envId }));
                 return;
             }
             throw new error_1.CloudBaseError('请参考文档填写 cloudbaserc 配置: https://docs.cloudbase.net/lowcode/custom-components/config/config-comps');
@@ -265,7 +265,7 @@ let LowCodePublishComps = class LowCodePublishComps extends common_1.Command {
             const config = ctx.config.lowcodeCustomComponents;
             if (config) {
                 const mergesOptions = (0, utils_2.getMergedOptions)((0, utils_2.getCmdConfig)(ctx.config, this.options), options);
-                yield lowcodeCli.gracePublishComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd), isAdmin: Boolean(mergesOptions.admin) }));
+                yield lowcodeCli.gracePublishComps(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd), isAdmin: Boolean(mergesOptions.admin), envId: ctx.envId || ctx.config.envId }));
                 log.success('组件库 - 已同步到云端，请到低码控制台发布该组件库！');
                 return;
             }
@@ -331,7 +331,7 @@ let LowCodePublishVersionComps = class LowCodePublishVersionComps extends common
             if (!config) {
                 throw new error_1.CloudBaseError('组件库 - 请添加组件库配置到cloudbaserc.json 以使用该命令');
             }
-            const res = yield lowcodeCli.publishVersion(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, isAdmin: options.admin, privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd) }), comment, tag);
+            const res = yield lowcodeCli.publishVersion(Object.assign(Object.assign({}, config), { context: config.context || process.cwd(), logger: log, isAdmin: options.admin, privateSettings: (0, utils_1.getPrivateSettings)(ctx.config, this.options.cmd), envId: ctx.envId || ctx.config.envId }), comment, tag);
             if (res.data.code === 200) {
                 log.success('组件库 - 已发布新版本！');
                 return;

package/lib/commands/lowcode/utils.js

@@ -60,11 +60,12 @@ function promisifyProcess(p, pipe = false) {
 exports.promisifyProcess = promisifyProcess;
 function getLowcodeCli() {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const key = '@cloudbase/lowcode-cli';
         const cache = new Map();
         let result;
         if (!cache.get(key)) {
-            const module = yield Promise.resolve().then(() => __importStar(require(key)));
+            const module = yield (_a = key, Promise.resolve().then(() => __importStar(require(_a))));
             cache.set(key, module);
         }
         result = cache.get(key);

package/lib/commands/run/index.js

@@ -18,5 +18,4 @@ __exportStar(require("./list"), exports);
 __exportStar(require("./version"), exports);
 __exportStar(require("./delete"), exports);
 __exportStar(require("./image"), exports);
-__exportStar(require("./standalonegateway"), exports);
 __exportStar(require("./service"), exports);

package/lib/commands/runf/base.js

@@ -0,0 +1,536 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(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 };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RunfRunCommand = exports.RunfDownloadCommand = exports.RunfDeployCommand = exports.RunfListCommand = void 0;
+const functions_framework_1 = require("@cloudbase/functions-framework");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const camelcase_keys_1 = __importDefault(require("camelcase-keys"));
+const iac_core_1 = require("@cloudbase/iac-core");
+const inquirer_1 = __importDefault(require("inquirer"));
+const path_1 = __importDefault(require("path"));
+const decorators_1 = require("../../decorators");
+const utils_1 = require("../../utils");
+const common_1 = require("../common");
+const constants_1 = require("../constants");
+const utils_2 = require("../utils");
+const nodemon_1 = __importDefault(require("nodemon"));
+const { CloudAPI } = iac_core_1.CloudAPI;
+const scfService = utils_1.CloudApiService.getInstance('tcb');
+class RunfListCommand extends common_1.Command {
+    get options() {
+        return {
+            cmd: 'runf',
+            childCmd: 'list',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                }
+            ],
+            requiredEnvId: false,
+            autoRunLogin: true,
+            desc: '查看函数式托管服务列表'
+        };
+    }
+    execute(envId, log) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const loading = (0, utils_1.loadingFactory)();
+            if (!envId) {
+                envId = yield _selectEnv();
+            }
+            else {
+                log.info(`当前环境 Id：${envId}`);
+            }
+            try {
+                loading.start('获取函数式托管服务列表中…');
+                let serverListRes = yield scfService
+                    .request('DescribeCloudBaseRunServers', {
+                    EnvId: envId,
+                    Limit: 100,
+                    Offset: 0
+                })
+                    .finally(() => loading.stop());
+                const serverList = (_a = serverListRes.CloudBaseRunServerSet) === null || _a === void 0 ? void 0 : _a.filter((item) => item.Tag === 'function');
+                const head = ['服务名称', '状态', '创建时间', '更新时间'];
+                const tableData = serverList.map((serverItem) => [
+                    serverItem.ServerName,
+                    serverItem.Status,
+                    serverItem.CreatedTime,
+                    serverItem.UpdatedTime
+                ]);
+                (0, utils_1.printHorizontalTable)(head, tableData);
+            }
+            catch (e) {
+                log.error('获取函数式托管服务列表失败：' + e.message);
+            }
+        });
+    }
+}
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.EnvId)()),
+    __param(1, (0, decorators_1.Log)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, decorators_1.Logger]),
+    __metadata("design:returntype", Promise)
+], RunfListCommand.prototype, "execute", null);
+exports.RunfListCommand = RunfListCommand;
+let RunfDeployCommand = class RunfDeployCommand extends common_1.Command {
+    get options() {
+        return {
+            cmd: 'runf',
+            childCmd: 'deploy',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-s, --serviceName <serviceName>',
+                    desc: '服务名称'
+                },
+                {
+                    flags: '--source <source>',
+                    desc: '目标函数文件所在目录路径。默认为当前路径'
+                }
+            ],
+            requiredEnvId: false,
+            autoRunLogin: true,
+            desc: '部署云函数 2.0 服务'
+        };
+    }
+    execute(ctx, envId, log, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { serviceName, source } = options;
+            const targetDir = path_1.default.resolve(source || process.cwd());
+            debugger;
+            const target = 'main';
+            const functionsConfigFile = path_1.default.resolve(targetDir, options.functionsConfigFile || 'cloudbase-functions.json');
+            let multiFunctionsConfig = null;
+            if (yield fs_extra_1.default.exists(functionsConfigFile)) {
+                try {
+                    multiFunctionsConfig = (0, functions_framework_1.loadFunctionsConfig)(functionsConfigFile);
+                }
+                catch (err) {
+                    log.error(`多函数定义配置文件 ${functionsConfigFile} 配置文件有误，请检查`);
+                    log.error(err);
+                    return;
+                }
+            }
+            const loadResult = yield (0, functions_framework_1.loadFunctions)({
+                target,
+                sourceLocation: targetDir,
+                multiFunctionsConfig
+            });
+            if (Array.isArray(loadResult)) {
+                for (const loadItem of loadResult) {
+                    if (!(loadItem === null || loadItem === void 0 ? void 0 : loadItem.userFunction)) {
+                        log.error(`加载函数 ${loadItem === null || loadItem === void 0 ? void 0 : loadItem.name} 失败: "${loadItem === null || loadItem === void 0 ? void 0 : loadItem.reason}"`);
+                        return;
+                    }
+                }
+            }
+            else {
+                if (!(loadResult === null || loadResult === void 0 ? void 0 : loadResult.userFunction)) {
+                    if (loadResult.reason.includes('is not a loadable module')) {
+                        log.error(`${targetDir} 不是一个有效的函数式托管代码目录，可以通过 --source <source> 指定代码目录路径`);
+                    }
+                    else if (loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason.includes('is not defined in the provided module')) {
+                        log.error(`主文件并未导出目标函数 ${target}，请导出 ${target} 目标函数`);
+                    }
+                    else {
+                        log.error(loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason);
+                    }
+                    return;
+                }
+            }
+            if (!envId) {
+                const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(targetDir));
+                if (envConfig.envId) {
+                    envId = envConfig.envId;
+                    log.info(`当前环境 Id：${envId}`);
+                }
+                else {
+                    envId = yield _selectEnv();
+                }
+            }
+            else {
+                log.info(`当前环境 Id：${envId}`);
+            }
+            if (!serviceName) {
+                let pkgName = '';
+                try {
+                    const pkg = yield fs_extra_1.default.readJSON(path_1.default.join(targetDir, 'package.json'));
+                    pkgName = pkg.name;
+                }
+                catch (e) { }
+                serviceName = yield _inputServiceName(pkgName);
+            }
+            const answers = yield inquirer_1.default.prompt([
+                {
+                    type: 'confirm',
+                    name: 'confirm',
+                    message: `即将开始部署，是否确认继续？`,
+                    default: true
+                }
+            ]);
+            if (!answers.confirm) {
+                return;
+            }
+            yield iac_core_1.IAC.init({
+                cwd: targetDir,
+                getCredential: () => {
+                    return getCredential(ctx, options);
+                },
+                polyRepoMode: true
+            });
+            yield _runDeploy();
+            function _runDeploy() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        yield iac_core_1.IAC.FunctionV2.apply({
+                            cwd: targetDir,
+                            envId: envId,
+                            name: serviceName
+                        }, function (message) {
+                            trackCallback(message, log);
+                        });
+                    }
+                    catch (e) {
+                        if ((e === null || e === void 0 ? void 0 : e.action) === 'UpdateCloudRunServer' && (e === null || e === void 0 ? void 0 : e.code) === 'ResourceInUse') {
+                            inquirer_1.default
+                                .prompt([
+                                {
+                                    type: 'confirm',
+                                    name: 'confirm',
+                                    message: `平台当前有部署发布任务正在运行中。确认继续部署，正在执行的部署任务将被取消，并立即部署最新的代码`,
+                                    default: true
+                                }
+                            ])
+                                .then((answers) => __awaiter(this, void 0, void 0, function* () {
+                                if (answers.confirm) {
+                                    try {
+                                        const { task } = yield CloudAPI.tcbrServiceRequest('DescribeServerManageTask', {
+                                            envId,
+                                            serverName: serviceName,
+                                            taskId: 0
+                                        });
+                                        const id = task === null || task === void 0 ? void 0 : task.id;
+                                        yield CloudAPI.tcbrServiceRequest('OperateServerManage', {
+                                            envId,
+                                            operateType: 'cancel',
+                                            serverName: serviceName,
+                                            taskId: id
+                                        });
+                                        yield _runDeploy();
+                                    }
+                                    catch (e) {
+                                        trackCallback({
+                                            type: 'error',
+                                            details: e.message
+                                        }, log);
+                                    }
+                                }
+                            }));
+                        }
+                        else {
+                            trackCallback({
+                                type: 'error',
+                                details: `${e.message}`,
+                                originalError: e
+                            }, log);
+                        }
+                    }
+                });
+            }
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.EnvId)()),
+    __param(2, (0, decorators_1.Log)()),
+    __param(3, (0, decorators_1.ArgsOptions)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger, Object]),
+    __metadata("design:returntype", Promise)
+], RunfDeployCommand.prototype, "execute", null);
+RunfDeployCommand = __decorate([
+    (0, common_1.ICommand)()
+], RunfDeployCommand);
+exports.RunfDeployCommand = RunfDeployCommand;
+let RunfDownloadCommand = class RunfDownloadCommand extends common_1.Command {
+    get options() {
+        return {
+            cmd: 'runf',
+            childCmd: 'download',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-s, --serviceName <serviceName>',
+                    desc: '服务名称'
+                },
+                {
+                    flags: '--source <source>',
+                    desc: '目标函数文件所在目录路径。默认为当前路径'
+                }
+            ],
+            requiredEnvId: false,
+            autoRunLogin: true,
+            desc: '下载云函数 2.0 服务代码'
+        };
+    }
+    execute(ctx, envId, log, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { serviceName, source } = options;
+            let targetDir = path_1.default.resolve(source || process.cwd());
+            if (!envId) {
+                const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(targetDir));
+                envId = envConfig.envId || (yield _selectEnv());
+            }
+            else {
+                log.info(`当前环境 Id：${envId}`);
+            }
+            if (!serviceName) {
+                let pkgName = '';
+                try {
+                    const pkg = yield fs_extra_1.default.readJSON(path_1.default.join(targetDir, 'package.json'));
+                    pkgName = pkg.name;
+                }
+                catch (e) { }
+                serviceName = yield _inputServiceName(pkgName);
+                if (serviceName !== pkgName) {
+                    targetDir = path_1.default.join(targetDir, serviceName);
+                }
+            }
+            const needTips = !(yield isDirectoryEmptyOrNotExists(targetDir));
+            if (needTips) {
+                const answers = yield inquirer_1.default.prompt([
+                    {
+                        type: 'confirm',
+                        name: 'confirm',
+                        message: `下载将覆盖 ${targetDir} 目录下的代码，是否继续？`,
+                        default: true
+                    }
+                ]);
+                if (!answers.confirm) {
+                    return;
+                }
+            }
+            yield iac_core_1.IAC.init({
+                cwd: targetDir,
+                getCredential: () => {
+                    return getCredential(ctx, options);
+                },
+                polyRepoMode: true
+            });
+            try {
+                yield iac_core_1.IAC.FunctionV2.pull({
+                    cwd: targetDir,
+                    envId: envId,
+                    name: serviceName
+                }, function (message) {
+                    trackCallback(message, log);
+                });
+            }
+            catch (e) {
+                trackCallback({
+                    type: 'error',
+                    details: `${e.message}`,
+                    originalError: e
+                }, log);
+            }
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.EnvId)()),
+    __param(2, (0, decorators_1.Log)()),
+    __param(3, (0, decorators_1.ArgsOptions)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger, Object]),
+    __metadata("design:returntype", Promise)
+], RunfDownloadCommand.prototype, "execute", null);
+RunfDownloadCommand = __decorate([
+    (0, common_1.ICommand)()
+], RunfDownloadCommand);
+exports.RunfDownloadCommand = RunfDownloadCommand;
+class RunfRunCommand extends common_1.Command {
+    get options() {
+        return {
+            cmd: 'runf',
+            childCmd: 'run',
+            options: [
+                {
+                    flags: '--source <source>',
+                    desc: '目标函数文件所在目录路径，默认为当前路径'
+                },
+                {
+                    flags: '--port <port>',
+                    desc: '监听的端口，默认为 3000'
+                },
+                {
+                    flags: '-w, --watch',
+                    desc: '是否启用热重启模式，如启用，将会在文件变更时自动重启服务，默认为 false'
+                },
+                {
+                    flags: '--dry-run',
+                    desc: '是否不启动服务，只验证代码可以正常加载，默认为 false'
+                },
+                {
+                    flags: '--logDirname <logDirname>',
+                    desc: '日志文件目录，默认为 ./logs'
+                },
+                {
+                    flags: '--functionsConfigFile <functionsConfigFile>',
+                    desc: '多函数定义配置文件，默认为 ./cloudbase-functions.json'
+                }
+            ],
+            requiredEnvId: false,
+            desc: '本地运行函数式托管代码'
+        };
+    }
+    execute(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const args = process.argv.slice(2);
+            const watchFlag = ['--watch', '-w'];
+            const defaultIgnoreFiles = ['logs/*.*'];
+            if (watchFlag.some((flag) => args.includes(flag))) {
+                debugger;
+                const cmd = args.filter((arg) => !watchFlag.includes(arg)).join(' ');
+                (0, nodemon_1.default)({
+                    script: '',
+                    exec: `${process.argv[1]} ${cmd}`,
+                    watchOptions: {
+                        usePolling: true,
+                        ignorePermissionErrors: true,
+                        ignored: defaultIgnoreFiles.join(','),
+                        persistent: true,
+                        interval: 500
+                    }
+                })
+                    .on('start', () => {
+                    logger.info('Initializing server in watch mode. Changes in source files will trigger a restart.');
+                })
+                    .on('quit', (e) => {
+                    logger.info(`Nodemon quit with code ${e}.`);
+                    process.exit(0);
+                })
+                    .on('restart', (e) => {
+                    var _a, _b;
+                    logger.info(`Server restarted due to changed files: ${(_b = (_a = e === null || e === void 0 ? void 0 : e.matched) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.join(', ')}`);
+                })
+                    .on('log', (e) => {
+                    logger.info(`[nodemon ${e.type}] ${e.message}`);
+                })
+                    .on('crash', () => {
+                    logger.error(`Server crashed.`);
+                    process.exit(1);
+                })
+                    .on('exit', (e) => {
+                    logger.info(`Server exited with code ${e}.`);
+                });
+            }
+            else {
+                (0, functions_framework_1.runCLI)();
+            }
+        });
+    }
+}
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.Log)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [decorators_1.Logger]),
+    __metadata("design:returntype", Promise)
+], RunfRunCommand.prototype, "execute", null);
+exports.RunfRunCommand = RunfRunCommand;
+function _selectEnv() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (0, utils_2.selectEnv)({ source: [constants_1.EnvSource.MINIAPP, constants_1.EnvSource.QCLOUD] });
+    });
+}
+function _inputServiceName(defaultVal = '') {
+    return __awaiter(this, void 0, void 0, function* () {
+        const questions = [
+            {
+                type: 'input',
+                name: 'serviceName',
+                message: '请输入服务名称（只能包含数字、小写字母和-，只能以小写字母开头，最多 20字符）',
+                default: defaultVal,
+                validate: (val) => {
+                    return /^[a-z][a-z0-9-]{0,19}$/.test(val) ? true : '请输入正确的服务名称';
+                }
+            }
+        ];
+        const answers = yield inquirer_1.default.prompt(questions);
+        return answers['serviceName'];
+    });
+}
+function getCredential(ctx, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let credential;
+        if (ctx.hasPrivateSettings) {
+            process.env.IS_PRIVATE = 'true';
+            const privateSettings = (0, utils_1.getPrivateSettings)(ctx.config, options.cmd);
+            credential = privateSettings === null || privateSettings === void 0 ? void 0 : privateSettings.credential;
+        }
+        else {
+            credential = yield utils_1.authSupevisor.getLoginState();
+        }
+        return credential;
+    });
+}
+function isDirectoryEmptyOrNotExists(dirPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const exists = yield fs_extra_1.default.pathExists(dirPath);
+            if (!exists) {
+                return true;
+            }
+            const files = yield fs_extra_1.default.readdir(dirPath);
+            return files.length === 0;
+        }
+        catch (error) {
+            return true;
+        }
+    });
+}
+function trackCallback(message, log) {
+    if (message.type === 'error') {
+        log.error(message.details);
+    }
+    else {
+        log.info(message.details);
+    }
+}

package/lib/commands/runf/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./base"), exports);

package/lib/help.js

@@ -20,7 +20,8 @@ const outputHelpInfo = () => {
     storage         [cmd]                      云存储资源管理操作
     service         [cmd]                      HTTP 访问服务管理操作
     run:deprecated  [cmd]                      云托管环境管理操作 (BAAS 或 RUN 类型环境)
-    run             [cmd]                      云托管环境管理操作 (TCBR 类型环境)`;
+    run             [cmd]                      云托管环境管理操作 (TCBR 类型环境)
+    runf            [cmd]                      云函数 2.0 服务管理操作`;
     const options = `
   选项
 

package/lib/utils/net/cloud-api-request.js

@@ -18,6 +18,15 @@ const debug_logger_1 = require("../debug-logger");
 let commonCredential;
 const isTokenExpired = (credential, gap = 120) => credential.accessTokenExpired && Number(credential.accessTokenExpired) < Date.now() + gap * 1000;
 class CloudApiService {
+    static getInstance(service) {
+        var _a;
+        if ((_a = CloudApiService.serviceCacheMap) === null || _a === void 0 ? void 0 : _a[service]) {
+            return CloudApiService.serviceCacheMap[service];
+        }
+        const apiService = new CloudApiService(service);
+        CloudApiService.serviceCacheMap[service] = apiService;
+        return apiService;
+    }
     constructor(service, baseParams, version = '') {
         this.apiService = new cloud_api_1.CloudApiService({
             service,
@@ -38,15 +47,6 @@ class CloudApiService {
             })
         });
     }
-    static getInstance(service) {
-        var _a;
-        if ((_a = CloudApiService.serviceCacheMap) === null || _a === void 0 ? void 0 : _a[service]) {
-            return CloudApiService.serviceCacheMap[service];
-        }
-        const apiService = new CloudApiService(service);
-        CloudApiService.serviceCacheMap[service] = apiService;
-        return apiService;
-    }
     request(action, data = {}, method = 'POST') {
         return __awaiter(this, void 0, void 0, function* () {
             const region = this.region || (yield (0, toolbox_1.getRegion)());

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.6.0-alpha.7",
+    "version": "2.6.0-pre-alpha.0",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -33,12 +33,14 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.7",
-        "@cloudbase/functions-framework": "^1.0.0-beta.3",
-        "@cloudbase/lowcode-cli": "^0.21.1",
+        "@cloudbase/functions-framework": "^1.5.0",
+        "@cloudbase/iac-core": "^0.0.3-alpha.1",
+        "@cloudbase/lowcode-cli": "^0.22.0",
         "@cloudbase/manager-node": "4.2.8",
         "@cloudbase/toolbox": "^0.7.5",
         "@sentry/node": "^5.10.2",
         "address": "^1.1.2",
+        "camelcase-keys": "^7.0.2",
         "chalk": "^2.4.2",
         "cli-table3": "^0.5.1",
         "commander": "7",

package/types/commands/index.d.ts

@@ -13,3 +13,4 @@ export * from './lowcode';
 export * from './run';
 export * from './db';
 export * from './fun';
+export * from './runf';

package/types/commands/run/index.d.ts

@@ -2,5 +2,4 @@ export * from './list';
 export * from './version';
 export * from './delete';
 export * from './image';
-export * from './standalonegateway';
 export * from './service';

package/types/commands/runf/base.d.ts

@@ -0,0 +1,57 @@
+import { Logger } from '../../decorators';
+import { Command } from '../common';
+export declare class RunfListCommand extends Command {
+    get options(): {
+        cmd: string;
+        childCmd: string;
+        options: {
+            flags: string;
+            desc: string;
+        }[];
+        requiredEnvId: boolean;
+        autoRunLogin: boolean;
+        desc: string;
+    };
+    execute(envId: any, log: Logger): Promise<void>;
+}
+export declare class RunfDeployCommand extends Command {
+    get options(): {
+        cmd: string;
+        childCmd: string;
+        options: {
+            flags: string;
+            desc: string;
+        }[];
+        requiredEnvId: boolean;
+        autoRunLogin: boolean;
+        desc: string;
+    };
+    execute(ctx: any, envId: any, log: Logger, options: any): Promise<void>;
+}
+export declare class RunfDownloadCommand extends Command {
+    get options(): {
+        cmd: string;
+        childCmd: string;
+        options: {
+            flags: string;
+            desc: string;
+        }[];
+        requiredEnvId: boolean;
+        autoRunLogin: boolean;
+        desc: string;
+    };
+    execute(ctx: any, envId: any, log: Logger, options: any): Promise<void>;
+}
+export declare class RunfRunCommand extends Command {
+    get options(): {
+        cmd: string;
+        childCmd: string;
+        options: {
+            flags: string;
+            desc: string;
+        }[];
+        requiredEnvId: boolean;
+        desc: string;
+    };
+    execute(logger: Logger): Promise<void>;
+}

package/types/commands/runf/index.d.ts

@@ -0,0 +1 @@
+export * from './base';

package/types/decorators/params/common.d.ts

@@ -1,4 +1,4 @@
 import { ParamTypes } from '../constants';
-declare type GetterFunction = (target: any) => Promise<any> | any;
+type GetterFunction = (target: any) => Promise<any> | any;
 export declare const createParamDecorator: (paramtype: ParamTypes, getter: GetterFunction) => () => (target: any, key: string | symbol, index: number) => void;
 export {};

package/types/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-export declare type CustomEvent = 'logout';
+export type CustomEvent = 'logout';
 export interface ICommandContext {
     cmd: string;
     envId: string;
@@ -33,7 +33,7 @@ export interface TmpCredential {
     uin?: string;
     hash?: string;
 }
-export declare type Credential = TmpCredential & PermanentCredential;
+export type Credential = TmpCredential & PermanentCredential;
 export interface AuthSecret {
     secretId: string;
     secretKey: string;

package/types/utils/config.d.ts

@@ -10,7 +10,7 @@ export interface IArgs {
 }
 export declare const getArgs: () => Arguments<IArgs>;
 export declare function getPrivateSettings(config: ICloudBaseRcSettings, cmd?: string): undefined | IPrivateSettings;
-declare type IAbsUrl = `http://${string}` | `https://${string}`;
+type IAbsUrl = `http://${string}` | `https://${string}`;
 export interface IPrivateSettings {
     credential: Credential;
     endpoints: {

package/types/utils/fs/index.d.ts

@@ -1,5 +1,5 @@
 export * from './del';
-export declare type SizeUnit = 'KB' | 'MB' | 'GB';
+export type SizeUnit = 'KB' | 'MB' | 'GB';
 export declare function checkFullAccess(dest: string, throwError?: boolean): boolean;
 export declare function checkWritable(dest: string, throwError?: boolean): boolean;
 export declare function checkReadable(dest: string, throwError?: boolean): boolean;

package/types/utils/net/http-request.d.ts

@@ -1,7 +1,7 @@
 import _fetch, { RequestInit } from 'node-fetch';
-declare type fetchReturnType = ReturnType<typeof _fetch>;
-declare type UnPromisify<T> = T extends PromiseLike<infer U> ? U : T;
-declare type fetchReturnTypeExtracted = UnPromisify<fetchReturnType>;
+type fetchReturnType = ReturnType<typeof _fetch>;
+type UnPromisify<T> = T extends PromiseLike<infer U> ? U : T;
+type fetchReturnTypeExtracted = UnPromisify<fetchReturnType>;
 export declare function fetch(url: string, config?: RequestInit): Promise<any>;
 export declare function postFetch(url: string, data?: Record<string, any>): Promise<any>;
 export declare function fetchStream(url: any, config?: Record<string, any>): Promise<fetchReturnTypeExtracted>;

package/types/utils/output/loading.d.ts

@@ -8,7 +8,7 @@ declare class Loading {
     fail(text: string): void;
 }
 export declare const loadingFactory: () => Loading;
-declare type Task<T> = (flush: (text: string) => void, ...args: any[]) => Promise<T>;
+type Task<T> = (flush: (text: string) => void, ...args: any[]) => Promise<T>;
 export interface ILoadingOptions {
     startTip?: string;
     successTip?: string;

package/types/utils/parallel.d.ts

@@ -1,4 +1,4 @@
-export declare type AsyncTask = () => Promise<any>;
+export type AsyncTask = () => Promise<any>;
 export declare class AsyncTaskParallelController {
     maxParallel: number;
     tasks: AsyncTask[];

package/types/utils/validator.d.ts

@@ -1,4 +1,4 @@
-declare type SimpleValue = number | string | boolean;
+type SimpleValue = number | string | boolean;
 export declare function assertTruthy(val: SimpleValue | SimpleValue[], errMsg: string): void;
 export declare function assertHas(obj: any, prop: string, errMsg: any): void;
 export declare const validateIp: (ip: string) => boolean;

package/.history/src/commands/lowcode/app_20220728111717.ts

@@ -1,52 +0,0 @@
-import _ from 'lodash'
-import { Command, ICommand } from '../common'
-import { watchApp } from '@cloudbase/lowcode-cli'
-import { InjectParams, Log, Logger, CmdContext, ArgsOptions } from '../../decorators'
-
-@ICommand()
-export class LowCodeWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--wx-devtool-path <wxDevtoolPath>',
-                    desc: '微信开发者工具的安装路径'
-                }
-            ],
-            desc: '开启云开发低码的本地构建模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        await watchApp({
-            watchPort: 8288,
-            wxDevtoolPath: options?.wxDevtoolPath
-        })
-    }
-}
-
-@ICommand()
-export class DanielWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch-ws',
-            options: [],
-            desc: '开启云开发低码的本地开发模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        console.log('>>> 启动啦')
-    }
-}

package/.history/src/commands/lowcode/app_20220728112031.ts

@@ -1,34 +0,0 @@
-import _ from 'lodash'
-import { Command, ICommand } from '../common'
-import { watchApp } from '@cloudbase/lowcode-cli'
-import { InjectParams, Log, Logger, CmdContext, ArgsOptions } from '../../decorators'
-
-@ICommand()
-export class LowCodeWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--wx-devtool-path <wxDevtoolPath>',
-                    desc: '微信开发者工具的安装路径'
-                }
-            ],
-            desc: '开启云开发低码的本地构建模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        await watchApp({
-            watchPort: 8288,
-            wxDevtoolPath: options?.wxDevtoolPath
-        })
-    }
-}

package/.history/src/commands/lowcode/app_20220729172854.ts

@@ -1,34 +0,0 @@
-import _ from 'lodash'
-import { Command, ICommand } from '../common'
-import { watchApp } from '@cloudbase/lowcode-cli'
-import { InjectParams, Log, Logger, CmdContext, ArgsOptions } from '../../decorators'
-
-@ICommand()
-export class LowCodeWatch extends Command {
-    get options() {
-        return {
-            cmd: 'lowcode',
-            childCmd: 'watch',
-            options: [
-                {
-                    flags: '--verbose',
-                    desc: '是否打印详细日志'
-                },
-                {
-                    flags: '--wx-devtool-path <wxDevtoolPath>',
-                    desc: '微信开发者工具的安装路径'
-                }
-            ],
-            desc: '开启微搭低代码的本地构建模式',
-            requiredEnvId: false
-        }
-    }
-
-    @InjectParams()
-    async execute(@CmdContext() ctx, @ArgsOptions() options) {
-        await watchApp({
-            watchPort: 8288,
-            wxDevtoolPath: options?.wxDevtoolPath
-        })
-    }
-}

package/.history/src/index_20220624162613.ts

@@ -1,13 +0,0 @@
-import 'reflect-metadata'
-import { registerCommands } from './commands/common'
-import './commands'
-
-export { smartDeploy } from './commands'
-
-registerCommands()
-
-// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
-if (typeof globalThis === undefined) {
-    // eslint-disable-next-line no-undef
-    ;(globalThis as any) = global
-}

package/.history/src/index_20220627113609.ts

@@ -1,15 +0,0 @@
-import 'reflect-metadata'
-import { registerCommands } from './commands/common'
-import './commands'
-
-export { smartDeploy } from './commands'
-
-registerCommands()
-
-// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
-if (typeof globalThis === undefined) {
-    // eslint-disable-next-line no-undef
-    ;(globalThis as any) = global
-}
-
-console.log("daniel tcb")

package/.history/src/index_20220627114102.ts

@@ -1,13 +0,0 @@
-import 'reflect-metadata'
-import { registerCommands } from './commands/common'
-import './commands'
-
-export { smartDeploy } from './commands'
-
-registerCommands()
-
-// HACK: 部分依赖使用了 globalThis，会在 Node12 以下的版本报错
-if (typeof globalThis === undefined) {
-    // eslint-disable-next-line no-undef
-    ;(globalThis as any) = global
-}