@nx/maven 22.6.4 → 22.6.5

package/dist/plugins/maven-analyzer.d.ts

@@ -1,4 +1,9 @@
 import { MavenAnalysisData, MavenPluginOptions } from './types';
+/**
+ * Cancel any in-flight Maven analysis process.
+ * Safe to call even if nothing is running.
+ */
+export declare function cancelPendingMavenAnalysis(): void;
 /**
  * Run Maven analysis using our Kotlin analyzer plugin
  */

package/dist/plugins/maven-analyzer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maven-analyzer.d.ts","sourceRoot":"","sources":["../../src/plugins/maven-analyzer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAGhE;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAyH5B"}
+{"version":3,"file":"maven-analyzer.d.ts","sourceRoot":"","sources":["../../src/plugins/maven-analyzer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAQhE;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,IAAI,CAKjD;AAaD;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CA4J5B"}

package/dist/plugins/maven-analyzer.js

@@ -1,12 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cancelPendingMavenAnalysis = cancelPendingMavenAnalysis;
 exports.runMavenAnalysis = runMavenAnalysis;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const child_process_1 = require("child_process");
 const devkit_1 = require("@nx/devkit");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const detect_maven_executable_1 = require("../utils/detect-maven-executable");
+const treeKill = require('tree-kill');
+const DEFAULT_ANALYSIS_TIMEOUT_SECONDS = (0, devkit_internals_1.isCI)() ? 600 : 120;
+let currentAbortController;
+/**
+ * Cancel any in-flight Maven analysis process.
+ * Safe to call even if nothing is running.
+ */
+function cancelPendingMavenAnalysis() {
+    if (currentAbortController) {
+        currentAbortController.abort('cancelled');
+        currentAbortController = undefined;
+    }
+}
+function getAnalysisTimeoutMs() {
+    const envTimeout = process.env.NX_MAVEN_ANALYSIS_TIMEOUT;
+    if (envTimeout) {
+        const parsed = Number(envTimeout);
+        if (!Number.isNaN(parsed) && parsed > 0) {
+            return parsed * 1000;
+        }
+    }
+    return DEFAULT_ANALYSIS_TIMEOUT_SECONDS * 1000;
+}
 /**
  * Run Maven analysis using our Kotlin analyzer plugin
  */
@@ -40,64 +65,97 @@ async function runMavenAnalysis(workspaceRoot, options) {
     if (isVerbose) {
         console.error(`Running Maven analyzer with verbose logging: ${mavenExecutable} ${mavenArgs.join(' ')}`);
     }
+    // Cancel any in-flight Maven process from a previous call, then create a fresh controller.
+    cancelPendingMavenAnalysis();
+    const controller = new AbortController();
+    currentAbortController = controller;
+    const signal = controller.signal;
+    const timeoutMs = getAnalysisTimeoutMs();
+    const timeoutSeconds = timeoutMs / 1000;
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
     // Run Maven plugin
     devkit_1.logger.verbose(`[Maven Analyzer] Spawning Maven process...`);
-    await new Promise((resolve, reject) => {
-        const child = (0, child_process_1.spawn)(mavenExecutable, mavenArgs, {
-            cwd: workspaceRoot,
-            windowsHide: true,
-            shell: true,
-            stdio: 'pipe', // Always use pipe so we can control output
-        });
-        devkit_1.logger.verbose(`[Maven Analyzer] Process spawned with PID: ${child.pid}`);
-        let stdout = '';
-        let stderr = '';
-        // In verbose mode, forward output to console in real-time
-        if (isVerbose) {
-            child.stdout?.on('data', (data) => {
-                const text = data.toString();
-                stdout += text;
-                process.stdout.write(text); // Forward to stdout
-            });
-            child.stderr?.on('data', (data) => {
-                const text = data.toString();
-                stderr += text;
-                process.stderr.write(text); // Forward to stderr
-            });
-        }
-        else {
-            child.stdout?.on('data', (data) => {
-                const text = data.toString();
-                stdout += text;
-                devkit_1.logger.verbose(`[Maven Analyzer] Stdout chunk: ${text.trim()}`);
+    try {
+        await new Promise((resolve, reject) => {
+            const child = (0, child_process_1.spawn)(mavenExecutable, mavenArgs, {
+                cwd: workspaceRoot,
+                windowsHide: true,
+                shell: true,
+                stdio: 'pipe', // Always use pipe so we can control output
             });
-            child.stderr?.on('data', (data) => {
-                const text = data.toString();
-                stderr += text;
-                devkit_1.logger.verbose(`[Maven Analyzer] Stderr chunk: ${text.trim()}`);
-            });
-        }
-        child.on('close', (code) => {
-            devkit_1.logger.verbose(`[Maven Analyzer] Process closed with code: ${code}`);
-            if (code === 0) {
-                devkit_1.logger.verbose(`[Maven Analyzer] Maven analysis completed successfully`);
-                resolve();
+            // Use tree-kill on abort to kill the entire process tree
+            const onAbort = () => {
+                if (child.pid) {
+                    treeKill(child.pid);
+                }
+            };
+            signal.addEventListener('abort', onAbort, { once: true });
+            devkit_1.logger.verbose(`[Maven Analyzer] Process spawned with PID: ${child.pid}`);
+            let stdout = '';
+            let stderr = '';
+            // In verbose mode, forward output to console in real-time
+            if (isVerbose) {
+                child.stdout?.on('data', (data) => {
+                    const text = data.toString();
+                    stdout += text;
+                    process.stdout.write(text); // Forward to stdout
+                });
+                child.stderr?.on('data', (data) => {
+                    const text = data.toString();
+                    stderr += text;
+                    process.stderr.write(text); // Forward to stderr
+                });
             }
             else {
-                let errorMsg = `Maven analysis failed with code ${code}`;
-                if (stderr)
-                    errorMsg += `\nStderr: ${stderr}`;
-                if (stdout && !isVerbose)
-                    errorMsg += `\nStdout: ${stdout}`;
-                console.error(`[Maven Analyzer] Error: ${errorMsg}`);
-                reject(new Error(errorMsg));
+                child.stdout?.on('data', (data) => {
+                    const text = data.toString();
+                    stdout += text;
+                    devkit_1.logger.verbose(`[Maven Analyzer] Stdout chunk: ${text.trim()}`);
+                });
+                child.stderr?.on('data', (data) => {
+                    const text = data.toString();
+                    stderr += text;
+                    devkit_1.logger.verbose(`[Maven Analyzer] Stderr chunk: ${text.trim()}`);
+                });
             }
+            child.on('close', (code) => {
+                signal.removeEventListener('abort', onAbort);
+                devkit_1.logger.verbose(`[Maven Analyzer] Process closed with code: ${code}`);
+                if (code === 0) {
+                    devkit_1.logger.verbose(`[Maven Analyzer] Maven analysis completed successfully`);
+                    resolve();
+                }
+                else {
+                    let errorMsg = `Maven analysis failed with code ${code}`;
+                    if (stderr)
+                        errorMsg += `\nStderr: ${stderr}`;
+                    if (stdout && !isVerbose)
+                        errorMsg += `\nStdout: ${stdout}`;
+                    console.error(`[Maven Analyzer] Error: ${errorMsg}`);
+                    reject(new Error(errorMsg));
+                }
+            });
+            child.on('error', (error) => {
+                signal.removeEventListener('abort', onAbort);
+                console.error(`[Maven Analyzer] Process error: ${error.message}`);
+                reject(new Error(`Failed to spawn Maven process: ${error.message}`));
+            });
         });
-        child.on('error', (error) => {
-            console.error(`[Maven Analyzer] Process error: ${error.message}`);
-            reject(new Error(`Failed to spawn Maven process: ${error.message}`));
-        });
-    });
+    }
+    catch (e) {
+        if (signal.reason === 'cancelled') {
+            throw new Error('Maven analysis was cancelled');
+        }
+        if (signal.aborted) {
+            throw new Error(`Maven analysis timed out after ${timeoutSeconds} ${timeoutSeconds === 1 ? 'second' : 'seconds'}.\n` +
+                `  1. If the issue persists, set the environment variable NX_MAVEN_ANALYSIS_TIMEOUT to a higher value (in seconds) to increase the timeout.\n` +
+                `  2. If the issue still persists, set NX_MAVEN_DISABLE=true to disable the Maven plugin entirely.`);
+        }
+        throw e;
+    }
+    finally {
+        clearTimeout(timer);
+    }
     // Read and parse the JSON output
     devkit_1.logger.verbose(`[Maven Analyzer] Checking for output file: ${outputFile}`);
     if (!(0, fs_1.existsSync)(outputFile)) {

package/dist/plugins/nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../src/plugins/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,aAAa,EAAa,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAmB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAW9D;;GAEG;AACH,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,kBAAkB,CAoEzD,CAAC"}
+{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../src/plugins/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,aAAa,EAAa,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAmB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAW9D;;GAEG;AACH,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,kBAAkB,CA+EzD,CAAC"}

package/dist/plugins/nodes.js

@@ -42,10 +42,20 @@ exports.createNodes = [
             let mavenData = isVerbose ? null : mavenCache.get(hash);
             // If no cached data or cache is stale, run fresh Maven analysis
             if (!mavenData) {
-                mavenData = await (0, maven_analyzer_1.runMavenAnalysis)(context.workspaceRoot, {
-                    ...opts,
-                    verbose: isVerbose,
-                });
+                try {
+                    mavenData = await (0, maven_analyzer_1.runMavenAnalysis)(context.workspaceRoot, {
+                        ...opts,
+                        verbose: isVerbose,
+                    });
+                }
+                catch (e) {
+                    if (e instanceof Error &&
+                        e.message === 'Maven analysis was cancelled') {
+                        // Cancelled by a newer createNodes call — silently return empty
+                        return [];
+                    }
+                    throw e;
+                }
                 // Cache the results with the hash
                 mavenCache.set(hash, mavenData);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/maven",
-  "version": "22.6.4",
+  "version": "22.6.5",
   "private": false,
   "description": "Nx plugin for Maven integration",
   "repository": {
@@ -46,8 +46,9 @@
   "author": "Victor Savkin",
   "license": "MIT",
   "dependencies": {
-    "@nx/devkit": "22.6.4",
+    "@nx/devkit": "22.6.5",
     "@xmldom/xmldom": "^0.8.10",
+    "tree-kill": "^1.2.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
@@ -56,7 +57,7 @@
     "@types/xmldom": "^0.1.34",
     "jest": "^30.0.2",
     "memfs": "^4.9.2",
-    "nx": "22.6.4",
+    "nx": "22.6.5",
     "ts-jest": "^29.4.0",
     "typescript": "~5.9.2"
   },