Emscripten Fixes

Author: danoli3

libs/openFrameworksCompiled/project/emscripten/app.js

@@ -101,7 +101,7 @@ document.addEventListener('DOMContentLoaded', () => {
   };
 
   Module.setStatus("Downloading...");
-  window.onerror = () => {
+  window.onerror = (text) => {
     const total = Module.totalDependencies || 1; // Default to avoid division by zero
     const left = text.match(/(\d+)\/(\d+)/);
     if (!left) {

libs/openFrameworksCompiled/project/emscripten/config.emscripten.default.mk

@@ -65,17 +65,17 @@ PLATFORM_REQUIRED_ADDONS = ofxEmscripten
 #   Note: Leave a leading space when adding list items with the += operator
 ################################################################################
 
-ifdef EMSCRIPTEN_PTHREADS
-	PLATFORM_PTHREAD = -s USE_PTHREADS=1
-	CFLAG_PLATFORM_PTHREAD = -pthread -matomics -mbulk-memory
-else
-	PLATFORM_PTHREAD = -s USE_PTHREADS=0
-	CFLAG_PLATFORM_PTHREAD = -matomics -mbulk-memory
-endif
+# ifdef EMSCRIPTEN_PTHREADS
+	PLATFORM_PTHREAD = #-s USE_PTHREADS=1
+	CFLAG_PLATFORM_PTHREAD = #-pthread -matomics -mbulk-memory
+# else
+# 	PLATFORM_PTHREAD = -s USE_PTHREADS=0
+# 	CFLAG_PLATFORM_PTHREAD = -matomics -mbulk-memory
+# endif
 
 # Code Generation Option Flags (http://gcc.gnu.org/onlinedocs/gcc/Code-Gen-Options.html)
-PLATFORM_CFLAGS = -std=c17 -fPIC $(CFLAG_PLATFORM_PTHREAD) -s ASSERTIONS=2
-PLATFORM_CXXFLAGS = -Wall -std=c++17 -fPIC -Wno-warn-absolute-paths $(CFLAG_PLATFORM_PTHREAD) -s ASSERTIONS=2
+PLATFORM_CFLAGS = -std=c17 -fPIC $(CFLAG_PLATFORM_PTHREAD) -s ASSERTIONS=2 #-sMEMORY64=1
+PLATFORM_CXXFLAGS = -Wall -std=c++17 -fPIC -Wno-warn-absolute-paths $(CFLAG_PLATFORM_PTHREAD) -s ASSERTIONS=2 #-sMEMORY64=1
 
 ################################################################################
 # PLATFORM LDFLAGS
@@ -103,23 +103,31 @@ ifdef USE_CCACHE
 	endif
 endif
 
-PLATFORM_LDFLAGS += -s EMBIND_AOT=1
+#PLATFORM_LDFLAGS += -s EMBIND_AOT=1
 PLATFORM_LDFLAGS = --preload-file bin/data@data --emrun --bind --profiling-funcs
-PLATFORM_LDFLAGS += -s USE_WEBGPU=1 -s NO_EXIT_RUNTIME=1
-PLATFORM_LDFLAGS += -s ALLOW_MEMORY_GROWTH=1 -s MAX_WEBGL_VERSION=2 -s WEBGL2_BACKWARDS_COMPATIBILITY_EMULATION=1 -s FULL_ES2
+PLATFORM_LDFLAGS += -s USE_WEBGPU=1
+PLATFORM_LDFLAGS += -s MAX_WEBGL_VERSION=2 -s WEBGL2_BACKWARDS_COMPATIBILITY_EMULATION=1 -s FULL_ES2
 PLATFORM_LDFLAGS += -s AUTO_NATIVE_LIBRARIES=1 -s AUTO_JS_LIBRARIES=1
-PLATFORM_LDFLAGS += -s EVAL_CTORS=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1
+#PLATFORM_LDFLAGS += -s EVAL_CTORS=1 -s ERROR_ON_UNDEFINED_SYMBOLS=1
 PLATFORM_LDFLAGS += -s ASSERTIONS=2
 PLATFORM_LDFLAGS += -s GL_ASSERTIONS=1
 PLATFORM_LDFLAGS += -s VERBOSE=1
-PLATFORM_LDFLAGS += -sEXPORTED_FUNCTIONS='["_main", "_malloc", "_free"]'
+#PLATFORM_LDFLAGS += -sEXPORTED_FUNCTIONS='["_main", "_malloc", "_free"]'
+# PLATFORM_LDFLAGS += -sEXPORTED_FUNCTIONS=all
 PLATFORM_LDFLAGS +=  $(PLATFORM_PTHREAD)
-PLATFORM_LDFLAGS += -lGL
-PLATFORM_LDFLAGS += -lhtml5
+# PLATFORM_LDFLAGS += -lGL
+# PLATFORM_LDFLAGS += -lhtml5
 PLATFORM_LDFLAGS += -s MINIFY_HTML=0
-PLATFORM_LDFLAGS += -s DYNAMIC_EXECUTION=0 -s NO_DYNAMIC_EXECUTION=1
+PLATFORM_LDFLAGS += -s MAIN_MODULE=1 \
+  -s ASSERTIONS=2 \
+  -s EXPORT_ALL=1 \
+  -s MODULARIZE=1 \
+  -s NO_DYNAMIC_EXECUTION=1
+PLATFORM_LDFLAGS += -s ALLOW_MEMORY_GROWTH=1
+PLATFORM_LDFLAGS += -sLOAD_SOURCE_MAP=1 -sABORT_ON_WASM_EXCEPTIONS=1
+PLATFORM_LDFLAGS += -s DYNAMIC_EXECUTION=0 -s EMBIND_AOT=1
 # PLATFORM_LDFLAGS += -s SINGLE_FILE=1
-PLATFORM_LDFLAGS += -s MODULARIZE=1
+#PLATFORM_LDFLAGS += -s MODULARIZE=1
 
 # PLATFORM_LDFLAGS += -s WASM_WORKERS=1 -s ENVIRONMENT="web,worker"
 # PLATFORM_LDFLAGS += -s USE_GLFW=3 -lglfw
@@ -165,11 +173,11 @@ PLATFORM_OPTIMIZATION_CFLAGS_RELEASE = -O3
 # DEBUG Debugging options (http://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html)
 PLATFORM_OPTIMIZATION_CFLAGS_DEBUG = -O1 -g 
 
-ifdef EMSCRIPTEN_MEMORY64
-	PLATFORM_CFLAGS += -s MEMORY64
-	PLATFORM_CXXFLAGS += -s MEMORY64
-	PLATFORM_LDFLAGS += -s MEMORY64
-endif
+# ifdef EMSCRIPTEN_MEMORY64
+# 	PLATFORM_CFLAGS += -s MEMORY64
+# 	PLATFORM_CXXFLAGS += -s MEMORY64
+# 	PLATFORM_LDFLAGS += -s MEMORY64 -mwasm64
+# endif
 
 
 ################################################################################

libs/openFrameworksCompiled/project/emscripten/generate_csp.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Set script directory
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd $SCRIPT_DIR
+
+# Files to hash
+FILES=("index.js" "app.js")
+OUTPUT_HTACCESS=".htaccess"
+
+# Generate CSP header
+CSP_HEADER="Content-Security-Policy: script-src 'self'"
+
+# Generate hashes for each file
+for FILE in "${FILES[@]}"; do
+    if [ -f "$FILE" ]; then
+        # Compute SHA-256 hash and convert to base64
+        HASH=$(sha256sum "$FILE" | awk '{print $1}' | xxd -r -p | base64)
+        CSP_HEADER="$CSP_HEADER 'sha256-$HASH'"
+         echo "HASH: $FILE - [$CSP_HEADER]"
+    else
+        echo "Warning: $FILE not found!"
+    fi
+done
+
+# Sanitize existing .htaccess
+if grep -q "Content-Security-Policy:" "$OUTPUT_HTACCESS"; then
+    echo "Existing CSP header found. Removing it..."
+    sed -i.bak '/Content-Security-Policy:/d' "$OUTPUT_HTACCESS"
+fi
+
+# Append new CSP header
+echo -e "\n# Automatically generated CSP header\n$CSP_HEADER;" >> "$OUTPUT_HTACCESS"
+echo "CSP header added to $OUTPUT_HTACCESS."