From b410a90121121de7a9ca177291ba926b5940d4e9 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick.users.noreply@github.com>
Date: Sat, 20 May 2023 11:05:47 -0700
Subject: [PATCH] Print http-server message, allow auto port finding starting
 at 3000

---
 src/lime/tools/HTML5Helper.hx                 | 26 +++++++++----------
 .../bin/node/http-server/bin/http-server      |  9 ++++++-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/lime/tools/HTML5Helper.hx b/src/lime/tools/HTML5Helper.hx
index 6a6d204f7..a02820493 100644
--- a/src/lime/tools/HTML5Helper.hx
+++ b/src/lime/tools/HTML5Helper.hx
@@ -85,7 +85,7 @@ class HTML5Helper
 		}
 	}
 
-	public static function launch(project:HXProject, path:String, port:Int = 3000):Void
+	public static function launch(project:HXProject, path:String, port:Int = 0):Void
 	{
 		if (project.app.url != null && project.app.url != "")
 		{
@@ -124,27 +124,25 @@ class HTML5Helper
 				Sys.command("chmod", ["+x", node]);
 			}
 
+			var args = [server, path, "-c-1", "--cors"];
+
 			if (project.targetFlags.exists("port"))
 			{
 				port = Std.parseInt(project.targetFlags.get("port"));
 			}
 
-			Log.info("", " - \x1b[1mStarting local web server:\x1b[0m http://localhost:" + port);
-
-			/*Thread.create (function () {
-
-				Sys.sleep (0.5);
-				System.openURL ("http://localhost:" + port);
-
-			});*/
-
-			var args = ["--no-deprecation", server, path, "-p", Std.string(port), "-c-1", "--cors"];
-
-			if (project.targetFlags.exists("nolaunch"))
+			if (port != 0)
 			{
-				Log.info("\x1b[1mStarting local web server:\x1b[0m http://localhost:" + port);
+				args.push("-p");
+				args.push(Std.string(port));
+				Log.info("", "\x1b[1mStarting local web server:\x1b[0m http://localhost:" + port);
 			}
 			else
+			{
+				Log.info("", "\x1b[1mStarting local web server:\x1b[0m http://localhost:[3000*]");
+			}
+
+			if (!project.targetFlags.exists("nolaunch"))
 			{
 				args.push("-o");
 			}
diff --git a/templates/bin/node/http-server/bin/http-server b/templates/bin/node/http-server/bin/http-server
index 7c597fa8a..b643bb1e5 100755
--- a/templates/bin/node/http-server/bin/http-server
+++ b/templates/bin/node/http-server/bin/http-server
@@ -120,13 +120,20 @@ else if (chalk) {
   };
 }
 
+// CHANGE: Always show logger info
+if (!logger) logger = {};
+logger.info = console.log;
+// END CHANGE
+
 if (version) {
   logger.info('v' + require('../package.json').version);
   process.exit();
 }
 
 if (!port) {
-  portfinder.basePort = 8080;
+  // CHANGE: Start finding ports beginning at port 3000
+  portfinder.basePort = 3000;
+  // END CHANGE
   portfinder.getPort(function (err, port) {
     if (err) { throw err; }
     listen(port);