Merge pull request #3237 from perkinslr/xmlhttp-request

Fix XMLHttpRequest issues
RPTools · Dec 4, 2021 · a73bf1c · a73bf1c
2 parents 21a338a + 1e48ba2
commit a73bf1c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/ui/htmlframe/MTXMLHttpRequest.java b/src/main/java/net/rptools/maptool/client/ui/htmlframe/MTXMLHttpRequest.java
@@ -56,7 +56,9 @@ public void _getResponseHeaders(JSObject jheaders) {
 
     responseHeaders.forEach(
         (key, value) -> {
-          jheaders.setMember(key, value);
+          if (!key.equals(":Status")) {
+            jheaders.setMember(key, value);
+          }
         });
   }
 

diff --git a/src/main/java/net/rptools/maptool/model/library/url/RequestHandler.java b/src/main/java/net/rptools/maptool/model/library/url/RequestHandler.java
@@ -121,7 +121,7 @@ public static CompletableFuture<String> processRequest(
       }
       responseHeaders.put(":Status", "200");
       try {
-        c.complete(new String(stream.readAllBytes(), StandardCharsets.UTF_16));
+        c.complete(new String(stream.readAllBytes(), StandardCharsets.UTF_8));
         return c;
       } catch (IOException e) {
         responseHeaders.put(":Status", "500 Internal Exception");

diff --git a/src/main/resources/net/rptools/maptool/client/html5/javascript/XMLHttpRequest.js b/src/main/resources/net/rptools/maptool/client/html5/javascript/XMLHttpRequest.js
@@ -107,7 +107,7 @@ class XMLHttpRequest {
 }
 
 
-function fetch(target, optionObject) {
+async function fetch(target, optionObject) {
     let request;
     if (target instanceof Request) {
 	request = target;
@@ -126,7 +126,8 @@ function fetch(target, optionObject) {
     for (let header of request.headers) {
 	x.setRequestHeader(header[0], header[1])
     }
-    let body = request.text();
+    let body = await request.text();
+
 
     let _resolve;
     let _reject;