@cloudbase/cli 2.7.0 → 2.7.2

package/lib/commands/cloudrun/base.js

@@ -24,17 +24,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CloudRunDeployCommand = exports.CloudRunDeleteCommand = exports.CloudRunDownloadCommand = exports.CloudRunListCommand = exports.CloudRunInitCommand = exports.getCloudrunService = void 0;
+exports.CloudRunRunCommand = exports.CloudRunDeployCommand = exports.CloudRunDeleteCommand = exports.CloudRunDownloadCommand = exports.CloudRunListCommand = exports.CloudRunInitCommand = exports.getCloudrunService = void 0;
+const functions_framework_1 = require("@cloudbase/functions-framework");
 const iac_core_1 = require("@cloudbase/iac-core");
 const manager_node_1 = __importDefault(require("@cloudbase/manager-node"));
 const toolbox_1 = require("@cloudbase/toolbox");
 const camelcase_keys_1 = __importDefault(require("camelcase-keys"));
 const chalk_1 = __importDefault(require("chalk"));
 const cli_table3_1 = __importDefault(require("cli-table3"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const inquirer_1 = __importDefault(require("inquirer"));
+const nodemon_1 = __importDefault(require("nodemon"));
+const open_1 = __importDefault(require("open"));
 const ora_1 = __importDefault(require("ora"));
 const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const decorators_1 = require("../../decorators");
 const utils_1 = require("../../utils");
 const common_1 = require("../common");
@@ -127,6 +130,10 @@ let CloudRunInitCommand = class CloudRunInitCommand extends common_1.Command {
                     template,
                     targetPath: targetDir
                 });
+                yield (0, utils_2.upsertCloudbaserc)(path_1.default.resolve(targetDir, serviceName), {
+                    envId,
+                    cloudrun: { name: serviceName }
+                });
                 spinner.succeed('项目初始化成功');
                 console.log(chalk_1.default.green(`项目路径：${projectDir}`));
             }
