@cloudbase/cli 2.7.7-alpha.0 → 2.7.8

package/lib/commands/cloudrun/base.js

@@ -47,7 +47,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CloudRunRunCommand = 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.getAgentService = 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"));
@@ -55,6 +55,7 @@ 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 execa_1 = __importDefault(require("execa"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const nodemon_1 = __importDefault(require("nodemon"));
@@ -89,6 +90,22 @@ function getCloudrunService(envId) {
     });
 }
 exports.getCloudrunService = getCloudrunService;
+function getAgentService(envId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const region = yield (0, toolbox_1.getRegion)();
+        const { secretId, secretKey, token } = yield (0, utils_1.checkAndGetCredential)(true);
+        const app = new manager_node_1.default({
+            region,
+            token,
+            envId,
+            secretId,
+            secretKey,
+            proxy: (0, utils_1.getProxy)()
+        });
+        return app.agent;
+    });
+}
+exports.getAgentService = getAgentService;
 let CloudRunInitCommand = class CloudRunInitCommand extends common_1.Command {
     get options() {
         return {
@@ -282,7 +299,7 @@ let CloudRunDownloadCommand = class CloudRunDownloadCommand extends common_1.Com
                     desc: '环境 ID'
                 },
                 {
-                    flags: '--serviceName <serviceName>',
+                    flags: '-s, --serviceName <serviceName>',
                     desc: '服务名称',
                     required: true
                 },
@@ -398,7 +415,7 @@ let CloudRunDeleteCommand = class CloudRunDeleteCommand extends common_1.Command
                     desc: '环境 ID'
                 },
                 {
-                    flags: '--serviceName <serviceName>',
+                    flags: '-s, --serviceName <serviceName>',
                     desc: '服务名称',
                     required: true
                 },
@@ -497,6 +514,10 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                     flags: '--source <source>',
                     desc: '部署代码所在目录路径（绝对路径或相对路径，默认: 当前目录）'
                 },
+                {
+                    flags: '--createAgent',
+                    desc: '创建函数型 Agent'
+                },
                 {
                     flags: '--force',
                     desc: '强制部署，跳过所有确认提示',
@@ -511,7 +532,7 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
     execute(ctx, envId, log, options) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            let { serviceName, source, force, port } = options;
+            let { serviceName, source, force, port, createAgent } = options;
             const targetDir = path_1.default.resolve(source || process.cwd());
             if (!envId) {
                 const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(targetDir));
@@ -523,6 +544,43 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                 }
             }
             log.info(`当前环境 Id：${envId}`);
+            if (createAgent) {
+                const questions = [
+                    {
+                        type: 'input',
+                        name: 'Name',
+                        message: '请输入函数式 Agent 名称:',
+                        validate: (input) => {
+                            if (!input.trim()) {
+                                return '名称不能为空';
+                            }
+                            return true;
+                        }
+                    },
+                    {
+                        type: 'input',
+                        name: 'BotId',
+                        message: '请输入括号内的标识 ibot-(服务名-BotTag)。示例：agent-chat:',
+                        validate: (input) => {
+                            if (!/^[a-z0-9_]+-[a-z0-9_]+$/.test(input)) {
+                                return '标识格式错误，应为"xxx-xxx"';
+                            }
+                            return true;
+                        }
+                    }
+                ];
+                const { Name, BotId } = yield inquirer_1.default.prompt(questions);
+                const botId = `ibot-${BotId}`;
+                const agentService = yield getAgentService(envId);
+                yield agentService.createFunctionAgent(source, {
+                    Name: Name,
+                    BotId: botId
+                });
+                (0, utils_2.trackCallback)({
+                    details: `请打开链接查看部署状态: https://tcb.cloud.tencent.com/dev?envId=${envId}#/ai?tab=agent&agent=${botId}`
+                }, log);
+                return;
+            }
             if (!serviceName) {
                 let defaultName = '';
                 const config = yield (0, utils_2.getCloudbaserc)(targetDir);
@@ -816,6 +874,7 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
                     logger.info('Initializing server in watch mode. Changes in source files will trigger a restart.');
                     if (!nodemonInstance._firstStartDone) {
                         nodemonInstance._firstStartDone = true;
+                        this.checkAndRunTsc();
                         this.openDebugApp(type, port, envId, agentId, openDebugPanel !== 'false');
                     }
                 }))
@@ -840,12 +899,33 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
             }
             else {
                 (0, functions_framework_1.runCLI)();
-                if (!process.env.FROM_NODEMON && openDebugPanel) {
-                    this.openDebugApp(type, port, envId, agentId, openDebugPanel !== 'false');
+                if (!process.env.FROM_NODEMON) {
+                    this.checkAndRunTsc();
+                    if (openDebugPanel) {
+                        this.openDebugApp(type, port, envId, agentId, openDebugPanel !== 'false');
+                    }
                 }
             }
         });
     }
+    checkAndRunTsc() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const tsConfigPath = path_1.default.join(process.cwd(), 'tsconfig.json');
+            if (yield fs_extra_1.default.exists(tsConfigPath)) {
+                const child = (0, execa_1.default)('npx', ['tsc', '-w'], {
+                    cwd: process.cwd(),
+                    stdio: 'pipe'
+                });
+                (_a = child.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+                    console.log(data.toString());
+                });
+                child.on('exit', (code) => {
+                    console.log(`子进程退出，退出码 ${code}`);
+                });
+            }
+        });
+    }
     openDebugApp(type, port, envId, agentId, isOpen = true) {
         return __awaiter(this, void 0, void 0, function* () {
             let url = `http://127.0.0.1:${port}/cloudrun-run-ui/index.html?type=${type}&envId=${envId}&port=${port}`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.7.7-alpha.0",
+    "version": "2.7.8",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -36,7 +36,7 @@
         "@cloudbase/functions-framework": "1.16.0",
         "@cloudbase/iac-core": "0.0.3-alpha.11",
         "@cloudbase/lowcode-cli": "^0.22.2",
-        "@cloudbase/manager-node": "4.3.2",
+        "@cloudbase/manager-node": "4.3.3",
         "@cloudbase/toolbox": "^0.7.5",
         "address": "^1.1.2",
         "camelcase-keys": "^7.0.2",

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

@@ -1,6 +1,7 @@
 import { Logger } from '../../decorators';
 import { Command } from '../common';
 export declare function getCloudrunService(envId: string): Promise<import("@cloudbase/manager-node/types/cloudrun").CloudRunService>;
+export declare function getAgentService(envId: string): Promise<import("@cloudbase/manager-node/types/agent").AgentService>;
 export declare class CloudRunInitCommand extends Command {
     get options(): {
         cmd: string;
@@ -136,6 +137,7 @@ export declare class CloudRunDeployCommand extends Command {
         source?: string;
         force?: boolean;
         port?: number;
+        createAgent?: boolean;
     }): Promise<void>;
 }
 export declare class CloudRunRunCommand extends Command {
@@ -151,6 +153,7 @@ export declare class CloudRunRunCommand extends Command {
         desc: string;
     };
     execute(envId: string, logger: Logger, ctx: any, options: any): Promise<void>;
+    private checkAndRunTsc;
     private openDebugApp;
     private waitForPort;
 }