Fix WebTerminal to use a HttpServer rather than readng from jar.

PerBothner · PerBothner · commit e7a9ff33622c · 2019-12-30T21:46:34.000-08:00
DomTerm is now partual module-compatible, which doesn't
seem to be comaptible with reading JavaScript from a jar:url scheme.
diff --git a/jfx-term.html b/jfx-term.html
@@ -17,13 +17,16 @@
 <script type='text/javascript' src='hlib/wcwidth.js'> </script>
 <script type='text/javascript' src='hlib/browserkeymap.js'> </script>
 <script type='module' src='hlib/commands.js'> </script>
-<script type='text/javascript' src='hlib/domterm-client.js'> </script>
 <script type='text/javascript'>
 var termElement;
 var termInstance;
-function makeDomTerm() {         
-    termElement = document.getElementById("term1");
-    var term = new DomTerm("term1");
+
+function makeDomTerm() {
+    let name = "kterm1";
+    let term;
+    termElement = DomTerm.makeElement(name, document.body);
+    termInstance = new window.DTerminal(name);
+    term = termInstance;
     term.processInputCharacters =
         function(str) { term.java.processInputCharacters(str); };
     term.reportEvent =
@@ -38,7 +41,6 @@
     term.log =
         function(str) {
             if (term && term.java) term.java.log(str); }
-    termInstance = term;
     return term;
 }
 function initDomTerm() {
@@ -47,5 +49,5 @@
 }
 </script>
 </head>
-<body><div class="domterm" id="term1"></div></body>
+<body></body>
 </html>
diff --git a/org/domterm/javafx/WebTerminal.java b/org/domterm/javafx/WebTerminal.java
@@ -41,6 +41,8 @@
 import javafx.scene.layout.*;
 import org.w3c.dom.events.EventTarget;
 import netscape.javascript.JSObject;
+import java.io.IOException;
+import java.net.UnknownHostException;
 import javafx.application.Platform;
 import javafx.scene.control.Control;
 import javafx.scene.input.Clipboard;
@@ -64,6 +66,8 @@ public class WebTerminal extends VBox // FIXME should extend Control
 {
     public Backend backend;
     public void log(String str) { WTDebug.println(str); }
+
+    static DomHttpServer httpServer;
     
     WebView webView;
     protected WebView getWebView() { return webView; } 
@@ -172,6 +176,13 @@ public void setBackend(Backend backend) {
     }
 
     public WebTerminal(final Backend backend) {
+        if (httpServer == null) {
+            try {
+                startServer(0);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
         setBackend(backend);
         webView = new WebView();
         webEngine = webView.getEngine();
@@ -213,10 +224,7 @@ public void changed(ObservableValue<? extends State> ov, State t, State newValue
      */
     protected String pageUrl() {
         String rname = "jfx-term.html";
-        java.net.URL rurl = Backend.class.getClassLoader().getResource(rname);
-        if (rurl == null)
-            throw new RuntimeException("no initial web page "+rname);
-        return rurl.toString();
+        return "http://localhost:"+httpServer.getPort()+"/domterm/"+rname;
     }
 
     /** Load the start page.  Do not call directly.
@@ -266,4 +274,11 @@ public void run() {
 
 
     }
+
+    public static void startServer(int port)
+        throws IOException, UnknownHostException {
+        DomHttpServer s = new DomHttpServer(port, new String[0]);
+        s.start();
+        httpServer = s;
+    }
 }
