Addons available for download in WASM builds

CMakeLists.txt

@@ -925,7 +925,7 @@ target_link_libraries(supertux2 supertux2_lib Boost::filesystem Boost::locale)
 set_target_properties(supertux2_lib PROPERTIES OUTPUT_NAME supertux2_lib)
 set_target_properties(supertux2_lib PROPERTIES COMPILE_FLAGS "${SUPERTUX2_EXTRA_WARNING_FLAGS}")
 if(EMSCRIPTEN)
-  target_link_options(supertux2 PUBLIC -sEXPORTED_FUNCTIONS=['_main','_set_resolution','_save_config'] PUBLIC -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap'] PUBLIC -sEXTRA_EXPORTED_RUNTIME_METHODS=['ccall','cwrap'])
+  target_link_options(supertux2 PUBLIC -sEXPORTED_FUNCTIONS=['_main','_set_resolution','_save_config','_onDownloadProgress','_onDownloadFinished','_onDownloadError','_onDownloadAborted'] PUBLIC -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap'] PUBLIC -sEXTRA_EXPORTED_RUNTIME_METHODS=['ccall','cwrap'])
 endif(EMSCRIPTEN)
 
 if(WIN32 AND NOT VCPKG_BUILD)

mk/emscripten/template.html.in

@@ -506,6 +506,43 @@
       });
     }
 
+    var onDownloadProgress, onDownloadFinished, onDownloadError, onDownloadAborted;
+    window.supertux_xhr_download = function(id, url, file) {
+      console.log('id: ' + id);
+      console.log('url: ' + url);
+      console.log('file: ' + file);
+
+      if (!onDownloadProgress)
+        onDownloadProgress = Module.cwrap('onDownloadProgress', 'void', ['number', 'number', 'number']);
+
+      if (!onDownloadFinished)
+        onDownloadFinished = Module.cwrap('onDownloadFinished', 'void', ['number']);
+
+      if (!onDownloadError)
+        onDownloadError = Module.cwrap('onDownloadError', 'void', ['number']);
+
+      if (!onDownloadAborted)
+        onDownloadAborted = Module.cwrap('onDownloadAborted', 'void', ['number']);
+
+      var xhr = new XMLHttpRequest();
+      xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+          var data = new Uint8Array(xhr.response);
+          var stream = FS.open(file, 'w+');
+          FS.write(stream, data, 0, data.length, 0);
+          FS.close(stream);
+          onDownloadFinished(id);
+        }
+      };
+      xhr.responseType = "arraybuffer";
+      xhr.open("GET", url);
+      xhr.send();
+
+      xhr.addEventListener('progress', (e) => { onDownloadProgress(id, e.loaded, e.total); });
+      xhr.addEventListener('error', (e) => { onDownloadError(id); });
+      xhr.addEventListener('abort', (e) => { onDownloadAborted(id); })
+    }
+
     window.addEventListener('resize', (e) => {
       tryResize();
     });

src/addon/addon.cpp

@@ -15,8 +15,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __EMSCRIPTEN__
-
 #include "addon/addon.hpp"
 
 #include <sstream>
@@ -180,6 +178,4 @@ Addon::set_enabled(bool v)
   m_enabled = v;
 }
 
-#endif
-
 /* EOF */

src/addon/addon.hpp

@@ -18,8 +18,6 @@
 #ifndef HEADER_SUPERTUX_ADDON_ADDON_HPP
 #define HEADER_SUPERTUX_ADDON_ADDON_HPP
 
-#ifndef __EMSCRIPTEN__
-
 #include <memory>
 #include <string>
 
@@ -88,6 +86,4 @@ class Addon final
 
 #endif
 
-#endif
-
 /* EOF */

src/addon/addon_manager.cpp

@@ -15,8 +15,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __EMSCRIPTEN__
-
 #include "addon/addon_manager.hpp"
 
 #include <physfs.h>
@@ -787,6 +785,30 @@ AddonManager::check_for_langpack_updates()
   }
 }
 
+#ifdef EMSCRIPTEN
+void
+AddonManager::onDownloadProgress(int id, int loaded, int total)
+{
+  m_downloader.onDownloadProgress(id, loaded, total);
+}
+
+void
+AddonManager::onDownloadFinished(int id)
+{
+  m_downloader.onDownloadFinished(id);
+}
+
+void
+AddonManager::onDownloadError(int id)
+{
+  m_downloader.onDownloadError(id);
+}
+
+void
+AddonManager::onDownloadAborted(int id)
+{
+  m_downloader.onDownloadAborted(id);
+}
 #endif
 
 /* EOF */

src/addon/addon_manager.hpp

@@ -18,8 +18,6 @@
 #ifndef HEADER_SUPERTUX_ADDON_ADDON_MANAGER_HPP
 #define HEADER_SUPERTUX_ADDON_ADDON_MANAGER_HPP
 
-#ifndef __EMSCRIPTEN__
-
 #include <memory>
 #include <string>
 #include <vector>
@@ -86,6 +84,13 @@ class AddonManager final : public Currenton<AddonManager>
   void update();
   void check_for_langpack_updates();
 
+#ifdef EMSCRIPTEN
+  void onDownloadProgress(int id, int loaded, int total);
+  void onDownloadFinished(int id);
+  void onDownloadError(int id);
+  void onDownloadAborted(int id);
+#endif
+
 private:
   std::vector<std::string> scan_for_archives() const;
   void add_installed_addons();
@@ -106,6 +111,4 @@ class AddonManager final : public Currenton<AddonManager>
 
 #endif
 
-#endif
-
 /* EOF */