From 4a21a194f49d6b6c5b45f17e8679e770166ddcc8 Mon Sep 17 00:00:00 2001
From: Hugh Sanderson <hugh@hughsando.com>
Date: Wed, 18 Sep 2024 13:32:48 +0800
Subject: [PATCH] Add native CURL code for emscripten

---
 include.nmml                             |   2 +
 project/ToolkitBuild.xml                 |  37 ++--
 project/src/common/ExternalInterface.cpp |   2 +-
 project/src/emscripten/CurlFetch.cpp     | 259 +++++++++++++++++++++++
 project/src/winrt/URL.cpp                |  69 ------
 samples/13-URLLoader/Sample.hx           |   6 +-
 src/nme/net/URLLoader.hx                 |  49 ++++-
 7 files changed, 336 insertions(+), 88 deletions(-)
 create mode 100755 project/src/emscripten/CurlFetch.cpp
 delete mode 100644 project/src/winrt/URL.cpp

diff --git a/include.nmml b/include.nmml
index 79273c898..a55e3f8e1 100644
--- a/include.nmml
+++ b/include.nmml
@@ -17,6 +17,8 @@
 
 <haxedef name="nme_api_level=611"/>
 
+<haxedef name="no_haxe_http" if="wasm" />
+
 <section if="NME_HXTELEMETRY || telemetry">
    <haxelib name="hxtelemetry"/>
    <haxedef name="HXCPP_TELEMETRY"/>
diff --git a/project/ToolkitBuild.xml b/project/ToolkitBuild.xml
index fc4768e66..73fb75aad 100644
--- a/project/ToolkitBuild.xml
+++ b/project/ToolkitBuild.xml
@@ -95,14 +95,25 @@
    <!-- For systems that do not create the egl context for us -->
    <set name="NME_EGL" value="1" if="rpi" unless="sdl_rpi" />
 
-   <!-- Do we need to implement curl in NME -->
-   <set name="NME_CURL" value="1" />
-   <unset name="NME_CURL" if="emscripten||winrt||gcw0||NME_LOCAL_TOOLKIT" />
+   <!-- It will fallback to using haxe http, which can handle https, without libCurl -->
+   <!--<set name="NME_CURL" value="1" />-->
+
+
+   <!-- Use native browser API.  This will check CORS however. -->
+   <set name="NME_CURL_NATIVE" value="1" if="emscripten" />
+
+   <set name="NME_CURL" value="1" if="NME_CURL_NATIVE" />
+
+   <unset name="NME_CURL" if="winrt||gcw0||NME_LOCAL_TOOLKIT||NME_NO_CURL" unless="NME_CURL_NATIVE" />
+
+   <set name="NME_CURL_TOOLKIT" value="1" if="NME_CURL" unless="NME_CURL_NATIVE" />
 
    <!-- And allow https ? -->
-   <set name="NME_SSL" value="1" />
-   <set name="NME_SSL_EXTRA" value="_ssl" if="NME_SSL"/>
-   <set name="NATIVE_TOOLKIT_CURL_SSL" value="1" if="NME_SSL" />
+   <section if="NME_CURL_TOOLKIT" >
+      <set name="NME_SSL" value="1" />
+      <set name="NME_SSL_EXTRA" value="_ssl" if="NME_SSL"/>
+      <set name="NATIVE_TOOLKIT_CURL_SSL" value="1" if="NME_SSL" />
+   </section>
    
    <!--<setenv name="MACOSX_DEPLOYMENT_TARGET" value="10.12" if="NME_SDL3" />-->
    <!--
@@ -176,7 +187,7 @@
       <set name="NME_LIBSDL_MIXER" value="${NATIVE_TOOLKIT_PATH}/sdl-mixer/" />
       <include name="${NME_LIBSDL_MIXER}files.xml" if="NME_MIXER" />
 
-      <include name="${NATIVE_TOOLKIT_PATH}/curl/files.xml" if="NME_CURL" />
+      <include name="${NATIVE_TOOLKIT_PATH}/curl/files.xml" if="NME_CURL_TOOLKIT" />
    </section>
 
 
@@ -340,6 +351,7 @@
       <section if="emscripten">
          <compilerflag value="-sUSE_SDL=1"/>
          <file name="${SRC_DIR}/emscripten/System.cpp" />
+         <file name="${SRC_DIR}/emscripten/CurlFetch.cpp" />
          <file name="${SRC_DIR}/emscripten/JsPrime.cpp" if="HXCPP_JS_PRIME" />
 
          <file name="${SRC_DIR}/emscripten/_sans.cpp" />
