Fixed additional CI pipeline failures

Author: shai-almog

Ports/JavaScriptPort/src/main/java/com/codename1/impl/html5/HTML5Implementation.java

@@ -7264,7 +7264,9 @@ public void browserStop(PeerComponent browserPeer) {
 
     @Override
     public Object createSoftWeakRef(Object o) {
-        if (Display.getInstance().getProperty("javascript.useES6WeakRefs", "true").equals("true") && isWeakMapSupported()) {
+        if (Display.getInstance().getProperty("javascript.useES6WeakRefs", "true").equals("true")
+                && isWeakMapSupported()
+                && (o == null || o instanceof JSObject)) {
             if (o == null) {
                 return new JSObjectWrapper();
             }
@@ -7473,18 +7475,34 @@ public InputStream getArrayBufferInputStream(String url){
             url = url + "?v=" + getBuildVersion();
         }
         req.open("get", url, false);
-        req.setResponseType("arraybuffer");
+        req.overrideMimeType("text/plain; charset=x-user-defined");
         req.send();
 
-        if (req.getResponse() == null  ){
+        Uint8Array responseBytes = toResponseBytes(req);
+        if (responseBytes == null) {
             System.out.println(req.getAllResponseHeaders());
             System.out.println(req.getStatusText());
             System.out.println("Failed to load resource "+url);
             System.out.println("Status code was "+req.getStatus());
             return null;
         }
 
-        ArrayBufferInputStream out = new ArrayBufferInputStream(Uint8Array.create((ArrayBuffer)req.getResponse()), req.getResponseType());
+        ArrayBufferInputStream out = new ArrayBufferInputStream(responseBytes, req.getResponseType());
+        return out;
+    }
+
+    private Uint8Array toResponseBytes(XMLHttpRequest req) {
+        if ("arraybuffer".equals(req.getResponseType()) && req.getResponse() != null) {
+            return Uint8Array.create((ArrayBuffer)req.getResponse());
+        }
+        String responseText = req.getResponseText();
+        if (responseText == null) {
+            return null;
+        }
+        Uint8Array out = Uint8Array.create(responseText.length());
+        for (int i = 0; i < responseText.length(); i++) {
+            out.set(i, (short)(responseText.charAt(i) & 0xff));
+        }
         return out;
     }
 

Ports/JavaScriptPort/src/main/java/com/codename1/impl/html5/NetworkConnection.java

@@ -73,7 +73,7 @@ private void open(){
         if (!isOpen){
             isOpen = true;
             req.open(httpMethod, url, false);
-            req.setResponseType("arraybuffer");
+            req.overrideMimeType("text/plain; charset=x-user-defined");
         }
     }
 
@@ -99,12 +99,18 @@ public void setHeader(String key, String val) {
     }
 
     public int getContentLength(){
-        if (req.getResponse()==null){
-            return 0;
-        } else {
+        try {
+            InputStream stream = inputStream;
+            if (stream instanceof ArrayBufferInputStream) {
+                return ((ArrayBufferInputStream) stream).getBuffer().getByteLength();
+            }
+        } catch (Throwable ignored) {
+        }
+        if (req.getResponse() != null) {
             return ((ArrayBuffer)req.getResponse()).getByteLength();
         }
-        
+        String responseText = req.getResponseText();
+        return responseText == null ? 0 : responseText.length();
     }
 
 
@@ -138,19 +144,35 @@ public InputStream openInputStream() throws IOException {
         }
 
 
-        if (req.getResponse() == null || req.getStatus() == 0 ){
+        Uint8Array responseBytes = toResponseBytes(req);
+        if (responseBytes == null || req.getStatus() == 0 ){
             System.out.println(req.getAllResponseHeaders());
             System.out.println(req.getStatusText());
             System.out.println("Failed to load url "+url);
             System.out.println("Status code was "+req.getStatus());
             throw new IOException("Failed to load "+url+".  Status "+req.getStatusText());
         }
 
-        inputStream = new ArrayBufferInputStream(Uint8Array.create((ArrayBuffer)req.getResponse()), req.getResponseType());
+        inputStream = new ArrayBufferInputStream(responseBytes, req.getResponseType());
         return inputStream;
 
 
 
+    }
+
+    private Uint8Array toResponseBytes(XMLHttpRequest req) {
+        if ("arraybuffer".equals(req.getResponseType()) && req.getResponse() != null) {
+            return Uint8Array.create((ArrayBuffer)req.getResponse());
+        }
+        String responseText = req.getResponseText();
+        if (responseText == null) {
+            return null;
+        }
+        Uint8Array out = Uint8Array.create(responseText.length());
+        for (int i = 0; i < responseText.length(); i++) {
+            out.set(i, (short)(responseText.charAt(i) & 0xff));
+        }
+        return out;
     }
 
      public OutputStream openOutputStream() throws IOException {

vm/ByteCodeTranslator/src/javascript/index.html

@@ -10,6 +10,12 @@
   <p>Loading...</p>
 </div>
 <canvas id="codenameone-canvas" width="320" height="480"></canvas>
+<script>
+window.cn1LoadedFiles = window.cn1LoadedFiles || [];
+window.cn1LoadedFile = window.cn1LoadedFile || function(filename) {
+  window.cn1LoadedFiles.push(String(filename || ""));
+};
+</script>
 <script src="js/push.js"></script>
 <script src="js/jquery.min.js"></script>
 <script src="js/fontmetrics.js"></script>