@vectorx/cloud-toolkit 0.5.1 → 1.0.0

package/lib/agent.kit.js

@@ -20,7 +20,6 @@ exports.cleanup = cleanup;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const agent_simulator_1 = require("@vectorx/agent-simulator");
 const archiver_1 = __importDefault(require("archiver"));
 const semver_1 = __importDefault(require("semver"));
 const container_1 = require("./container");
@@ -34,7 +33,7 @@ function validatePort(port, name = "端口") {
     }
 }
 function startRcbFramework(workDir_1, port_1, watch_1) {
-    return __awaiter(this, arguments, void 0, function* (workDir, port, watch, nodePath = "node", options) {
+    return __awaiter(this, arguments, void 0, function* (workDir, port, watch, nodePath = "node", options, onLog) {
         return new Promise((resolve, reject) => {
             const args = [
                 ...(watch ? ["--watch"] : []),
@@ -47,10 +46,29 @@ function startRcbFramework(workDir_1, port_1, watch_1) {
                 "localhost,127.0.0.1",
                 "--config",
                 "agent-cloudbase-functions.json",
+                ...((options === null || options === void 0 ? void 0 : options.mode) ? ["--mode", options.mode] : []),
                 ...((options === null || options === void 0 ? void 0 : options.enableRedLangfuse) ? ["--enableRedLangfuse"] : []),
             ];
             try {
-                const packagePath = require.resolve("@vectorx/functions-framework/package.json");
+                let packagePath;
+                try {
+                    packagePath = require.resolve("@vectorx/functions-framework/package.json", { paths: [workDir] });
+                }
+                catch (err) {
+                    const msg = (err === null || err === void 0 ? void 0 : err.message) || String(err);
+                    const isMissing = (err === null || err === void 0 ? void 0 : err.code) === "MODULE_NOT_FOUND" &&
+                        (msg.includes("@vectorx/functions-framework") || msg.includes("functions-framework"));
+                    if (!isMissing) {
+                        throw err;
+                    }
+                    throw new Error([
+                        "未检测到可选依赖 @vectorx/functions-framework，无法启动 rcb-ff 服务。",
+                        "请在你的项目根目录安装（推荐）：",
+                        "  pnpm add @vectorx/functions-framework",
+                        "或在 monorepo 根目录安装：",
+                        "  pnpm add -w @vectorx/functions-framework",
+                    ].join("\n"));
+                }
                 const packageDir = path_1.default.dirname(packagePath);
                 const rcbFfPath = path_1.default.join(packageDir, "bin/rcb-ff.js");
                 console.log("开始启动 rcb-ff 服务...");
@@ -61,12 +79,32 @@ function startRcbFramework(workDir_1, port_1, watch_1) {
                     cwd: workDir,
                 });
                 rcbProcess.stdout.on("data", (data) => {
-                    const output = data.toString();
-                    console.log(output.trim());
+                    const logMessage = data.toString();
+                    process.stdout.write(logMessage);
+                    if (onLog) {
+                        const lines = logMessage.split(/\r?\n/).filter((line) => line.trim().length > 0);
+                        lines.forEach((line) => {
+                            onLog({
+                                level: "info",
+                                message: line,
+                                timestamp: new Date().toISOString(),
+                            });
+                        });
+                    }
                 });
                 rcbProcess.stderr.on("data", (data) => {
-                    const error = data.toString();
-                    console.error(error.trim());
+                    const logMessage = data.toString();
+                    process.stderr.write(logMessage);
+                    if (onLog) {
+                        const lines = logMessage.split(/\r?\n/).filter((line) => line.trim().length > 0);
+                        lines.forEach((line) => {
+                            onLog({
+                                level: "error",
+                                message: line,
+                                timestamp: new Date().toISOString(),
+                            });
+                        });
+                    }
                 });
                 rcbProcess.on("message", (message) => {
                     if ((message.type === "message" && message.data.type === "start-up") ||
@@ -96,7 +134,8 @@ function startRcbFramework(workDir_1, port_1, watch_1) {
 }
 function startDev(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { workDir = process.cwd(), port: specifiedPort, simulatorPort: specifiedSimulatorPort, watch = false, enableRedLangfuse = false, } = options;
+        var _a;
+        const { workDir = process.cwd(), port: specifiedPort, simulatorPort: specifiedSimulatorPort, watch = false, enableRedLangfuse = false, mode = "agent", } = options;
         if (!fs_1.default.existsSync(workDir)) {
             throw new Error(`目录不存在: ${workDir}`);
         }
@@ -127,8 +166,30 @@ function startDev(options) {
         else {
             simulatorPort = yield (0, port_finder_1.findAvailablePort)(port + 1);
         }
-        yield startRcbFramework(workDir, port, watch, undefined, { enableRedLangfuse });
-        const simulator = new agent_simulator_1.AgentSimulator({
+        yield startRcbFramework(workDir, port, watch, undefined, { enableRedLangfuse, mode });
+        let AgentSimulator = (_a = options === null || options === void 0 ? void 0 : options.deps) === null || _a === void 0 ? void 0 : _a.AgentSimulator;
+        if (!AgentSimulator) {
+            try {
+                const mod = require("@vectorx/agent-simulator");
+                AgentSimulator = ((mod === null || mod === void 0 ? void 0 : mod.AgentSimulator) || (mod === null || mod === void 0 ? void 0 : mod.default) || mod);
+            }
+            catch (err) {
+                const msg = (err === null || err === void 0 ? void 0 : err.message) || String(err);
+                const isMissing = (err === null || err === void 0 ? void 0 : err.code) === "MODULE_NOT_FOUND" &&
+                    (msg.includes("@vectorx/agent-simulator") || msg.includes("agent-simulator"));
+                if (!isMissing)
+                    throw err;
+                throw new Error([
+                    "未检测到可选依赖 @vectorx/agent-simulator，无法启动本地模拟器。",
+                    "如在 CLI 中使用，请升级/使用最新的 rcb（CLI 会自动注入该依赖）。",
+                    "如需在当前项目手动启用该能力，请安装：",
+                    "  pnpm add @vectorx/agent-simulator",
+                    "或在 monorepo 根目录安装：",
+                    "  pnpm add -w @vectorx/agent-simulator",
+                ].join("\n"));
+            }
+        }
+        const simulator = new AgentSimulator({
             port: simulatorPort,
             agentServerUrl: `http://localhost:${port}/v1/aiagent/agents/demo-agent`,
             open: false,
@@ -172,45 +233,13 @@ function build(options) {
                 reject(err);
             });
             archive.pipe(output);
-            const filesToAdd = [];
-            const collectFiles = (dir, basePath = "") => {
-                const files = fs_1.default.readdirSync(dir);
-                for (const file of files) {
-                    const fullPath = path_1.default.join(dir, file);
-                    const relativePath = path_1.default.join(basePath, file);
-                    const stat = fs_1.default.statSync(fullPath);
-                    const excludePatterns = [/^\.git/, /^dist/, /\.zip$/, /\.DS_Store$/];
-                    if (excludePatterns.some((pattern) => pattern.test(relativePath))) {
-                        continue;
-                    }
-                    if (stat.isDirectory()) {
-                        collectFiles(fullPath, relativePath);
-                    }
-                    else {
-                        const isExecutable = relativePath.startsWith("bin/") ||
-                            relativePath.includes("/bin/") ||
-                            (() => {
-                                try {
-                                    const content = fs_1.default.readFileSync(fullPath, "utf8");
-                                    return content.startsWith("#!/");
-                                }
-                                catch (_a) {
-                                    return false;
-                                }
-                            })();
-                        filesToAdd.push({ fullPath, relativePath, isExecutable });
-                    }
+            archive.directory(workDir, false, (data) => {
+                const excludePatterns = [/^\.git/, /^dist/, /\.zip$/, /\.DS_Store$/];
+                if (excludePatterns.some((pattern) => pattern.test(data.name))) {
+                    return false;
                 }
-            };
-            collectFiles(workDir);
-            for (const { fullPath, relativePath, isExecutable } of filesToAdd) {
-                if (isExecutable) {
-                    archive.file(fullPath, { name: relativePath, mode: 0o755 });
-                }
-                else {
-                    archive.file(fullPath, { name: relativePath });
-                }
-            }
+                return data;
+            });
             archive.finalize();
         });
         const size = fs_1.default.statSync(outputPath).size;

package/lib/config/api.config.js

@@ -1,13 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBaseUrl = getBaseUrl;
-const apiUrls = {
-    sit: "http://miniapp-tailiang.sl.sit.xiaohongshu.com",
-    development: "https://miniapp.beta.xiaohongshu.com",
-    production: "https://miniapp.xiaohongshu.com",
-};
-const env = process.env.AGENT_BUILD_ENV || "production";
-const baseUrl = apiUrls[env] || apiUrls.development;
+const endpoints_1 = require("@vectorx/endpoints");
 function getBaseUrl() {
-    return baseUrl;
+    console.log("resolveUrl", (0, endpoints_1.resolveUrl)("@vectorx/cloud-toolkit", "baseUrl"));
+    return (0, endpoints_1.resolveUrl)("@vectorx/cloud-toolkit", "baseUrl");
 }

package/lib/container/container.js

@@ -3,9 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.container = void 0;
 const inversify_1 = require("inversify");
 const auth_service_1 = require("../services/auth-service");
+const cloud_env_service_1 = require("../services/cloud-env-service");
+const fun_service_1 = require("../services/fun-service");
 const upload_service_1 = require("../services/upload-service");
 const identifiers_1 = require("./identifiers");
 const container = new inversify_1.Container();
 exports.container = container;
 container.bind(identifiers_1.SERVICE_IDENTIFIERS.AuthService).to(auth_service_1.AuthService).inSingletonScope();
 container.bind(identifiers_1.SERVICE_IDENTIFIERS.UploadService).to(upload_service_1.UploadService).inSingletonScope();
+container.bind(identifiers_1.SERVICE_IDENTIFIERS.CloudEnvService).to(cloud_env_service_1.CloudEnvService).inSingletonScope();
+container.bind(identifiers_1.SERVICE_IDENTIFIERS.FunService).to(fun_service_1.FunService).inSingletonScope();

package/lib/container/identifiers.js

@@ -4,4 +4,6 @@ exports.SERVICE_IDENTIFIERS = void 0;
 exports.SERVICE_IDENTIFIERS = {
     AuthService: Symbol.for("AuthService"),
     UploadService: Symbol.for("UploadService"),
+    CloudEnvService: Symbol.for("CloudEnvService"),
+    FunService: Symbol.for("FunService"),
 };

package/lib/container/index.js

@@ -26,6 +26,12 @@ class ServiceProvider {
     static getUploadService() {
         return container_1.container.get(identifiers_1.SERVICE_IDENTIFIERS.UploadService);
     }
+    static getCloudEnvService() {
+        return container_1.container.get(identifiers_1.SERVICE_IDENTIFIERS.CloudEnvService);
+    }
+    static getFunService() {
+        return container_1.container.get(identifiers_1.SERVICE_IDENTIFIERS.FunService);
+    }
 }
 exports.ServiceProvider = ServiceProvider;
 __exportStar(require("./types"), exports);

package/lib/env.kit.js

@@ -0,0 +1,40 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCloudEnvironments = getCloudEnvironments;
+exports.getCloudEnvironment = getCloudEnvironment;
+exports.createCloudEnvironment = createCloudEnvironment;
+exports.updateCloudEnvironment = updateCloudEnvironment;
+const container_1 = require("./container");
+function getCloudEnvironments(cloudEnvId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const envService = container_1.ServiceProvider.getCloudEnvService();
+        return envService.getCloudEnvironments(cloudEnvId);
+    });
+}
+function getCloudEnvironment(cloudEnvId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const envService = container_1.ServiceProvider.getCloudEnvService();
+        return envService.getCloudEnvironment(cloudEnvId);
+    });
+}
+function createCloudEnvironment(payload) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const envService = container_1.ServiceProvider.getCloudEnvService();
+        return envService.createCloudEnvironment(payload);
+    });
+}
+function updateCloudEnvironment(payload) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const envService = container_1.ServiceProvider.getCloudEnvService();
+        return envService.updateCloudEnvironment(payload);
+    });
+}

package/lib/fun.kit.js

@@ -0,0 +1,34 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startFunDev = startFunDev;
+exports.deployFun = deployFun;
+exports.getPublishHistory = getPublishHistory;
+const container_1 = require("./container");
+function startFunDev() {
+    return __awaiter(this, arguments, void 0, function* (options = {}) {
+        const funService = container_1.ServiceProvider.getFunService();
+        return funService.startFunDev(options);
+    });
+}
+function deployFun(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const funService = container_1.ServiceProvider.getFunService();
+        const result = yield funService.deploy(options);
+        return result;
+    });
+}
+function getPublishHistory(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const funService = container_1.ServiceProvider.getFunService();
+        return funService.getPublishHistory(options);
+    });
+}

package/lib/index.js

@@ -16,6 +16,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Uploader = void 0;
 __exportStar(require("./agent.kit"), exports);
+__exportStar(require("./fun.kit"), exports);
+__exportStar(require("./env.kit"), exports);
 var cos_uploader_1 = require("./utils/cos-uploader");
 Object.defineProperty(exports, "Uploader", { enumerable: true, get: function () { return cos_uploader_1.Uploader; } });
 __exportStar(require("./container"), exports);
@@ -28,3 +30,5 @@ __exportStar(require("./utils/tracker"), exports);
 __exportStar(require("./utils/port-finder"), exports);
 __exportStar(require("./utils/open-browser"), exports);
 __exportStar(require("./utils/output"), exports);
+__exportStar(require("./utils/table"), exports);
+__exportStar(require("./utils/fun-project-validator"), exports);

package/lib/services/auth-service.js

@@ -104,6 +104,7 @@ let AuthService = class AuthService {
                 return loginInfo;
             }
             catch (error) {
+                yield this.clearLoginInfo();
                 return null;
             }
         });