@@ -273,6 +280,7 @@ let CloudRunDownloadCommand = class CloudRunDownloadCommand extends common_1.Com
         };
     }
     execute(ctx, envId, log, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let { serviceName, targetPath, force } = options;
             let targetDir = path_1.default.resolve(targetPath || process.cwd());
@@ -285,12 +293,18 @@ let CloudRunDownloadCommand = class CloudRunDownloadCommand extends common_1.Com
             if (!serviceName) {
                 let defaultName = '';
                 if (maybeInProject) {
-                    const { shortName } = yield (0, utils_2.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
-                    if (shortName) {
-                        defaultName = shortName;
+                    const config = yield (0, utils_2.getCloudbaserc)(targetDir);
+                    if ((_a = config === null || config === void 0 ? void 0 : config['cloudrun']) === null || _a === void 0 ? void 0 : _a['name']) {
+                        defaultName = config['cloudrun']['name'];
                     }
                     else {
-                        defaultName = path_1.default.basename(targetDir);
+                        const { shortName } = yield (0, utils_2.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
+                        if (shortName) {
+                            defaultName = shortName;
+                        }
+                        else {
+                            defaultName = path_1.default.basename(targetDir);
+                        }
                     }
                 }
                 serviceName = yield _inputServiceName(defaultName);
@@ -319,6 +333,10 @@ let CloudRunDownloadCommand = class CloudRunDownloadCommand extends common_1.Com
                     serverName: serviceName,
                     targetPath: targetDir
                 });
+                yield (0, utils_2.upsertCloudbaserc)(targetDir, {
+                    envId,
+                    cloudrun: { name: serviceName }
+                });
                 log.success(`云托管服务 ${serviceName} 代码已成功下载到: ${targetDir}`);
             }
             catch (e) {
@@ -373,6 +391,7 @@ let CloudRunDeleteCommand = class CloudRunDeleteCommand extends common_1.Command
         };
     }
     execute(ctx, envId, log, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let { serviceName, force } = options;
             if (!envId) {
@@ -381,7 +400,12 @@ let CloudRunDeleteCommand = class CloudRunDeleteCommand extends common_1.Command
             log.info(`当前环境：${envId}`);
             const cloudrunService = yield getCloudrunService(envId);
             if (!serviceName) {
-                serviceName = yield _inputServiceName();
+                const config = yield (0, utils_2.getCloudbaserc)(process.cwd());
+                let detaultName = '';
+                if ((_a = config === null || config === void 0 ? void 0 : config['cloudrun']) === null || _a === void 0 ? void 0 : _a['name']) {
+                    detaultName = config['cloudrun']['name'];
+                }
+                serviceName = yield _inputServiceName(detaultName);
             }
             if (!force) {
                 const answers = yield inquirer_1.default.prompt([
@@ -462,7 +486,7 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
         };
     }
     execute(ctx, envId, log, options) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let { serviceName, source, force, port } = options;
             const targetDir = path_1.default.resolve(source || process.cwd());
@@ -470,18 +494,23 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                 const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(targetDir));
                 if (envConfig === null || envConfig === void 0 ? void 0 : envConfig.envId) {
                     envId = envConfig.envId;
-                    log.info(`当前环境 Id：${envId}`);
                 }
                 else {
                     envId = yield _selectEnv();
                 }
             }
-            else {
-                log.info(`当前环境 Id：${envId}`);
-            }
+            log.info(`当前环境 Id：${envId}`);
             if (!serviceName) {
-                const { shortName } = yield (0, utils_2.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
-                serviceName = yield _inputServiceName(shortName);
+                let defaultName = '';
+                const config = yield (0, utils_2.getCloudbaserc)(targetDir);
+                if ((_a = config === null || config === void 0 ? void 0 : config['cloudrun']) === null || _a === void 0 ? void 0 : _a['name']) {
+                    defaultName = config['cloudrun']['name'];
+                }
+                else {
+                    const { shortName } = yield (0, utils_2.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
+                    defaultName = shortName;
+                }
+                serviceName = yield _inputServiceName(defaultName);
             }
             if (!force) {
                 const answers = yield inquirer_1.default.prompt([
@@ -507,7 +536,7 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
             let serverType;
             try {
                 const details = yield cloudrunService.detail({ serverName: serviceName });
-                serverType = (_a = details.BaseInfo) === null || _a === void 0 ? void 0 : _a.ServerType;
+                serverType = (_b = details.BaseInfo) === null || _b === void 0 ? void 0 : _b.ServerType;
             }
             catch (e) {
                 const dockerfilePath = path_1.default.join(targetDir, 'Dockerfile');
@@ -544,6 +573,10 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                             }, function (message) {
                                 (0, utils_2.trackCallback)(message, log);
                             });
+                        yield (0, utils_2.upsertCloudbaserc)(targetDir, {
+                            envId,
+                            cloudrun: { name: serviceName }
+                        });
                         const { envId: _envId, name, resourceType: _resourceType } = res === null || res === void 0 ? void 0 : res.data;
                         (0, utils_2.trackCallback)({
                             details: `请打开链接查看部署状态: https://tcb.cloud.tencent.com/dev?envId=${_envId}#/platform-run/service/detail?serverName=${name}&tabId=deploy&envId=${_envId}`
@@ -615,6 +648,204 @@ CloudRunDeployCommand = __decorate([
     (0, common_1.ICommand)()
 ], CloudRunDeployCommand);
 exports.CloudRunDeployCommand = CloudRunDeployCommand;
+let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
+    get options() {
+        return {
+            cmd: 'cloudrun',
+            childCmd: 'run',
+            allowUnknownOption: true,
+            options: [
+                {
+                    flags: '--runMode <runMode>',
+                    desc: `运行模式，可选值: normal(普通函数) | agent(函数式 Agent)，默认值: normal`
+                },
+                {
+                    flags: '--agentId <agentId>',
+                    desc: `在 agent 模式下需要提供 Agent ID 进行调试`
+                },
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 ID'
+                },
+                {
+                    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。
+                                             环境变量: FUNCTIONS_CONFIG_FILE
+                    `
+                },
+                {
+                    flags: '--loadAllFunctions',
+                    desc: `是否加载 "functionsRoot" 目录中的所有函数。默认为 false
+                    `
+                },
+                {
+                    flags: '--extendedContext <extendedContext>',
+                    desc: `用于解析 context.extendedContext 的值。""表示该功能已关闭。默认值为 null
+                                             示例：--extendedContext '{"a":1,"b":2}'
+                                             环境变量：EXTENDED_CONTEXT
+                                             `
+                }
+            ],
+            requiredEnvId: false,
+            desc: '本地运行函数型云托管服务（不支持容器型云托管服务）'
+        };
+    }
+    execute(envId, logger, ctx, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            debugger;
+            let { runMode = 'normal', agentId } = options;
+            const type = runMode;
+            console.log(chalk_1.default.green(`当前运行模式: ${type}`));
+            if (!process.argv.some((arg) => arg.includes('--dotEnvFilePath='))) {
+                process.argv.push('--dotEnvFilePath=.env.local');
+            }
+            const args = process.argv.slice(2);
+            const watchFlag = ['--watch', '-w'];
+            const defaultIgnoreFiles = ['logs/*.*'];
+            if (!envId) {
+                const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(process.cwd()));
+                if (envConfig === null || envConfig === void 0 ? void 0 : envConfig.envId) {
+                    envId = envConfig.envId;
+                }
+                else {
+                    envId = yield _selectEnv();
+                }
+            }
+            logger.info(`当前环境 Id：${envId}`);
+            if (type === 'agent') {
+                if (!agentId) {
+                    const answers = yield inquirer_1.default.prompt([
+                        {
+                            type: 'input',
+                            name: 'agentId',
+                            message: `请输入 Agent ID:`,
+                            validate: (val) => {
+                                return val.trim() ? true : 'Agent ID 不能为空';
+                            }
+                        }
+                    ]);
+                    agentId = answers.agentId;
+                }
+                logger.info(`当前 Agent ID: ${agentId}`);
+            }
+            const credential = yield (0, utils_2.getCredential)(ctx, options);
+            process.env.EXTENDED_CONTEXT = JSON.stringify({
+                tmpSecret: {
+                    secretId: credential.secretId,
+                    secretKey: credential.secretKey,
+                    token: credential.token
+                },
+                source: 'local_dev',
+                envId,
+                accessToken: `Bearer ${yield (0, utils_2.fetchAccessToken)({
+                    envId,
+                    secretId: credential.secretId,
+                    secretKey: credential.secretKey,
+                    token: credential.token
+                })}`
+            });
+            process.env.STATIC_SERVE_ROOT = __dirname;
+            process.env.ENABLE_CORS = 'true';
+            process.env.ALLOWED_ORIGINS = '*';
+            const port = options.port || process.env.PORT || 3000;
+            if (watchFlag.some((flag) => args.includes(flag))) {
+                const cmd = args.filter((arg) => !watchFlag.includes(arg)).join(' ');
+                const nodemonInstance = (0, nodemon_1.default)({
+                    script: '',
+                    exec: `${process.argv[1]} ${cmd} --envId=${envId} --runMode=${type} --agentId=${agentId}`,
+                    watchOptions: {
+                        usePolling: true,
+                        ignorePermissionErrors: true,
+                        ignored: defaultIgnoreFiles.join(','),
+                        persistent: true,
+                        interval: 500
+                    },
+                    env: {
+                        FROM_NODEMON: 'true'
+                    }
+                })
+                    .on('start', () => __awaiter(this, void 0, void 0, function* () {
+                    logger.info('Initializing server in watch mode. Changes in source files will trigger a restart.');
+                    if (!nodemonInstance._firstStartDone) {
+                        nodemonInstance._firstStartDone = true;
+                        this.openDebugApp(type, port, envId, agentId);
+                    }
+                }))
+                    .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)();
+                if (!process.env.FROM_NODEMON) {
+                    this.openDebugApp(type, port, envId, agentId);
+                }
+            }
+        });
+    }
+    openDebugApp(type, port, envId, agentId) {
+        setTimeout(() => {
+            let url = `http://127.0.0.1:${port}/cloudrun-run-ui/index.html?type=${type}&envId=${envId}&port=${port}`;
+            if (type === 'agent') {
+                url += `&agentId=${agentId}`;
+                console.log(chalk_1.default.green(`点击 [${url}] 可以打开 Agent 调试应用`));
+            }
+            else {
+                console.log(chalk_1.default.green(`点击 [${url}] 可以打开函数调试面板`));
+            }
+            (0, open_1.default)(url, { wait: false });
+        }, 3000);
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.EnvId)()),
+    __param(1, (0, decorators_1.Log)()),
+    __param(2, (0, decorators_1.CmdContext)()),
+    __param(3, (0, decorators_1.ArgsOptions)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, decorators_1.Logger, Object, Object]),
+    __metadata("design:returntype", Promise)
+], CloudRunRunCommand.prototype, "execute", null);
+CloudRunRunCommand = __decorate([
+    (0, common_1.ICommand)()
+], CloudRunRunCommand);
+exports.CloudRunRunCommand = CloudRunRunCommand;
 function _selectEnv() {
     return __awaiter(this, void 0, void 0, function* () {
         return (0, utils_2.selectEnv)({ source: [constants_1.EnvSource.MINIAPP, constants_1.EnvSource.QCLOUD] });

package/lib/commands/cloudrun/cloudrun-run-ui/index.html

@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Cloudrun Debug Panel</title>
+    <script src="https://weda.cloud.tencent.com/third-party/axios.min.js"></script>
+</head>
+
+<body style="height: 100vh;">
+    <iframe srcdoc="<!DOCTYPE html>
+    <head>
+    <meta charset=&quot;UTF-8&quot;>
+    <meta name=&quot;viewport&quot; content=&quot;width=device-width, initial-scale=1.0&quot;>
+    <title>Http Client</title>
+    </head>
+    <body>
+    <div id=&quot;app&quot;></div>
+    <script>
+    window.addEventListener('message', (event) => {
+        if (event.data.type === 'loadScript') {
+            const script = document.createElement('script');
+            script.src = event.data.url;
+            document.body.appendChild(script);
+        }
+    });
+    </script>
+    </body>
+    </html>" style="width: 100%; height: 100%; border: none;"></iframe>
+
+    <script>
+        // 获取当前页面的 URL 参数
+        const urlParams = new URLSearchParams(window.location.search);
+        const type = urlParams.get('type');       // 获取 type 参数
+        const agentId = urlParams.get('agentId'); // 获取 agentId 参数
+        const envId = urlParams.get('envId');     // 获取 envId 参数
+        const port = urlParams.get('port');       // 获取 port 参数
+
+        // 监听来自VSCode扩展的消息
+        window.addEventListener('message', (event) => {
+            const message = event.data;
+
+            if (message.type === 'request') {
+                handleRequest(message, iframe.contentWindow);
+            }
+
+            // 处理ready类型的消息
+            if (message.type === 'ready') {
+                iframe.contentWindow.postMessage({
+                    success: true,
+                    id: message.id,
+                    data: {
+                        url: `http://127.0.0.1:${port}${type === 'agent' ? `/v1/aibot/bots/${agentId}/send-message` : ''}`,
+                        resourceType: 'FunctionV2',
+                        body: type === "agent" ? { botId: agentId, msg: 'hi', searchEnable: false, files: [] } : {},
+                        defaultType: type === 'agent' ? 'AGENT' : 'HTTP',
+                        agentConfig: {
+                            uin: '',
+                            envId,
+                            ibotId: agentId,
+                        },
+                    }
+                });
+            }
+        });
+
+        const iframe = document.querySelector('iframe');
+        iframe.addEventListener('load', () => {
+            try {
+                const iframeWindow = iframe.contentWindow;
+                window.setState = (state) => { }
+                iframeWindow.acquireVsCodeApi = () => window
+                iframeWindow.postMessage({
+                    type: 'loadScript',
+                    url: 'https://weda.cloud.tencent.com/code_studio_webview/app.js'
+                }, '*');
+            } catch (error) {
+                console.error('挂载vscodeRef失败:', error);
+            }
+        });
+
+        // 在head中添加axios和URLParse的CDN引用
+        const HTTP_METHODS = {
+            GET: 'get',
+            POST: 'post',
+            PUT: 'put',
+            PATCH: 'patch',
+            DELETE: 'delete',
+            HEAD: 'head',
+            OPTIONS: 'options'
+        };
+
+        function getRequestConfig(state) {
+            const url = new URL(state.url);
+
+            if (!url.protocol) {
+                url.protocol = 'http:';
+            }
+
+            const headers = {};
+            state.request.headers.forEach(({ key, value, checked }) => {
+                if (checked) {
+                    headers[key] = value;
+                }
+            });
+
+            const config = {
+                url: url.href,
+                method: state.method,
+                headers,
+                params: JSON.parse(JSON.stringify(state.request.params)),
+                validateStatus: () => true,
+                paramsSerializer: function (params) {
+                    const param = {};
+                    params.forEach((i) => {
+                        if (!i.checked) {
+                            return;
+                        }
+                        param[i.key] = i.value;
+                    });
+                    return new URLSearchParams(param).toString();
+                }
+            };
+
+            if (![HTTP_METHODS.GET, HTTP_METHODS.DELETE, HTTP_METHODS.OPTIONS].includes(state.method)) {
+                const type = state.request.body.type;
+                let body = state.request.body[type];
+                let data;
+
+                if (type === 'X_WWW_FORM_URLENCODED') {
+                    data = body
+                        .filter(i => i.checked)
+                        .map(i => `${encodeURIComponent(i.key)}=${encodeURIComponent(i.value)}`)
+                        .join('&');
+                }
+
+                if (type === 'RAW') {
+                    try {
+                        data = JSON.parse(body.value);
+                    } catch (e) {
+                        throw new Error('JSON 格式错误');
+                    }
+                }
+
+                if (data) {
+                    config.data = data;
+                }
+            }
+
+            return config;
+        }
+
+        async function handleRequest({ id, payload }, panel) {
+            let message;
+
+            try {
+                const config = getRequestConfig(payload);
+                const { data, status, statusText, headers } = await axios(config);
+
+                message = {
+                    success: true,
+                    id,
+                    data: {
+                        data: typeof data === 'object' ? JSON.stringify(data) : data,
+                        status,
+                        statusText,
+                        headers,
+                    },
+                };
+            } catch (e) {
+                message = {
+                    success: false,
+                    id,
+                    error: { message: e.message },
+                };
+            }
+
+            panel.postMessage(message);
+        }
+
+    </script>
+</body>
+
+</html>

package/lib/commands/common.js

@@ -113,7 +113,10 @@ class Command extends events_1.EventEmitter {
         }
     }
     createProgram(instance, deprecate, newCmd) {
-        const { cmd, childCmd, desc, options, requiredEnvId = true, withoutAuth = false, autoRunLogin = false } = this.options;
+        const { cmd, childCmd, desc, options, requiredEnvId = true, withoutAuth = false, autoRunLogin = false, allowUnknownOption = false } = this.options;
+        if (allowUnknownOption) {
+            instance.allowUnknownOption();
+        }
         instance.storeOptionsAsProperties(false);
         options.forEach((option) => {
             const { hideHelp } = option;

package/lib/commands/fun/base.js

@@ -153,25 +153,6 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                     return;
                 }
             }
-            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)) {
-                    log.error(`验证加载云函数失败: ${loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason}`);
-                    return;
-                }
-            }
             if (!envId) {
                 envId = yield _selectEnv();
             }

package/lib/commands/utils.js

@@ -8,15 +8,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCredential = exports.trackCallback = exports.isDirectoryEmptyOrNotExists = exports.getPackageJsonName = exports.selectEnv = void 0;
+exports.getCloudbaserc = exports.upsertCloudbaserc = exports.fetchAccessToken = exports.getCredential = exports.trackCallback = exports.isDirectoryEmptyOrNotExists = exports.getPackageJsonName = exports.selectEnv = void 0;
 const fs_1 = require("@cloudbase/iac-core/lib/src/fs");
+const signature_nodejs_1 = require("@cloudbase/signature-nodejs");
 const fs_extra_1 = require("fs-extra");
 const inquirer_1 = __importDefault(require("inquirer"));
 const lodash_1 = require("lodash");
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const path_1 = __importDefault(require("path"));
 const env_1 = require("../env");
 const utils_1 = require("../utils");
 const constants_1 = require("./constants");
@@ -100,3 +114,75 @@ function getCredential(ctx, options) {
     });
 }
 exports.getCredential = getCredential;
+function fetchAccessToken(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { envId, secretId, secretKey, token } = params;
+        const domain = `${envId}.api.tcloudbasegateway.com`;
+        const url = `https://${domain}/auth/v1/token/clientCredential`;
+        const method = 'POST';
+        const body = {
+            grant_type: 'client_credentials'
+        };
+        const now = Date.now();
+        const requiredHeaders = {
+            Host: domain,
+            'Content-Type': 'application/json'
+        };
+        const { authorization, timestamp } = (0, signature_nodejs_1.sign)({
+            secretId,
+            secretKey,
+            method,
+            url,
+            params: body,
+            headers: requiredHeaders,
+            timestamp: Math.floor(now / 1000) - 1,
+            withSignedParams: false,
+            isCloudApi: true
+        });
+        const tokenResponse = yield (0, node_fetch_1.default)(url, {
+            method,
+            headers: Object.assign(Object.assign({}, requiredHeaders), { Authorization: `${authorization}, Timestamp=${timestamp}, Token=${token}` }),
+            body: JSON.stringify(body)
+        });
+        const res = yield tokenResponse.json();
+        return res === null || res === void 0 ? void 0 : res.access_token;
+    });
+}
+exports.fetchAccessToken = fetchAccessToken;
+function upsertCloudbaserc(projectPath, inputData) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { envId } = inputData, rest = __rest(inputData, ["envId"]);
+        const configPath = path_1.default.resolve(projectPath, 'cloudbaserc.json');
+        const defaultConfig = {
+            version: '2.0',
+            envId: envId || '{{envId}}',
+            $schema: 'https://framework-1258016615.tcloudbaseapp.com/schema/latest.json'
+        };
+        try {
+            const fileExists = yield (0, fs_extra_1.pathExists)(configPath);
+            if (!fileExists) {
+                const initialConfig = Object.assign(Object.assign({}, defaultConfig), rest);
+                yield (0, fs_extra_1.writeJson)(configPath, initialConfig, { spaces: 2 });
+                return;
+            }
+            const existingConfig = yield (0, fs_extra_1.readJson)(configPath);
+            const mergedConfig = (0, lodash_1.merge)(existingConfig, inputData);
+            yield (0, fs_extra_1.writeJson)(configPath, mergedConfig, { spaces: 2 });
+        }
+        catch (error) {
+            throw new Error(`更新 cloudbaserc.json 失败: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    });
+}
+exports.upsertCloudbaserc = upsertCloudbaserc;
+function getCloudbaserc(projectPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            return yield (0, utils_1.getCloudBaseConfig)(path_1.default.resolve(projectPath, 'cloudbaserc.json'));
+        }
+        catch (e) {
+            return {};
+        }
+    });
+}
+exports.getCloudbaserc = getCloudbaserc;

package/lib/help.js

@@ -21,8 +21,7 @@ const outputHelpInfo = () => {
     service           [cmd]                      HTTP 访问服务管理操作
     run:deprecated    [cmd]                      云托管环境管理操作 (BAAS 或 RUN 类型环境)
     run               [cmd]                      云托管环境管理操作 (TCBR 类型环境)
-    cloudrun          [cmd]                      云托管服务管理操作（新版云开发平台）
-    cloudrunfunction  [cmd]                      云函数 2.0 服务管理操作`;
+    cloudrun          [cmd]                      云托管服务管理操作（新版云开发平台）`;
     const options = `
   选项
 

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.7.0",
+    "version": "2.7.2",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
-        "build": "rimraf lib types && tsc --resolveJsonModule",
+        "build": "rimraf lib types && tsc --resolveJsonModule && cpx \"src/**/*.html\" lib",
         "watch": "rimraf lib types && tsc -w",
-        "dev": "rimraf lib types && tsc -w",
+        "dev": "rimraf lib types && cpx \"src/**/*.html\" lib && tsc -w",
         "eslint": "eslint \"./**/*.ts\"",
         "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000",
         "tsc": "tsc",
@@ -33,10 +33,10 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.7",
-        "@cloudbase/functions-framework": "^1.5.0",
+        "@cloudbase/functions-framework": "1.16.0",
         "@cloudbase/iac-core": "0.0.3-alpha.10",
         "@cloudbase/lowcode-cli": "^0.22.2",
-        "@cloudbase/manager-node": "4.3.0",
+        "@cloudbase/manager-node": "4.3.2",
         "@cloudbase/toolbox": "^0.7.5",
         "address": "^1.1.2",
         "camelcase-keys": "^7.0.2",
@@ -84,6 +84,7 @@
         "@types/webpack-dev-server": "^3.11.1",
         "@typescript-eslint/eslint-plugin": "^4.8.1",
         "@typescript-eslint/parser": "^4.8.1",
+        "cpx": "^1.5.0",
         "eslint": "^7.14.0",
         "eslint-config-alloy": "^3.8.2",
         "husky": "^3.0.9",

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

@@ -138,3 +138,18 @@ export declare class CloudRunDeployCommand extends Command {
         port?: number;
     }): Promise<void>;
 }
