@zereight/mcp-gitlab 2.0.33 → 2.0.35

package/build/test/utils/server-launcher.js

@@ -2,9 +2,9 @@
  * Server launcher utility for testing different transport modes
  * Manages server processes and provides clean shutdown
  */
-import { spawn } from 'child_process';
-import * as path from 'path';
-export const HOST = process.env.HOST || '127.0.0.1';
+import { spawn } from "child_process";
+import * as path from "path";
+export const HOST = process.env.HOST || "127.0.0.1";
 export var TransportMode;
 (function (TransportMode) {
     TransportMode["STDIO"] = "stdio";
@@ -22,45 +22,49 @@ export async function launchServer(config) {
     const GITLAB_API_URL = process.env.GITLAB_API_URL || "https://gitlab.com";
     const GITLAB_TOKEN = process.env.GITLAB_TOKEN_TEST || process.env.GITLAB_TOKEN;
     const TEST_PROJECT_ID = process.env.TEST_PROJECT_ID;
-    // Check if remote authorization is enabled
-    const isRemoteAuth = env.REMOTE_AUTHORIZATION === 'true';
-    // Validate that we have required configuration (unless using remote auth)
-    if (!GITLAB_TOKEN && !isRemoteAuth) {
-        throw new Error('GITLAB_TOKEN_TEST or GITLAB_TOKEN environment variable is required for server testing');
+    // Check which auth modes are active
+    const isRemoteAuth = env.REMOTE_AUTHORIZATION === "true";
+    const isMcpOAuth = env.GITLAB_MCP_OAUTH === "true";
+    // Both REMOTE_AUTHORIZATION and GITLAB_MCP_OAUTH manage tokens at the HTTP layer;
+    // neither requires a pre-configured GITLAB_TOKEN on the server process.
+    const isServerManagedAuth = isRemoteAuth || isMcpOAuth;
+    // Validate that we have required configuration (unless using a server-managed auth mode)
+    if (!GITLAB_TOKEN && !isServerManagedAuth) {
+        throw new Error("GITLAB_TOKEN_TEST or GITLAB_TOKEN environment variable is required for server testing");
     }
-    if (!TEST_PROJECT_ID && !isRemoteAuth && env.ENABLE_DYNAMIC_API_URL !== 'true') {
-        throw new Error('TEST_PROJECT_ID environment variable is required for server testing');
+    if (!TEST_PROJECT_ID && !isServerManagedAuth && env.ENABLE_DYNAMIC_API_URL !== "true") {
+        throw new Error("TEST_PROJECT_ID environment variable is required for server testing");
     }
     const serverEnv = {
         ...process.env,
         ...env,
     };
-    // Only set GITLAB_PERSONAL_ACCESS_TOKEN if not using remote auth
-    if (!isRemoteAuth && GITLAB_TOKEN) {
+    // Only set GITLAB_PERSONAL_ACCESS_TOKEN if not using a server-managed auth mode
+    if (!isServerManagedAuth && GITLAB_TOKEN) {
         serverEnv.GITLAB_PERSONAL_ACCESS_TOKEN = GITLAB_TOKEN;
     }
     // Set transport-specific environment variables
     switch (mode) {
         case TransportMode.SSE:
-            serverEnv.SSE = 'true';
+            serverEnv.SSE = "true";
             serverEnv.PORT = port.toString();
             break;
         case TransportMode.STREAMABLE_HTTP:
-            serverEnv.STREAMABLE_HTTP = 'true';
+            serverEnv.STREAMABLE_HTTP = "true";
             serverEnv.PORT = port.toString();
             break;
         case TransportMode.STDIO:
             // Stdio mode doesn't need port configuration - uses process communication
             throw new Error(`${TransportMode.STDIO} mode is not supported for server testing, because it uses process communication.`);
     }
-    const serverPath = path.resolve(process.cwd(), 'build/index.js');
+    const serverPath = path.resolve(process.cwd(), "build/index.js");
     console.log("Launcher: Spawning server process with env:", serverEnv);
     console.log("Launcher: Spawning server process with env:", serverEnv);
-    const serverProcess = spawn('node', [serverPath], {
+    const serverProcess = spawn("node", [serverPath], {
         env: serverEnv,
-        stdio: ['pipe', 'pipe', 'pipe'],
+        stdio: ["pipe", "pipe", "pipe"],
         shell: false,
-        detached: false
+        detached: false,
     });
     console.log(`Launcher: Server process spawned with PID: ${serverProcess.pid}`);
     console.log("Launcher: Server process spawned.");
@@ -72,15 +76,15 @@ export async function launchServer(config) {
         mode,
         kill: () => {
             if (!serverProcess.killed) {
-                serverProcess.kill('SIGTERM');
+                serverProcess.kill("SIGTERM");
                 // Force kill if not terminated within 5 seconds
                 setTimeout(() => {
                     if (!serverProcess.killed) {
-                        serverProcess.kill('SIGKILL');
+                        serverProcess.kill("SIGKILL");
                     }
                 }, 5000);
             }
-        }
+        },
     };
     return instance;
 }
@@ -92,7 +96,7 @@ async function waitForServerStart(process, mode, port, timeout) {
         const timer = setTimeout(() => {
             reject(new Error(`Server failed to start within ${timeout}ms for mode ${mode}`));
         }, timeout);
-        let outputBuffer = '';
+        let outputBuffer = "";
         const onData = (data) => {
             try {
                 const output = data.toString();
@@ -106,11 +110,11 @@ async function waitForServerStart(process, mode, port, timeout) {
             }
             // Check for server start messages
             const startMessages = [
-                'Starting GitLab MCP Server with stdio transport',
-                'Starting GitLab MCP Server with SSE transport',
-                'Starting GitLab MCP Server with Streamable HTTP transport',
-                'GitLab MCP Server running',
-                `port ${port}`
+                "Starting GitLab MCP Server with stdio transport",
+                "Starting GitLab MCP Server with SSE transport",
+                "Starting GitLab MCP Server with Streamable HTTP transport",
+                "GitLab MCP Server running",
+                `port ${port}`,
             ];
             const hasStartMessage = startMessages.some(msg => outputBuffer.includes(msg));
             if (hasStartMessage) {
@@ -139,27 +143,27 @@ async function waitForServerStart(process, mode, port, timeout) {
             clearTimeout(timer);
             reject(new Error(`Server process exited with code ${code} before starting`));
         };
-        process.stdout?.on('data', onData);
-        process.on('close', onClose);
-        process.stderr?.on('data', onData);
-        process.on('error', onError);
-        process.on('exit', onExit);
+        process.stdout?.on("data", onData);
+        process.on("close", onClose);
+        process.stderr?.on("data", onData);
+        process.on("error", onError);
+        process.on("exit", onExit);
     });
 }
 /**
  * Find an available port starting from a base port
  */
 export async function findAvailablePort(basePort = 3002) {
-    const net = await import('net');
+    const net = await import("net");
     return new Promise((resolve, reject) => {
         const server = net.createServer();
         server.listen(basePort, () => {
             const address = server.address();
-            const port = typeof address === 'object' && address ? address.port : basePort;
+            const port = typeof address === "object" && address ? address.port : basePort;
             server.close(() => resolve(port));
         });
-        server.on('error', (err) => {
-            if (err.code === 'EADDRINUSE') {
+        server.on("error", (err) => {
+            if (err.code === "EADDRINUSE") {
                 // Port is in use, try next one
                 resolve(findAvailablePort(basePort + 1));
             }
@@ -199,11 +203,11 @@ export async function checkHealthEndpoint(port, maxRetries = 5) {
         try {
             const controller = createTimeoutController(5000);
             const response = await fetch(`http://${HOST}:${port}/health`, {
-                method: 'GET',
-                signal: controller.signal
+                method: "GET",
+                signal: controller.signal,
             });
             if (response.ok) {
-                const healthData = await response.json();
+                const healthData = (await response.json());
                 return healthData;
             }
             else {
@@ -211,8 +215,8 @@ export async function checkHealthEndpoint(port, maxRetries = 5) {
             }
         }
         catch (error) {
-            if (error instanceof Error && error.name === 'AbortError') {
-                lastError = new Error('Request timeout after 5000ms');
+            if (error instanceof Error && error.name === "AbortError") {
+                lastError = new Error("Request timeout after 5000ms");
             }
             else {
                 lastError = error instanceof Error ? error : new Error(String(error));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zereight/mcp-gitlab",
-  "version": "2.0.33",
+  "version": "2.0.35",
   "description": "MCP server for using the GitLab API",
   "license": "MIT",
   "author": "zereight",
@@ -29,7 +29,8 @@
     "changelog": "auto-changelog -p",
     "test": "npm run test:all",
     "test:all": "npm run build && npm run test:mock && npm run test:live",
-    "test:mock": "npx tsx --test test/remote-auth-simple-test.ts && tsx test/oauth-tests.ts && tsx test/test-list-merge-requests.ts && tsx test/test-list-project-members.ts && tsx test/test-download-attachment.ts && tsx --test test/test-job-artifacts.ts && tsx --test test/test-deployment-tools.ts && tsx --test test/test-merge-request-approval-state-tools.ts",
+    "test:mock": "npx tsx --test test/remote-auth-simple-test.ts && npx tsx --test test/mcp-oauth-tests.ts && tsx test/oauth-tests.ts && tsx test/test-list-merge-requests.ts && tsx test/test-list-project-members.ts && tsx test/test-download-attachment.ts && tsx --test test/test-job-artifacts.ts && tsx --test test/test-deployment-tools.ts && tsx --test test/test-merge-request-approval-state-tools.ts && npx tsx --test test/test-search-code.ts && npx tsx --test test/test-toolset-filtering.ts",
+    "test:mcp-oauth": "npm run build && npx tsx --test test/mcp-oauth-tests.ts",
     "test:live": "node test/validate-api.js",
     "test:remote-auth": "npm run build && npx tsx --test test/remote-auth-simple-test.ts",
     "test:schema": "tsx test/schema-tests.ts",