@@ -373,7 +385,7 @@
       <compilerflag value="-I${NME_FREETYPE}include/freetype"/>
 
       <compilerflag value="-I${NME_MODPLUG}" if="modplug" />
-      <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/curl/include" if="NME_CURL" />
+      <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/curl/include" if="NME_CURL_TOOLKIT" />
 
       <depend files="native-toolkit-freetype-depends" />
       <depend files="native-toolkit-jpeg-depends" />
@@ -381,7 +393,7 @@
       <depend files="native-toolkit-vorbis-depends" />
       <depend files="native-toolkit-ogg-depends" />
       <depend files="native-toolkit-modplug-depends" if="modplug" />
-      <depend files="native-toolkit-curl-depends" if="NME_CURL" />
+      <depend files="native-toolkit-curl-depends" if="NME_CURL_TOOLKIT" />
 
       <section if="NME_NATIVE_SDL_SYSTEM" unless="NME_SDL2" >
         <compilerflag value="-I/opt/local/include" if="macos" />
@@ -414,7 +426,7 @@
       </section>
 
       <compilerflag value="-DNME_CURL" if="NME_CURL"/>
-      <section if="NME_CURL">
+      <section if="NME_CURL" unless="NME_CURL_NATIVE" >
          <compilerflag value="-DNME_CURL_SSL" if="NME_SSL"/>
       </section>
 
@@ -472,7 +484,7 @@
       <file name="${SRC_DIR}/common/Input.cpp" unless="iphone" />
       <file name="${SRC_DIR}/common/SurfaceIO.cpp" unless="sdl_image" />
       <file name="${SRC_DIR}/common/ManagedStage.cpp" unless="winrt" />
-      <file name="${SRC_DIR}/common/CURL.cpp" if="NME_CURL"/>
+      <file name="${SRC_DIR}/common/CURL.cpp" if="NME_CURL_TOOLKIT"/>
       <file name="${SRC_DIR}/common/Thread.cpp"/>
       <file name="${SRC_DIR}/common/Camera.cpp" if="NME_CAMERA" />
       <file name="${SRC_DIR}/common/ObjectStream.cpp" />
@@ -596,7 +608,7 @@
          <files id="native-toolkit-zlib" unless="NME_LOCAL_TOOLKIT"  />
          <files id="hxcpp_zlib" if="NME_LOCAL_TOOLKIT"  />
          <files id="native-toolkit-angle" if="NME_ANGLE" />
-         <section if="NME_CURL">
+         <section if="NME_CURL_TOOLKIT">
             <files id="native-toolkit-curl" />
          </section>
 
@@ -655,6 +667,7 @@
 
          <section if="HXCPP_JS_PRIME || emscripten">
             <vflag name="-s" value="EXPORTED_FUNCTIONS=['_malloc','_free','_main','ccall']" />
+            <vflag name="-s" value="FETCH=1" />
          </section>
 
          <section if="android">
diff --git a/project/src/common/ExternalInterface.cpp b/project/src/common/ExternalInterface.cpp
index 6fa85e1d2..5ff5fa9cb 100644
--- a/project/src/common/ExternalInterface.cpp
+++ b/project/src/common/ExternalInterface.cpp
@@ -628,7 +628,7 @@ void ToValue(value &outVal,const ColorTransform &inTrans)
 
 
 
