Merge pull request #464 from TencentCloudBase/fix/runtime-validation-stability

fix(runtime-validation): 🧪 stabilize event runtime validation tests

Author: binggg

mcp/src/tools/functions.test.ts

@@ -1,7 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import {
   buildFunctionOperationErrorMessage,
+  DEFAULT_RUNTIME,
   registerFunctionTools,
+  resolveEventFunctionRuntime,
   shouldInstallDependencyForFunction,
 } from "./functions.js";
 import type { ExtendedMcpServer } from "../server.js";
@@ -111,6 +113,20 @@ describe("functions tool helpers", () => {
     expect(message).toContain("package.json");
   });
 
+  it("normalizes supported Event runtimes with whitespace", () => {
+    expect(resolveEventFunctionRuntime("Python 3.9")).toBe("Python3.9");
+    expect(resolveEventFunctionRuntime("Php 7.4")).toBe("Php7.4");
+  });
+
+  it("falls back to the default runtime when Event runtime is omitted", () => {
+    expect(resolveEventFunctionRuntime(undefined)).toBe(DEFAULT_RUNTIME);
+  });
+
+  it("rejects unsupported Event runtimes with a helpful message", () => {
+    expect(() => resolveEventFunctionRuntime("Ruby3.2")).toThrow(/不支持的运行时环境/);
+    expect(() => resolveEventFunctionRuntime("Ruby3.2")).toThrow(/Python3.9/);
+  });
+
   it("guides HTTP functions through anonymous-access follow-up without auto-creating gateway access", async () => {
     const result = await tools.manageFunctions.handler({
       action: "createFunction",

mcp/src/tools/functions.ts

@@ -308,6 +308,21 @@ export function shouldInstallDependencyForFunction(
   return true;
 }
 
+export function resolveEventFunctionRuntime(runtime: unknown): string {
+  if (typeof runtime !== "string" || !runtime.trim()) {
+    return DEFAULT_RUNTIME;
+  }
+
+  const normalizedRuntime = runtime.replace(/\s+/g, "");
+  if ((ALL_SUPPORTED_RUNTIMES as readonly string[]).includes(normalizedRuntime)) {
+    return normalizedRuntime;
+  }
+
+  throw new Error(
+    `不支持的运行时环境: "${String(runtime)}"\n\n支持的运行时:\n${formatRuntimeList()}`,
+  );
+}
+
 export function buildFunctionOperationErrorMessage(
   operation: "createFunction" | "updateFunctionCode",
   functionName: string,
@@ -820,26 +835,16 @@ export function registerFunctionTools(server: ExtendedMcpServer) {
       );
 
       if (func.type !== "HTTP") {
-        if (!func.runtime || typeof func.runtime !== "string") {
-          func.runtime = DEFAULT_RUNTIME;
-        } else {
-          const normalizedRuntime = func.runtime.replace(/\s+/g, "");
-          if ((ALL_SUPPORTED_RUNTIMES as readonly string[]).includes(normalizedRuntime)) {
-            func.runtime = normalizedRuntime;
-          } else if (func.runtime.includes(" ")) {
-            console.warn(
-              `检测到 runtime 参数包含空格: "${func.runtime}"，已自动移除空格`,
-            );
-            func.runtime = normalizedRuntime;
-          }
-        }
+        const originalRuntime = typeof func.runtime === "string" ? func.runtime : undefined;
+        func.runtime = resolveEventFunctionRuntime(func.runtime);
 
         if (
-          typeof func.runtime !== "string" ||
-          !(ALL_SUPPORTED_RUNTIMES as readonly string[]).includes(func.runtime)
+          typeof originalRuntime === "string" &&
+          originalRuntime.includes(" ") &&
+          originalRuntime.replace(/\s+/g, "") === func.runtime
         ) {
-          throw new Error(
-            `不支持的运行时环境: "${String(func.runtime)}"\n\n支持的运行时:\n${formatRuntimeList()}`,
+          console.warn(
+            `检测到 runtime 参数包含空格: "${originalRuntime}"，已自动移除空格`,
           );
         }
       }

tests/runtime-validation.test.js

@@ -34,8 +34,16 @@ if (existsSync(envPath)) {
   console.log('✅ Loaded .env file from:', envPath);
 }
 
-// Helper function to delay
-const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+async function waitForToolList(client, timeoutMs = 5000) {
+  return Promise.race([
+    client.listTools(),
+    new Promise((_, reject) => {
+      setTimeout(() => {
+        reject(new Error(`MCP server did not become ready within ${timeoutMs}ms`));
+      }, timeoutMs);
+    }),
+  ]);
+}
 
 // Detect if real CloudBase credentials are available
 function hasCloudBaseCredentials() {
@@ -48,16 +56,19 @@ function hasCloudBaseCredentials() {
 describe('Runtime Validation - Event Function Multi-Language Support', () => {
   let testClient = null;
   let testTransport = null;
-  const testFunctionsDir = join(__dirname, '../temp-runtime-test');
   const timestamp = Date.now();
+  const testFunctionsDir = join(__dirname, `../temp-runtime-test-${timestamp}`);
 
   beforeAll(async () => {
     if (!hasCloudBaseCredentials()) {
       console.log('⚠️ No CloudBase credentials, skipping runtime validation tests');
       return;
     }
 
-    // Create test client
+    if (!existsSync(testFunctionsDir)) {
+      mkdirSync(testFunctionsDir, { recursive: true });
+    }
+
     const client = new Client({
       name: 'runtime-validation-client',
       version: '1.0.0',
@@ -67,35 +78,33 @@ describe('Runtime Validation - Event Function Multi-Language Support', () => {
 
     const serverPath = join(__dirname, '../mcp/dist/cli.cjs');
     const transport = new StdioClientTransport({
-      command: 'node',
+      command: process.execPath,
       args: [serverPath],
       env: {
         ...process.env,
       }
     });
 
-    await client.connect(transport);
-    await delay(2000);
-
-    testClient = client;
-    testTransport = transport;
-
-    // Create test functions directory
-    if (!existsSync(testFunctionsDir)) {
-      mkdirSync(testFunctionsDir, { recursive: true });
+    try {
+      await client.connect(transport);
+      await waitForToolList(client, 5000);
+      testClient = client;
+      testTransport = transport;
+    } catch (error) {
+      await transport.close().catch(() => {});
+      throw error;
     }
-  });
+  }, 30000);
 
   afterAll(async () => {
     if (testTransport) {
       await testTransport.close();
     }
 
-    // Clean up test directory
     if (existsSync(testFunctionsDir)) {
       rmSync(testFunctionsDir, { recursive: true, force: true });
     }
-  });
+  }, 10000);
 
   // Helper function to create a simple Python Event function
   function createPythonFunction(functionName) {