Clean up Mill Server code

build.sc

@@ -762,6 +762,9 @@ object main extends MillStableScalaModule with BuildInfo {
     }
   }
 
+  object server extends MillPublishScalaModule {
+    def moduleDeps = Seq(client, api)
+  }
   object graphviz extends MillPublishScalaModule {
     def moduleDeps = Seq(main, scalalib)
     def ivyDeps = Agg(Deps.graphvizJava, Deps.jgraphtCore)
@@ -1434,7 +1437,7 @@ def launcherScript(
     cmdClassPath: Agg[String]
 ) = {
 
-  val millMainClass = "mill.main.client.MillClientMain"
+  val millMainClass = "mill.runner.client.MillClientMain"
 
   Jvm.universalScript(
     shellCommands = {
@@ -1545,7 +1548,14 @@ def launcherScript(
 }
 
 object runner extends MillPublishScalaModule {
-  def moduleDeps = Seq(scalalib, scalajslib, scalanativelib, bsp, linenumbers, main.codesig)
+  object client extends MillPublishJavaModule{
+    def buildInfoPackageName = "mill.runner.client"
+    def moduleDeps = Seq(main.client)
+  }
+
+  def moduleDeps = Seq(
+    scalalib, scalajslib, scalanativelib, bsp, linenumbers, main.codesig, main.server, client
+  )
   def skipPreviousVersions: T[Seq[String]] = Seq("0.11.0-M7")
 
   object linenumbers extends MillPublishScalaModule {

main/client/src/mill/main/client/FileToStreamTailer.java

@@ -99,6 +99,7 @@ public void flush() {
 
     @Override
     public void close() throws Exception {
+        flush();
         interrupt();
     }
 }

main/client/src/mill/main/client/InputPumper.java

@@ -38,7 +38,12 @@ public void run() {
                 }
                 else if (checkAvailable && src.available() == 0) Thread.sleep(2);
                 else {
-                    int n = src.read(buffer);
+                    int n;
+                    try{
+                      n = src.read(buffer);
+                    } catch (Exception e){
+                        n = -1;
+                    }
                     if (n == -1) {
                         running = false;
                     }

main/client/src/mill/main/client/ServerCouldNotBeStarted.java

@@ -0,0 +1,7 @@
+package mill.main.client;
+
+public class ServerCouldNotBeStarted extends Exception {
+    public ServerCouldNotBeStarted(String msg) {
+        super(msg);
+    }
+}

main/client/src/mill/main/client/ServerFiles.java

@@ -5,6 +5,7 @@
  * and documentation about what they do
  */
 public class ServerFiles {
+    final public static String serverId = "serverId";
     final public static String sandbox = "sandbox";
 
     /**
@@ -30,7 +31,7 @@ public class ServerFiles {
      */
     public static String pipe(String base) {
         try {
-            return base + "/mill-" + Util.md5hex(new java.io.File(base).getCanonicalPath()) + "-io";
+            return base + "/mill-" + Util.md5hex(new java.io.File(base).getCanonicalPath()).substring(0, 8) + "-io";
         }catch (Exception e){
             throw new RuntimeException(e);
         }