+export declare class CloudRunRunCommand extends Command {
+    get options(): {
+        cmd: string;
+        childCmd: string;
+        allowUnknownOption: boolean;
+        options: {
+            flags: string;
+            desc: string;
+        }[];
+        requiredEnvId: boolean;
+        desc: string;
+    };
+    execute(envId: string, logger: Logger, ctx: any, options: any): Promise<void>;
+    private openDebugApp;
+}

package/types/commands/common.d.ts

@@ -9,6 +9,7 @@ interface ICommandOption {
 export interface ICommandOptions {
     deprecateCmd?: string;
     cmd: string;
+    allowUnknownOption?: boolean;
     childCmd?: string | {
         cmd: string;
         desc: string;

package/types/commands/utils.d.ts

@@ -9,3 +9,14 @@ export declare function getPackageJsonName(pkgPath: string): Promise<{
 export declare function isDirectoryEmptyOrNotExists(dirPath: string): Promise<boolean>;
 export declare function trackCallback(message: any, log: Logger): void;
 export declare function getCredential(ctx: any, options: any): Promise<any>;
+export declare function fetchAccessToken(params: {
+    envId: string;
+    secretId: string;
+    secretKey: string;
+    token?: string;
+}): Promise<any>;
+export declare function upsertCloudbaserc(projectPath: string, inputData: {
+    envId?: string;
+    [key: string]: any;
+}): Promise<void>;
+export declare function getCloudbaserc(projectPath: string): Promise<{}>;