extract base serve code

Author: simschla

lib/src/main/java/com/diffplug/spotless/npm/NpmResourceHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 DiffPlug
+ * Copyright 2016-2022 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
 import com.diffplug.spotless.ThrowingEx;
 
@@ -45,6 +47,12 @@ static void deleteFileIfExists(File file) throws IOException {
 		}
 	}
 
+	static String readUtf8StringFromClasspath(Class<?> clazz, String... resourceNames) {
+		return Arrays.stream(resourceNames)
+				.map(resourceName -> readUtf8StringFromClasspath(clazz, resourceName))
+				.collect(Collectors.joining("\n"));
+	}
+
 	static String readUtf8StringFromClasspath(Class<?> clazz, String resourceName) {
 		try (InputStream input = clazz.getResourceAsStream(resourceName)) {
 			return readUtf8StringFromInputStream(input);

lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java

@@ -70,7 +70,9 @@ private static class State extends NpmFormatterStepStateBase implements Serializ
 									NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class, "/com/diffplug/spotless/npm/prettier-package.json"),
 									new TreeMap<>(devDependencies)),
 							"prettier",
-							NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class, "/com/diffplug/spotless/npm/prettier-serve.js"),
+							NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class,
+									"/com/diffplug/spotless/npm/common-serve.js",
+									"/com/diffplug/spotless/npm/prettier-serve.js"),
 							npmPathResolver.resolveNpmrcContent()),
 					buildDir,
 					npmPathResolver.resolveNpmExecutable());

lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java

@@ -76,7 +76,9 @@ public State(String stepName, Map<String, String> versions, File buildDir, NpmPa
 					new NpmConfig(
 							replaceDevDependencies(NpmResourceHelper.readUtf8StringFromClasspath(TsFmtFormatterStep.class, "/com/diffplug/spotless/npm/tsfmt-package.json"), new TreeMap<>(versions)),
 							"typescript-formatter",
-							NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class, "/com/diffplug/spotless/npm/tsfmt-serve.js"),
+							NpmResourceHelper.readUtf8StringFromClasspath(PrettierFormatterStep.class,
+									"/com/diffplug/spotless/npm/common-serve.js",
+									"/com/diffplug/spotless/npm/tsfmt-serve.js"),
 							npmPathResolver.resolveNpmrcContent()),
 					buildDir,
 					npmPathResolver.resolveNpmExecutable());

lib/src/main/resources/com/diffplug/spotless/npm/common-serve.js

@@ -0,0 +1,32 @@
+// this file will be glued to the top of the specific xy-server.js file
+const GracefulShutdownManager = require("@moebius/http-graceful-shutdown").GracefulShutdownManager;
+const express = require("express");
+const app = express();
+
+app.use(express.json({ limit: "50mb" }));
+
+const fs = require("fs");
+
+var listener = app.listen(0, "127.0.0.1", () => {
+	console.log("Server running on port " + listener.address().port);
+	fs.writeFile("server.port.tmp", "" + listener.address().port, function(err) {
+		if (err) {
+			return console.log(err);
+		} else {
+			fs.rename("server.port.tmp", "server.port", function(err) {
+				if (err) {
+					return console.log(err);
+				}
+			}); // try to be as atomic as possible
+		}
+	});
+});
+const shutdownManager = new GracefulShutdownManager(listener);
+
+app.post("/shutdown", (req, res) => {
+	res.status(200).send("Shutting down");
+	setTimeout(function() {
+		shutdownManager.terminate(() => console.log("graceful shutdown finished."));
+	}, 200);
+});
+

lib/src/main/resources/com/diffplug/spotless/npm/prettier-serve.js

@@ -1,35 +1,5 @@
-const GracefulShutdownManager = require("@moebius/http-graceful-shutdown").GracefulShutdownManager;
-const express = require("express");
-const app = express();
-
-app.use(express.json({ limit: "50mb" }));
 const prettier = require("prettier");
 
-const fs = require("fs");
-
-var listener = app.listen(0, "127.0.0.1", () => {
-	console.log("Server running on port " + listener.address().port);
-	fs.writeFile("server.port.tmp", "" + listener.address().port, function(err) {
-		if (err) {
-			return console.log(err);
-		} else {
-			fs.rename("server.port.tmp", "server.port", function(err) {
-				if (err) {
-					return console.log(err);
-				}
-			}); // try to be as atomic as possible
-		}
-	});
-});
-const shutdownManager = new GracefulShutdownManager(listener);
-
-app.post("/shutdown", (req, res) => {
-	res.status(200).send("Shutting down");
-	setTimeout(function() {
-		shutdownManager.terminate(() => console.log("graceful shutdown finished."));
-	}, 200);
-});
-
 app.post("/prettier/config-options", (req, res) => {
 	var config_data = req.body;
 	var prettier_config_path = config_data.prettier_config_path;

lib/src/main/resources/com/diffplug/spotless/npm/tsfmt-serve.js

@@ -1,36 +1,5 @@
-const GracefulShutdownManager = require("@moebius/http-graceful-shutdown").GracefulShutdownManager;
-const express = require("express");
-const app = express();
-app.use(express.json({ limit: "50mb" }));
-
 const tsfmt = require("typescript-formatter");
 
-const fs = require("fs");
-
-var listener = app.listen(0, "127.0.0.1", () => {
-	console.log("Server running on port " + listener.address().port);
-	fs.writeFile("server.port.tmp", "" + listener.address().port, function(err) {
-		if (err) {
-			return console.log(err);
-		} else {
-			fs.rename("server.port.tmp", "server.port", function(err) {
-				if (err) {
-					return console.log(err);
-				}
-			}); // try to be as atomic as possible
-		}
-	});
-});
-
-const shutdownManager = new GracefulShutdownManager(listener);
-
-app.post("/shutdown", (req, res) => {
-	res.status(200).send("Shutting down");
-	setTimeout(function() {
-		shutdownManager.terminate(() => console.log("graceful shutdown finished."));
-	}, 200);
-});
-
 app.post("/tsfmt/format", (req, res) => {
 	var format_data = req.body;
 	tsfmt.processString("spotless-format-string.ts", format_data.file_content, format_data.config_options).then(resultMap => {