-#ifndef EMSCRIPTEN
+#ifdef NME_CURL
 void FromValue(value obj, URLRequest &request)
 {
    request.url = val_string( val_field(obj, _id_url) );
diff --git a/project/src/emscripten/CurlFetch.cpp b/project/src/emscripten/CurlFetch.cpp
new file mode 100755
index 000000000..eca041c2d
--- /dev/null
+++ b/project/src/emscripten/CurlFetch.cpp
@@ -0,0 +1,259 @@
+#include <URL.h>
+#include <Utils.h>
+#include <map>
+#include <string>
+
+#include "emscripten.h"
+#include "emscripten/fetch.h"
+#include <sys/stat.h>
+
+namespace nme
+{
+
+static int sgAvtiveCount = 0;
+
+static void onsuccess(struct emscripten_fetch_t *fetch);
+static void onerror(struct emscripten_fetch_t *fetch);
+static void onprogress(struct emscripten_fetch_t *fetch);
+static void onreadystatechange(struct emscripten_fetch_t *fetch);
+
+static const bool allowUserAgent = false;
+
+class CurlFetch : public URLLoader
+{
+   emscripten_fetch_t *fetch;
+   URLState state;
+   ByteArray data;
+   std::string err;
+   int status;
+   std::vector<char> postData;
+
+public:
+   CurlFetch(URLRequest &request)
+   {
+      state = urlInit;
+      status = 400;
+      fetch = nullptr;
+
+      emscripten_fetch_attr_t attr;
+      emscripten_fetch_attr_init(&attr);
+      attr.userData = this;
+      attr.onsuccess = onsuccess;
+      attr.onprogress = onprogress;
+      attr.onerror = onerror;
+      attr.onreadystatechange = onreadystatechange;
+      attr.attributes = EMSCRIPTEN_FETCH_LOAD_TO_MEMORY;
+
+      strcpy(attr.requestMethod, request.method);
+
+      if (request.postData.Size()>0)
+      {
+         postData.resize(request.postData.Size());
+         memcpy(&postData[0],request.postData.Bytes(), request.postData.Size());
+         attr.requestData = &postData[0];
+         attr.requestDataSize = postData.size();
+      }
+
+      std::string user;
+      std::string pass;
+      if (request.credentials && request.credentials[0])
+      {
+         std::string creds(request.credentials);
+         auto col = creds.find(":");
+         if (col!=std::string::npos)
+         {
+            user = creds.substr(0,col);
+            pass = creds.substr(col+1);
+            attr.userName = user.c_str();
+            attr.password = pass.c_str();
+         }
+      }
+      std::vector<const char *> allHeaders;
+      bool seenCookie = false;
+      bool seenAgent = false;
+      bool seenContent = false;
+      for(int i=0;i<request.headers.size();i++)
+      {
+         URLRequestHeader &h = request.headers[i];
+         const char *value = h.value;
+         if (!strcmp(h.name,"User-Agent"))
+         {
+            if (allowUserAgent)
+            {
+               seenAgent = true;
+               if (request.userAgent && request.userAgent[0])
+                  value = request.userAgent;
+            }
+         }
+         else if (!strcmp(h.name,"Cookie"))
+         {
+            seenCookie = true;
+            if (request.cookies && request.cookies[0])
+               value = request.cookies;
+         }
+         else if (!strcmp(h.name,"Content-Type"))
+         {
+            seenContent = true;
+            if (request.contentType && request.contentType[0])
+               value = request.contentType;
+         }
+
+         allHeaders.push_back(h.name);
+         allHeaders.push_back(value);
+      }
+      if (allowUserAgent && !seenAgent && request.userAgent && request.userAgent[0])
+      {
+         allHeaders.push_back("User-Agent");
+         allHeaders.push_back(request.userAgent);
+      }
+      if (!seenCookie && request.cookies && request.cookies[0])
+      {
+         allHeaders.push_back("Cookie");
+         allHeaders.push_back(request.cookies);
+      }
+      if (!seenContent && request.contentType && request.contentType[0])
+      {
+         allHeaders.push_back("Content-Type");
+         allHeaders.push_back(request.contentType);
+      }
+
+      if (allHeaders.size())
+      {
+         allHeaders.push_back(nullptr);
+         attr.requestHeaders = &allHeaders[0];
+      }
+
+
+      fetch = emscripten_fetch(&attr, request.url);
+
+      state = urlLoading;
+   }
+
+   ~CurlFetch()
+   {
+      close();
+   }
+
+   void onSuccess()
+   {
+      if (fetch)
+      {
+         int len = (int)fetch->numBytes;
+         if (len)
+         {
+            data = ByteArray(len);
+            memcpy(data.Bytes(), fetch->data, len);
+         }
+         status = fetch->status;
+      }
+      state = urlComplete;
+   }
+   void onError()
+   {
+      if (fetch)
+      {
+         status = fetch->status;
+         err = fetch->statusText;
+      }
+      close();
+      state = urlError;
+   }
+   void onProgress() { }
+
+   void onReadyStateChanged()
+   {
+   }
+
+
+   void close()
+   {
+      if (fetch)
+      {
+         emscripten_fetch_close(fetch);
+         fetch = nullptr;
+      }
+   }
+   URLState getState()
+   {
+      return state;
+   }
+
+   int bytesLoaded()
+   {
+      if (fetch)
+         return (int)fetch->dataOffset;
+      return 0;
+   }
+   int bytesTotal()
+   {
+      if (fetch)
+         return (int)fetch->totalBytes;
+      return 0;
+   }
+   int getHttpCode()
+   {
+      return status;
+   }
+   const char *getErrorMessage()
+   {
+      return err.c_str();
+   }
+
+   ByteArray releaseData()
+   {
+      return data;
+   }
+
+   void getCookies( std::vector<std::string> &outCookies )
+   {
+   }
+
+   void getResponseHeaders( std::vector<std::string> &outHeaders )
+   {
+      if (fetch)
+      {
+         size_t len = emscripten_fetch_get_response_headers_length(fetch);
+         if (len)
+         {
+            std::vector<char> buf(len);
+            emscripten_fetch_get_response_headers(fetch, &buf[0], len);
+            char **headers = emscripten_fetch_unpack_response_headers(&buf[0]);
+            std::string sep(": ");
+            for(char **h = headers; *h; h+=2)
+               outHeaders.push_back( h[0] + sep + h[1] );
+            emscripten_fetch_free_unpacked_response_headers(headers);
+         }
+      }
+   }
+
+};
+
+static void onsuccess(struct emscripten_fetch_t *fetch) {
+   ((CurlFetch *)fetch->userData)->onSuccess();
+}
+static void onerror(struct emscripten_fetch_t *fetch) {
+   ((CurlFetch *)fetch->userData)->onError();
+}
+static void onprogress(struct emscripten_fetch_t *fetch) {
+   ((CurlFetch *)fetch->userData)->onProgress();
+}
+static void onreadystatechange(struct emscripten_fetch_t *fetch) {
+   ((CurlFetch *)fetch->userData)->onReadyStateChanged();
+}
+
+
+
+URLLoader *URLLoader::create(URLRequest &inRequest)
+{
+   return new CurlFetch(inRequest);
+}
+
+bool URLLoader::processAll()
+{
+   return sgAvtiveCount > 0;
+}
+void URLLoader::initialize(const char *inCACertFilePath)
+{
+}
+
+}  // End namespace nme
diff --git a/project/src/winrt/URL.cpp b/project/src/winrt/URL.cpp
deleted file mode 100644
index 829644520..000000000
--- a/project/src/winrt/URL.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <URL.h>
-
-namespace nme
-{
-
-
-class WinRTURLLoader : public URLLoader
-{
-public:
-   WinRTURLLoader(URLRequest &inRequest)
-   {
-   }
-
-   ~WinRTURLLoader()
-   {
-   }
-
-   URLState getState()
-   {
-      return urlError;
-   }
-
-   int bytesLoaded()
-   {
-      return 0;
-   }
-
-   int bytesTotal()
-   {
-      return 0;
-   }
-
-   int  getHttpCode()
-   {
-      return 404;
-   }
-
-   const char *getErrorMessage()
-   {
-      return "";
-   }
-
-   ByteArray releaseData()
-   {
-      return ByteArray();
-   }
-
-   void  getCookies( std::vector<std::string> &outCookies )
-   {
-   }
-};
-
-
-URLLoader *URLLoader::create(URLRequest &inRequest)
-{
-   return new WinRTURLLoader(inRequest);
-}
-
-bool URLLoader::processAll()
-{
-   return false;
-}
-
-void URLLoader::initialize(const char *inCACertFilePath)
-{
-}
-
-
-}
diff --git a/samples/13-URLLoader/Sample.hx b/samples/13-URLLoader/Sample.hx
index 6ee7b3e89..1855ce6ce 100644
--- a/samples/13-URLLoader/Sample.hx
+++ b/samples/13-URLLoader/Sample.hx
@@ -104,7 +104,8 @@ class Sample extends Sprite
         post.data = vars;
         //post.verbose = true;
         var postLoad = new URLLoader();
-        postLoad.addEventListener(IOErrorEvent.IO_ERROR, e -> postTextField.htmlText = "Error:" + e );
+        postLoad.addEventListener(IOErrorEvent.IO_ERROR, e ->
+           postTextField.htmlText = "Error in post:" + e + " " + post);
         postLoad.addEventListener(Event.COMPLETE, function(_) {
            postTextField.htmlText = postLoad.data.toString();
         } );
@@ -143,6 +144,9 @@ class Sample extends Sprite
     {
        trace("error " + e);
        xmlTextField.text = "Error:" + e.text;
+       #if wasm
+       xmlTextField.text += " Perhaps CORS - check developer console";
+       #end
     }
 }
 
