Show npm run failures more clearly (#7)

Author: nedtwigg

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [Unreleased]
 ### Added
 - Task like `npm run lint:fix` get turned into `npm_run_lint-fix` (so the colons don't screw up Gradle)
+- When `npm run` commands fail, they dump their console output as a Gradle error.
 
 ## [1.1.0] - 2024-08-04
 ### Added

src/main/java/com/diffplug/webtools/node/NodePlugin.java

@@ -15,18 +15,19 @@
  */
 package com.diffplug.webtools.node;
 
-import com.github.eirslett.maven.plugins.frontend.lib.ProxyConfig;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.Collections;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 import java.util.TreeMap;
-import org.gradle.api.Action;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
+import java.util.concurrent.CompletableFuture;
+import org.gradle.api.*;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.CacheableTask;
@@ -94,14 +95,66 @@ public TreeMap<String, String> getEnvironment() {
 		@Internal
 		public abstract DirectoryProperty getProjectDir();
 
+		private static CompletableFuture<Void> readStream(InputStream inputStream, List<String> outputLines, String streamName) {
+			return CompletableFuture.runAsync(() -> {
+				try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
+					String line;
+					while ((line = reader.readLine()) != null) {
+						synchronized (outputLines) {
+							outputLines.add(line);
+						}
+					}
+				} catch (IOException e) {
+					synchronized (outputLines) {
+						outputLines.add("Error reading " + streamName + ": " + e.getMessage());
+					}
+				}
+			});
+		}
+
 		@TaskAction
 		public void npmCiRunTask() throws Exception {
 			SetupCleanupNode setup = getSetup().get();
+			File projectDir = getProjectDir().get().getAsFile();
 			// install node, npm, and package-lock.json
-			setup.start(getProjectDir().get().getAsFile());
-			// run the gulp task
-			ProxyConfig proxyConfig = new ProxyConfig(Collections.emptyList());
-			setup.factory().getNpmRunner(proxyConfig, null).execute("run " + npmTaskName, environment);
+			setup.start(projectDir);
+
+			// Use ProcessBuilder for direct console output instead of NpmRunner
+			File installDir = new File(projectDir, "build/node-install");
+			File npmExe;
+			if (System.getProperty("os.name").toLowerCase().contains("win")) {
+				npmExe = new File(installDir, "node/npm.cmd");
+			} else {
+				npmExe = new File(installDir, "node/npm");
+			}
+
+			ProcessBuilder processBuilder = new ProcessBuilder(npmExe.getAbsolutePath(), "run", npmTaskName);
+			processBuilder.directory(projectDir);
+			processBuilder.environment().putAll(environment);
+			Process process = processBuilder.start();
+
+			// Buffer output to only show on failure
+			List<String> stdoutLines = new ArrayList<>();
+			List<String> stderrLines = new ArrayList<>();
+
+			// Create threads to read stdout and stderr concurrently
+			CompletableFuture<Void> stdoutFuture = readStream(process.getInputStream(), stdoutLines, "stdout");
+			CompletableFuture<Void> stderrFuture = readStream(process.getErrorStream(), stderrLines, "stderr");
+			int exitCode = process.waitFor();
+			CompletableFuture.allOf(stdoutFuture, stderrFuture).join();
+			if (exitCode == 0) {
+				return;
+			}
+
+			var cmd = new StringBuilder().append("> npm run ").append(npmTaskName).append(" FAILED\n");
+			environment.forEach((key, value) -> cmd.append("  env ").append(key).append("=").append(value).append("\n"));
+			for (String line : stdoutLines) {
+				cmd.append(line).append("\n");
+			}
+			for (String line : stderrLines) {
+				cmd.append(line).append("\n");
+			}
+			throw new GradleException(cmd.toString());
 		}
 	}
 

src/main/java/com/diffplug/webtools/node/SetupCleanup.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 DiffPlug
+ * Copyright (C) 2024-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/diffplug/webtools/node/SetupCleanupNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 DiffPlug
+ * Copyright (C) 2024-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/diffplug/webtools/serve/StaticServerTask.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 DiffPlug
+ * Copyright (C) 2024-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.