@@ -124,7 +125,7 @@ let AuthService = class AuthService {
                 return response.data;
             }
             catch (error) {
-                throw new Error("检查登录信息失败");
+                throw new Error("检查登录失败信息");
             }
         });
     }

package/lib/services/cloud-env-service.js

@@ -0,0 +1,166 @@
+"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 __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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudEnvService = void 0;
+const inversify_1 = require("inversify");
+const config_1 = require("../config");
+const container_1 = require("../container");
+const env_helper_1 = require("../utils/env-helper");
+const logger_1 = require("../utils/logger");
+const request_1 = require("../utils/request");
+let CloudEnvService = class CloudEnvService {
+    constructor() {
+        this.authService = container_1.container.get(container_1.SERVICE_IDENTIFIERS.AuthService);
+    }
+    getCloudEnvironments(cloudEnvId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            try {
+                let query = {};
+                if (!env_helper_1.isIDE) {
+                    const loginInfo = yield this.authService.getLoginInfo();
+                    if (!loginInfo) {
+                        throw new Error("未登录，请先执行登录命令");
+                    }
+                    query = {
+                        secret_id: loginInfo.secret_id,
+                        cli_token: loginInfo.cli_token,
+                    };
+                }
+                const httpResponse = yield request_1.request.fetch({
+                    method: "POST",
+                    url: `${(0, config_1.getBaseUrl)()}/api/eros/mp/red/code/cloud_env/query`,
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: {
+                        query,
+                        body: {
+                            cloud_env_id: cloudEnvId !== null && cloudEnvId !== void 0 ? cloudEnvId : "",
+                        },
+                    },
+                });
+                const data = request_1.request.handleCode(request_1.request.handleHttpStatus(httpResponse));
+                return ((_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.env_list) || ((_b = data === null || data === void 0 ? void 0 : data.data) === null || _b === void 0 ? void 0 : _b.envs) || [];
+            }
+            catch (error) {
+                const msg = (error === null || error === void 0 ? void 0 : error.message) || String(error);
+                logger_1.logger.error(`云环境列表接口调用失败: ${msg}`);
+                throw error;
+            }
+        });
+    }
+    getCloudEnvironment(cloudEnvId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!cloudEnvId) {
+                return null;
+            }
+            const envs = yield this.getCloudEnvironments(cloudEnvId);
+            if (!envs || envs.length === 0) {
+                return null;
+            }
+            const exact = envs.find((env) => env.cloud_env_id === cloudEnvId);
+            return exact || envs[0] || null;
+        });
+    }
+    createCloudEnvironment(payload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (!(payload === null || payload === void 0 ? void 0 : payload.cloud_env_name)) {
+                throw new Error("cloud_env_name 为必填字段");
+            }
+            let query = {};
+            if (!env_helper_1.isIDE) {
+                const loginInfo = yield this.authService.getLoginInfo();
+                if (!loginInfo) {
+                    throw new Error("未登录，请先执行登录命令");
+                }
+                query = {
+                    secret_id: loginInfo.secret_id,
+                    cli_token: loginInfo.cli_token,
+                };
+            }
+            const httpResponse = yield request_1.request.fetch({
+                method: "POST",
+                url: `${(0, config_1.getBaseUrl)()}/api/eros/mp/red/code/cloud_env/create`,
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                data: {
+                    query,
+                    body: {
+                        cloud_env_name: payload.cloud_env_name,
+                        description: (_a = payload.description) !== null && _a !== void 0 ? _a : "",
+                    },
+                },
+            });
+            const res = request_1.request.handleCode(request_1.request.handleHttpStatus(httpResponse));
+            return ((_b = res.data) === null || _b === void 0 ? void 0 : _b.env_info) || res.data;
+        });
+    }
+    updateCloudEnvironment(payload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (!(payload === null || payload === void 0 ? void 0 : payload.cloud_env_id)) {
+                throw new Error("cloud_env_id 为必填字段");
+            }
+            let query = {};
+            if (!env_helper_1.isIDE) {
+                const loginInfo = yield this.authService.getLoginInfo();
+                if (!loginInfo) {
+                    throw new Error("未登录，请先执行登录命令");
+                }
+                query = {
+                    secret_id: loginInfo.secret_id,
+                    cli_token: loginInfo.cli_token,
+                };
+            }
+            const httpResponse = yield request_1.request.fetch({
+                method: "POST",
+                url: `${(0, config_1.getBaseUrl)()}/api/eros/mp/red/code/cloud_env/update`,
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                data: {
+                    query,
+                    body: {
+                        cloud_env_id: payload.cloud_env_id,
+                        env_variables: payload.env_variables,
+                    },
+                },
+            });
+            if ((httpResponse === null || httpResponse === void 0 ? void 0 : httpResponse.status) === 401) {
+                const msg = ((_a = httpResponse === null || httpResponse === void 0 ? void 0 : httpResponse.data) === null || _a === void 0 ? void 0 : _a.msg) || "请先登录";
+                throw new Error(msg);
+            }
+            const res = request_1.request.handleCode(request_1.request.handleHttpStatus(httpResponse));
+            if ((res === null || res === void 0 ? void 0 : res.success) === false) {
+                const msg = (res === null || res === void 0 ? void 0 : res.msg) || (res === null || res === void 0 ? void 0 : res.message) || "更新云环境配置失败";
+                throw new Error(msg);
+            }
+            return ((_b = res.data) === null || _b === void 0 ? void 0 : _b.env_info) || res.data;
+        });
+    }
+};
+exports.CloudEnvService = CloudEnvService;
+exports.CloudEnvService = CloudEnvService = __decorate([
+    (0, inversify_1.injectable)(),
+    __metadata("design:paramtypes", [])
+], CloudEnvService);