diff --git a/src/nme/net/URLLoader.hx b/src/nme/net/URLLoader.hx
index 3e115b95f..cb2c13c32 100644
--- a/src/nme/net/URLLoader.hx
+++ b/src/nme/net/URLLoader.hx
@@ -8,7 +8,11 @@ import nme.events.ProgressEvent;
 import nme.events.HTTPStatusEvent;
 import nme.utils.ByteArray;
 import nme.Loader;
+
+#if !no_haxe_http
+// Not using haxe.http avoids inclusing all the https cpp code
 import nme.net.HttpLoader;
+#end
 
 #if html5
 // ok
@@ -35,7 +39,9 @@ class URLLoader extends EventDispatcher
    public var dataFormat:URLLoaderDataFormat;
 
    public var nmeHandle:NativeHandle;
+   #if !no_haxe_http
    public var httpLoader:HttpLoader;
+   #end
 
    private static var hasCurlLoader = false;
    private static var activeLoaders = new List<URLLoader>();
@@ -63,7 +69,14 @@ class URLLoader extends EventDispatcher
          load(request);
    }
 
-   override public function toString() return 'URLLoader(${nmeHandle!=null?"curl":httpLoader!=null?"http":"null"})';
+   override public function toString()
+   {
+      #if no_haxe_http
+      return 'URLLoader(${nmeHandle!=null?"curl":"null"})';
+      #else
+      return 'URLLoader(${nmeHandle!=null?"curl":httpLoader!=null?"http":"null"})';
+      #end
+   }
 
    public function close() 
    {
@@ -76,9 +89,7 @@ class URLLoader extends EventDispatcher
 
    public static function initialize(inCACertFilePath:String) 
    {
-      #if !NME_USE_HTTP
       nme_curl_initialize(inCACertFilePath);
-      #end
    }
 
    public function load(request:URLRequest) 
@@ -119,16 +130,18 @@ class URLLoader extends EventDispatcher
          request.nmePrepare();
 
          nmeHandle = nme_curl_create(request);
+         #if !no_haxe_http
          if (nmeHandle==null)
          {
             httpLoader = new HttpLoader(this,request);
          }
          else
+         #end
          {
             hasCurlLoader = true;
          }
 
-         if (nmeHandle==null && HttpLoader==null)
+         if (nmeHandle==null #if !no_haxe_http && HttpLoader==null #end )
             onError("Could not open URL");
          else
          {
@@ -204,7 +217,7 @@ class URLLoader extends EventDispatcher
 
    private function update()
    {
-      if (nmeHandle!=null || httpLoader!=null)
+      if (nmeHandle!=null #if !no_haxe_http || httpLoader!=null #end )
       {
          var old_loaded = bytesLoaded;
          var old_total = bytesTotal;
@@ -266,13 +279,21 @@ class URLLoader extends EventDispatcher
    {
       if (nmeHandle!=null)
          return nme_curl_get_error_message(nmeHandle);
+      #if no_haxe_http
+      return null;
+      #else
       return httpLoader.getErrorMessage();
+      #end
    }
    function getData(): ByteArray
    {
       if (nmeHandle!=null)
          return nme_curl_get_data(nmeHandle);
+      #if no_haxe_http
+      return null;
+      #else
       return httpLoader.getData();
+      #end
    }
    function getString(): String
    {
@@ -281,13 +302,21 @@ class URLLoader extends EventDispatcher
          var bytes:ByteArray = getData();
          return bytes == null ? "" : bytes.asString();
       }
+      #if no_haxe_http
+      return "";
+      #else
       return httpLoader.getString();
+      #end
    }
    function getCode(): Int
    {
       if (nmeHandle!=null)
          return nme_curl_get_code(nmeHandle);
+      #if no_haxe_http
+      return 400;
+      #else
       return httpLoader.getCode();
+      #end
    }
    function updateLoader()
    {
@@ -295,18 +324,24 @@ class URLLoader extends EventDispatcher
       {
          nme_curl_update_loader(nmeHandle,this);
       }
+      #if !no_haxe_http
       else
       {
          bytesLoaded = httpLoader.bytesLoaded;
          bytesTotal = httpLoader.bytesTotal;
          state = httpLoader.state;
       }
+      #end
    }
    function getHeaders() : Array<String>
    {
       if (nmeHandle!=null)
          return nme_curl_get_headers(nmeHandle);
+      #if no_haxe_http
+      return null;
+      #else
       return httpLoader.getHeaders();
+      #end
    }
 
 
@@ -314,7 +349,11 @@ class URLLoader extends EventDispatcher
    {
       if (nmeHandle!=null)
          return nme_curl_get_cookies(nmeHandle);
+      #if no_haxe_http
+      return null;
+      #else
       return httpLoader==null ? null : httpLoader.getCookies();
+      #end
    }
 
    static function pollLoaders()