Frontend - Improve wasm caching

Author: tizoc

docker-compose.block-producer.yml

@@ -2,16 +2,17 @@ services:
   openmina-node:
     image: openmina/openmina:${OPENMINA_TAG:-latest}
     entrypoint: >
-      sh -c "openmina node --producer-key /root/.openmina/producer-key $${COINBASE_RECEIVER:+--coinbase-receiver $$COINBASE_RECEIVER} $${OPENMINA_LIBP2P_EXTERNAL_IP:+--libp2p-external-ip $$OPENMINA_LIBP2P_EXTERNAL_IP}"
+      sh -c "openmina node --producer-key /root/.openmina/producer-key $${COINBASE_RECEIVER:+--coinbase-receiver $$COINBASE_RECEIVER} $${OPENMINA_LIBP2P_EXTERNAL_IP:+--libp2p-external-ip $$OPENMINA_LIBP2P_EXTERNAL_IP} $${OPENMINA_LIBP2P_PORT:+--libp2p-port $$OPENMINA_LIBP2P_PORT}"
     ports:
       - "3000:3000"
-      - "8302:8302"
+      - "${OPENMINA_LIBP2P_PORT:-8302}:${OPENMINA_LIBP2P_PORT:-8302}"
     volumes:
       - ./openmina-workdir:/root/.openmina:rw
     environment:
       MINA_PRIVKEY_PASS: "${MINA_PRIVKEY_PASS:-}"
       COINBASE_RECEIVER: "${COINBASE_RECEIVER:-}"
       OPENMINA_LIBP2P_EXTERNAL_IP: "${OPENMINA_LIBP2P_EXTERNAL_IP}"
+      OPENMINA_LIBP2P_PORT: "${OPENMINA_LIBP2P_PORT}"
 
   frontend:
     image: openmina/frontend:${OPENMINA_FRONTEND_TAG:-latest}

docker-compose.yml

@@ -2,14 +2,15 @@ services:
   openmina-node:
     image: openmina/openmina:${OPENMINA_TAG:-latest}
     entrypoint: >
-      sh -c "openmina node $${OPENMINA_LIBP2P_EXTERNAL_IP:+--libp2p-external-ip $$OPENMINA_LIBP2P_EXTERNAL_IP}"
+      sh -c "openmina node $${OPENMINA_LIBP2P_EXTERNAL_IP:+--libp2p-external-ip $$OPENMINA_LIBP2P_EXTERNAL_IP} $${OPENMINA_LIBP2P_PORT:+--libp2p-port $$OPENMINA_LIBP2P_PORT}"
     volumes:
       - ./openmina-workdir:/root/.openmina:rw
     ports:
       - "3000:3000"
-      - "8302:8302"
+      - "${OPENMINA_LIBP2P_PORT:-8302}:${OPENMINA_LIBP2P_PORT:-8302}"
     environment:
       OPENMINA_LIBP2P_EXTERNAL_IP: "${OPENMINA_LIBP2P_EXTERNAL_IP}"
+      OPENMINA_LIBP2P_PORT: "${OPENMINA_LIBP2P_PORT}"
 
   frontend:
     image: openmina/frontend:${OPENMINA_FRONTEND_TAG:-latest}

frontend/docker/startup.sh

@@ -120,7 +120,6 @@ inject_caching_logic() {
     # Generate a unique hash
     local hash=$(openssl rand -hex 8)
 
-    sed -i "/module_or_path = fetch(module_or_path);/i\    module_or_path += \"\?v=${hash}\";" "$js_file"
     sed -i 's/module_or_path = fetch(module_or_path);/module_or_path = fetch(module_or_path, { cache: "force-cache", headers: { "Cache-Control": "max-age=31536000, immutable" } });/' "$js_file"
     if [[ $? -ne 0 ]]; then
       echo "Failed to inject caching logic into $js_file"

frontend/httpd.conf

@@ -229,23 +229,12 @@ SSLProxyEngine On
 
 <IfModule unixd_module>
 
-# Define development environments
-SetEnvIf Host "localhost|127.0.0.1" DEVELOPMENT
-
 # Cache rules for WebNode assets
 <LocationMatch "/assets/webnode/pkg/openmina_node_web\.js">
-    # Development environment - no cache
-    Header set Cache-Control "no-store, no-cache, must-revalidate" env=DEVELOPMENT
-
-    # Production environment - aggressive caching
-    Header set Cache-Control "public, max-age=31536000, immutable" env=!DEVELOPMENT
+    Header set Cache-Control "public, max-age=31536000, immutable"
 </LocationMatch>
 <LocationMatch "/assets/webnode/pkg/openmina_node_web_bg\.wasm">
-    # Development environment - no cache
-    Header set Cache-Control "no-store, no-cache, must-revalidate" env=DEVELOPMENT
-
-    # Production environment - aggressive caching
-    Header set Cache-Control "public, max-age=31536000, immutable" env=!DEVELOPMENT
+    Header set Cache-Control "public, max-age=31536000, immutable"
 </LocationMatch>
 
 # Make sure mod_headers is enabled

frontend/src/index.html

@@ -45,7 +45,7 @@
   // Get version from build-time replaced variable or from meta tag
   // This will be replaced during build (don't change this line!!)
   const WEBNODE_VERSION = '13b85f46d3496a8608a86c8af21374bf';
-  const webNodeUrl = `./assets/webnode/pkg/openmina_node_web.js?v=${WEBNODE_VERSION}`;
+  const webNodeUrl = `./assets/webnode/pkg/openmina_node_web.js`;
 
   import(webNodeUrl)
     .then((v) => {