cordova-plugin-hot-updates 2.3.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-hot-updates",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Frontend-controlled manual hot updates for Cordova iOS and Android apps using WebView Reload approach. Manual updates only, JavaScript controls all decisions. 100% API compatibility between platforms.",
   "main": "www/HotUpdates.js",
   "scripts": {

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <plugin id="cordova-plugin-hot-updates"
-        version="2.3.0"
+        version="2.3.1"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -88,12 +88,8 @@
         <source-file src="src/android/HotUpdatesConstants.java"
                      target-dir="src/com/getmeback/hotupdates" />
 
-        <!-- Critical preferences for file:// scheme support -->
-        <config-file target="res/xml/config.xml" parent="/*">
-            <preference name="scheme" value="file" />
-            <preference name="AndroidInsecureFileModeEnabled" value="true" />
-            <preference name="LoadUrlTimeoutValue" value="120000" />
-        </config-file>
+        <!-- AndroidX WebKit for CordovaPluginPathHandler support -->
+        <framework src="androidx.webkit:webkit:1.12.+" />
     </platform>
 
     <!-- Plugin hooks (optional) -->

package/src/android/HotUpdates.java

@@ -18,11 +18,16 @@ import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
+import android.webkit.MimeTypeMap;
+import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
+import androidx.webkit.WebViewAssetLoader;
+
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
+import org.apache.cordova.CordovaPluginPathHandler;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -88,23 +93,6 @@ public class HotUpdates extends CordovaPlugin {
 
         canaryHandler = new Handler(Looper.getMainLooper());
 
-        // Enable file access for WebView (needed for loading from files/www)
-        try {
-            Object engineView = webView.getView();
-            if (engineView instanceof WebView) {
-                WebView wv = (WebView) engineView;
-                WebSettings settings = wv.getSettings();
-                settings.setAllowFileAccess(true);
-                settings.setAllowContentAccess(true);
-                // Note: These are deprecated but needed for file:// access
-                settings.setAllowFileAccessFromFileURLs(true);
-                settings.setAllowUniversalAccessFromFileURLs(true);
-                Log.d(TAG, "WebView file access enabled");
-            }
-        } catch (Exception e) {
-            Log.w(TAG, "Could not configure WebView settings: " + e.getMessage());
-        }
-
         loadConfiguration();
         loadIgnoreList();
         loadVersionHistory();
@@ -140,28 +128,8 @@ public class HotUpdates extends CordovaPlugin {
     @Override
     public void onStart() {
         super.onStart();
-
-        // If there's an installed version, redirect to external storage on startup
-        // This ensures pending updates that were auto-installed will be loaded
-        String installedVersion = getPrefs().getString(PREF_INSTALLED_VERSION, null);
-        if (installedVersion != null) {
-            cordova.getActivity().runOnUiThread(() -> {
-                try {
-                    String indexPath = "file://" + wwwPath + "/" + INDEX_HTML;
-                    Log.d(TAG, "Redirecting to external storage: " + indexPath);
-
-                    // Clear cache and disable caching before redirect
-                    android.webkit.WebView androidWebView = (android.webkit.WebView) webView.getView();
-                    androidWebView.clearCache(true);
-                    WebSettings webSettings = androidWebView.getSettings();
-                    webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
-
-                    webView.loadUrlIntoView(indexPath, false);
-                } catch (Exception e) {
-                    Log.e(TAG, "Failed to redirect to external storage: " + e.getMessage());
-                }
-            });
-        }
+        // No redirect needed - PathHandler transparently serves from files/www
+        // when an installed version exists, or falls through to assets/www otherwise
     }
 
     @Override
@@ -173,6 +141,77 @@ public class HotUpdates extends CordovaPlugin {
         super.onDestroy();
     }
 
+    // ============================================================
+    // PathHandler - serve updated files via https://localhost/
+    // ============================================================
+
+    @Override
+    public CordovaPluginPathHandler getPathHandler() {
+        WebViewAssetLoader.PathHandler handler = path -> {
+            try {
+                // Only intercept if there's an installed version
+                String installedVersion = getPrefs().getString(PREF_INSTALLED_VERSION, null);
+                if (installedVersion == null) {
+                    return null; // Let Cordova serve from assets/www
+                }
+
+                File wwwDir = new File(wwwPath);
+                if (!wwwDir.exists()) {
+                    return null;
+                }
+
+                if (path.isEmpty()) {
+                    path = INDEX_HTML;
+                }
+
+                File file = new File(wwwDir, path);
+
+                // Security: prevent path traversal
+                if (!file.getCanonicalPath().startsWith(wwwDir.getCanonicalPath())) {
+                    Log.e(TAG, "Path traversal attempt blocked: " + path);
+                    return null;
+                }
+
+                if (!file.exists() || file.isDirectory()) {
+                    return null; // Fall through to Cordova default handler
+                }
+
+                String mimeType = getMimeType(path);
+                InputStream is = new FileInputStream(file);
+                return new WebResourceResponse(mimeType, null, is);
+
+            } catch (Exception e) {
+                Log.e(TAG, "PathHandler error: " + e.getMessage());
+                return null;
+            }
+        };
+
+        return new CordovaPluginPathHandler(handler);
+    }
+
+    private String getMimeType(String path) {
+        if (path.endsWith(".js") || path.endsWith(".mjs")) {
+            return "application/javascript";
+        } else if (path.endsWith(".wasm")) {
+            return "application/wasm";
+        } else if (path.endsWith(".html") || path.endsWith(".htm")) {
+            return "text/html";
+        } else if (path.endsWith(".css")) {
+            return "text/css";
+        } else if (path.endsWith(".json")) {
+            return "application/json";
+        } else if (path.endsWith(".svg")) {
+            return "image/svg+xml";
+        }
+
+        String extension = MimeTypeMap.getFileExtensionFromUrl("file:///" + path);
+        if (extension != null) {
+            String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
+            if (mime != null) return mime;
+        }
+        return "application/octet-stream";
+    }
+
     // ============================================================
     // Configuration
     // ============================================================
@@ -812,29 +851,23 @@ public class HotUpdates extends CordovaPlugin {
     private void reloadWebView() {
         cordova.getActivity().runOnUiThread(() -> {
             try {
-                // Get WebView and its settings
                 android.webkit.WebView androidWebView = (android.webkit.WebView) webView.getView();
                 WebSettings webSettings = androidWebView.getSettings();
 
-                // Aggressively clear all WebView caches BEFORE reload
-                androidWebView.clearCache(true); // Clear cache including disk files
+                // Clear cache to force fresh load from PathHandler
+                androidWebView.clearCache(true);
                 androidWebView.clearHistory();
-                androidWebView.clearFormData();
                 webView.clearCache(true);
                 webView.clearHistory();
-
-                // Disable caching completely to force fresh load
                 webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
 
-                Log.d(TAG, "WebView cache, history and form data cleared");
-
-                String indexPath = "file://" + wwwPath + "/" + INDEX_HTML;
-                Log.d(TAG, "Reloading WebView with: " + indexPath);
+                // Always use https://localhost/ - PathHandler serves from files/www
+                String hostname = preferences.getString("hostname", "localhost");
+                String reloadUrl = "https://" + hostname + "/" + INDEX_HTML;
 
-                // Load new content directly into WebView (like CHCP does)
-                webView.loadUrlIntoView(indexPath, false);
+                Log.d(TAG, "Reloading WebView: " + reloadUrl);
+                webView.loadUrlIntoView(reloadUrl, false);
 
-                Log.d(TAG, "WebView reloaded successfully");
             } catch (Exception e) {
                 Log.e(TAG, "Failed to reload WebView: " + e.getMessage());
             }

package/src/android/HotUpdatesConstants.java

@@ -53,7 +53,6 @@ public final class HotUpdatesConstants {
     public static final String PREF_VERSION_HISTORY = "hot_updates_version_history";
     public static final String PREF_CANARY_VERSION = "hot_updates_canary_version";
     public static final String PREF_DOWNLOAD_IN_PROGRESS = "hot_updates_download_in_progress";
-    public static final String PREF_PENDING_UPDATE_URL = "hot_updates_pending_update_url";
     public static final String PREF_PENDING_UPDATE_READY = "hot_updates_pending_ready";
 
     // ============================================================